Merge pull request #8 from nmorey/dev/rpm

Color support

Author: nmorey

doc/git-sequencer-status.txt

@@ -23,6 +23,15 @@ state in a human readable format.
 
 This is largely inspired by the way Magit prints its status screen.
 
+OPTIONS
+-------
+
+--[no]-color::
+		Force coloring to be on/off whether the command is run in a TTY or not
+
+--help::
+		Display usage
+
 Authors
 -------
 'git-sequencer-status' is maintained by:

rpm/git-sequencer-status.spec

@@ -25,11 +25,11 @@ License:        GPL-3.0
 Group:          Development/Tools/Version
 Url:            https://github.com/nmorey/git-sequencer-status
 Source:         %{name}-%{version}%{git_ver}.tar.bz2
-BuildRequires:  git
+BuildRequires:  git-core >= 2.0
 BuildRequires:  bc
 BuildRequires:  asciidoc
 BuildRequires:  xmlto
-Requires:       git
+Requires:       git-core >= 2.0
 BuildArch:      noarch
 
 %description

sequencer-status

@@ -2,40 +2,92 @@
 
 export GIT_DIR=$(git rev-parse --git-dir)
 
+USE_COLOR=0
+if [ -t 1 ]; then
+	USE_COLOR=1
+fi
+
+usage()
+{
+	local errCode=$1
+	echo -e "Usage: $(basename $0) [OPTS]"
+	echo -e "\t--[no-]color     Force color to be enabled/disabled"
+	echo -e "\t-h,--help        Diplay usage"
+	exit $errCode
+}
+
+
+while [ $# -gt 0 ]; do
+	ARG=$1
+	shift
+	case "$ARG" in
+		--color)
+			USE_COLOR=1
+			;;
+		--no-color)
+			USE_COLOR=0
+			;;
+		-h|--help)
+			usage 0
+			;;
+		*)
+			echo "ERROR: Invalid option $ARG" >&2
+			usage 1
+			;;
+	esac
+done
+
+if [ $USE_COLOR -eq 1 ]; then
+	export YELLOW_NODIM='\033[00;33m'
+	export RED_NODIM='\033[00;31m'
+	export RED_DIM='\033[02;31m'
+	export CYAN_BOLD='\033[01;36m'
+	export WHITE='\033[00m'
+	export COLOR_OPT="--color"
+else
+	export COLOR_OPT="--no-color"
+fi
+
+__git_log()
+{
+	git --no-pager log $COLOR_OPT "$@"
+}
 __colorize_todo()
 {
-	awk  -vC0='\033[00;33m' -vC1='\033[00;31m' -vC2='\033[00m' '{printf( C0 "%-7s " C1 $2 " " C2, $1); for (i = 3; i <= NF; i++) { printf("%s ", $i);}; printf("\n");}'
+	awk  -vC0=$YELLOW_NODIM -vC1=$RED_NODIM -vC2=$WHITE \
+		 '{printf( C0 "%-7s " C1 $2 " " C2, $1); for (i = 3; i <= NF; i++) { printf("%s ", $i);}; printf("\n");}'
 }
 
 __git_log_todo()
 {
-	git --no-pager log --format='%C(yellow nodim)pick    %C(red nodim)%h %C(white)%s' $*
+	__git_log --format='%C(auto,yellow nodim)pick    %C(auto,red nodim)%h %C(auto,white)%s' $*
 }
 __colorize_current()
 {
-	awk  -vC0='\033[01;36m' -vC1='\033[00;31m' -vC2='\033[00m' '{printf( C0 "%-7s " C1 $2 " " C2, $1); for (i = 3; i <= NF; i++) { printf("%s ", $i);}; printf("\n");}'
+	awk  -vC0=$CYAN_BOLD -vC1=$RED_NODIM -vC2=$WHITE \
+		 '{printf( C0 "%-7s " C1 $2 " " C2, $1); for (i = 3; i <= NF; i++) { printf("%s ", $i);}; printf("\n");}'
 }
 __git_log_current_unmerged()
 {
-	git --no-pager log --format='%C(cyan bold)*pick   %C(red nodim)%h %C(white)%s'  $*
+	__git_log --format='%C(auto,cyan bold)*pick   %C(auto,red nodim)%h %C(auto,white)%s'  $*
 }
 __git_log_current()
 {
-	git --no-pager log --format='%C(cyan bold)pick    %C(red nodim)%h %C(white)%s' $*
+	__git_log --format='%C(auto,cyan bold)pick    %C(auto,red nodim)%h %C(auto,white)%s' $*
 }
 
 __colorize_done()
 {
-	awk  -vC0='\033[02;31m' -vC1='\033[00;31m' -vC2='\033[00m' '{printf( C0 "%-7s " C1 $2 " " C2, $1); for (i = 3; i <= NF; i++) { printf("%s ", $i);}; printf("\n");}'
+	awk  -vC0=$RED_DIM -vC1=$RED_NODIM -vC2=$WHITE '{printf( C0 "%-7s " C1 $2 " " C2, $1); for (i = 3; i <= NF; i++) { printf("%s ", $i);}; printf("\n");}'
 }
 __git_log_done()
 {
-	git --no-pager log --format='%C(red dim)done    %C(red nodim)%h %C(white)%s' $*
+	__git_log --format='%C(auto,red dim)done    %C(auto,red nodim)%h %C(auto,white)%s' $*
 }
 
 __git_log_onto()
 {
-	git --no-pager log -n 1 --format='%C(red dim)onto    %C(red nodim)%h %C(white)%s' $*
+	__git_log -n 1 --format='%C(auto,red dim)onto    %C(auto,red nodim)%h %C(auto,white)%s' $*
 
 }
 __has_unmerged()
@@ -101,7 +153,7 @@ __simple_action()
 	local COMMIT=$(cat ${GIT_DIR}/$HEADFILE)
 	shift 2
 	echo "# " $* " a single commit"
-	echo "*$ACTION $(git --no-pager log --format='%h %s' -n 1 $COMMIT)" | __colorize_current
+	echo "*$ACTION $(__git_log  --format='%h %s' -n 1 $COMMIT)" | __colorize_current
 	__git_log_onto ${BASE}
 }
 

travis/test.sh

@@ -11,7 +11,7 @@ export TMPDIR=$(mktemp -d)
 # Drop colors and SHA as they change from one run to another
 __sanitize_log()
 {
-	sed -r -e "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g" -e 's/^([a-zA-Z\*]* +)[a-f0-9]+ /\1 /g'
+	sed -r  -e 's/^([a-zA-Z\*]* +)[a-f0-9]+ /\1 /g'
 }
 
 echo $TMPDIR
@@ -273,13 +273,39 @@ EOF
 	git rebase --abort
 }
 
+
+test_color()
+{
+	goto_repo
+	echo "Checking coloring support"
+	git checkout revert
+	git rebase rebase_conflict > /dev/null 2>&1
+	LOG=$($SEQDIR/sequencer-status --color | __sanitize_log)
+	REF_LOG=$(cat <<EOF | __sanitize_log
+# Non-interactive rebase: revert onto rebase_conflict
+pick    38fb428 Fourth commit
+pick    46c2f5e Third commit
+*pick   22bc518 Second commit
+onto    68cb488 Alternate second
+EOF
+		   )
+
+	diff  <(echo "$LOG")  <(echo "$REF_LOG")
+	if [ $? -eq 0 ]; then
+		echo "Failure in color mode" >&2
+		exit 1
+	fi
+	git rebase --abort
+}
+
 juLog_fatal setup_repo
 
 juLog test_cherry_pick
 juLog test_revert
 juLog test_rebase
 juLog test_am
 juLog test_rebase_interative
+juLog test_color
 
 
 # Post cleanup