Merge pull request #118 from jacebrowning/release/v0.11

Release v0.11

.gitattributes

@@ -1,2 +1,2 @@
 * text=auto
-CHANGES.md merge=union
+CHANGELOG.md merge=union

.travis.yml

@@ -2,7 +2,6 @@ sudo: false
 
 language: python
 python:
-- 3.4
 - 3.5
 
 cache:

CHANGES.md → CHANGELOG.md

@@ -1,58 +1,54 @@
-Revision History
-================
+# Revision History
 
-0.10 (2016/04/14)
------------------
+## 0.11 (2016/05/10)
+
+- Removed dependency on `sh` to support Cygwin/MinGW/etc. on Windows.
+- Dropped Python 3.4 support for `subprocess` and `*args` improvements.
+- **BREAKING**: Renamed config file key `dir` to `name`.
+
+## 0.10 (2016/04/14)
 
 - Added `show` command to display dependency and internal paths.
 
-0.9 (2016/03/31)
-----------------
+## 0.9 (2016/03/31)
 
 - Added `edit` command to launch the configuration file.
 - Depth now defaults to 5 to prevent infinite recursion.
 - Fixed handling of source lists containing different dependencies.
 
-0.8.3 (2016/03/14)
-------------------
+## 0.8.3 (2016/03/14)
 
 - Renamed to GitMan.
 
-0.8.2 (2016/02/24)
-------------------
+## 0.8.2 (2016/02/24)
 
 - Updated to YORM v0.6.
 
-0.8.1 (2016/01/21)
-------------------
+## 0.8.1 (2016/01/21)
 
 - Added an error message when attempting to lock invalid repositories.
 
-0.8 (2016/01/13)
-----------------
+## 0.8 (2016/01/13)
 
 - Switched to using repository mirrors to speed up cloning.
 - Disabled automatic fetching on install.
 - Added `--fetch` option on `install` to always fetch.
 - Now displaying `git status` output when there are changes.
 
-0.7 (2015/12/22)
-----------------
+## 0.7 (2015/12/22)
 
 - Fixed `git remote rm` command (@hdnivara).
 - Now applying the `update` dependency filter to locking as well.
 - Now only locking previous locked dependencies.
 - Added `lock` command to manually save all dependency versions.
 - Now requiring `--lock` option on `update` to explicitly lock dependencies.
 
-0.6 (2015/11/13)
-----------------
+## 0.6 (2015/11/13)
 
 - Added the ability to filter the dependency list on `install` and `update`.
 - Added `--depth` option to limit dependency traversal on `install`, `update`, and `list`.
 
-0.5 (2015/10/20)
-----------------
+## 0.5 (2015/10/20)
 
 - Added Git plugin support via: `git deps`.
 - Removed `--no-clean` option (now the default) on `install` and `update`.
@@ -62,86 +58,71 @@ Revision History
 - Disabled warnings when running `install` without locked sources.
 - Added `--no-lock` option to disable version recording.
 
-0.4.2 (2015/10/18)
-------------------
+## 0.4.2 (2015/10/18)
 
 - Fixed crash when running with some sources missing.
 
-0.4.1 (2015/09/24)
-------------------
+## 0.4.1 (2015/09/24)
 
 - Switched to cloning for initial working tree creation.
 
-0.4 (2015/09/18)
-----------------
+## 0.4 (2015/09/18)
 
 - Replaced `install` command with `update`.
 - Updated `install` command to use locked dependency versions.
 - Now sorting sources after a successful `update`.
 - Now requiring `--force` to `uninstall` with uncommitted changes.
 - Updated `list` command to show full shell commands.
 
-0.3.1 (2015/09/09)
-------------------
+## 0.3.1 (2015/09/09)
 
 - Ensures files are not needlessly reloaded with newer versions of YORM.
 
-0.3 (2015/06/26)
-----------------
+## 0.3 (2015/06/26)
 
 - Added `--no-clean` option to disable removing untracked files.
 - Added support for `rev-parse` dates as the dependency `rev`.
 
-0.2.5 (2015/06/15)
-------------------
+## 0.2.5 (2015/06/15)
 
 - Added `--quiet` option to hide warnings.
 
-0.2.4 (2015/05/19)
-------------------
+## 0.2.4 (2015/05/19)
 
 - Now hiding YORM logging bellow warnings.
 
-0.2.3 (2015/05/17)
-------------------
+## 0.2.3 (2015/05/17)
 
 - Upgraded to YORM v0.4.
 
-0.2.2 (2015/05/04)
-------------------
+## 0.2.2 (2015/05/04)
 
 - Specified YORM < v0.4.
 
-0.2.1 (2015/03/12)
-------------------
+## 0.2.1 (2015/03/12)
 
 - Added automatic remote branch tracking in dependencies.
 - Now requiring `--force` when there are untracked files.
 
-0.2 (2015/03/10)
-----------------
+## 0.2 (2015/03/10)
 
 - Added `list` command to display current URLs/SHAs.
 
-0.1.4 (2014/02/27)
-------------------
+## 0.1.4 (2014/02/27)
 
 - Fixed an outdated index when checking for changes.
 
-0.1.3 (2014/02/27)
-------------------
+## 0.1.3 (2014/02/27)
 
 - Fixed extra whitespace when logging shell output.
 
-0.1.2 (2014/02/27)
-------------------
+## 0.1.2 (2014/02/27)
 
 - Added `--force` argument to:
     - overwrite uncommitted changes
     - create symbolic links in place of directories
 - Added live shell command output with `-vv` argument.
 
-0.1 (2014/02/24)
-----------------
+## 0.1 (2014/02/24)
 
 - Initial release.

Makefile

@@ -9,11 +9,6 @@ ifndef TRAVIS
 	PYTHON_MINOR ?= 5
 endif
 
-# Test settings
-UNIT_TEST_COVERAGE := 73
-INTEGRATION_TEST_COVERAGE := 79
-COMBINED_TEST_COVERAGE := 97
-
 # System paths
 PLATFORM := $(shell python -c 'import sys; print(sys.platform)')
 ifneq ($(findstring win32, $(PLATFORM)), )
@@ -68,6 +63,7 @@ PYREVERSE := $(BIN_)pyreverse
 NOSE := $(BIN_)nosetests
 PYTEST := $(BIN_)py.test
 COVERAGE := $(BIN_)coverage
+COVERAGE_SPACE := $(BIN_)coverage.space
 SNIFFER := $(BIN_)sniffer
 HONCHO := $(ACTIVATE) && honcho
 
@@ -119,7 +115,7 @@ depends: depends-ci depends-doc depends-dev
 .PHONY: depends-ci
 depends-ci: env Makefile $(DEPENDS_CI_FLAG)
 $(DEPENDS_CI_FLAG): Makefile
-	$(PIP) install --upgrade pep8 pep257 pylint coverage pytest pytest-describe pytest-expecter pytest-cov pytest-random freezegun
+	$(PIP) install --upgrade pep8 pep257 pylint coverage coverage.space pytest pytest-describe pytest-expecter pytest-cov pytest-random freezegun
 	@ touch $(DEPENDS_CI_FLAG)  # flag to indicate dependencies are installed
 
 .PHONY: depends-doc
@@ -171,7 +167,7 @@ README-pypi.html: README.rst
 
 .PHONY: verify-readme
 verify-readme: $(DOCS_FLAG)
-$(DOCS_FLAG): README.rst CHANGES.rst
+$(DOCS_FLAG): README.rst CHANGELOG.rst
 	$(PYTHON) setup.py check --restructuredtext --strict --metadata
 	@ touch $(DOCS_FLAG)  # flag to indicate README has been checked
 
@@ -219,11 +215,11 @@ fix: depends-dev
 RANDOM_SEED ?= $(shell date +%s)
 
 PYTEST_CORE_OPTS := --verbose -r xXw --maxfail=3
-PYTEST_COV_OPTS := --cov=$(PACKAGE) --no-cov-on-fail --cov-report=term-missing
+PYTEST_COV_OPTS := --cov=$(PACKAGE) --no-cov-on-fail --cov-report=term-missing --cov-report=html
 PYTEST_RANDOM_OPTS := --random --random-seed=$(RANDOM_SEED)
 
 PYTEST_OPTS := $(PYTEST_CORE_OPTS) $(PYTEST_COV_OPTS) $(PYTEST_RANDOM_OPTS)
-PYTEST_OPTS_FAILFAST := $(PYTEST_OPTS) --failed --exitfirst
+PYTEST_OPTS_FAILFAST := $(PYTEST_OPTS) --last-failed --exitfirst
 
 FAILURES := .cache/v/cache/lastfailed
 
@@ -234,15 +230,15 @@ test-unit: depends-ci
 	$(PYTEST) $(PYTEST_OPTS) $(PACKAGE)
 	@- mv $(FAILURES).bak $(FAILURES)
 ifndef TRAVIS
-	$(COVERAGE) html --directory htmlcov --fail-under=$(UNIT_TEST_COVERAGE)
+	$(COVERAGE_SPACE) jacebrowning/gitman unit
 endif
 
 .PHONY: test-int
 test-int: depends-ci
 	@ if test -e $(FAILURES); then $(PYTEST) $(PYTEST_OPTS_FAILFAST) tests; fi
 	$(PYTEST) $(PYTEST_OPTS) tests
 ifndef TRAVIS
-	$(COVERAGE) html --directory htmlcov --fail-under=$(INTEGRATION_TEST_COVERAGE)
+	$(COVERAGE_SPACE) jacebrowning/gitman integration
 endif
 
 .PHONY: tests test-all
@@ -251,7 +247,7 @@ test-all: depends-ci
 	@ if test -e $(FAILURES); then $(PYTEST) $(PYTEST_OPTS_FAILFAST) $(PACKAGE) tests; fi
 	$(PYTEST) $(PYTEST_OPTS) $(PACKAGE) tests
 ifndef TRAVIS
-	$(COVERAGE) html --directory htmlcov --fail-under=$(COMBINED_TEST_COVERAGE)
+	$(COVERAGE_SPACE) jacebrowning/gitman overall
 endif
 
 .PHONY: read-coverage

README.md

@@ -10,9 +10,9 @@ GitMan is a language-agnostic "dependency manager" using Git. It aims to serve a
 
 ## Requirements
 
-* Python 3.4+
-* Latest version of Git (with [stored credentials](http://git-dependency-manager.info/setup/git/))
-* OSX/Linux (with a decent shell for Git)
+* Python 3.5+
+* Git 1.8+ (with [stored credentials](http://git-dependency-manager.info/setup/git/))
+* Unix shell (or Cygwin/MinGW/etc. on Windows)
 
 ## Installation
 
@@ -37,11 +37,11 @@ Create a configuration file (`gitman.yml` or `.gitman.yml`) in the root of your
 ```yaml
 location: vendor
 sources:
-- repo: https://github.com/kstenerud/iOS-Universal-Framework
-  dir: framework
+- name: framework
+  repo: https://github.com/kstenerud/iOS-Universal-Framework
   rev: Mk5-end-of-life
-- repo: https://github.com/jonreid/XcodeCoverage
-  dir: coverage
+- name: coverage
+  repo: https://github.com/jonreid/XcodeCoverage
   rev: master
   link: Tools/XcodeCoverage
 ```
@@ -70,9 +70,9 @@ $ gitman update
 
 which will essentially:
 
-1. create a working tree at _root_/`location`/`dir`
+1. create a working tree at _root_/`location`/`name`
 2. fetch from `repo` and checkout the specified `rev`
-3. symbolically link each `location`/`dir` from _root_/`link` (if specified)
+3. symbolically link each `location`/`name` from _root_/`link` (if specified)
 4. repeat for all nested working trees containing a configuration file
 5. record the actual commit SHAs that were checked out (with `--lock` option)
 

docs/about/changelog.md

@@ -0,0 +1 @@
+../../CHANGELOG.md

docs/index.md

@@ -4,9 +4,9 @@ GitMan is a language-agnostic "dependency manager" using Git. It aims to serve a
 
 ## Requirements
 
-* Python 3.4+
-* Latest version of Git (with [stored credentials](setup/git/#stored-credentials))
-* OSX/Linux (with a decent shell for Git)
+* Python 3.5+
+* Git 1.8+ (with [stored credentials](setup/git/#stored-credentials))
+* Unix shell (or Cygwin/MinGW/etc. on Windows)
 
 ## Installation
 
@@ -31,11 +31,11 @@ Create a configuration file (`gitman.yml` or `.gitman.yml`) in the root of your
 ```yaml
 location: vendor
 sources:
-- repo: https://github.com/kstenerud/iOS-Universal-Framework
-  dir: framework
+- name: framework
+  repo: https://github.com/kstenerud/iOS-Universal-Framework
   rev: Mk5-end-of-life
-- repo: https://github.com/jonreid/XcodeCoverage
-  dir: coverage
+- name: coverage
+  repo: https://github.com/jonreid/XcodeCoverage
   rev: master
   link: Tools/XcodeCoverage
 ```
@@ -56,9 +56,9 @@ $ gitman install
 
 which will essentially:
 
-1. create a working tree at _root_/`location`/`dir`
+1. create a working tree at _root_/`location`/`name`
 2. fetch from `repo` and checkout the specified `rev`
-3. symbolically link each `location`/`dir` from _root_/`link` (if specified)
+3. symbolically link each `location`/`name` from _root_/`link` (if specified)
 4. repeat for all nested working trees containing a configuration file
 
 where `rev` can be:

docs/use-cases/branch-tracking.md

@@ -9,13 +9,11 @@ A web app's `gitman.yml` might look something like:
 ```yaml
 location: vendor
 sources:
-- dir: api
-  link: ''
+- name: api
   repo: https://github.com/example/api
   rev: develop
 sources_locked:
-- dir: api
-  link: ''
+- name: api
   repo: https://github.com/example/api
   rev: b2730855c9efaaa7448b25b82e5a4363785c83ed
 ```

docs/use-cases/build-integration.md

@@ -26,19 +26,19 @@ clean:
 using a configuration file similar to:
 
 ```yaml
-location: sources
+location: vendor
 sources:
-- dir: lib_foo
+- name: lib_foo
   repo: https://github.com/example/lib_foo
   rev: develop
-- dir: lib_bar
+- name: lib_bar
   repo: https://github.com/example/lib_bar
   rev: master
 sources_locked:
-- dir: lib_foo
+- name: lib_foo
   repo: https://github.com/example/lib_foo
   rev: 73cb3668d4c9c3388fb21de16c9c3f6217cc0e1c
-- dir: lib_bar
+- name: lib_bar
   repo: https://github.com/example/lib_bar
   rev: 560ea99953a4b3e393e170e07895d14904eb032c
 ```