Merge remote-tracking branch 'upstream/master' into linkif

dotbot/__init__.py

@@ -1,4 +1,4 @@
 from .cli import main
 from .plugin import Plugin
 
-__version__ = '1.12.3'
+__version__ = '1.12.4'

dotbot/cli.py

@@ -52,7 +52,7 @@ def main():
             log.set_level(Level.DEBUG)
         plugin_directories = list(options.plugin_dirs)
         if not options.disable_built_in_plugins:
-          plugin_directories.append(os.path.join(os.path.dirname(__file__), '..', 'plugins'))
+            from .plugins import Clean, Link, Shell
         plugin_paths = []
         for directory in plugin_directories:
           for plugin_path in glob.glob(os.path.join(directory, '*.py')):

dotbot/plugins/__init__.py

@@ -0,0 +1,3 @@
+from .clean import Clean
+from .link import Link
+from .shell import Shell

test/tests/plugin-disable-builtin.bash

@@ -0,0 +1,17 @@
+test_description='can disable built-in plugins'
+. '../test-lib.bash'
+
+test_expect_success 'setup' '
+echo "apple" > ${DOTFILES}/f
+'
+
+test_expect_failure 'run' '
+run_dotbot --disable-built-in-plugins <<EOF
+- link:
+    ~/.f: f
+EOF
+'
+
+test_expect_failure 'test' '
+test -f ~/.f
+'