Add positional args for directory, branch, and repository.

arg-parsing-test.bats

@@ -75,4 +75,10 @@ write_conf_file() {
 	parse_args --message "a message"
 	assert that "$commit_message" = "a message"
 }
+@test '        correctly handles positional args.' {
+	parse_args pos-dir pos-branch pos-repo
+	assert that "$deploy_directory" = "pos-dir"
+	assert that "$deploy_branch" = "pos-branch"
+	assert that "$repo" = "pos-repo"
+}
 

deploy.sh

@@ -3,7 +3,7 @@ set -o errexit #abort if any command fails
 me=$(basename "$0")
 
 help_message="\
-Usage: $me [-c FILE] [<options>]
+Usage: $me [-c <FILE>] [<options>] [<directory> [<branch> [<repository>]]]
 Deploy generated files to a git branch.
 
 Options:
@@ -28,7 +28,14 @@ Variables:
 These variables have default values defined in the script. The defaults can be
 overridden by environment variables. Any environment variables are overridden
 by values set in a '.env' file (if it exists), and in turn by those set in a
-file specified by the '--config-file' option."
+file specified by the '--config-file' option.
+
+Positional Args:
+
+At the end of the command, you can optionally specify the directory, branch,
+and repository as well. Earlier values are required to specify later ones. For
+example, in order to specify <branch>, you must also specify <directory>. Like
+the command-line options, these"
 
 parse_args() {
 	# Set args from a local environment file.
@@ -61,6 +68,16 @@ parse_args() {
 		elif [[ $1 = "-n" || $1 = "--no-hash" ]]; then
 			GIT_DEPLOY_APPEND_HASH=false
 			shift
+		elif [[ -n ${1} ]]; then
+			# Set positional args
+			GIT_DEPLOY_DIR=$1
+			if [[ -n $2 ]]; then
+				GIT_DEPLOY_BRANCH=$2
+			fi
+			if [[ -n $3 ]]; then
+				GIT_DEPLOY_REPO=$3
+			fi
+			break
 		else
 			break
 		fi

readme.md

@@ -37,6 +37,9 @@ Do this every time you want to deploy, or have your CI server do it.
 5. run `./deploy.sh`
 
 ### options
+
+`deploy.sh [--config <FILE>] [<options>] [<directory> [<branch> [<repository>]]]`
+
 `-h`, `--help`: show the program's help info.
 
 `-c`, `--config-file`: specify a file that overrides the script's default configuration, or those values set in `.env`. The syntax for this file should be normal `var=value` declarations. __This option _must_ come first on the command-line__.
@@ -48,3 +51,5 @@ Do this every time you want to deploy, or have your CI server do it.
 `-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.
 
 `-e`, `--allow-empty`: allow deployment of an empty directory. By default, the script will abort if `deploy_directory` is empty.
+
+`[<directory> [<branch> [<repository>]]]`: set the directory/branch/repository. __These options _must_ come at the end of the command-line__. Also, in order to specify later options, you _must_ specify each earlier one. So in order to specify "repository", you need to also specify "directory" and "branch".