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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0ace7de8deb6d1ed1c75f04e3a4bab456ca7e359b04862ae3130c5055ec2b5
-  data.tar.gz: 1126e77a12912921eba8cdb78491a1061d25e5534cf9de3f51a8be0150d874ce
+  metadata.gz: 8bcb52a7bdd3a25aa1938ba7d13b929bb52e2ecae2107810dd074ad400a04c1c
+  data.tar.gz: f5fbd110ec71a7be53ef29ee44debbfa5febff13d70cdd6633624bae7fd9ccd3
 SHA512:
-  metadata.gz: d7bca7e41c472fbd244ffa1a4622958fb002f35e39fe5315ff10f3b78764d31f0061354661c73d2c85a0328380ffebfd212ed90d15d1b6d9796fa3276da27d78
-  data.tar.gz: cc8978a4410022a1f8089db3c17b87eec877234f9b91e138eb3c4e0c4043d169fc1686d419b71f40c35e5f605a5c5525ba54cd59b19234b0827a21bbba614a65
+  metadata.gz: 2ae93ca8deccd1c7879ba6b22aee84b64b92d85826ebfcf188c02bdccfb07935df88e661d75d4dfe0453bdbe02fbef4f0e2dcc15b020950191be07e9017c3b25
+  data.tar.gz: 4462b95bd0165cf7693b63aab7faab069e02a99f6c96ac47bea33d2a44d427a6b78b1c834abe5148732c1ff062ddc5e0959e282884dc8487a24d18659776f1c0

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
 
@@ -25,7 +24,7 @@ module LearnTest
 
           @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 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 = LearnTest::Git::Wip::NoCommitsError::REGEX
+
               if raise_no_commits
-                raise e.message.match(NoCommitsError::REGEX) ? NoCommitsError.new(@name) : e
+                raise e.message.match(regex) ? LearnTest::Git::Wip::NoCommitsError.new(@name) : e
               end
 
-              raise unless e.message.match(NoCommitsError::REGEX)
+              raise unless e.message.match(regex)
 
               false
             end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+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)
+          Dir.mkdir(dir, 0755) unless Dir.exist?(dir)
+
+          super(base: base, name: "#{PREFIX}#{name}")
+        end
+      end
+    end
+  end
+end

data/lib/learn_test/version.rb

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

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

@@ -39,19 +39,20 @@ 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(Dir).to receive(:mkdir).with("#{path}/.git/refs/wip/", 0755)
+        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::NoCommitsError)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 3.3.0.pre.4
+  version: 3.3.0.pre.5
 platform: ruby
 authors:
 - Flatiron School
@@ -185,6 +185,7 @@ files:
 - 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/reference.rb
 - lib/learn_test/github_interactor.rb
 - lib/learn_test/js_strategy.rb
 - lib/learn_test/learn_oauth_token_parser.rb