Merge pull request #126 from JrGoodle/v0.11.0

v0.11.0

README.md

@@ -38,7 +38,7 @@ $ brew install python3
 To install from the [GitHub Releases](https://github.com/JrGoodle/clowder/releases) open a terminal and run:
 
 ```bash
-$ pip3 install https://github.com/JrGoodle/clowder/releases/download/0.10.0/clowder-0.10.0-py3-none-any.whl
+$ pip3 install https://github.com/JrGoodle/clowder/releases/download/0.11.0/clowder-0.11.0-py3-none-any.whl
 ```
 
 For terminal autocompletion, add the following to your shell profile:

clowder/cmd.py

@@ -59,7 +59,7 @@ def __init__(self):
         self.args = parser.parse_args()
 
         if self.args.clowder_version:
-            print('clowder version 0.10.0')
+            print('clowder version 0.11.0')
             sys.exit(0)
         print('')
         if self.args.command is None or not hasattr(self, self.args.command):

docs/commands.md

@@ -97,21 +97,28 @@ $ clowder prune stale_branch -p llvm-mirror/clang
 
 ### `repo`
 
-Manage clowder repository (`.clowder` directory).
+Convenience commands for managing clowder repo (the `.clowder` directory).
+More advanced needs may require changing to the `.clowder` directory and running commands directly.
 
 ```bash
 # Checkout git ref in clowder repo
 $ clowder repo checkout my_branch
+
 # Discard current changes in clowder repo
 $ clowder repo clean
+
 # Commit changes to yaml files in clowder repo
 $ clowder repo commit 'commit message'
+
 # Pull latest changes in clowder repo
 $ clowder repo pull
+
 # Push latest changes in clowder repo
 $ clowder repo push
+
 # Run command in .clowder directory
 $ clowder repo run 'git status'
+
 # Print clowder repo git status
 $ clowder repo status
 ```
@@ -121,6 +128,7 @@ $ clowder repo status
 ### `save`
 
 Save a `clowder.yaml` version with the information from currently checked out repositories.
+Versions are saved to `.clowder/versions/<version_name>/clowder.yaml` and need to be committed manually.
 
 ```bash
 # Save a version of clowder.yaml with current commit sha's

scripts/test_cats_example.sh

@@ -83,20 +83,20 @@ test_herd_sha()
 {
     print_separator
     echo "TEST: Test herd of static commit hash refs"
-    clowder repo run 'git checkout static-refs'
+    clowder repo checkout static-refs || exit 1
     clowder herd || exit 1
     clowder status || exit 1
-    clowder repo run 'git checkout master'
+    clowder repo checkout master || exit 1
 }
 
 test_herd_tag()
 {
     print_separator
     echo "TEST: Test herd of tag refs"
-    clowder repo run 'git checkout tags'
+    clowder repo checkout tags || exit 1
     clowder herd || exit 1
     clowder status || exit 1
-    clowder repo run 'git checkout master'
+    clowder repo checkout master || exit 1
 }
 
 test_init_branch()
@@ -118,7 +118,7 @@ test_invalid_yaml()
     print_separator
     echo "TEST: Fail herd with invalid yaml"
 
-    clowder repo run 'git checkout invalid-yaml'
+    clowder repo checkout invalid-yaml || exit 1
 
     test_cases=( 'missing-defaults' \
                  'missing-sources' \
@@ -149,11 +149,11 @@ test_no_versions()
 {
     print_separator
     echo "TEST: Test clowder repo with no versions saved"
-    clowder repo run 'git checkout no-versions'
+    clowder repo checkout no-versions || exit 1
     clowder herd -v saved-version && exit 1
     clowder herd || exit 1
     clowder status || exit 1
-    clowder repo run 'git checkout master'
+    clowder repo checkout master || exit 1
 }
 
 test_prune()

scripts/test_utilities.sh

@@ -3,8 +3,8 @@
 make_dirty_clowder_repo()
 {
     echo "TEST: Make dirty clowder repo"
-    clowder repo run 'touch newfile'
-    clowder repo run 'git add newfile'
+    clowder repo run 'touch newfile' || exit 1
+    clowder repo add newfile || exit 1
     clowder status || exit 1
 }
 

setup.py

@@ -13,7 +13,7 @@
 setup(
     name='clowder',
     description='A tool for managing code',
-    version='0.10.0',
+    version='0.11.0',
     url='http://clowder.cat',
     author='joe DeCapo',
     author_email='joe@polka.cat',