refactor: Remove old parsing function and improve naming of current one

Author: hyperupcall

pkg/lib/commands/do-add.sh

@@ -20,7 +20,7 @@ do-add() {
 	fi
 
 	for repoSpec in "${pkgs[@]}"; do
-		util.construct_clone_url "$repoSpec" "$with_ssh"
+		util.extract_data_from_input "$repoSpec" "$with_ssh"
 		local uri="$REPLY1"
 		local site="$REPLY2"
 		local package="$REPLY3"

pkg/lib/commands/do-plumbing-remove-deps.sh

@@ -22,7 +22,7 @@ do-plumbing-remove-deps() {
 
 	log.info "Removing dependencies for '$package'"
 	for dep in "${deps[@]}"; do
-		util.construct_clone_url "$repoSpec" "$with_ssh"
+		util.extract_data_from_input "$repoSpec" "$with_ssh"
 		local site="$REPY2"
 		local package="$REPLY3"
 		local ref="$REPLY4"

pkg/lib/commands/do-remove.sh

@@ -20,7 +20,7 @@ do-remove() {
 				do_actual_removal "$site/$package"
 			fi
 		else
-			util.construct_clone_url "$repoSpec"
+			util.extract_data_from_input "$repoSpec"
 			local site="$REPLY2"
 			local package="$REPLY3"
 			local ref="$REPLY4"

pkg/lib/commands/do-upgrade.sh

@@ -46,7 +46,7 @@ do-upgrade() {
 
 			do_actual_upgrade "$site/$package"
 		else
-			util.construct_clone_url "$repoSpec"
+			util.extract_data_from_input "$repoSpec"
 			local site="$REPLY2"
 			local package="$REPLY3"
 			local ref="$REPLY4"

pkg/lib/util/util.sh

@@ -3,43 +3,12 @@
 # @file util.sh
 # @brief Utility functions for all subcommands
 
-# @description Given input of a particular package on the internet
-# parse it into its components
-util.parse_package_full() {
-	local repoSpec="$1"
-
-	if [ -z "$repoSpec" ]; then
-		die "Must supply a repository"
-	fi
-
-	# Remove any http(s) prefixes
-	repoSpec="${repoSpec#http?(s)://}"
-
-	local site user repository
-	if [[ "$repoSpec" == */*/* ]]; then
-		IFS='/' read -r site user repository <<< "$repoSpec"
-	elif [[ "$repoSpec" == */* ]]; then
-		site="github.com"
-		IFS='/' read -r user repository <<< "$repoSpec"
-	fi
-
-	if [[ "$repository" == *@* ]]; then
-		IFS='@' read -r repository ref <<< "$repository"
-	else
-		ref=""
-	fi
-
-	ensure.non_zero 'site' "$site"
-	ensure.non_zero 'user' "$user"
-	ensure.non_zero 'repository' "$repository"
-
-	REPLY="$site:$user:$repository:$ref"
-}
-
-# @description Generate the final URL to clone from
+# @description Given some user input, this extracts
+# data like the site it was cloned from, the owner of
+# the repository, and the name of the repository
 # @arg $1 repoSpec
 # @arg $2 with_ssh Whether to clone with SSH (yes/no)
-util.construct_clone_url() {
+util.extract_data_from_input() {
 	REPLY1=
 	REPLY2=
 	REPLY3=
@@ -111,6 +80,7 @@ util.extract_data_from_package_dir() {
 	REPLY1=
 	REPLY2=
 	REPLY3=
+	REPLY4=
 
 	local dir="$1"
 	ensure.non_zero 'dir' "$dir"
@@ -122,6 +92,7 @@ util.extract_data_from_package_dir() {
 	REPLY1="$site"
 	REPLY2="$user"
 	REPLY3="$repository"
+	REPLY4=
 }
 
 util.readlink() {

tests/util-construct-clone-url.bats renamed to tests/util-extract-data-from-input.bats

@@ -4,14 +4,14 @@ load 'util/init.sh'
 
 
 @test "fails on no arguments" {
-	run util.construct_clone_url
+	run util.extract_data_from_input
 
 	assert_failure
 	assert_line -p "Must supply a repository"
 }
 
 @test "parses with full https url" {
-	util.construct_clone_url 'https://gitlab.com/eankeen/proj'
+	util.extract_data_from_input 'https://gitlab.com/eankeen/proj'
 
 	assert [ "$REPLY1" = 'https://gitlab.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -20,7 +20,7 @@ load 'util/init.sh'
 }
 
 @test "parses with full http url" {
-	util.construct_clone_url 'http://gitlab.com/eankeen/proj'
+	util.extract_data_from_input 'http://gitlab.com/eankeen/proj'
 
 	assert [ "$REPLY1" = 'http://gitlab.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -29,7 +29,7 @@ load 'util/init.sh'
 }
 
 @test "parses with full https url with .git ending" {
-	util.construct_clone_url 'https://gitlab.com/eankeen/proj'
+	util.extract_data_from_input 'https://gitlab.com/eankeen/proj'
 
 	assert [ "$REPLY1" = 'https://gitlab.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -38,7 +38,7 @@ load 'util/init.sh'
 }
 
 @test "parses with full http url with .git ending" {
-	util.construct_clone_url 'http://gitlab.com/eankeen/proj.git'
+	util.extract_data_from_input 'http://gitlab.com/eankeen/proj.git'
 
 	assert [ "$REPLY1" = 'http://gitlab.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -47,7 +47,7 @@ load 'util/init.sh'
 }
 
 @test "parses with full ssh url" {
-	util.construct_clone_url 'git@gitlab.com:eankeen/proj.git'
+	util.extract_data_from_input 'git@gitlab.com:eankeen/proj.git'
 
 	assert [ "$REPLY1" = 'git@gitlab.com:eankeen/proj' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -56,7 +56,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package and domain" {
-	util.construct_clone_url 'gitlab.com/eankeen/proj'
+	util.extract_data_from_input 'gitlab.com/eankeen/proj'
 
 	assert [ "$REPLY1" = 'https://gitlab.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -65,7 +65,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package and domain and ref" {
-	util.construct_clone_url 'gitlab.com/eankeen/proj@v0.1.0'
+	util.extract_data_from_input 'gitlab.com/eankeen/proj@v0.1.0'
 
 	assert [ "$REPLY1" = 'https://gitlab.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -74,7 +74,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package and domain with ssh" {
-	util.construct_clone_url 'gitlab.com/eankeen/proj' 'yes'
+	util.extract_data_from_input 'gitlab.com/eankeen/proj' 'yes'
 
 	assert [ "$REPLY1" = 'git@gitlab.com:eankeen/proj' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -83,7 +83,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package and domain and ref with ssh" {
-	util.construct_clone_url 'gitlab.com/eankeen/proj@v0.1.0' 'yes'
+	util.extract_data_from_input 'gitlab.com/eankeen/proj@v0.1.0' 'yes'
 
 	assert [ "$REPLY1" = 'git@gitlab.com:eankeen/proj' ]
 	assert [ "$REPLY2" = 'gitlab.com' ]
@@ -92,7 +92,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package" {
-	util.construct_clone_url 'eankeen/proj'
+	util.extract_data_from_input 'eankeen/proj'
 
 	assert [ "$REPLY1" = 'https://github.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'github.com' ]
@@ -101,7 +101,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package and ref" {
-	util.construct_clone_url 'eankeen/proj@v0.2.0'
+	util.extract_data_from_input 'eankeen/proj@v0.2.0'
 
 	assert [ "$REPLY1" = 'https://github.com/eankeen/proj.git' ]
 	assert [ "$REPLY2" = 'github.com' ]
@@ -110,7 +110,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package with ssh" {
-	util.construct_clone_url 'eankeen/proj' 'yes'
+	util.extract_data_from_input 'eankeen/proj' 'yes'
 
 	assert [ "$REPLY1" = 'git@github.com:eankeen/proj' ]
 	assert [ "$REPLY2" = 'github.com' ]
@@ -119,7 +119,7 @@ load 'util/init.sh'
 }
 
 @test "parses with package with ssh and ref" {
-	util.construct_clone_url 'eankeen/proj@v0.2.0' 'yes'
+	util.extract_data_from_input 'eankeen/proj@v0.2.0' 'yes'
 
 	assert [ "$REPLY1" = 'git@github.com:eankeen/proj' ]
 	assert [ "$REPLY2" = 'github.com' ]