git-fastclone 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2eb17be407c42dbabdb002d8cee1fb56820f6543df47758b0376e84ed2344e
-  data.tar.gz: 0c1ca35bca06f608f8087670eba49cb5cc7d6c1af7c308e38159477455bd33c3
+  metadata.gz: 4b755aef58d17ded702b989b16fb92cf93908413403bb99f92b542319c59fdbc
+  data.tar.gz: c7ad9ab44516bea864027aa562af274bd49999aea62eccbfc3df9421cc6674d6
 SHA512:
-  metadata.gz: 4a3d27522c916ac8883ad8abceb5d19529bb406409b3f7904652a54640b2edc91184420baad3118d8379b7c26ce2331018367c994375843c9130ae9511f1108f
-  data.tar.gz: 413c42026762c4bf1a80d693d2920c0a519969a7d5c4f215fb810b88f6dabb5e449a15d331214c0751e0daa92c4cbc706915e7ca4d9691ec2aaefb292b8cbef6
+  metadata.gz: 8f6cff1907474ac42d8a4936dba9e5e684440b72f9995ce80bdb0bc79bc169d79969386b32eb3c8e8cc64358fc1872b0cbb07011d2bebfd753b04423fc1198be
+  data.tar.gz: 889d56227ae2aff1aba3d9dfc33fdd7ab554b9f6ae77f21c036c66af5c2eb47756d49e62a2244ca922855442856caaeb772baace5bc1c9f093d1eae0a3043b02

data/lib/git-fastclone/version.rb

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

data/lib/git-fastclone.rb

@@ -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,10 +346,9 @@ 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

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/.',
@@ -338,7 +337,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 +387,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 +401,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.3
 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-09-01 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.1.6
 signing_key:
 specification_version: 4
 summary: git-clone --recursive on steroids!