From a75411b0298b1e045723e54c0cb74765949a1dae Mon Sep 17 00:00:00 2001
From: Mark Pitman <mark@pitman.bz>
Date: Tue, 11 Jul 2017 21:42:02 -0700
Subject: [PATCH] Consolidate feature/bug/chore/refactor logic

Remove unneccesary code
---
 bin/git-bug           | 55 ++----------------------------------------
 bin/git-chore         | 56 ++-----------------------------------------
 bin/git-create-branch |  3 ---
 bin/git-refactor      | 56 ++-----------------------------------------
 4 files changed, 6 insertions(+), 164 deletions(-)

diff --git a/bin/git-bug b/bin/git-bug
index 3f6ebb8..4cb6cb1 100755
--- a/bin/git-bug
+++ b/bin/git-bug
@@ -1,55 +1,4 @@
 #!/usr/bin/env bash
 
-branch_prefix=bug
-declare -a argv
-while test $# != 0
-do
-    case $1 in
-    -a|--alias )
-        if [[ -n $2 ]]
-        then
-            shift # shift -a|-alias
-            branch_prefix=$1
-        else
-            argv+=($1) # treat tail '-a' as <name>
-        fi
-        ;;
-	-r|--remote )
-		if [[ -n $2 ]]
-		then
-			remote=$2
-			shift
-		else
-			remote="origin"
-		fi
-		;;
-    * )
-        argv+=($1)
-        ;;
-    esac
-    shift
-done
-
-concatargs(){
-    str=$(IFS='-'; echo "$*")
-    branch="$branch_prefix"/$str
-}
-
-if test "${argv[0]}" = "finish"; then
-	test -z "${argv[1]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
-	branch="$branch_prefix"/"${argv[1]}"
-	git merge --no-ff "$branch" && git delete-branch "$branch"
-else
-	test -z "${argv[0]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
-	if test -n "${argv[1]}"; then
-		concatargs "${argv[@]}"
-	else 
-		branch="$branch_prefix"/"${argv[0]}"
-	fi
-	if [[ -n $remote ]]
-	then
-		git create-branch -r $remote $branch
-	else
-		git create-branch $branch
-	fi
-fi
+ALIAS=bug
+git feature -a $ALIAS $@
diff --git a/bin/git-chore b/bin/git-chore
index c4f5dc3..8e417cd 100755
--- a/bin/git-chore
+++ b/bin/git-chore
@@ -1,56 +1,4 @@
 #!/usr/bin/env bash
 
-branch_prefix=chore
-declare -a argv
-while test $# != 0
-do
-    case $1 in
-    -a|--alias )
-        if [[ -n $2 ]]
-        then
-            shift # shift -a|-alias
-            branch_prefix=$1
-        else
-            argv+=($1) # treat tail '-a' as <name>
-        fi
-        ;;
-	-r|--remote )
-		if [[ -n $2 ]]
-		then
-			remote=$2
-			shift
-		else
-			remote="origin"
-		fi
-		;;
-    * )
-        argv+=($1)
-        ;;
-    esac
-    shift
-done
-
-concatargs(){
-    str=$(IFS='-'; echo "$*")
-    branch="$branch_prefix"/$str
-}
-
-if test "${argv[0]}" = "finish"; then
-	test -z "${argv[1]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
-	branch="$branch_prefix"/"${argv[1]}"
-	git merge --no-ff "$branch" && git delete-branch "$branch"
-else
-	test -z "${argv[0]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
-	if test -n "${argv[1]}"; then
-		concatargs "${argv[@]}"
-	else 
-		branch="$branch_prefix"/"${argv[0]}"
-	fi
-	if [[ -n $remote ]]
-	then
-		git create-branch -r $remote $branch
-	else
-		git create-branch $branch
-	fi
-fi
-
+ALIAS=chore
+git feature -a $ALIAS $@
diff --git a/bin/git-create-branch b/bin/git-create-branch
index 6035840..9b2f86e 100755
--- a/bin/git-create-branch
+++ b/bin/git-create-branch
@@ -10,7 +10,6 @@ do
 				shift
 			else			
 				REMOTE=origin
-				shift
 			fi
 			;;
 		*)
@@ -39,5 +38,3 @@ then
 fi
 
 git checkout -b $BRANCH
-exit $?
-
diff --git a/bin/git-refactor b/bin/git-refactor
index a5dfe77..c61df45 100755
--- a/bin/git-refactor
+++ b/bin/git-refactor
@@ -1,56 +1,4 @@
 #!/usr/bin/env bash
 
-branch_prefix=refactor
-declare -a argv
-while test $# != 0
-do
-    case $1 in
-    -a|--alias )
-        if [[ -n $2 ]]
-        then
-            shift # shift -a|-alias
-            branch_prefix=$1
-        else
-            argv+=($1) # treat tail '-a' as <name>
-        fi
-        ;;
-	-r|--remote )
-		if [[ -n $2 ]]
-		then
-			remote=$2
-			shift
-		else
-			remote="origin"
-		fi
-		;;
-    * )
-        argv+=($1)
-        ;;
-    esac
-    shift
-done
-
-concatargs(){
-    str=$(IFS='-'; echo "$*")
-    branch="$branch_prefix"/$str
-}
-
-if test "${argv[0]}" = "finish"; then
-	test -z "${argv[1]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
-	branch="$branch_prefix"/"${argv[1]}"
-	git merge --no-ff "$branch" && git delete-branch "$branch"
-else
-	test -z "${argv[0]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
-	if test -n "${argv[1]}"; then
-		concatargs "${argv[@]}"
-	else 
-		branch="$branch_prefix"/"${argv[0]}"
-	fi
-	if [[ -n $remote ]]
-	then
-		git create-branch -r $remote $branch
-	else
-		git create-branch $branch
-	fi
-fi
-
+ALIAS=refactor
+git feature -a $ALIAS $@