git-multi 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d58d5d1665855c2297ef0621a06775b05d93e4c32bb57a13f32855617cca68
-  data.tar.gz: a3600a70e589ddff71ac7f02ad5d6b3f9b7dd2a66a8d087345845375c60e4edf
+  metadata.gz: 1d67da6065deb617ec35011956c6c726d31da7fcb32f1672326f6de23bab2613
+  data.tar.gz: d522c33fce1d1d53b785bca1b13bde697b9391c328bf717f90430016bb5f4e14
 SHA512:
-  metadata.gz: 8bcad95ab175d8882c53b991bfcb7ef8c32535f72eb08b3e2a9974239119dbbf531489f7cb8ea24a65c7b73ec7af85e095389ac4687059da80d2ce5831f80809
-  data.tar.gz: a80e9fa77758f8af11722cc5f1f542cb1c20dac96fc26bf0529abada1bc6e9d3693fd71a1aa62fca192aba50945ede04abe245cd36710f34dbe075a148f65e13
+  metadata.gz: 979d1a098da4582eb08dbd5183fc7af0f697484bb949d52b435b94d9d8163e23a405241a74a71fd8e8ebfea7a520c820f2a899c5693a789c9c71f2cc3d155896
+  data.tar.gz: 2039285af97431a8704579d750f2e14a2a00e48225454db71b19a4f7f1450168bd1d2982965e9cc569a781527b7c05a2a3631a1f5002a8803d91a59a5ce53444

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.3
   Exclude:
     - 'doc/*'
     - 'tmp/*'

data/Gemfile.lock

@@ -1,53 +1,50 @@
 PATH
   remote: .
   specs:
-    git-multi (2.6.1)
-      octokit (~> 4.13)
+    git-multi (2.7.0)
+      faraday (~> 0.15.0)
+      octokit (~> 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     coderay (1.1.2)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     interception (0.5)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.3)
     method_source (0.9.2)
-    minitest (5.11.3)
+    minitest (5.12.2)
     multipart-post (2.1.1)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.13.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-rescue (1.5.0)
       interception (>= 0.5)
       pry (>= 0.12.0)
-    psych (3.1.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rubocop (0.65.0)
+    rake (13.0.0)
+    rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      psych (>= 3.1.0)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby

data/git-multi.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = Git::Multi::PIM
 
-  spec.add_dependency 'octokit', '~> 4.13'
+  spec.add_dependency 'faraday', '~> 0.15.0'
+  spec.add_dependency 'octokit', '~> 4'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest'

data/lib/git/multi/commands.rb

@@ -94,6 +94,7 @@ module Git
             ->(repo) {
               Kernel.system "git clone -q #{repo.rels[:ssh].href.shellescape}"
             },
+            nil, # captured
             in: 'parent_dir'
           )
         end
@@ -176,7 +177,20 @@ module Git
               Kernel.system cmd
             },
             ->(repo) {
-              Kernel.system "#{cmd} 2>&1 | sed -e 's#^##{repo.full_name.shellescape}: #'"
+              prefix = "sed -e 's#^##{repo.full_name.shellescape}: #'"
+              Kernel.system "#{cmd} 2>&1 | #{prefix} ;"
+            },
+            ->(repo, errors) {
+              #
+              # because `Kernel.system()` uses the standard shell,
+              # which always means "/bin/sh" on Unix-like systems,
+              # the following version using "process substitution"
+              # doesn't work:
+              #
+              # Kernel.system "#{cmd} 2> >(#{prefix}) | #{prefix} ;"
+              #
+              prefix = "sed -e 's#^##{repo.full_name.shellescape}: #'"
+              Kernel.system "#{cmd} 2> #{errors} | #{prefix} ;"
             },
             in: 'local_path'
           )

data/lib/git/multi/report.rb

@@ -84,20 +84,22 @@ module Git
       private_class_method def symbolize(token)
         case token
         when Git::Multi.env_var('OCTOKIT_ACCESS_TOKEN')
-          then '${OCTOKIT_ACCESS_TOKEN}'
+          '${OCTOKIT_ACCESS_TOKEN}'
         when Git::Multi.global_option('github.token')
-          then 'github.token'
-        else '(unset)'
+          'github.token'
+        else
+          '(unset)'
         end
       end
 
       private_class_method def abbreviate(directory, root_dir = nil)
         case root_dir
         when :home
-          then directory.gsub(Git::Multi::HOME, '${HOME}')
+          directory.gsub(Git::Multi::HOME, '${HOME}')
         when :workarea
-          then directory.gsub(Git::Multi::WORKAREA, '${WORKAREA}')
-        else abbreviate(abbreviate(directory, :workarea), :home)
+          directory.gsub(Git::Multi::WORKAREA, '${WORKAREA}')
+        else
+          abbreviate(abbreviate(directory, :workarea), :home)
         end
       end
 

data/lib/git/multi/version.rb

@@ -1,7 +1,7 @@
 module Git
   module Multi
     NAME = 'git-multi'.freeze
-    VERSION = '2.6.1'.freeze
+    VERSION = '2.7.0'.freeze
 
     def self.version
       "#{NAME} v#{VERSION}"

data/lib/git/multi.rb

@@ -4,6 +4,8 @@ require 'pathname'
 require 'fileutils'
 require 'shellwords'
 
+require 'English'
+
 require 'octokit'
 require 'sawyer'
 require 'faraday'
@@ -11,7 +13,6 @@ require 'addressable'
 
 require 'ext/dir'
 require 'ext/string'
-require 'ext/kernel'
 require 'ext/commify'
 require 'ext/sawyer/resource'
 
@@ -144,21 +145,34 @@ module Git
 
     module Nike
 
-      def just_do_it(interactive, pipeline, options = {})
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def just_do_it(interactive, pipelined, captured = nil, options = {})
         working_dir = case (options[:in] || '').to_sym
                       when :parent_dir then parent_dir
                       when :local_path then local_path
                       else Dir.pwd
                       end
         Dir.chdir(working_dir) do
-          if interactive?
-            puts "#{full_name.invert} (#{fractional_index})"
+          if STDOUT.tty? && STDERR.tty?
+            STDOUT.puts "#{full_name.invert} (#{fractional_index})"
             interactive.call(self)
+          elsif STDERR.tty?
+            errors = File.join(ENV['TMPDIR'], "git-multi.#{$PID}")
+            captured.call(self, errors)
+            unless File.zero?(errors)
+              # rubocop:disable Style/StderrPuts
+              STDERR.puts "#{full_name.invert} (#{fractional_index})"
+              Kernel.system "cat #{errors} > /dev/tty ;"
+              # rubocop:enable Style/StderrPuts
+            end
           else
-            pipeline.call(self)
+            pipelined.call(self)
           end
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def spputs(*args)
         # split, prefix and puts

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: git-multi
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +149,6 @@ files:
 - git-multi.gemspec
 - lib/ext/commify.rb
 - lib/ext/dir.rb
-- lib/ext/kernel.rb
 - lib/ext/sawyer/resource.rb
 - lib/ext/string.rb
 - lib/git/hub.rb
@@ -174,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The ultimate multi-repo utility for git!

data/lib/ext/kernel.rb

@@ -1,5 +0,0 @@
-module Kernel
-  def interactive?
-    STDOUT.tty? && STDERR.tty?
-  end
-end