Merge pull request #491 from JrGoodle/default-project-path

Update default project path to last name component

.gitignore

@@ -8,6 +8,10 @@ examples/cats/peru.yaml
 examples/cats/black*
 examples/cats/mu
 examples/cats/duke
+examples/cats/kit
+examples/cats/kishka
+examples/cats/june
+examples/cats/sasha
 examples/cats/polkabot
 examples/cats/videos
 examples/cats/jrgoodle

examples/cats/clean.sh

@@ -9,5 +9,9 @@ rm -rf .clowder
 rm -rf black-cats
 rm -rf duke
 rm -rf mu
+rm -rf kit
+rm -rf kishka
+rm -rf june
+rm -rf sasha
 rm -rf jrgoodle
 rm -f clowder.yaml

src/clowder/model/project.py

@@ -69,7 +69,7 @@ def __init__(self, project: dict, defaults: Defaults, sources: List[Source]):
         """
 
         self.name = project['name']
-        self.path = project.get('path', self.name)
+        self.path = project.get('path', fmt.last_path_component(self.name))
         self.remote = project.get('remote', defaults.remote)
         self.depth = project.get('depth', defaults.depth)
         self.recursive = project.get('recursive', defaults.recursive)

src/clowder/util/formatting.py

@@ -5,6 +5,7 @@
 
 """
 
+import os
 from typing import Optional
 
 # noinspection PyPackageRequirements
@@ -303,6 +304,17 @@ def fork_string(name: str) -> str:
     return colored(name, 'cyan')
 
 
+def last_path_component(path: str) -> str:
+    """Return last path component
+
+    :param str path: Path string
+    :return: Last path component
+    :rtype: str
+    """
+
+    return os.path.basename(os.path.normpath(path))
+
+
 def path_string(path: str) -> str:
     """Return formatted path
 

src/clowder/util/yaml.py

@@ -228,7 +228,7 @@ def _validate_yaml_contents(yaml: dict, yaml_file: str) -> None:
     projects_with_forks = []
     for p in yaml['projects']:
         project = {'name': p['name'],
-                   'path': p.get('path', p['name'])}
+                   'path': p.get('path', fmt.last_path_component(p['name']))}
         if 'remote' in p:
             project['remote'] = p['remote']
         if 'source' in p:

test/scripts/cats/herd.sh

@@ -53,22 +53,22 @@ test_herd_implicit_project_paths() {
     echo "TEST: Check projects are on correct branches with implicit project paths"
     $COMMAND link -v implicit-paths || exit 1
     $COMMAND herd $PARALLEL || exit 1
-    pushd jrgoodle/mu || exit 1
+    pushd mu || exit 1
     test_branch knead
     popd || exit 1
-    pushd jrgoodle/duke || exit 1
+    pushd duke || exit 1
     test_branch purr
     popd || exit 1
-    pushd jrgoodle/kit || exit 1
+    pushd kit || exit 1
     test_branch master
     popd || exit 1
-    pushd jrgoodle/kishka || exit 1
+    pushd kishka || exit 1
     test_branch master
     popd || exit 1
-    pushd jrgoodle/sasha || exit 1
+    pushd sasha || exit 1
     test_branch master
     popd || exit 1
-    pushd jrgoodle/june || exit 1
+    pushd june || exit 1
     test_branch master
     popd || exit 1
 }