learn-test 3.2.1.pre.2 → 3.2.1.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15426312a830557a6848f66424053f7e48ad4712b82c1f9ffc20b85d31bdc527
-  data.tar.gz: 00afcb7752cb7d6d8e4d6fdecc28ee11eaef7266b7320e3a2ea8817aa9d88b69
+  metadata.gz: 249f2021b3b57e076db38961e1abfb5a8cdedbc7726ee33ad707ac7eea2678ff
+  data.tar.gz: 1688198ff9a0a2c5a558385b551db62b9a8d22b8435eb985200c91741d49aa7e
 SHA512:
-  metadata.gz: 639fc95e645ec9ae18039783b98f78be4e73e9902d4fc7fb68bff843ed2d5cc8048d13b63fa4e170a7b102ad77e65d72f48fafba8a1838494a1c688afee1b950
-  data.tar.gz: c834fe0531e3b8242c172ff3b4394976c26c69f049a7ac67b1a6e8aca9928f1b7c7b3fb2c8d645899bafed196929a1db6c768e907b2c274f700ceedd37eceec6
+  metadata.gz: bb4e34682cefc0b4e0c07d53a20ec48fe0b97cd4c6f1fac9dc83bf897d641d16cb61366ade6ceb6d641e7562578b7fa3f4ce8beb3ff890c57dcc190a91d6ac10
+  data.tar.gz: 1963e7a2d20ff15ff403e933ce85b8d875dc55c8146632d21b70cf4a2b17a565d8acac9509be7b98bb5f03796b8e97bb1fb6768e6f92863532026bd9c7071e6a

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,22 +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
 "
 
-SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=''
-
-source "$(git --exec-path)/git-sh-setup"
+. "$(git --exec-path)/git-sh-setup"
 
 require_work_tree
 
-TMP="$GIT_DIR/.git-wip.$$"
-trap 'rm -f "$TMP-*"' EXIT
+TMP=$(mktemp -d -t .git-wip)
+
+cleanup () {
+	rm -f "$TMP-*"
+}
+
+trap cleanup 0
 
 WIP_INDEX="$TMP-INDEX"
 
@@ -68,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"
@@ -85,10 +75,6 @@ get_work_branch () {
 	echo $branch
 }
 
-get_wip_branch () {
-	return 0
-}
-
 check_files () {
 	local -a files="$@"
 
@@ -223,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"
@@ -323,13 +229,6 @@ save)
 		shift
 	fi
 	;;
-info|log|delete)
-	WIP_COMMAND=$1
-	shift
-	;;
-help)
-	do_help 0
-	;;
 --*)
 	;;
 *)
@@ -341,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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'git'
+require 'logger'
 
 module LearnTest
   module GitWip
@@ -9,13 +10,23 @@ module LearnTest
         git = Git.open('./', log: log)
         working_branch = git.current_branch
 
-        `learn-test-wip save "Automatic test submission" -u &> /dev/null`
+        commands = [
+          'learn-test-wip save "Automatic test submission" --editor',
+          "git push origin wip/#{working_branch}:refs/heads/wip"
+        ].join(';')
 
-        return false unless $?.success? # rubocop:disable Style/SpecialGlobalVars
-
-        git.push('origin', "wip/#{working_branch}:refs/heads/wip")
-        git.config['remote.origin.url'].gsub('.git', '/tree/wip')
-      rescue StandardError
+        Open3.popen3(commands) do |_stdin, _stdout, _stderr, wait_thr|
+          # while out = stdout.gets do; puts out; end
+          # while err = stderr.gets do; puts err; end
+  
+          if wait_thr.value.exitstatus.zero?
+            git.config['remote.origin.url'].gsub('.git', '/tree/wip')
+          else
+            #  puts 'There was an error running learn-test-wip'
+            false
+          end
+        end
+      rescue StandardError => e
         false
       end
     end

data/lib/learn_test/version.rb

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

data/spec/learn_test/git_spec.rb

@@ -7,28 +7,35 @@ describe LearnTest::GitWip do
   let!(:git_url) { 'https://github.com/learn-co/learn-test' }
   let!(:git_base) { instance_double(Git::Base) }
 
+  let(:wait_thr) { double }
+  let(:wait_thr_value) { double }
+  let(:stdout_and_stderr) { double }
+
   context 'success' do
     it 'should return the git url' do
       expect(Git::Base).to receive(:open).with('./', { log: false }).and_return(git_base)
       expect(git_base).to receive(:current_branch).and_return(working_branch)
 
-      expect(subject).to receive(:`).with(/learn-test-wip save ".+" -u &> \/dev\/null/ )
-      expect($?).to receive(:success?).and_return(true)
+      expect(wait_thr).to receive(:value).and_return(wait_thr_value)
+      expect(wait_thr_value).to receive(:exitstatus).and_return(0)
 
-      expect(git_base).to receive(:push).with('origin', "wip/#{working_branch}:refs/heads/wip")
-      expect(git_base).to receive_message_chain(:config, :[]).with('remote.origin.url').and_return("#{git_url}.git")
+      expect(Open3).to receive(:popen3).and_yield(nil, nil, nil, wait_thr)
 
+      expect(git_base).to receive_message_chain(:config, :[]).with('remote.origin.url').and_return("#{git_url}.git")
       expect(subject.run!).to eq("#{git_url}/tree/wip")
     end
   end
 
   context 'failure' do
     it 'should return false on process error' do
-      allow(Git::Base).to receive(:open).and_return(git_base)
-      allow(git_base).to receive(:current_branch)
-      allow(subject).to receive(:`)
+      expect(Git::Base).to receive(:open).with('./', { log: false }).and_return(git_base)
+      expect(git_base).to receive(:current_branch).and_return(working_branch)
+
+      expect(wait_thr).to receive(:value).and_return(wait_thr_value)
+      expect(wait_thr_value).to receive(:exitstatus).and_return(1)
+
+      expect(Open3).to receive(:popen3).and_yield(nil, nil, nil, wait_thr)
 
-      expect($?).to receive(:success?).and_return(false)
       expect(subject.run!).to eq(false)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre.2
+  version: 3.2.1.pre.7
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake