learn-test 3.3.0.pre.5 → 3.3.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bcb52a7bdd3a25aa1938ba7d13b929bb52e2ecae2107810dd074ad400a04c1c
-  data.tar.gz: f5fbd110ec71a7be53ef29ee44debbfa5febff13d70cdd6633624bae7fd9ccd3
+  metadata.gz: 7906a9d22e49996f18bf0b8c0cd1c7d76f5ef27447ee235b09403c58b6132340
+  data.tar.gz: 98f97cbd9e8d2b0bd643ff95e9e6f5ec11988a74a4e1a17819d303cbb2b9bba8
 SHA512:
-  metadata.gz: 2ae93ca8deccd1c7879ba6b22aee84b64b92d85826ebfcf188c02bdccfb07935df88e661d75d4dfe0453bdbe02fbef4f0e2dcc15b020950191be07e9017c3b25
-  data.tar.gz: 4462b95bd0165cf7693b63aab7faab069e02a99f6c96ac47bea33d2a44d427a6b78b1c834abe5148732c1ff062ddc5e0959e282884dc8487a24d18659776f1c0
+  metadata.gz: 6ded3c645f8ae0ef2f7a2ab4cf39819b42f6c82a5a93e7876ad2ab625199d033a311fbbff03adf736a6ac64cbb655ae03eb35147abeca20ee13a59efe6979453
+  data.tar.gz: d41f77188f4fb422e216d0d808ab817d7a3ec915ca12376f62cdbecb39384e5256b100b4135869cb8e3e3dc4b4aeb2d52eee1ef24369fcf7a3466be130587df5

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)

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

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

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'fileutils'
+
 module LearnTest
   module Git
     module Wip
@@ -10,7 +12,11 @@ module LearnTest
 
         def initialize(base:, name:)
           dir = File.join(base.repo.path, PREFIX)
-          Dir.mkdir(dir, 0755) unless Dir.exist?(dir)
+          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

data/lib/learn_test/version.rb

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

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

@@ -43,7 +43,11 @@ describe LearnTest::Git::Wip::Base do
       before(:each) { initialize_repo }
 
       it 'should create refs/wip' do
-        expect(Dir).to receive(:mkdir).with("#{path}/.git/refs/wip/", 0755)
+        expect(FileUtils)
+          .to receive(:mkdir_p)
+          .with("#{path}/.git/refs/wip/", { mode: 0755 })
+          .and_call_original
+
         instance.process!
       end
     end
@@ -52,7 +56,7 @@ describe LearnTest::Git::Wip::Base do
       before(:each) { initialize_repo(commit: false) }
 
       it 'should raise' do
-        expect { instance.process! }.to raise_error(LearnTest::Git::Wip::NoCommitsError)
+        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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.3.0.pre.5
+  version: 3.3.0.pre.6
 platform: ruby
 authors:
 - Flatiron School
@@ -184,7 +184,9 @@ 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
@@ -221,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
@@ -265,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