git-fastclone 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83fead53c699b625667b994e06ab9cfe0c25ed62c01239c054ec1523109f986
-  data.tar.gz: 9e4513fe51d1e1deb357a1781fadd1df723997df527402c12beb436103ce7b2a
+  metadata.gz: cef4cf9ee8a10c9fb00ccb58382046fa71298ad8263985156f8e1b7c3dc85af4
+  data.tar.gz: 53dbb091ce1e6f02db4ee9aa89b03791aae4f790d816e33b1f792b9912fde28f
 SHA512:
-  metadata.gz: ecc286e3180698eab52e06e61d3bf62c27af6524a3ab398d86cf1bbbe336dd9c547609ec6744264be506ea9f41920cf68210b08d6fad752f5d8fc589b069e2be
-  data.tar.gz: 653a21b17f4a033ee23bd77f1953a72df9176006ebb320a33ed179e4f7f2a957133a4569f1d91722c65d2d638ee727eae15d41b6b73f5b133d138823365e6937
+  metadata.gz: 184ddbefb71a17d2521f898ebf6f2f7887249d7f61423bb55b85e58ce1d3d637c5c7246fdf34058957274fbc3ee62e65be37bcb41b8e803143035c5ff0a13c4f
+  data.tar.gz: 1d8b9882c5f1b3f48044cd4c71e8cae8d14c747f52ad7314a5897e137430a7e6af8bc215e8296b722cc5208fe4aac4d04f22d4bb7c1e173ca64719bbb76fad06

data/lib/git-fastclone/version.rb

@@ -2,5 +2,5 @@
 
 # Version string for git-fastclone
 module GitFastCloneVersion
-  VERSION = '1.3.1'
+  VERSION = '1.3.3'
 end

data/lib/git-fastclone.rb

@@ -154,7 +154,7 @@ module GitFastClone
 
         opts.on('--lock-timeout N', 'Timeout in seconds to acquire a lock on any reference repo.
                 Default is 0 which waits indefinitely.') do |timeout_secs|
-          self.flock_timeout_secs = timeout_secs
+          self.flock_timeout_secs = timeout_secs.to_i
         end
       end.parse!
     end
@@ -379,8 +379,9 @@ module GitFastClone
     # To avoid corruption of the cache, if we failed to update or check out we remove
     # the cache directory entirely. This may cause the current clone to fail, but if the
     # underlying error from git is transient it will not affect future clones.
-    def clear_cache(dir)
+    def clear_cache(dir, url)
       FileUtils.remove_entry_secure(dir, force: true)
+      reference_updated.delete(reference_repo_name(url))
     end
 
     # This command will create and bring the mirror up-to-date on-demand,
@@ -391,33 +392,31 @@ module GitFastClone
     # moment means we only need to synchronize our own threads in case a single
     # submodule url is included twice via multiple dependency paths
     def with_git_mirror(url)
+      retries_allowed ||= 1
+      attempt_number ||= 0
+
       update_reference_repo(url, true)
+      dir = reference_repo_dir(url, reference_dir, using_local_repo)
 
       # Sometimes remote updates involve re-packing objects on a different thread
       # We grab the reference repo lock here just to make sure whatever thread
       # ended up doing the update is done with its housekeeping.
       # This makes sure we have control and unlock when the block returns:
       with_reference_repo_lock(url) do
-        dir = reference_repo_dir(url, reference_dir, using_local_repo)
-        retries_allowed = 1
-        attempt_number = 0
-
-        begin
-          yield dir, attempt_number
-        rescue Terrapin::ExitStatusError => e
-          if retriable_error?(e)
-            print_formatted_error(e)
-            clear_cache(dir)
-
-            if attempt_number < retries_allowed
-              attempt_number += 1
-              retry
-            end
-          end
+        yield dir, attempt_number
+      end
+    rescue Terrapin::ExitStatusError => e
+      if retriable_error?(e)
+        print_formatted_error(e)
+        clear_cache(dir, url)
 
-          raise
+        if attempt_number < retries_allowed
+          attempt_number += 1
+          retry
         end
       end
+
+      raise
     end
 
     def usage

data/spec/git_fastclone_runner_spec.rb

@@ -24,7 +24,7 @@ describe GitFastClone::Runner do
   let(:test_reference_repo_dir) { '/var/tmp/git-fastclone/reference/test_reference_dir' }
   let(:placeholder_arg) { 'PH' }
 
-  let(:lockfile) do
+  def create_lockfile_double
     lockfile = double
     expect(lockfile).to receive(:flock).with(File::LOCK_EX).once
     expect(lockfile).to receive(:flock).with(File::LOCK_UN).once
@@ -32,6 +32,8 @@ describe GitFastClone::Runner do
     lockfile
   end
 
+  let(:lockfile) { create_lockfile_double }
+
   before do
     stub_const('ARGV', ['ssh://git@git.com/git-fastclone.git', 'test_reference_dir'])
   end
@@ -331,13 +333,6 @@ describe GitFastClone::Runner do
   end
 
   describe '.with_git_mirror' do
-    before(:each) do
-      allow(subject).to receive(:update_reference_repo) {}
-      allow(subject).to receive(:print_formatted_error) {}
-      expect(subject).to receive(:reference_repo_dir).and_return(test_reference_repo_dir)
-      expect(subject).to receive(:reference_repo_lock_file).and_return(lockfile)
-    end
-
     def retriable_error
       %(
         STDOUT:
@@ -370,28 +365,81 @@ describe GitFastClone::Runner do
       expect(yielded).to eq(results)
     end
 
-    it 'should yield properly' do
-      expect(subject).not_to receive(:clear_cache)
-      try_with_git_mirror([true], [[test_reference_repo_dir, 0]])
+    let(:expected_commands) { [] }
+    let(:expected_commands_args) { [] }
+
+    before(:each) do
+      expect(expected_commands.length).to eq(expected_commands_args.length)
+      allow(Terrapin::CommandLine).to receive(:new) do |*command|
+        expect(expected_commands.length).to be > 0
+        expected_command = expected_commands.shift
+        expected_args = expected_commands_args.shift
+        expect(command).to eq(expected_command)
+        stub = double(Terrapin::CommandLine)
+        expect(stub).to receive(:run).with(expected_args)
+        stub
+      end
+
+      allow(subject).to receive(:print_formatted_error) {}
+      allow(subject).to receive(:reference_repo_dir).and_return(test_reference_repo_dir)
+      allow(subject).to receive(:reference_repo_lock_file) { create_lockfile_double }
     end
 
-    it 'should retry once for retriable errors' do
-      expect(subject).to receive(:clear_cache).once {}
-      try_with_git_mirror([retriable_error, true], [[test_reference_repo_dir, 1]])
+    after(:each) do
+      expect(expected_commands).to be_empty
     end
 
-    it 'should only retry twice at most' do
-      expect(subject).to receive(:clear_cache).twice {}
-      expect do
-        try_with_git_mirror([retriable_error, retriable_error], [])
-      end.to raise_error(Terrapin::ExitStatusError)
+    def clone_cmds
+      [
+        ['git clone', '--mirror :url :mirror'],
+        ['cd', ':path; git remote update --prune']
+      ]
     end
 
-    it 'should not retry for non-retriable errors' do
-      expect(subject).not_to receive(:clear_cache)
-      expect do
-        try_with_git_mirror(['Some unexpected error message'], [])
-      end.to raise_error(Terrapin::ExitStatusError)
+    def clone_args
+      [
+        {
+          mirror: test_reference_repo_dir,
+          url: test_url_valid
+        },
+        {
+          path: test_reference_repo_dir
+        }
+      ]
+    end
+
+    context 'expecting 1 clone attempt' do
+      let(:expected_commands) { clone_cmds }
+      let(:expected_commands_args) { clone_args }
+
+      it 'should succeed with a successful clone' do
+        expect(subject).not_to receive(:clear_cache)
+        try_with_git_mirror([true], [[test_reference_repo_dir, 0]])
+      end
+
+      it 'should fail after a non-retryable clone error' do
+        expect(subject).not_to receive(:clear_cache)
+        expect do
+          try_with_git_mirror(['Some unexpected error message'], [])
+        end.to raise_error(Terrapin::ExitStatusError)
+      end
+    end
+
+    context 'expecting 2 clone attempts' do
+      let(:expected_commands) { clone_cmds + clone_cmds }
+      let(:expected_commands_args) { clone_args + clone_args }
+
+      it 'should succeed after a single retryable clone failure' do
+        expect(subject).to receive(:clear_cache).and_call_original
+        try_with_git_mirror([retriable_error, true], [[test_reference_repo_dir, 1]])
+      end
+
+      it 'should fail after two retryable clone failures' do
+        expect(subject).to receive(:clear_cache).twice.and_call_original
+        expect do
+          try_with_git_mirror([retriable_error, retriable_error], [])
+        end.to raise_error(Terrapin::ExitStatusError)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Michael Tauraso
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: git-clone --recursive on steroids!