diff options
| author |  Jon Bernard <jbernard@tuxion.com>
| 2012-01-01 11:41:10 -0500 |
|---|---|---|
| committer | Jon Bernard <jbernard@tuxion.com>
| 2012-01-01 11:41:10 -0500 |
| commit | 81529f062459efc2c7c5d00761767797aae6f830 (patch) | |
| tree | 94a9691726d1402e321cb3305e78f4db9d1995f1 | |
| parent | af27db8aed8d3aa7695bc35b9c2180aa90757635 (diff) | |
| parent | 6cf8d5fdae4fda5be0fd3bcea4afd7883d56a188 (diff) | |
| download | dotfiles-81529f062459efc2c7c5d00761767797aae6f830.tar.gz dotfiles-81529f062459efc2c7c5d00761767797aae6f830.tar.bz2 dotfiles-81529f062459efc2c7c5d00761767797aae6f830.zip | |
Merge branch 'release/0.5.2'v0.5.2
| -rw-r--r-- | AUTHORS.rst | 1 | ||||
| -rw-r--r-- | HISTORY.rst | 7 | ||||
| -rw-r--r-- | LICENSE.rst | 2 | ||||
| -rw-r--r-- | README.rst | 9 | ||||
| -rw-r--r-- | dotfiles/cli.py | 2 | ||||
| -rw-r--r-- | dotfiles/core.py | 5 |
6 files changed, 21 insertions, 5 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index dc83965..2d33bcb 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -12,3 +12,4 @@ Patches and Suggestions - Anaël Beutot - Remco Wendt <remco@maykinmedia.nl> - Sebastian Rahlf +- Reinout van Rees <reinout@vanrees.org> diff --git a/HISTORY.rst b/HISTORY.rst index 6f874d1..78da6ac 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,13 @@ History ------- +0.5.2 ++++++ + +* Improve wording of "unmanaged" with "unsynced" +* Fix adding a directory with a trailing slash +* Mention support for directories in documentation + 0.5.1 +++++ diff --git a/LICENSE.rst b/LICENSE.rst index d7d596d..e00fc0e 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -3,7 +3,7 @@ License ISC License. :: - Copyright (c) 2011, Jon Bernard <jbernard@tuxion.com> + Copyright (c) 2011-2012, Jon Bernard <jbernard@tuxion.com> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -7,6 +7,13 @@ easy, allowing you to keep all your dotfiles in a single directory. Hosting is up to you. Using whatever VCS you prefer, or even rsync, you can easily distribute your dotfiles repository across multiple hosts. +The repository can be specified at runtime, so you can manage multiple +repositories without hassle. See the Configuration_ section below for further +details. + +Directories are supported as well. Any file object in your home directory that +starts with a ``.`` is fair game. + Interface --------- @@ -14,7 +21,7 @@ Interface Add dotfile(s) to the repository. ``-c, --check`` - Check for missing or unmanged dotfiles. + Check for missing or unsynced dotfiles. ``-l, --list`` List currently managed dotfiles, one per line. diff --git a/dotfiles/cli.py b/dotfiles/cli.py index 192144f..1de9f1c 100644 --- a/dotfiles/cli.py +++ b/dotfiles/cli.py @@ -91,7 +91,7 @@ def add_action_group(parser): action_group.add_option("-c", "--check", action="store_const", dest="action", const="check", - help="check for broken and unmanaged dotfiles") + help="check for broken and unsynced dotfiles") action_group.add_option("-l", "--list", action="store_const", dest="action", const="list", diff --git a/dotfiles/core.py b/dotfiles/core.py index aa0dce9..76a354d 100644 --- a/dotfiles/core.py +++ b/dotfiles/core.py @@ -12,7 +12,7 @@ import shutil import fnmatch -__version__ = '0.5.1' +__version__ = '0.5.2' __author__ = 'Jon Bernard' __license__ = 'ISC' @@ -113,7 +113,7 @@ class Dotfiles(object): print dotfile def check(self): - """List only unmanaged and/or missing dotfiles.""" + """List only unsynced and/or missing dotfiles.""" self.list(verbose=False) @@ -137,6 +137,7 @@ class Dotfiles(object): def _perform_action(self, action, files): for file in files: + file = file.rstrip('/') if os.path.basename(file).startswith('.'): getattr(Dotfile(file, self._fqpn(file), self.homedir), action)() else: |