learn-test 3.2.1.pre.5 → 3.2.1.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa5269d6592f75a026d41d5bee54f7686bcaaa9bf2b99971ee1487dde30b2d0
-  data.tar.gz: 333c1cea1f4e90469849d33de21318171a2653154c8f25cb73c1800b84f32e66
+  metadata.gz: 8794c9f5f79754792e07d3d25d4394cb893f1156c2f90ddf49fa791e3295ed5b
+  data.tar.gz: 106bb411827dd6cc527f5f2703f1720a7cb5abd4f950fae6f9429da46beef4c9
 SHA512:
-  metadata.gz: dc93578f641f6ce01740dcbe4934012599a76ed4e671ffd5db601d0197f4c30e4b7dd6b99bca3eae50199206c8d108e8ac7710415e4ba4b800020e013b00b4e5
-  data.tar.gz: 17eab038da86b9a9e127afe3c314a0005b1e29c578b7d1dda04b6ba5bfca4e66f982dcaa62041d2ed3e1505a54780597ed30928f5acca69f849c713b98f3c189
+  metadata.gz: b0499f0e0986bc8e1a2e8425bfdf364c701540b8f7e799055b7929868fecec7a5c4812a0df10deaf310f5efff8d22d7caa5e3b046f96b719757d32c81f2269e8
+  data.tar.gz: 51369aeb558ad730d61618dbcf426c99250d4368c7b3baec7e0d858e39a29cf18d378cabad353bb2ea13164a3adaa60731ca5ec8de1d3ca6b22cfdacb4eca005

data/bin/learn-test-wip

@@ -15,15 +15,12 @@
 # Please see http://www.gnu.org/licenses/gpl-2.0.txt
 #
 
-USAGE='[ info | save <message> [ --editor | --untracked | --no-gpg-sign ] | log [ --pretty ] | delete ] [ [--] <file>... ]'
+USAGE='[ save <message> [ --editor | --untracked | --no-gpg-sign ] | delete ] [ [--] <file>... ]'
 LONG_USAGE="Manage Work In Progress branches
 
 Commands:
         git wip                   - create a new WIP commit
         git wip save <message>    - create a new WIP commit with custom message
-        git wip info [<branch>]   - brief WIP info
-        git wip log [<branch>]    - show changes on the WIP branch
-        git wip delete [<branch>] - delete a WIP branch
 
 Options for save:
         -e --editor               - be less verbose, assume called from an editor
@@ -31,19 +28,19 @@ Options for save:
         -i --ignored              - capture also ignored files
         --no-gpg-sign             - do not sign commit; that is, countermand
                                     'commit.gpgSign = true'
-
-Options for log:
-  -p --pretty               - show a pretty graph
-	-r --reflog               - show changes in reflog
-	-s --stat                 - show diffstat
 "
 
 source "$(git --exec-path)/git-sh-setup"
 
 require_work_tree
 
-TMP="$GIT_DIR/.git-wip.$$"
-trap 'rm -f "$TMP-*"' 0
+TMP=$(mktemp -d -t .git-wip)
+
+cleanup () {
+	rm -f "$TMP-*"
+}
+
+trap cleanup 0
 
 WIP_INDEX="$TMP-INDEX"
 
@@ -65,10 +62,6 @@ report_soft_error () {
 	die "$@"
 }
 
-cleanup () {
-	rm -f "$TMP-*"
-}
-
 get_work_branch () {
 	ref=$(git symbolic-ref -q HEAD) \
 	|| report_soft_error "git-wip requires a branch"
@@ -82,10 +75,6 @@ get_work_branch () {
 	echo $branch
 }
 
-get_wip_branch () {
-	return 0
-}
-
 check_files () {
 	local -a files="$@"
 
@@ -220,86 +209,6 @@ do_save () {
 	dbg "SUCCESS"
 }
 
-do_info () {
-	local branch=$1
-
-	die "info not implemented"
-}
-
-do_log () {
-	local work_branch=$1
-	[ -z $branch ] && work_branch=$(get_work_branch)
-	local wip_branch="$WIP_PREFIX$work_branch"
-
-	local log_cmd="log"
-	local graph=""
-	local pretty=""
-	local stat=""
-	while [ -n "$1" ]
-	do
-		case "$1" in
-			-p|--pretty)
-				graph="--graph"
-				pretty="--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
-				;;
-			-s|--stat)
-				stat="--stat"
-				;;
-			-r|--reflog)
-				log_cmd="reflog"
-				;;
-			*)
-				break
-				;;
-		esac
-		shift
-	done
-
-	if [ $log_cmd = reflog ]
-	then
-		echo git reflog $stat $pretty $wip_branch | sh
-		return $?
-	fi
-
-	if ! work_last=$(git rev-parse --verify $work_branch)
-	then
-		die "'$work_branch' branch has no commits."
-	fi
-
-	dbg work_last=$work_last
-
-	if ! wip_last=$(git rev-parse --quiet --verify $wip_branch)
-	then
-		die "'$work_branch' branch has no commits."
-	fi
-
-	dbg wip_last=$wip_last
-
-	local base=$(git merge-base $wip_last $work_last)
-
-	dbg base=$base
-
-	echo git log $graph $stat $pretty $@ $wip_last $work_last "^$base~1" | sh
-}
-
-do_delete () {
-	local branch=$1
-
-	die "delete not implemented"
-}
-
-do_help () {
-	local rc=$1
-
-	cat <<END
-Usage: git wip $USAGE
-
-$LONG_USAGE
-END
-	exit $rc
-}
-
-
 if test $# -eq 0
 then
 	dbg "no arguments"
@@ -320,13 +229,6 @@ save)
 		shift
 	fi
 	;;
-info|log|delete)
-	WIP_COMMAND=$1
-	shift
-	;;
-help)
-	do_help 0
-	;;
 --*)
 	;;
 *)
@@ -338,15 +240,6 @@ case $WIP_COMMAND in
 save)
 	do_save "$WIP_MESSAGE" $@
 	;;
-info)
-	do_info $@
-	;;
-log)
-	do_log $@
-	;;
-delete)
-	do_delete $@
-	;;
 *)
 	usage
 	exit 1

data/lib/learn_test/git_wip.rb

@@ -9,10 +9,10 @@ module LearnTest
         git = Git.open('./', log: log)
         working_branch = git.current_branch
 
-        Open3.popen3('learn-test-wip save "Automatic test submission" --editor') do |_stdin, _stdout, stderr, wait_thr|
-          # while out = stdout.gets do
-          #   puts out
-          # end
+        Open3.popen3('learn-test-wip save "Automatic test submission" --editor') do |_stdin, stdout, stderr, wait_thr|
+          while out = stdout.gets do
+            puts out
+          end
   
           while err = stderr.gets do
             puts err
@@ -21,7 +21,6 @@ module LearnTest
           if wait_thr.value.exitstatus.zero?
             git.push('origin', "wip/#{working_branch}:refs/heads/wip")
             git.config['remote.origin.url'].gsub('.git', '/tree/wip')
-            true
           else
             puts 'There was an error running learn-test-wip'
             false

data/lib/learn_test/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LearnTest
-  VERSION = '3.2.1.pre.5'
+  VERSION = '3.2.1.pre.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre.5
+  version: 3.2.1.pre.6
 platform: ruby
 authors:
 - Flatiron School