Implement json format for configuration files

Author: p

.travis.yml

@@ -3,5 +3,5 @@ python:
   - "2.6"
   - "2.7"
   - "3.2"
-install: "pip install -r requirements.txt --use-mirrors"
+install: "pip install -r requirements-dev.txt --use-mirrors"
 script: python tests/run-tests.py

README.md

@@ -83,7 +83,8 @@ To use buildploy, you need:
 3. A configuration file informing buildploy of where the repositories are
 and how the project should be built.
 
-Configuration files are in YAML format and look like this:
+Configuration files can be in YAML or JSON format.
+YAML configuration files look like this:
 
 	src_repo: git@github.com:foo/foo.git
 	deploy_repo: git@github.com:foo/foo-deploy.git
@@ -99,6 +100,15 @@ path accepted by Git, including a local filesystem path.
 deployable trees.
 - ``build_cmd`` - Command used to perform the build.
 
+JSON configuration files use the same schema but serialized in JSON.
+Buildploy detects configuration file type via its extension: .yaml and .yml
+files are considered YAML files, .json files are considered JSON files.
+The default for other extensions is currently YAML, although an automatic
+detection facility may be added in the future.
+
+JSON is part of Python standard library as of 2.6, and when using it
+buildploy has no dependencies. Using YAML requires installing PyYAML.
+
 Then, execute ``buildploy path/to/config.yaml``.
 
 ## Branches

TODO

@@ -1,4 +1,4 @@
-- json support for configuration files
+- command line option to force yaml/json for configuration file
 - branch command line option
 - test for building without reset into an empty repository
 - add tests for transforming a branch that does and does not exist in deploy repo

buildploy.py

@@ -6,7 +6,6 @@
 import subprocess
 import os.path
 import sys
-import yaml
 import time
 
 py3 = sys.version_info[0] == 3
@@ -124,8 +123,14 @@ def git_reset_to_empty_tree(deploy_dir, branch):
     git_in_dir(deploy_dir, ['branch', '-d', 'newbranch'])
 
 def load_config_file(path):
+    if path.endswith('.json'):
+        import json
+        load_fn = json.load
+    else:
+        import yaml
+        load_fn = yaml.load
     with open(path) as f:
-        config = yaml.load(f)
+        config = load_fn(f)
     return config
 
 def main():

requirements-dev.txt

@@ -0,0 +1,2 @@
+mock
+pyyaml

tests/config_test.py

@@ -1,6 +1,20 @@
 import os.path
 import buildploy
 import unittest
+import mock
+
+try:
+    # py 2
+    base_exception = StandardError
+except NameError:
+    # py 3
+    base_exception = Exception
+
+class YamlDisabled(base_exception):
+    pass
+
+def disabled_yaml(*args):
+    raise YamlDisabled
 
 class UnitTest(unittest.TestCase):
     def setUp(self):
@@ -12,6 +26,17 @@ def test_yaml(self):
     def test_yml(self):
         self.check('yaml_config.yml')
 
+    @mock.patch('yaml.load', disabled_yaml)
+    def test_yaml_patching(self):
+        # this just checks that our patch works
+        try:
+            self.check('yaml_config.yml')
+        except YamlDisabled:
+            pass
+        else:
+            self.fail('Patch did not work')
+    
+    @mock.patch('yaml.load', disabled_yaml)
     def test_json(self):
         self.check('json_config.json')