learn-test 3.3.0.pre.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34479d2b40afafa001626db60d17a0f80273293a0d70817fc46b3c91e01f8b81
-  data.tar.gz: 6423442bb278878a96673d8769a81eaa01bbcd56b12a1080b3e696298bb06f01
+  metadata.gz: f2c7dd60c1cafe4bd233f4a199c25e434761404f8bfb1404aed7f3252b16c99a
+  data.tar.gz: 5a43ca3b2d74d0a0107221d8436e4067e84ae53358ebaac7fddacd76cc868b94
 SHA512:
-  metadata.gz: eedc292d447fcc1732ae73457fae8c1c574db19ddeeea0cd1a42a527d879c4757bd951a2b47af8e1b2913714d74cf5e955ebcb0b8605eb2f4beb3b50fac5a602
-  data.tar.gz: d87fdc06850600e77021ac6891122a14a5c69bea2af562304b4d2c9e0345ea56823871f3a0b7f7e64077ee67873fc717662633562575ad6d2af734b75ca21ab1
+  metadata.gz: a72c51120e794a2f9e19109dcad02bc633f974ad57880bd319b7e07b832d705a0b5465e6ca3f8cc225dad4d70227b9a65c5c887ccd53437a5982bee6dc7cf7ab
+  data.tar.gz: b12583db44d75295101f9ebf904c395de1b2d943d6beec8b8c2ca007d5ec3bfc8ee5ee62a369b5b4a3a0cb8d6a6a1eebbc7b9ca699352a96b3d09dc0f7a5f4a4

data/lib/learn_test.rb

@@ -8,7 +8,9 @@ require 'zeitwerk'
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect(
   'csharp' => 'CSharp',
-  'csharp_nunit' => 'CSharpNunit'
+  'csharp_nunit' => 'CSharpNunit',
+  'nodejs' => 'NodeJS',
+  'phantomjs' => 'PhantomJS'
 )
 loader.setup
 

data/lib/learn_test/git/wip/base.rb

@@ -10,7 +10,6 @@ module LearnTest
     module Wip
       class Base < ::Git::Path
         TEMPFILE = '.wip'
-        PREFIX = 'refs/wip/'
 
         attr_reader :working_branch, :wip_branch
 
@@ -21,11 +20,11 @@ module LearnTest
 
           current_branch = @base.current_branch
 
-          raise NoCommitsError, 'master' if current_branch.nil? # TODO: Swap to `main`?
+          raise Errors::NoCommitsError, 'master' if current_branch.nil? # TODO: Swap to `main`?
 
           @tmp = Tempfile.new(TEMPFILE)
           @working_branch = Branch.new(base: @base, name: current_branch)
-          @wip_branch = Branch.new(base: @base, name: "#{PREFIX}#{current_branch}")
+          @wip_branch = Reference.new(base: @base, name: current_branch)
         end
 
         def process!
@@ -44,9 +43,6 @@ module LearnTest
           new_tree = build_new_tree(@wip_branch.parent)
           @base.diff(new_tree, @wip_branch.parent)
 
-          # tree_diff = @base.diff(new_tree, @wip_branch.parent)
-          # raise LearnTest::Git::Wip::NoChangesError, @wip_branch if tree_diff.count.zero?
-
           commit = @base.commit_tree(new_tree, parent: @wip_branch.parent)
 
           @base.lib.send(:command, 'update-ref', ['-m', @message, @wip_branch, commit.objectish])

data/lib/learn_test/git/wip/branch.rb

@@ -16,11 +16,13 @@ module LearnTest
             begin
               @base.revparse(@name)
             rescue ::Git::GitExecuteError => e
+              regex = Errors::NoCommitsError::REGEX
+
               if raise_no_commits
-                raise e.message.match(LearnTest::Git::Wip::NoCommitsError::REGEX) ? LearnTest::Git::Wip::NoCommitsError.new(@name) : e
+                raise e.message.match(regex) ? Errors::NoCommitsError.new(@name) : e
               end
 
-              raise unless e.message.match(LearnTest::Git::Wip::NoCommitsError::REGEX)
+              raise unless e.message.match(regex)
 
               false
             end

data/lib/learn_test/git/wip/errors/base_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LearnTest
+  module Git
+    module Wip
+      module Errors
+        class BaseError < StandardError; end
+      end
+    end
+  end
+end

data/lib/learn_test/git/wip/errors/no_changes_error.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module LearnTest
+  module Git
+    module Wip
+      module Errors
+        class NoChangesError < BaseError
+          def initialize(branch)
+            super "No changes found on `#{branch}`"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/learn_test/git/wip/errors/no_commits_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module LearnTest
+  module Git
+    module Wip
+      module Errors
+        class NoCommitsError < BaseError
+          REGEX = /unknown revision or path not in the working tree/i.freeze
+
+          def initialize(branch)
+            super "Branch `#{branch}` doesn't have any commits. Please commit and try again."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/learn_test/git/wip/reference.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module LearnTest
+  module Git
+    module Wip
+      class Reference < Branch
+        attr_accessor :parent
+
+        PREFIX = 'refs/wip/'
+
+        def initialize(base:, name:)
+          dir = File.join(base.repo.path, PREFIX)
+          file = File.join(dir, name)
+          sha = base.log(1)[0].sha
+
+          FileUtils.mkdir_p(dir, { mode: 0755 }) unless Dir.exist?(dir)
+          File.open(file, 'w+') { |f| f.puts sha } unless File.exist?(file)
+
+          super(base: base, name: "#{PREFIX}#{name}")
+        end
+      end
+    end
+  end
+end

data/lib/learn_test/reporter.rb

@@ -68,7 +68,7 @@ module LearnTest
         repo.push('origin', "#{res.wip_branch}:refs/heads/fis-wip", { force: true })
       rescue ::Git::GitExecuteError => e
         if @debug
-          puts 'There was a problem connecting to Github. Not pushing current branch state.'.red
+          puts 'There was a problem connecting to GitHub. Not pushing current branch state.'.red
           puts e.message
         end
       end

data/lib/learn_test/version.rb

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

data/spec/learn_test/git/wip/base_spec.rb

@@ -39,19 +39,24 @@ describe LearnTest::Git::Wip::Base do
       end
     end
 
-    context 'no commits' do
-      before(:each) { initialize_repo(commit: false) }
+    context 'no refs/wip' do
+      before(:each) { initialize_repo }
 
-      it 'should raise' do
-        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::NoCommitsError)
+      it 'should create refs/wip' do
+        expect(FileUtils)
+          .to receive(:mkdir_p)
+          .with("#{path}/.git/refs/wip/", { mode: 0755 })
+          .and_call_original
+
+        instance.process!
       end
     end
 
-    xcontext 'no changes' do
-      before(:each) { initialize_repo }
+    context 'no commits' do
+      before(:each) { initialize_repo(commit: false) }
 
       it 'should raise' do
-        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::NoChangesError)
+        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::Errors::NoCommitsError)
       end
     end
 

data/spec/learn_test/git/wip/branch_spec.rb

@@ -91,7 +91,7 @@ describe LearnTest::Git::Wip::Branch do
         expect do
           branch.last_revision(raise_no_commits: true)
         end.to raise_error(
-          LearnTest::Git::Wip::NoCommitsError, "Branch `#{name}` doesn't have any commits. Please commit and try again."
+          LearnTest::Git::Wip::Errors::NoCommitsError, "Branch `#{name}` doesn't have any commits. Please commit and try again."
         )
       end
     end

data/spec/learn_test/git/wip/errors/base_error_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Errors::BaseError do
+  it 'should inherit from StandardError' do
+    expect(described_class).to be < StandardError
+  end
+end

data/spec/learn_test/git/wip/errors/no_changes_error_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Errors::NoChangesError do
+  let(:branch) { rand(0..999_999).to_s }
+
+  it 'should inherit from Error' do
+    expect(described_class).to be < LearnTest::Git::Wip::Errors::BaseError
+  end
+
+  it 'should require a branch' do
+    expect { described_class.new }.to raise_error(ArgumentError)
+  end
+
+  it 'should have the correct messaging' do
+    error = described_class.new(branch)
+    expect(error.message).to eq "No changes found on `#{branch}`"
+  end
+end

data/spec/learn_test/git/wip/errors/no_commits_error_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+describe LearnTest::Git::Wip::Errors::NoCommitsError do
+  let(:branch) { rand(0..999_999).to_s }
+
+  it 'should inherit from Error' do
+    expect(described_class).to be < LearnTest::Git::Wip::Errors::BaseError
+  end
+
+  it 'should require a branch' do
+    expect { described_class.new }.to raise_error(ArgumentError)
+  end
+
+  it 'should have the correct messaging' do
+    error = described_class.new(branch)
+    expect(error.message).to eq "Branch `#{branch}` doesn't have any commits. Please commit and try again."
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ support_dir = File.join('./', 'spec', 'support', '**', '*.rb')
 Dir.glob(support_dir).each { |f| require f }
 
 RSpec.configure do |config|
+  config.filter_run focus: true
+
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.3.0.pre.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Flatiron School
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
-description: 
+description:
 email:
 - learn@flatironschool.com
 executables:
@@ -184,7 +184,10 @@ files:
 - lib/learn_test/git.rb
 - lib/learn_test/git/wip/base.rb
 - lib/learn_test/git/wip/branch.rb
-- lib/learn_test/git/wip/error.rb
+- lib/learn_test/git/wip/errors/base_error.rb
+- lib/learn_test/git/wip/errors/no_changes_error.rb
+- lib/learn_test/git/wip/errors/no_commits_error.rb
+- lib/learn_test/git/wip/reference.rb
 - lib/learn_test/github_interactor.rb
 - lib/learn_test/js_strategy.rb
 - lib/learn_test/learn_oauth_token_parser.rb
@@ -220,7 +223,9 @@ files:
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
 - spec/learn_test/git/wip/base_spec.rb
 - spec/learn_test/git/wip/branch_spec.rb
-- spec/learn_test/git/wip/error_spec.rb
+- spec/learn_test/git/wip/errors/base_error_spec.rb
+- spec/learn_test/git/wip/errors/no_changes_error_spec.rb
+- spec/learn_test/git/wip/errors/no_commits_error_spec.rb
 - spec/learn_test/git_spec.rb
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb
@@ -233,7 +238,7 @@ homepage: https://github.com/learn-co/learn-test
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,12 +250,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.3
+signing_key:
 specification_version: 4
 summary: Runs RSpec, Karma, Mocha, and Python Pytest Test builds and pushes JSON output
   to Learn.
@@ -264,7 +269,9 @@ test_files:
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
 - spec/learn_test/git/wip/base_spec.rb
 - spec/learn_test/git/wip/branch_spec.rb
-- spec/learn_test/git/wip/error_spec.rb
+- spec/learn_test/git/wip/errors/base_error_spec.rb
+- spec/learn_test/git/wip/errors/no_changes_error_spec.rb
+- spec/learn_test/git/wip/errors/no_commits_error_spec.rb
 - spec/learn_test/git_spec.rb
 - spec/learn_test/reporter_spec.rb
 - spec/learn_test/username_parser_spec.rb

data/lib/learn_test/git/wip/error.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module LearnTest
-  module Git
-    module Wip
-      class Error < StandardError; end
-
-      class NoChangesError < Error
-        def initialize(branch)
-          super "No changes found on `#{branch}`"
-        end
-      end
-
-      class NoCommitsError < Error
-        REGEX = /unknown revision or path not in the working tree/i.freeze
-
-        def initialize(branch)
-          super "Branch `#{branch}` doesn't have any commits. Please commit and try again."
-        end
-      end
-    end
-  end
-end

data/spec/learn_test/git/wip/error_spec.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-describe LearnTest::Git::Wip do
-  let(:branch) { rand(0..999_999).to_s }
-
-  describe LearnTest::Git::Wip::Error do
-    it 'should inherit from StandardError' do
-      expect(described_class).to be < StandardError
-    end
-  end
-
-  describe LearnTest::Git::Wip::NoChangesError do
-    it 'should inherit from Error' do
-      expect(described_class).to be < LearnTest::Git::Wip::Error
-    end
-
-    it 'should require a branch' do
-      expect { described_class.new }.to raise_error(ArgumentError)
-    end
-
-    it 'should have the correct messaging' do
-      error = described_class.new(branch)
-      expect(error.message).to eq "No changes found on `#{branch}`"
-    end
-  end
-
-  describe LearnTest::Git::Wip::NoCommitsError do
-    it 'should inherit from Error' do
-      expect(described_class).to be < LearnTest::Git::Wip::Error
-    end
-
-    it 'should require a branch' do
-      expect { described_class.new }.to raise_error(ArgumentError)
-    end
-
-    it 'should have the correct messaging' do
-      error = described_class.new(branch)
-      expect(error.message).to eq "Branch `#{branch}` doesn't have any commits. Please commit and try again."
-    end
-  end
-end