Merge pull request #11 from dcrosta/knife-rb-env-values

Support "#{ENV['FOO']}" expressions in knife.rb

Author: coderanger

chef/api.py

@@ -67,6 +67,7 @@ class ChefAPI(object):
     """
 
     ruby_value_re = re.compile(r'#\{([^}]+)\}')
+    env_value_re = re.compile(r'ENV\[(.+)\]')
 
     def __init__(self, url, key, client, version='0.10.8', headers={}):
         self.url = url.rstrip('/')
@@ -105,6 +106,10 @@ def _ruby_value(match):
                 expr = match.group(1).strip()
                 if expr == 'current_dir':
                     return os.path.dirname(path)
+                envmatch = cls.env_value_re.match(expr)
+                if envmatch:
+                    envmatch = envmatch.group(1).strip('"').strip("'")
+                    return os.environ.get(envmatch) or ''
                 log.debug('Unknown ruby expression in line "%s"', line)
                 raise UnknownRubyExpression
             try:

chef/tests/configs/basic.rb

@@ -1,4 +1,4 @@
 chef_server_url 'http://chef:4000'
-client_key 'chef/tests/client.pem'
+client_key '../client.pem'
 # Use both kind of quotes, also a comment for testing
 node_name "test_1"

chef/tests/configs/current_dir.rb

@@ -1,3 +1,3 @@
 chef_server_url 'http://chef:4000'
-client_key 'chef/tests/client.pem'
+client_key '../client.pem'
 node_name "#{current_dir}/test_1"

chef/tests/configs/env_values.rb

@@ -0,0 +1,3 @@
+chef_server_url 'http://chef:4000'
+client_key '../client.pem'
+node_name "#{ENV['_PYCHEF_TEST_']}"

chef/tests/test_api.py

@@ -18,3 +18,11 @@ def test_current_dir(self):
         api = self.load('current_dir.rb')
         path = os.path.join(os.path.dirname(__file__), 'configs', 'test_1')
         self.assertEqual(api.client, path)
+
+    def test_env_variables(self):
+        try:
+            os.environ['_PYCHEF_TEST_'] = 'foobar'
+            api = self.load('env_values.rb')
+            self.assertEqual(api.client, 'foobar')
+        finally:
+            del os.environ['_PYCHEF_TEST_']