feat: More flexible parse command line arguments. Closes #15

Now, options can be placed after or in between directories or package identifiers

Author: hyperupcall

pkg/lib/cmd/bpm.sh

@@ -37,52 +37,42 @@ main() {
 	complete)
 		shift
 		do-complete "$@"
-		exit
 		;;
 	echo)
 		shift
 		do-echo "$@"
-		exit
 		;;
 	init)
 		shift
 		do-init "$@"
-		exit
 		;;
 	install)
 		shift
 		do-install "$@"
-		exit
 		;;
 	link)
 		shift
 		do-link "$@"
-		exit
 		;;
 	list)
 		shift
 		do-list "$@"
-		exit
 		;;
 	outdated)
 		shift
 		bpm-outdated "$@"
-		exit
 		;;
 	package-path)
 		shift
 		bpm-package-path "$@"
-		exit
 		;;
 	uninstall)
 		shift
 		do-uninstall "$@"
-		exit
 		;;
 	upgrade)
 		shift
 		do-upgrade "$@"
-		exit
 		;;
 	*)
 		if [ -n "$1" ]; then

pkg/lib/commands/do-install.sh

@@ -3,18 +3,23 @@
 do-install() {
 	local with_ssh='no'
 
-	case "$1" in
+	local -a pkgs=()
+	for arg; do
+		case "$arg" in
 		--ssh)
 			with_ssh='yes'
-			shift
-		;;
-	esac
+			;;
+		*)
+			pkgs+=("$arg")
+			;;
+		esac
+	done
 
-	if (( $# == 0 )); then
+	if (( ${#pkgs[@]} == 0 )); then
 		die "At least one package must be supplied"
 	fi
 
-	for repoSpec; do
+	for repoSpec in "${pkgs[@]}"; do
 		util.construct_clone_url "$repoSpec" "$with_ssh"
 		local uri="$REPLY1"
 		local package="$REPLY2"

pkg/lib/commands/do-link.sh

@@ -1,20 +1,25 @@
 # shellcheck shell=bash
 
 do-link() {
-	if (( $# == 0 )); then
-		die "You must supply at least one directory"
-	fi
-
 	local install_deps='yes'
 
-	case "$1" in
-	--no-deps)
-		install_deps='no'
-		shift
-		;;
-	esac
+	local -a dirs=()
+	for arg; do
+		case "$arg" in
+		--no-deps)
+			install_deps='no'
+			;;
+		*)
+			dirs+=("$arg")
+			;;
+		esac
+	done
+
+	if (( ${#dirs[@]} == 0 )); then
+		die "You must supply at least one directory"
+	fi
 
-	for directory; do
+	for directory in "${dirs[@]}"; do
 		if [ ! -d "$directory" ]; then
 			die "Directory '$directory' not found"
 		fi

pkg/lib/commands/do-list.sh

@@ -7,7 +7,6 @@ do-list() {
 		case "$arg" in
 		--outdated)
 			should_show_outdated='yes'
-			shift
 			;;
 		esac
 	done

pkg/lib/util/util.sh

@@ -83,7 +83,7 @@ util.construct_clone_url() {
 			site="github.com"
 			package="$repoSpec"
 		else
-			die "Invalid repository"
+			die "Invalid repository '$repoSpec'"
 		fi
 
 		if [[ "$package" = *@* ]]; then
@@ -234,13 +234,13 @@ Subcommands:
   init <shell>
     Configure shell environment for Basher
 
-  install [--ssh] [site]/<package>[@ref]
+  install [--ssh] [[site/]<package>[@ref]...]
     Installs a package from GitHub (or a custom site)
 
-  uninstall <package>
+  uninstall <package...>
     Uninstalls a package
 
-  link [--no-deps] <directory>
+  link [--no-deps] <directory...>
     Installs a local directory as a bpm package. These show up with
     a namespace of 'bpm-local'
 
@@ -250,10 +250,10 @@ Subcommands:
   package-path <package>
     Outputs the path for a package
 
-  upgrade <package>
+  upgrade <package...>
     Upgrades a package
 
-  complete <command>
+  complete <command...>
     Perform the completion for a particular subcommand. Used by the completion scripts
 
 Examples:

tests/do-install.bats

@@ -123,6 +123,19 @@ load 'util/init.sh'
 	assert_line "do-plumbing-clone git@github.com:username/package.git username/package"
 }
 
+@test "uses ssh protocol, when specified (at end)" {
+	test_util.mock_command do-plumbing-clone
+	test_util.mock_command do-plumbing-add-deps
+	test_util.mock_command do-plumbing-link-bins
+	test_util.mock_command do-plumbing-link-completions
+	test_util.mock_command do-plumbing-link-man
+
+	run do-install username/package --ssh
+
+	assert_success
+	assert_line "do-plumbing-clone git@github.com:username/package.git username/package"
+}
+
 @test "uses ssh protocol raw, when specified" {
 	test_util.mock_command do-plumbing-clone
 	test_util.mock_command do-plumbing-add-deps

tests/do-link.bats

@@ -139,6 +139,20 @@ load 'util/init.sh'
 	refute_line "do-plumbing-add-deps bpm-local/package2"
 }
 
+@test "respects the --no-deps option (at end)" {
+	test_util.mock_command do-plumbing-add-deps
+	test_util.mock_command do-plumbing-link-bins
+	test_util.mock_command do-plumbing-link-completions
+	test_util.mock_command do-plumbing-link-man
+
+	mkdir 'package2'
+
+	run do-link 'package2' --no-deps
+
+	assert_success
+	refute_line "do-plumbing-add-deps bpm-local/package2"
+}
+
 @test "links the current directory" {
 	test_util.mock_command do-plumbing-add-deps
 	test_util.mock_command do-plumbing-link-bins