Merge pull request #350 from JrGoodle/default-version

Disallow saving a version named "default"

clowder/clowder/clowder_controller.py

@@ -209,12 +209,7 @@ def get_saved_version_names(self):
         versions_dir = os.path.join(self.root_directory, '.clowder', 'versions')
         if not os.path.exists(versions_dir):
             return None
-
-        versions = os.listdir(versions_dir)
-        for version in versions[:]:
-            if version.startswith('.'):
-                versions.remove(version)
-        return versions
+        return [v for v in os.listdir(versions_dir) if not v.startswith('.') if v.lower() != 'default']
 
     def herd(self, group_names, project_names=None, skip=None, branch=None, tag=None, depth=None, rebase=False):
         """Pull or rebase latest upstream changes for projects"""

clowder/clowder/cmd.py

@@ -372,6 +372,10 @@ def save(self):
         if self.clowder is None:
             sys.exit(1)
 
+        if self.args.version.lower() == 'default':
+            print(fmt.save_default_error(self.args.version))
+            sys.exit(1)
+
         self.clowder_repo.print_status()
         self.clowder.save_version(self.args.version)
 

clowder/clowder/util/formatting.py

@@ -282,6 +282,14 @@ def remove_prefix(text, prefix):
     return text
 
 
+def save_default_error(name):
+    """Format error message for trying to save 'default' version"""
+    name_output = colored(name, attrs=['bold'])
+    output_1 = colored(' - Error: Version name ', 'red')
+    output_2 = colored(' is not allowed\n', 'red')
+    return output_1 + name_output + output_2
+
+
 def save_file_error(pth):
     """Format error message for failing to save file"""
 

test/scripts/cats/save.sh

@@ -20,6 +20,9 @@ test_save() {
     clowder link -v v100 && exit 1
     echo "TEST: Fail saving a previously saved version"
     clowder save v0.1 && exit 1
+    echo "TEST: Fail saving a saved version named 'default'"
+    clowder save default && exit 1
+    clowder save DEFAULT && exit 1
     echo "TEST: Successfully save a new version"
     clowder save v0.11 || exit 1
     echo "TEST: Successfully save version with path separator in input name"