learn-test 3.2.1.pre.5 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa5269d6592f75a026d41d5bee54f7686bcaaa9bf2b99971ee1487dde30b2d0
-  data.tar.gz: 333c1cea1f4e90469849d33de21318171a2653154c8f25cb73c1800b84f32e66
+  metadata.gz: d7d56bdb688e05fbb81c50ba01c290faff91f67647e04d70e837f2ca444555b1
+  data.tar.gz: 4d4bf3e106248a1d57408d990ccbd6d0a17c48080db7de8fb971c91a16e557b9
 SHA512:
-  metadata.gz: dc93578f641f6ce01740dcbe4934012599a76ed4e671ffd5db601d0197f4c30e4b7dd6b99bca3eae50199206c8d108e8ac7710415e4ba4b800020e013b00b4e5
-  data.tar.gz: 17eab038da86b9a9e127afe3c314a0005b1e29c578b7d1dda04b6ba5bfca4e66f982dcaa62041d2ed3e1505a54780597ed30928f5acca69f849c713b98f3c189
+  metadata.gz: e73cea00a3e2a7fbafaa01271aeb155de1775b88eb0e8392810bfeae485b8c84d644d8a1d1c70ddb2d3df7df9a79ec7a40dc9d48bf56675ca6bee28551a273c0
+  data.tar.gz: ea17876778a49cc46a03ba853f39d1edde098f24f57e67606e9f632a5144c1bb94438f810073adad296b7ad4dfc09e750f7dbbcdb630bf5eb5cbec825f23395a

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"
+. "$(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.rb

@@ -26,6 +26,7 @@ require_relative 'learn_test/strategies/java_junit'
 require_relative 'learn_test/strategies/csharp_nunit'
 require_relative 'learn_test/strategies/mocha'
 require_relative 'learn_test/strategies/pytest'
+require_relative 'learn_test/strategies/none'
 
 module LearnTest
   module Dependencies

data/lib/learn_test/git_wip.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'git'
+require 'logger'
 
 module LearnTest
   module GitWip
@@ -9,26 +10,23 @@ 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
-  
-          while err = stderr.gets do
-            puts err
-          end
+        commands = [
+          'learn-test-wip save "Automatic test submission" --editor',
+          "git push origin wip/#{working_branch}:refs/heads/wip"
+        ].join(';')
+
+        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.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'
+            #  puts 'There was an error running learn-test-wip'
             false
           end
         end
       rescue StandardError => e
-        puts e
         false
       end
     end

data/lib/learn_test/runner.rb

@@ -57,7 +57,8 @@ module LearnTest
         LearnTest::Strategies::Protractor,
         LearnTest::Strategies::JavaJunit,
         LearnTest::Strategies::Mocha,
-        LearnTest::Strategies::Pytest
+        LearnTest::Strategies::Pytest,
+        LearnTest::Strategies::None
       ]
     end
 

data/lib/learn_test/strategies/none.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module LearnTest
+  module Strategies
+    class None < LearnTest::Strategy
+      def service_endpoint
+        '/e/flatiron_none'
+      end
+
+      def detect
+        runner.files.include?('.canvas')
+      end
+
+      def run
+        puts 'Your assignment was submitted. You can resubmit by running `learn test` again.'
+      end
+
+      def results
+        {
+          username: username,
+          github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
+          repo_name: runner.repo,
+          build: {
+            test_suite: [{ framework: 'none' }]
+          },
+          examples: 0,
+          passing_count: 0,
+          pending_count: 0,
+          failure_count: 0,
+          failure_descriptions: ''
+        }
+      end
+    end
+  end
+end

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.3'
 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
 

data/spec/lib/learn_test/strategies/none_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+describe LearnTest::Strategies::None do
+  describe '#detect' do
+    context 'there is a .canvas file' do
+      before { FileUtils.touch('.canvas') }
+      after { FileUtils.rm('.canvas') }
+
+      it 'is true' do
+        runner = LearnTest::Runner.new(double(:repo), {})
+        strategy = LearnTest::Strategies::None.new(runner)
+
+        expect(strategy.detect).to eq(true)
+      end
+    end
+
+    context 'there is no .canvas file' do
+      it 'is false' do
+        runner = LearnTest::Runner.new(double(:repo), {})
+        strategy = LearnTest::Strategies::None.new(runner)
+
+        expect(strategy.detect).to eq(false)
+      end
+    end
+  end
+
+  describe '#run' do
+    it 'prints a message' do
+      strategy = LearnTest::Strategies::None.new(double(:runner, options: {}))
+      msg = "Your assignment was submitted. You can resubmit by running `learn test` again.\n"
+
+      expect { strategy.run }.to output(msg).to_stdout
+    end
+  end
+
+  describe '#results' do
+    it 'contains the appropriate attributes' do
+      user_id = rand(1000..9999)
+      username = "test-username-#{user_id}"
+      oauth_token = "test-token-#{user_id}"
+      repo = double(:repo)
+
+      runner = LearnTest::Runner.new(repo, {})
+      strategy = LearnTest::Strategies::None.new(runner)
+
+      expect(LearnTest::UsernameParser).to receive(:get_username)
+        .and_return(username)
+
+      expect(LearnTest::UserIdParser).to receive(:get_user_id)
+        .and_return(user_id)
+
+      expect(LearnTest::LearnOauthTokenParser).to receive(:get_learn_oauth_token)
+        .and_return(oauth_token)
+
+
+      expect(strategy.results).to eq(
+        username: username,
+        github_user_id: user_id,
+        learn_oauth_token: oauth_token,
+        repo_name: repo,
+        build: {
+          test_suite: [{ framework: 'none' }]
+        },
+        examples: 0,
+        passing_count: 0,
+        pending_count: 0,
+        failure_count: 0,
+        failure_descriptions: ''
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.2.1.pre.5
+  version: 3.2.3
 platform: ruby
 authors:
 - Flatiron School
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: 
+description:
 email:
 - learn@flatironschool.com
 executables:
@@ -181,6 +181,7 @@ files:
 - lib/learn_test/strategies/karma.rb
 - lib/learn_test/strategies/karma/karma.conf.js
 - lib/learn_test/strategies/mocha.rb
+- lib/learn_test/strategies/none.rb
 - lib/learn_test/strategies/protractor.rb
 - lib/learn_test/strategies/pytest.rb
 - lib/learn_test/strategies/pytest/requirements_checker.rb
@@ -204,13 +205,14 @@ files:
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb
 - spec/lib/learn_test/strategies/mocha_spec.rb
+- spec/lib/learn_test/strategies/none_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/learn-co/learn-test
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,12 +224,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Runs RSpec, Karma, Mocha, and Python Pytest Test builds and pushes JSON output
   to Learn.
@@ -242,5 +244,6 @@ test_files:
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb
 - spec/lib/learn_test/strategies/mocha_spec.rb
+- spec/lib/learn_test/strategies/none_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb