learn-test 3.3.0.pre.3 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1a864132415df805ab19a42f9a8c5d3892602742fca35cf3a8aff5ae5e7a97
-  data.tar.gz: 62fcb6feb51b50944d9622fb4306d815125c9338efc1be888775037e853b6d70
+  metadata.gz: 159d9e9f72ea50f9b2f88f1bb947933f59ab93eabad5d0b5354aef0315700898
+  data.tar.gz: b553b0b3bbdbd257b1227a60ce63aee383187b3f4218eee14193ddac0fbc77d4
 SHA512:
-  metadata.gz: 52ab71e5a63eec57aba9391d97255d4aca85e62c9adae8dadb7f02efb0591d6f3d0637a203fca5b1c47fb27cd627c935d837b2e05f55f79f0b7dc1ebbcf025d7
-  data.tar.gz: 94c627e54f10bbb7ae74f482c4d806ccba4de548b6530843524d950c6a5da3286d5e2e422a70a242daa1e51f66181950c991927e5f0eac38af874195bf176e23
+  metadata.gz: 2071fedae3bad80d38ee3ee451aadf17a85dcc2bd4efa50e87a70d28d8cf629e6df27729e1790c82ee9beeeba4b2f2a90b550815b50e22e3bd7770207686e9aa
+  data.tar.gz: 5ac388b9d5fcad67fef8957cf937879dbfee791357d60cea982d7cf19431ae0e1f7d36d2a04fa1f0acf516c7451fb47a1aac174e6e14c67d8b9f88948edf2159

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

@@ -20,7 +20,7 @@ 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)
@@ -43,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

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require 'json'
+require 'logger'
 
 module LearnTest
   class Reporter
@@ -54,7 +55,7 @@ module LearnTest
         return
       end
 
-      logger = @debug ? Logger.new(STDOUT, level: Logger::DEBUG) : false
+      logger = @debug ? ::Logger.new($stdout, level: ::Logger::DEBUG) : false
       repo = LearnTest::Git.open(options: { log: logger })
 
       res = repo.wip(message: 'Automatic test submission')

data/lib/learn_test/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LearnTest
-  VERSION = '3.3.0.pre.3'
+  VERSION = '3.3.1'
 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.3
+  version: 3.3.1
 platform: ruby
 authors:
 - Flatiron School
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2020-11-06 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