New testsuite based on Git's test-lib.sh

.travis.yml

@@ -1,15 +1,9 @@
-language: perl
-before_install:
-  - cpanm Shell::Command
-  - cpanm Test::Most
-  - apt-get moo
-install:
-  - sudo apt-get update
-  - sudo apt-get install cowsay git ruby-ronn
+sudo: false
+language: bash
+before_script:
+  - echo '-v' > "$HOME/.proverc"
 script:
   - make test
-after_script:
-  - make moo
 notifications:
   email:
     on_success: change

Makefile

@@ -4,6 +4,8 @@ DOCDIR=$(DOCDIR_PREFIX)/$(self)
 ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
 RONN ?= ronn
 
+.PHONY: all install manpages clean uninstall purge test moo
+
 self=vcsh
 manpages=$(self).1
 all=test manpages
@@ -44,8 +46,7 @@ purge: uninstall
 	rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(ZSHDIR)
 
 test:
-	@if which git   > /dev/null; then :    ; else echo "'git' not found, exiting..."         ; exit 1; fi
-	@if which prove > /dev/null; then prove; else echo "'prove' not found; not running tests";         fi
+	$(MAKE) -C t/
 
 moo:
 	@which cowsay >/dev/null 2>&1 && cowsay "I hope you're happy now..."

README.md

@@ -1,6 +1,6 @@
 vcsh - Version Control System for $HOME - multiple Git repositories in $HOME
 
-[![Build Status](https://travis-ci.org/RichiH/vcsh.svg?branch=master)](https://travis-ci.org/RichiH/vcsh)
+[![Build Status](https://travis-ci.org/djpohly/vcsh.svg?branch=git-test-lib)](https://travis-ci.org/djpohly/vcsh)
 
 
 # Index

t/.gitignore

@@ -0,0 +1,2 @@
+/test-results/
+/trash directory.*/

t/Makefile

@@ -0,0 +1,10 @@
+.PHONY: all test test-prereq
+
+all: test
+
+test-prereq:
+	@if ! which git   > /dev/null; then echo "'git' not found, exiting..."         ; exit 1; fi
+	@if ! which prove > /dev/null; then echo "'prove' not found; not running tests"; exit 1; fi
+
+test: test-prereq
+	prove $(filter -j%,$(MAKEFLAGS)) --timer *.t :: $(TEST_ARGS)

t/clone.t

@@ -0,0 +1,125 @@
+#!/bin/sh
+
+test_description='Clone command'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/environment.sh"
+
+test_setup 'Create upstream repos' \
+	'test_create_repo empty &&
+
+	test_create_repo repo &&
+	test_commit -C repo A &&
+	git -C repo checkout -b branchb &&
+	test_commit -C repo A2 &&
+	git -C repo checkout master &&
+
+	test_create_repo repo2 &&
+	test_commit -C repo2 B &&
+
+	git clone --bare repo2 repo3.git'
+
+test_expect_success 'Clone requires a remote' \
+	'test_must_fail $VCSH clone'
+
+test_expect_success 'Warn about cloning empty repo' \
+	'test_when_finished "doit | $VCSH delete empty" &&
+	test_might_fail $VCSH clone empty 2>&1 | test_grep "remote is empty"'
+
+test_expect_success 'Clone refuses to overwrite existing files' \
+	'echo success >A.t &&
+	test_when_finished "rm -f A.t" &&
+	test_might_fail $VCSH clone repo temp &&
+	test_when_finished "doit | $VCSH delete temp" &&
+	echo success >expected &&
+	test_cmp expected A.t'
+
+test_expect_success 'Clone uses existing repo name by default' \
+	'$VCSH clone ./repo &&
+	test_when_finished "doit | $VCSH delete repo" &&
+	echo "repo" >expected &&
+	$VCSH list >output &&
+
+	$VCSH clone ./repo3.git &&
+	test_when_finished "doit | $VCSH delete repo3" &&
+	echo "repo3" >>expected &&
+	$VCSH list >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone honors specified repo name' \
+	'$VCSH clone ./repo foo &&
+	test_when_finished "doit | $VCSH delete foo" &&
+	echo foo >expected &&
+	$VCSH list >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone defaults to HEAD of given remote' \
+	'$VCSH clone ./repo foo &&
+	test_when_finished "doit | $VCSH delete foo" &&
+	git -C repo rev-parse HEAD >expected &&
+	$VCSH foo rev-parse HEAD >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone can be abbreviated "clon"' \
+	'$VCSH clon ./repo a &&
+	test_when_finished "doit | $VCSH delete a" &&
+	echo a >expected &&
+	$VCSH list >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone can be abbreviated "clo"' \
+	'$VCSH clo ./repo b &&
+	test_when_finished "doit | $VCSH delete b" &&
+	echo b >expected &&
+	$VCSH list >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone can be abbreviated "cl"' \
+	'$VCSH cl ./repo c &&
+	test_when_finished "doit | $VCSH delete c" &&
+	echo c >expected &&
+	$VCSH list >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone honors -b option before remote' \
+	'$VCSH clone -b branchb ./repo &&
+	test_when_finished "doit | $VCSH delete repo" &&
+	git -C repo rev-parse branchb >expected &&
+	$VCSH repo rev-parse HEAD >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone honors -b option before remote and repo name' \
+	'$VCSH clone -b branchb ./repo foo &&
+	test_when_finished "doit | $VCSH delete foo" &&
+	git -C repo rev-parse branchb >expected &&
+	$VCSH foo rev-parse HEAD >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone honors -b option after remote' \
+	'$VCSH clone ./repo -b branchb &&
+	test_when_finished "doit | $VCSH delete repo" &&
+	git -C repo rev-parse branchb >expected &&
+	$VCSH repo rev-parse HEAD >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone honors -b option between remote and repo name' \
+	'$VCSH clone ./repo -b branchb foo &&
+	test_when_finished "doit | $VCSH delete foo" &&
+	git -C repo rev-parse branchb >expected &&
+	$VCSH foo rev-parse HEAD >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone honors -b option after repo name' \
+	'$VCSH clone ./repo foo -b branchb &&
+	test_when_finished "doit | $VCSH delete foo" &&
+	git -C repo rev-parse branchb >expected &&
+	$VCSH foo rev-parse HEAD >output &&
+	test_cmp expected output'
+
+test_expect_success 'Clone -b option clones only one branch' \
+	'$VCSH clone -b branchb ./repo foo &&
+	test_when_finished "doit | $VCSH delete foo" &&
+	$VCSH foo show-ref --heads >output &&
+	test_line_count = 1 output'
+
+test_done