Merge lp:~hazmat/pyjuju/env-from-env into lp:pyjuju

[Kapil Thangavelu]

Juju environment can be specified via environment variable.

The environment variable JUJU_ENV can now also be used to specify which
environment to use, this value takes precedence over the default in
environments.yaml, but is preceded by an explicit env on the cli args.

[Jim Baker (jimbaker)]

+1, really a trivial. LGTM!

review: Approve

[Benjamin Saller (bcsaller)]

+1 lgtm

review: Approve

=== modified file 'juju/control/tests/test_utils.py'
--- juju/control/tests/test_utils.py	2011-12-02 04:35:10 +0000
+++ juju/control/tests/test_utils.py	2012-02-15 23:35:21 +0000
@@ -92,6 +92,22 @@
 
 class GetEnvironmentTest(ControlToolTest):
 
+    def test_get_environment_from_environment(self):
+        self.change_environment(JUJU_ENV="secondenv")
+        config = {
+            "environments": {"firstenv": {"type": "dummy"},
+                             "secondenv": {"type": "dummy"}}}
+        self.write_config(dump(config))
+
+        env_config = EnvironmentsConfig()
+        env_config.load_or_write_sample()
+        options = FakeOptions()
+        options.environment = None
+        options.environments = env_config
+
+        environment = get_environment(options)
+        self.assertEqual(environment.name, "secondenv")
+
     def test_get_environment(self):
         config = {
             "environments": {"firstenv": {"type": "dummy"}}}

=== modified file 'juju/control/utils.py'
--- juju/control/utils.py	2011-12-02 00:22:55 +0000
+++ juju/control/utils.py	2012-02-15 23:35:21 +0000
@@ -10,7 +10,8 @@
 
 
 def get_environment(options):
-    environment = options.environments.get(options.environment)
+    env_name = options.environment or os.environ.get("JUJU_ENV")
+    environment = options.environments.get(env_name)
     if environment is None and options.environment:
         raise EnvironmentsConfigError(
             "Invalid environment %r" % options.environment)