git-fastclone 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5f3f84cbab65351479f22b659b912521699f542c898010527f25b7c3786c84
-  data.tar.gz: 5f02716656bf0962d9a808ae368078f0e151e6bdfd3abba5b25503504f64194b
+  metadata.gz: 7e915bc1276ac42ac35559122dc1c12f4a04778032ec4510fe96a64b37fc4a7a
+  data.tar.gz: 9fcb6e4a441106da6b09f2d4b39cf0e740942ae99de051712fba27656d962f04
 SHA512:
-  metadata.gz: a9219567c52c31d5219027adb6227c88970dd839fa8dd2f50258fc205adc3e4f9372d44d6f734242849865d7885f6b8f5a3fadfef05f77c88e24d8d85016a849
-  data.tar.gz: c136b5240dfc87480457c924772944282f518f8c77d49473f41724449ae0566d8cc5476e6f698aa86de2b18f1f77a8995d0f5f3e8778546630e390d6ed2d2530
+  metadata.gz: fc52b41c18799ec2154000bc7762c8301ed50f28d2eb252e4adcdc82ff36cdc6e3fa772d85db4d52ea95782ea16e02ea0460f1488b5ce95a745ee8a451511a3d
+  data.tar.gz: f86877adef196e5416e69aac06c7129bfaf22a21a566a5afe05e4780da60cdc3f0e2379e81d1bc0b4e8bd129d18a893f925dbd7096a4057ef428f085a964b2f2

data/lib/git-fastclone/version.rb

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

data/lib/git-fastclone.rb

@@ -212,13 +212,13 @@ module GitFastClone
         clone_commands = ['git', 'clone', verbose ? '--verbose' : '--quiet']
         clone_commands << '--reference' << mirror.to_s << url.to_s << clone_dest
         clone_commands << '--config' << config.to_s unless config.nil?
-        fail_pipe_on_error(clone_commands, quiet: !verbose)
+        fail_on_error(*clone_commands, quiet: !verbose)
       end
 
       # 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_pipe_on_error(['git', 'checkout', '--quiet', rev.to_s], quiet: !verbose)
+          fail_on_error('git', 'checkout', '--quiet', rev.to_s, quiet: !verbose)
         end
       end
 
@@ -261,10 +261,9 @@ module GitFastClone
       threads << Thread.new do
         with_git_mirror(submodule_url) do |mirror, _|
           Dir.chdir(File.join(abs_clone_path, pwd).to_s) do
-            fail_pipe_on_error(
-              ['git', 'submodule', verbose ? nil : '--quiet', 'update', '--reference', mirror.to_s,
-               submodule_path.to_s].compact, quiet: !verbose
-            )
+            cmd = ['git', 'submodule', verbose ? nil : '--quiet', 'update', '--reference', mirror.to_s,
+                   submodule_path.to_s].compact
+            fail_on_error(*cmd, quiet: !verbose)
           end
         end
 
@@ -337,21 +336,13 @@ module GitFastClone
     # that this repo has been updated on this run of fastclone
     def store_updated_repo(url, mirror, repo_name, fail_hard)
       unless Dir.exist?(mirror)
-        fail_pipe_on_error(
-          ['git', 'clone', verbose ? '--verbose' : '--quiet', '--mirror', url.to_s,
-           mirror.to_s], quiet: !verbose
-        )
+        fail_on_error('git', 'clone', verbose ? '--verbose' : '--quiet', '--mirror', url.to_s, mirror.to_s,
+                      quiet: !verbose)
       end
 
       Dir.chdir(mirror) do
         cmd = ['git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
-        if verbose
-          fail_pipe_on_error(cmd, quiet: !verbose)
-        else
-          # Because above operation might spit out a lot to stderr, we use this to swallow them
-          # and only display if the operation return non 0 exit code
-          fail_on_error(*cmd, quiet: !verbose)
-        end
+        fail_on_error(*cmd, quiet: !verbose)
       end
       reference_updated[repo_name] = true
     rescue RunnerExecutionRuntimeError => e

data/lib/runner_execution.rb

@@ -20,34 +20,6 @@ module RunnerExecution
     end
   end
 
-  # Wrapper around open3.pipeline_r which fails on error.
-  # and stops users from invoking the shell by accident.
-  def fail_pipe_on_error(*cmd_list, quiet: false, **opts)
-    print_command('Running Pipeline:', cmd_list) unless quiet
-
-    env = opts.delete(:env) { {} }
-    raise ArgumentError, "The :env option must be a hash, not #{env.inspect}" unless env.is_a?(Hash)
-
-    cmd_list.map! { |cmd| shell_safe(cmd).unshift(env) }
-
-    output, *status_list = Open3.pipeline_r(*cmd_list, opts) do |out, wait_threads|
-      out_reader = Thread.new do
-        if quiet
-          output = out.read
-        else
-          # Output from pipeline should go to stdout and also get returned for
-          # processing if necessary.
-          output = tee(out, STDOUT)
-        end
-        out.close
-        output
-      end
-      [out_reader.value] + wait_threads.map(&:value)
-    end
-    exit_on_status(output, cmd_list, status_list, quiet: quiet)
-  end
-  module_function :fail_pipe_on_error
-
   # Runs a command that fails on error.
   # Uses popen2e wrapper. Handles bad statuses with potential for retries.
   def fail_on_error(*cmd, stdin_data: nil, binmode: false, quiet: false, **opts)

data/spec/git_fastclone_runner_spec.rb

@@ -89,7 +89,7 @@ describe GitFastClone::Runner do
   describe '.clone' do
     let(:runner_execution_double) { double('runner_execution') }
     before(:each) do
-      allow(runner_execution_double).to receive(:fail_pipe_on_error) {}
+      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)
@@ -97,12 +97,12 @@ describe GitFastClone::Runner do
     end
 
     it 'should clone correctly' do
-      expect(subject).to receive(:fail_pipe_on_error).with(
-        ['git', 'checkout', '--quiet', 'PH'],
+      expect(subject).to receive(:fail_on_error).with(
+        'git', 'checkout', '--quiet', 'PH',
         { quiet: true }
       ) { runner_execution_double }
-      expect(subject).to receive(:fail_pipe_on_error).with(
-        ['git', 'clone', '--quiet', '--reference', '/cache', 'PH', '/pwd/.'],
+      expect(subject).to receive(:fail_on_error).with(
+        'git', 'clone', '--quiet', '--reference', '/cache', 'PH', '/pwd/.',
         { quiet: true }
       ) { runner_execution_double }
 
@@ -111,12 +111,12 @@ describe GitFastClone::Runner do
 
     it 'should clone correctly with verbose mode on' do
       subject.verbose = true
-      expect(subject).to receive(:fail_pipe_on_error).with(
-        ['git', 'checkout', '--quiet', 'PH'],
+      expect(subject).to receive(:fail_on_error).with(
+        'git', 'checkout', '--quiet', 'PH',
         { quiet: false }
       ) { runner_execution_double }
-      expect(subject).to receive(:fail_pipe_on_error).with(
-        ['git', 'clone', '--verbose', '--reference', '/cache', 'PH', '/pwd/.'],
+      expect(subject).to receive(:fail_on_error).with(
+        'git', 'clone', '--verbose', '--reference', '/cache', 'PH', '/pwd/.',
         { quiet: false }
       ) { runner_execution_double }
 
@@ -124,8 +124,8 @@ describe GitFastClone::Runner do
     end
 
     it 'should clone correctly with custom configs' do
-      expect(subject).to receive(:fail_pipe_on_error).with(
-        ['git', 'clone', '--quiet', '--reference', '/cache', 'PH', '/pwd/.', '--config', 'config'],
+      expect(subject).to receive(:fail_on_error).with(
+        'git', 'clone', '--quiet', '--reference', '/cache', 'PH', '/pwd/.', '--config', 'config',
         { quiet: true }
       ) { runner_execution_double }
 
@@ -298,7 +298,7 @@ describe GitFastClone::Runner do
         status = double('status')
         allow(status).to receive(:exitstatus).and_return(1)
         ex = RunnerExecution::RunnerExecutionRuntimeError.new(status, 'cmd')
-        allow(subject).to receive(:fail_pipe_on_error) { raise ex }
+        allow(subject).to receive(:fail_on_error) { raise ex }
         expect(FileUtils).to receive(:remove_entry_secure).with(placeholder_arg, force: true)
         expect do
           subject.store_updated_repo(placeholder_arg, placeholder_arg, placeholder_arg, true)
@@ -311,7 +311,7 @@ describe GitFastClone::Runner do
         status = double('status')
         allow(status).to receive(:exitstatus).and_return(1)
         ex = RunnerExecution::RunnerExecutionRuntimeError.new(status, 'cmd')
-        allow(subject).to receive(:fail_pipe_on_error) { raise ex }
+        allow(subject).to receive(:fail_on_error) { raise ex }
         expect(FileUtils).to receive(:remove_entry_secure).with(placeholder_arg, force: true)
         expect do
           subject.store_updated_repo(placeholder_arg, placeholder_arg, placeholder_arg, false)
@@ -322,7 +322,7 @@ describe GitFastClone::Runner do
     let(:placeholder_hash) { {} }
 
     it 'should correctly update the hash' do
-      allow(subject).to receive(:fail_pipe_on_error)
+      allow(subject).to receive(:fail_on_error)
       allow(Dir).to receive(:chdir) {}
 
       subject.reference_updated = placeholder_hash
@@ -367,12 +367,6 @@ describe GitFastClone::Runner do
     let(:expected_commands) { [] }
 
     before(:each) do
-      allow(subject).to receive(:fail_pipe_on_error) { |*params|
-        command = params[0]
-        expect(expected_commands.length).to be > 0
-        expected_command = expected_commands.shift
-        expect(command).to eq(expected_command)
-      }
       allow(subject).to receive(:fail_on_error) { |*params|
         # last one is an argument `quiet:`
         command = params.first(params.size - 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Michael Tauraso
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize