git-fastclone 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2eb17be407c42dbabdb002d8cee1fb56820f6543df47758b0376e84ed2344e
-  data.tar.gz: 0c1ca35bca06f608f8087670eba49cb5cc7d6c1af7c308e38159477455bd33c3
+  metadata.gz: c7330529bf940f74fcdf782fa298d7de00d0f75b5ccbd303bb6a99d57668b6a0
+  data.tar.gz: 4dc5b12076314094bf03638433dcbc6df5f486b6b2b5da6ff2350c77942b23ca
 SHA512:
-  metadata.gz: 4a3d27522c916ac8883ad8abceb5d19529bb406409b3f7904652a54640b2edc91184420baad3118d8379b7c26ce2331018367c994375843c9130ae9511f1108f
-  data.tar.gz: 413c42026762c4bf1a80d693d2920c0a519969a7d5c4f215fb810b88f6dabb5e449a15d331214c0751e0daa92c4cbc706915e7ca4d9691ec2aaefb292b8cbef6
+  metadata.gz: c3ce186a25e7acbc07735118a7a9d55bbca2deee8ff7ba79ea8eebdb1dd8ecff2a01beb640528af0ed8d35a9a62bf03161b8afa545ca6ceb5b7b3ea62ce510ba
+  data.tar.gz: f6d0ec9167c8dc69ebdd7caad9c24d595bfd83c3400618d8eefaeb1e0ace4f6dc7a1eb4a752bb499f3c2dc16edf522096e4680dd69f414dcbef6dd9bc9addcd3

data/README.md

@@ -35,7 +35,7 @@ It aggressively updates these mirrors from origin and then clones from the mirro
 directory of your choosing. It always works recursively and multithreaded to get your checkout up as
 fast as possible.
 
-Detailed explanation [here][1].
+Detailed explanation [here](https://developer.squareup.com/blog/introducing-git-fastclone/).
 
 
 Usage
@@ -71,7 +71,7 @@ requests.
 When submitting code, please make every effort to follow existing conventions and style in order to
 keep the code as readable as possible.
 
-Before accepting any pull requests, we need you to sign an [Individual Contributor Agreement][2]
+Before accepting any pull requests, we need you to sign an [Individual Contributor Agreement](https://docs.google.com/a/squareup.com/forms/d/13WR8m5uZ2nAkJH41k7GdVBXAAbzDk00vxtEYjd6Imzg/viewform?formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ&ndplr=1)
 (Google form).
 
 Once landed, please reach out to any owner listed in https://rubygems.org/gems/git-fastclone and ask them to help publish the new version.
@@ -79,15 +79,10 @@ Once landed, please reach out to any owner listed in https://rubygems.org/gems/g
 
 Acknowledgements
 ----------------
-[thoughtbot/terrapin][3] - jyurek and collaborators
-
-[robolson][4]
-
-[ianchesal][5]
-
-[mtauraso][6]
-
-[chriseckhardt][7]
+* [robolson](https://github.com/robolson)
+* [ianchesal](https://github.com/ianchesal)
+* [mtauraso](https://github.com/mtauraso)
+* [chriseckhardt](https://github.com/chriseckhardt)
 
 
 License
@@ -105,11 +100,3 @@ License
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-
-[1]: https://corner.squareup.com/2015/11/fastclone.html
-[2]: https://docs.google.com/a/squareup.com/forms/d/13WR8m5uZ2nAkJH41k7GdVBXAAbzDk00vxtEYjd6Imzg/viewform?formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ&ndplr=1
-[3]: https://github.com/thoughtbot/terrapin
-[4]: https://github.com/robolson
-[5]: https://github.com/ianchesal
-[6]: https://github.com/mtauraso
-[7]: https://github.com/chriseckhardt

data/lib/git-fastclone/version.rb

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

data/lib/git-fastclone.rb

@@ -110,7 +110,7 @@ module GitFastClone
     def run
       url, path, options = parse_inputs
 
-      require_relative './git-fastclone/version'
+      require_relative 'git-fastclone/version'
       msg = "git-fastclone #{GitFastCloneVersion::VERSION}"
       if color
         puts msg.yellow
@@ -225,10 +225,9 @@ module GitFastClone
 
       # Only checkout if we're changing branches to a non-default branch
       if rev
-        Dir.chdir(File.join(abs_clone_path, src_dir)) do
-          fail_on_error('git', 'checkout', '--quiet', rev.to_s, quiet: !verbose,
-                                                                print_on_failure: print_git_errors)
-        end
+        fail_on_error('git', 'checkout', '--quiet', rev.to_s, quiet: !verbose,
+                                                              print_on_failure: print_git_errors,
+                                                              chdir: File.join(abs_clone_path, src_dir))
       end
 
       update_submodules(src_dir, url)
@@ -250,11 +249,9 @@ module GitFastClone
 
       threads = []
       submodule_url_list = []
-      output = ''
-      Dir.chdir(File.join(abs_clone_path, pwd).to_s) do
-        output = fail_on_error('git', 'submodule', 'init', quiet: !verbose,
-                                                           print_on_failure: print_git_errors)
-      end
+      output = fail_on_error('git', 'submodule', 'init', quiet: !verbose,
+                                                         print_on_failure: print_git_errors,
+                                                         chdir: File.join(abs_clone_path, pwd))
 
       output.split("\n").each do |line|
         submodule_path, submodule_url = parse_update_info(line)
@@ -270,11 +267,10 @@ module GitFastClone
     def thread_update_submodule(submodule_url, submodule_path, threads, pwd)
       threads << Thread.new do
         with_git_mirror(submodule_url) do |mirror, _|
-          Dir.chdir(File.join(abs_clone_path, pwd).to_s) do
-            cmd = ['git', 'submodule', verbose ? nil : '--quiet', 'update', '--reference', mirror.to_s,
-                   submodule_path.to_s].compact
-            fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)
-          end
+          cmd = ['git', 'submodule',
+                 verbose ? nil : '--quiet', 'update', '--reference', mirror.to_s, submodule_path.to_s].compact
+          fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors,
+                              chdir: File.join(abs_clone_path, pwd))
         end
 
         update_submodules(File.join(pwd, submodule_path), submodule_url)
@@ -350,19 +346,25 @@ module GitFastClone
                       quiet: !verbose, print_on_failure: print_git_errors)
       end
 
-      Dir.chdir(mirror) do
-        cmd = ['git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
-        fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)
-      end
+      cmd = ['git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
+      fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors, chdir: mirror)
+
       reference_updated[repo_name] = true
     rescue RunnerExecutionRuntimeError => e
       # 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.
-      clear_cache(mirror, url)
+      #
+      # The only exception to this is authentication failures, because they are transient,
+      # usually due to either a remote server outage or a local credentials config problem.
+      clear_cache(mirror, url) unless auth_error?(e.output)
       raise e if fail_hard
     end
 
+    def auth_error?(error)
+      error.to_s =~ /.*^fatal: Authentication failed/m
+    end
+
     def retriable_error?(error)
       error_strings = [
         /^fatal: missing blob object/,
@@ -371,7 +373,8 @@ module GitFastClone
         /^fatal: pack has \d+ unresolved delta/,
         /^error: unable to read sha1 file of /,
         /^fatal: did not receive expected object/,
-        /^fatal: unable to read tree [a-z0-9]+\n^warning: Clone succeeded, but checkout failed/
+        /^fatal: unable to read tree [a-z0-9]+\n^warning: Clone succeeded, but checkout failed/,
+        /^fatal: Authentication failed/
       ]
       error.to_s =~ /.*#{Regexp.union(error_strings)}/m
     end

data/spec/git_fastclone_runner_spec.rb

@@ -91,7 +91,6 @@ describe GitFastClone::Runner do
     before(:each) do
       allow(runner_execution_double).to receive(:fail_on_error) {}
       allow(Dir).to receive(:pwd) { '/pwd' }
-      allow(Dir).to receive(:chdir).and_yield
       allow(subject).to receive(:with_git_mirror).and_yield('/cache', 0)
       expect(subject).to receive(:clear_clone_dest_if_needed).once {}
     end
@@ -99,7 +98,7 @@ describe GitFastClone::Runner do
     it 'should clone correctly' do
       expect(subject).to receive(:fail_on_error).with(
         'git', 'checkout', '--quiet', 'PH',
-        { quiet: true, print_on_failure: false }
+        { chdir: '/pwd/.', print_on_failure: false, quiet: true }
       ) { runner_execution_double }
       expect(subject).to receive(:fail_on_error).with(
         'git', 'clone', '--quiet', '--reference', '/cache', 'PH', '/pwd/.',
@@ -113,7 +112,7 @@ describe GitFastClone::Runner do
       subject.verbose = true
       expect(subject).to receive(:fail_on_error).with(
         'git', 'checkout', '--quiet', 'PH',
-        { quiet: false, print_on_failure: false }
+        { chdir: '/pwd/.', print_on_failure: false, quiet: false }
       ) { runner_execution_double }
       expect(subject).to receive(:fail_on_error).with(
         'git', 'clone', '--verbose', '--reference', '/cache', 'PH', '/pwd/.',
@@ -309,7 +308,7 @@ describe GitFastClone::Runner do
 
   describe '.store_updated_repo' do
     context 'when fail_hard is true' do
-      it 'should raise a Runtime error and clear cache' do
+      it 'should raise a Runtime error and clear cache if there were no authentication errors' do
         status = double('status')
         allow(status).to receive(:exitstatus).and_return(1)
         ex = RunnerExecution::RunnerExecutionRuntimeError.new(status, 'cmd')
@@ -319,6 +318,18 @@ describe GitFastClone::Runner do
           subject.store_updated_repo(placeholder_arg, placeholder_arg, placeholder_arg, true)
         end.to raise_error(ex)
       end
+
+      it 'should raise a Runtime error and skip clearing the cache if there were authentication errors' do
+        status = double('status')
+        allow(status).to receive(:exitstatus).and_return(1)
+        ex = RunnerExecution::RunnerExecutionRuntimeError.new(status, 'cmd')
+        allow(ex).to receive(:output).and_return('fatal: Authentication failed')
+        allow(subject).to receive(:fail_on_error) { raise ex }
+        expect(FileUtils).to_not receive(:remove_entry_secure).with(placeholder_arg, force: true)
+        expect do
+          subject.store_updated_repo(placeholder_arg, placeholder_arg, placeholder_arg, true)
+        end.to raise_error(ex)
+      end
     end
 
     context 'when fail_hard is false' do
@@ -338,7 +349,6 @@ describe GitFastClone::Runner do
 
     it 'should correctly update the hash' do
       allow(subject).to receive(:fail_on_error)
-      allow(Dir).to receive(:chdir) {}
 
       subject.reference_updated = placeholder_hash
       subject.store_updated_repo(placeholder_arg, placeholder_arg, placeholder_arg, false)
@@ -389,7 +399,6 @@ describe GitFastClone::Runner do
         expected_command = expected_commands.shift
         expect(command).to eq(expected_command)
       }
-      allow(Dir).to receive(:chdir).and_yield
 
       allow(subject).to receive(:print_formatted_error) {}
       allow(subject).to receive(:reference_repo_dir).and_return(test_reference_repo_dir)
@@ -404,7 +413,8 @@ describe GitFastClone::Runner do
       [
         ['git', 'clone', verbose ? '--verbose' : '--quiet', '--mirror', test_url_valid,
          test_reference_repo_dir],
-        ['git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
+        ['git', 'remote', verbose ? '--verbose' : nil, 'update',
+         '--prune'].compact
       ]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.4
 platform: ruby
 authors:
 - Michael Tauraso
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: git-clone --recursive on steroids!