Merge pull request #63 from dustinbrown/master

fixed python3 bug in ChefAPI.from_config_file

Author: coderanger

chef/api.py

@@ -136,13 +136,16 @@ def _ruby_value(match):
             url = key_path = client_name = None
             proc = subprocess.Popen('ruby', stdin=subprocess.PIPE, stdout=subprocess.PIPE)
             script = config_ruby_script % path.replace('\\', '\\\\').replace("'", "\\'")
-            out, err = proc.communicate(script)
+            out, err = proc.communicate(script.encode())
             if proc.returncode == 0 and out.strip():
-                data = json.loads(out)
+                data = json.loads(out.decode())
                 log.debug('Ruby parse succeeded with %r', data)
                 url = data.get('chef_server_url')
                 client_name = data.get('node_name')
                 key_path = data.get('client_key')
+                if key_path and not os.path.isabs(key_path):
+                    # Relative paths are relative to the config file
+                    key_path = os.path.abspath(os.path.join(os.path.dirname(path), key_path))
             else:
                 log.debug('Ruby parse failed with exit code %s: %s', proc.returncode, out.strip())
         if not url:

chef/tests/configs/basic_with_interpolated_values.rb

@@ -0,0 +1,9 @@
+key_name = 'client'
+chef_server_url "#{url}"
+client_key "../#{key_name}.pem"
+# Use both kind of quotes, also a comment for testing
+node_name "test_1"
+# test multiple line values
+client_name = {
+    'dev' =>'test_1'
+}['dev']

chef/tests/test_api.py

@@ -1,14 +1,30 @@
 import os
 
+import mock
 import unittest2
 
 from chef.api import ChefAPI
 
+
 class APITestCase(unittest2.TestCase):
     def load(self, path):
         path = os.path.join(os.path.dirname(__file__), 'configs', path)
         return ChefAPI.from_config_file(path)
 
+    @mock.patch('chef.api.subprocess.Popen')
+    def test_config_with_interpolated_settings(self, mock_subproc_popen):
+        process_mock = mock.Mock()
+        output = b'{"chef_server_url": "http:///chef:4000", "client_key": "../client.pem",' \
+                 b'"node_name": "test_1"}'
+        attrs = {
+            'communicate.return_value': (output, 'error'),
+            'returncode': 0}
+        process_mock.configure_mock(**attrs)
+        mock_subproc_popen.return_value = process_mock
+
+        api = self.load('basic_with_interpolated_values.rb')
+        self.assertEqual(api.client, 'test_1')
+
     def test_basic(self):
         api = self.load('basic.rb')
         self.assertEqual(api.url, 'http://chef:4000')