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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8794c9f5f79754792e07d3d25d4394cb893f1156c2f90ddf49fa791e3295ed5b
-  data.tar.gz: 106bb411827dd6cc527f5f2703f1720a7cb5abd4f950fae6f9429da46beef4c9
+  metadata.gz: 249f2021b3b57e076db38961e1abfb5a8cdedbc7726ee33ad707ac7eea2678ff
+  data.tar.gz: 1688198ff9a0a2c5a558385b551db62b9a8d22b8435eb985200c91741d49aa7e
 SHA512:
-  metadata.gz: b0499f0e0986bc8e1a2e8425bfdf364c701540b8f7e799055b7929868fecec7a5c4812a0df10deaf310f5efff8d22d7caa5e3b046f96b719757d32c81f2269e8
-  data.tar.gz: 51369aeb558ad730d61618dbcf426c99250d4368c7b3baec7e0d858e39a29cf18d378cabad353bb2ea13164a3adaa60731ca5ec8de1d3ca6b22cfdacb4eca005
+  metadata.gz: bb4e34682cefc0b4e0c07d53a20ec48fe0b97cd4c6f1fac9dc83bf897d641d16cb61366ade6ceb6d641e7562578b7fa3f4ce8beb3ff890c57dcc190a91d6ac10
+  data.tar.gz: 1963e7a2d20ff15ff403e933ce85b8d875dc55c8146632d21b70cf4a2b17a565d8acac9509be7b98bb5f03796b8e97bb1fb6768e6f92863532026bd9c7071e6a

data/bin/learn-test-wip

@@ -30,7 +30,7 @@ Options for save:
                                     'commit.gpgSign = true'
 "
 
-source "$(git --exec-path)/git-sh-setup"
+. "$(git --exec-path)/git-sh-setup"
 
 require_work_tree
 

data/lib/learn_test/git_wip.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'git'
+require 'logger'
 
 module LearnTest
   module GitWip
@@ -9,25 +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')
           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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LearnTest
-  VERSION = '3.2.1.pre.6'
+  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.6
+  version: 3.2.1.pre.7
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake