complete integrating setup into main deploy flow

closes #16

Author: X1011

deploy.sh

@@ -47,52 +47,57 @@ main() {
 	fi
 
 	if git ls-remote --exit-code $repo "refs/heads/$deploy_branch" ; then
+		# deploy_branch exists in $repo; make sure we have the latest version
+		
 		disable_expanded_output
 		git fetch --force $repo $deploy_branch:$deploy_branch
 		enable_expanded_output
 	fi
 
-	if git show-ref --verify --quiet "refs/heads/$deploy_branch" ; then
-		#read-tree
-		
-		#make deploy_branch the current branch
-		git symbolic-ref HEAD refs/heads/$deploy_branch
-
-		#put the previously committed contents of deploy_branch into the index
-		git --work-tree "$deploy_directory" reset --mixed --quiet
-	else
-		# deploy_branch doesn't exist; create it
-		#read-tree --empty?
-		#write-tree
-		#commit-tree
-		git --work-tree "$deploy_directory" checkout --orphan $deploy_branch
-		git --work-tree "$deploy_directory" rm -r "*"
+	# check if deploy_branch exists locally
+	if git show-ref --verify --quiet "refs/heads/$deploy_branch"
+	then incremental_deploy
+	else initial_deploy
 	fi
 
+	restore_head
+}
+
+initial_deploy() {
+	git --work-tree "$deploy_directory" checkout --orphan $deploy_branch
+	git --work-tree "$deploy_directory" add --all
+	commit+push
+}
+
+incremental_deploy() {
+	#make deploy_branch the current branch
+	git symbolic-ref HEAD refs/heads/$deploy_branch
+	#put the previously committed contents of deploy_branch into the index
+	git --work-tree "$deploy_directory" reset --mixed --quiet
 	git --work-tree "$deploy_directory" add --all
 
 	set +o errexit
-	diff=$(git --work-tree "$deploy_directory" diff --exit-code --quiet HEAD)$?
+	diff=$(git --work-tree "$deploy_directory" diff --exit-code --quiet HEAD --)$?
 	set -o errexit
 	case $diff in
 		0) echo No changes to files in $deploy_directory. Skipping commit.;;
-		1)
-			set_user_id
-			git --work-tree "$deploy_directory" commit -m \
-				"publish: $commit_title"$'\n\n'"generated from commit $commit_hash"
-
-			disable_expanded_output
-			#--quiet is important here to avoid outputting the repo URL, which may contain a secret token
-			git push --quiet $repo $deploy_branch
-			enable_expanded_output
-			;;
+		1) commit+push;;
 		*)
 			echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to master, use: git symbolic-ref HEAD refs/heads/master && git reset --mixed >&2
 			return $diff
 			;;
 	esac
+}
 
-	restore_head
+commit+push() {
+	set_user_id
+	git --work-tree "$deploy_directory" commit -m \
+		"publish: $commit_title"$'\n\n'"generated from commit $commit_hash"
+
+	disable_expanded_output
+	#--quiet is important here to avoid outputting the repo URL, which may contain a secret token
+	git push --quiet $repo $deploy_branch
+	enable_expanded_output
 }
 
 #echo expanded commands as they are executed (for debugging)

integration-test.bats

@@ -24,22 +24,41 @@ create_repo() {
 
 source deploy.sh --source-only
 
-@test "script creates branch and deploys file" {
+@test "deploy creates branch and deploys file" {
 
 	main
 
 	git cat-file -e gh-pages:file # `file` exists on gh-pages
 }
 
-@test "       deploys file to existing branch" {
+@test "       deploys new file to existing branch" {
 	git branch gh-pages
 
 	main
 
 	git cat-file -e gh-pages:file # `file` exists on gh-pages
 }
 
-@test "       doesn't clobber files in deploy directory" {
+@test "       updates existing file" {
+	main
+	echo updated > dist/file
+
+	main
+	
+	[[ `git cat-file blob gh-pages:file` = updated ]]
+}
+
+@test "       removes missing file" {
+	main
+	rm dist/file
+	
+	main --allow-empty
+
+	! git cat-file -e gh-pages:file # `file` does not exist on gh-pages
+}
+
+@test "       doesn't clobber file in deploy directory" {
+	# make sure that a source file doesn't overwrite a deploy file with the same name
 	echo source > file
 	echo dist > dist/file
 	git add file
@@ -48,7 +67,7 @@ source deploy.sh --source-only
 	main
 
 	[[ `cat dist/file` = dist ]]
-	[[ `git cat-file gh-pages:file` = dist ]]
+	[[ `git cat-file blob gh-pages:file` = dist ]]
 }
 
 @test "       doesn't deploy source file" {

readme.md

@@ -12,9 +12,6 @@ Download the script (`wget https://github.com/X1011/git-directory-deploy/raw/mas
 - **default_username**, **default_email**: identity to use for git commits if none is set already. Useful for CI servers.
 - **repo**: repository to deploy to. Must be readable and writable. The default of "origin" will not work on Travis CI, since it uses the read-only git protocol. In that case, it is recommended to store a [GitHub token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) in a [secure environment variable](http://docs.travis-ci.com/user/environment-variables/#Secure-Variables) and use it in an HTTPS URL like this: <code>repo=https://$GITHUB_TOKEN@github\.com/<i>user</i>/<i>repo</i>.git</code>
 
-## setup
-Ensure configuration variables are correct in `deploy.sh` and run `./deploy.sh -s`
-
 ## run
 Do this every time you want to deploy, or have your CI server do it.
 
@@ -27,6 +24,4 @@ Do this every time you want to deploy, or have your CI server do it.
 ### options
 `-v`, `--verbose`: echo expanded commands as they are executed, using the xtrace option. This can be useful for debugging, as the output will include the values of variables that are being used, such as $commit_title and $deploy_directory. However, the script makes special effort to not output the value of $repo, as it may contain a secret authentication token.
 
-`-s`, `--setup`: perform one-time setup to prepare the repo for deployments. Creates `deploy_branch`, initializes it with the contents of `deploy_directory`, and pushes it to `repo`.
-
 `-e`, `--allow-empty`: allow deployment of an empty directory. By default, the script will abort if `deploy_directory` is empty.