Merge pull request #92 from larsewi/remove

CFE-3896: cfbs remove now automatically prepends ./ if necessary

cfbs/commands.py

@@ -228,6 +228,9 @@ def remove_command(to_remove: list, non_interactive=False):
     modules = definition["build"]
 
     def _get_module_by_name(name) -> dict:
+        if not name.startswith("./") and name.endswith(".cf") and os.path.exists(name):
+            name = "./" + name
+
         for module in modules:
             if module["name"] == name:
                 return module

test/shell/012_prepend_dot_slash.sh

@@ -0,0 +1,35 @@
+set -e
+set -x
+cd test
+mkdir -p ./tmp/
+cd ./tmp/
+
+echo '
+bundle agent test_bundle
+{
+  meta:
+    "tags" slist => { "autorun" };
+  reports:
+    "test";
+}
+' > test_policy.cf
+
+touch cfbs.json && rm cfbs.json
+cfbs init
+cfbs add ./test_policy.cf
+cfbs remove ./test_policy.cf --non-interactive
+
+rm cfbs.json
+cfbs init
+cfbs add test_policy.cf
+cfbs remove test_policy.cf --non-interactive
+
+rm cfbs.json
+cfbs init
+cfbs add ./test_policy.cf
+cfbs remove test_policy.cf --non-interactive
+
+rm cfbs.json
+cfbs init
+cfbs add test_policy.cf
+cfbs remove ./test_policy.cf --non-interactive

test/shell/all.sh

@@ -14,3 +14,4 @@ bash test/shell/008_remove.sh
 bash test/shell/009_clean.sh
 bash test/shell/010_local_add.sh
 bash test/shell/011_update.sh
+bash test/shell/012_prepend_dot_slash.sh