summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Klein <robobenklein@gmail.com>2018-01-27 02:27:44 -0500
committerAnish Athalye <me@anishathalye.com>2018-04-13 08:49:02 -0400
commitdece710399e305a2d94a0786e71c56dcdba14430 (patch)
tree723694a132b851eefb5a69703fd6a2a5c477bda0
parenta517c4c5d0b6bdd8ab3a62f3c6c3f38837354bde (diff)
Implement globbing support
-rw-r--r--dotbot/dispatcher.py3
-rw-r--r--plugins/link.py56
2 files changed, 48 insertions, 11 deletions
diff --git a/dotbot/dispatcher.py b/dotbot/dispatcher.py
index cc07435..d1a4f95 100644
--- a/dotbot/dispatcher.py
+++ b/dotbot/dispatcher.py
@@ -30,10 +30,11 @@ class Dispatcher(object):
try:
success &= plugin.handle(action, task[action])
handled = True
- except Exception:
+ except Exception as err:
self._log.error(
'An error was encountered while executing action %s' %
action)
+ self._log.debug(err)
if not handled:
success = False
self._log.error('Action %s not handled' % action)
diff --git a/plugins/link.py b/plugins/link.py
index 4b50320..b77b956 100644
--- a/plugins/link.py
+++ b/plugins/link.py
@@ -1,4 +1,5 @@
import os
+import glob
import shutil
import dotbot
@@ -27,26 +28,60 @@ class Link(dotbot.Plugin):
force = defaults.get('force', False)
relink = defaults.get('relink', False)
create = defaults.get('create', False)
+ use_glob = defaults.get('use_glob', False)
if isinstance(source, dict):
# extended config
relative = source.get('relative', relative)
force = source.get('force', force)
relink = source.get('relink', relink)
create = source.get('create', create)
+ use_glob = source.get('use_glob', use_glob)
path = self._default_source(destination, source.get('path'))
else:
path = self._default_source(destination, source)
path = os.path.expandvars(os.path.expanduser(path))
- if not self._exists(os.path.join(self._context.base_directory(), path)):
- success = False
- self._log.warning('Nonexistent target %s -> %s' %
- (destination, path))
- continue
- if create:
- success &= self._create(destination)
- if force or relink:
- success &= self._delete(path, destination, relative, force)
- success &= self._link(path, destination, relative)
+ if use_glob:
+ self._log.debug("Globbing with path: " + str(path))
+ glob_results = glob.glob(path)
+ if len(glob_results) is 0:
+ self._log.warning("Globbing couldn't find anything matching " + str(path))
+ success = False
+ continue
+ glob_star_loc = path.find('*')
+ if glob_star_loc is -1 and destination[-1] is '/':
+ self._log.error("Ambiguous action requested.")
+ self._log.error("No wildcard in glob, directory use undefined: " +
+ destination + " -> " + str(glob_results))
+ self._log.warning("Did you want to link the directory or into it?")
+ success = False
+ continue
+ elif glob_star_loc is -1 and len(glob_results) is 1:
+ # perform a normal link operation
+ if create:
+ success &= self._create(destination)
+ if force or relink:
+ success &= self._delete(path, destination, relative, force)
+ success &= self._link(path, destination, relative)
+ else:
+ self._log.lowinfo("Linking globbed items: " + str(glob_results))
+ glob_base = path[:glob_star_loc]
+ for glob_full_item in glob_results:
+ glob_item = glob_full_item[len(glob_base):]
+ glob_link_destination = destination + glob_item
+ if create:
+ success &= self._create(glob_link_destination)
+ success &= self._link(glob_full_item, glob_link_destination, relative)
+ else:
+ if create:
+ success &= self._create(destination)
+ if not self._exists(os.path.join(self._context.base_directory(), path)):
+ success = False
+ self._log.warning('Nonexistent target %s -> %s' %
+ (destination, path))
+ continue
+ if force or relink:
+ success &= self._delete(path, destination, relative, force)
+ success &= self._link(path, destination, relative)
if success:
self._log.info('All links have been set up')
else:
@@ -87,6 +122,7 @@ class Link(dotbot.Plugin):
success = True
parent = os.path.abspath(os.path.join(os.path.expanduser(path), os.pardir))
if not self._exists(parent):
+ self._log.debug("Try to create parent: " + str(parent))
try:
os.makedirs(parent)
except OSError: