git-multi 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5662c60b6650e56066d055e7864327c792b31ef2bbb8d963e46ba86f31992707
-  data.tar.gz: 486067d955e4a13f7e09ce5db09793df17bd03858e0ceec46092a2e002857f21
+  metadata.gz: 49bfee3e9faa4d3eea798863ec6891761b5f2dc144912437f8aed41f4ef3afc4
+  data.tar.gz: e35b5abff76ddc7f394f1b0e35a3479bd6a365f16861e39111a70a1f8f95fd13
 SHA512:
-  metadata.gz: 2263f8291a3fff25abc42a61502d84a8c525e4c1acca473b7a8040149b088541003234aba3755e4264106cf67c503bf4d5829bcd7a607921cda468f1ec1f139b
-  data.tar.gz: 570f5804de61968cc585506e127a48f14064cf22ab416e31b2fc291b4de131f8cee7dfa23f70446066a3b9de2588e7c62fdb4ca2eabddef847b6d911f2ad11f0
+  metadata.gz: b1a5a8d752b0c9ff87f3764f60bd83ea13ff293b1ad0fbf3a5d4e029e00423e438916242093fddbdc3d98092efd34f40f6166ffec2b629bdc6cd17c97c300e95
+  data.tar.gz: 503dd9d963fedc4c1d629ae1db81e79caad4274f5f5d4bdf600e8679e36c1dfd2fdd374da57dca193f94a3b6224af318b6e546ccea9632e6ea31bf0346edcd33

data/.pryrc

@@ -16,10 +16,10 @@ require 'octokit'
 Octokit.middleware.response :logger, logger
 
 # enumerator for Faraday middleware apps
-def (middleware = Octokit.middleware).each_app
+def (_middleware = Octokit.middleware).each_app
   Enumerator.new do |yielder|
     next_app = app
-    while next_app do
+    while next_app
       yielder << next_app
       next_app = next_app.instance_variable_get(:@app)
     end
@@ -28,12 +28,12 @@ end
 
 # utility function to set pry context
 # to an instance of <Octokit::Client>
-def client() pry Git::Hub.send(:client) ; end
+def client() pry Git::Hub.send(:client); end
 
 # utility function to set pry context
 # to the Array of github repositories
-def repos() pry Git::Multi.repositories ; end
+def repos() pry Git::Multi.repositories; end
 
 # utility function to set pry context
 # to the various 'git multi' commands:
-def cmds() pry Git::Multi::Commands ; end
+def cmds() pry Git::Multi::Commands; end

data/.rubocop.yml

@@ -1,4 +1,33 @@
-Style/FrozenStringLiteralComment:
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+Lint/HandleExceptions:
+  Enabled: false
+
+Metrics/AbcSize:
   Enabled: false
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
+
 Style/BlockDelimiters:
   Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/Lambda:
+  Enabled: false
+Style/NestedTernaryOperator:
+  Enabled: false
+Style/SingleLineMethods:
+  Enabled: false
+Style/TrailingCommaInArguments:
+  Enabled: false
+Style/TrailingCommaInLiteral:
+  Enabled: false

data/Rakefile

@@ -15,6 +15,10 @@ task :validate do
   gemspec.validate
 end
 
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
+
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
@@ -23,7 +27,7 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task :default => [:rubocop, :test]
 
 require 'git/multi'
 
@@ -41,8 +45,8 @@ end
 
 task :documentation => git_asciidoc do
   Dir.chdir(documentation) do
-    # use git's documentation approach and build system
-    %x{ make git-multi.1 git-multi.html }
+    # use git's documentation framework
+    `make git-multi.1 git-multi.html`
     FileUtils.cp 'git-multi.1',    Git::Multi::MAN_PAGE
     FileUtils.cp 'git-multi.html', Git::Multi::HTML_PAGE
   end

data/contrib/git-dash/git-dash.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# rubocop:disable all
+
 TIME_INTERVALS = {
 
   :minute  => (  MINUTE = 60 ), # seconds
@@ -50,9 +52,11 @@ RED = {
   :year    => "#FF2222" ,
 }.freeze
 
-if __FILE__ == $0
+# rubocop:enable all
+
+if $PROGRAM_NAME == __FILE__
 
-  $:.unshift File.expand_path('../../lib', __dir__)
+  $LOAD_PATH.unshift File.expand_path('../../lib', __dir__)
 
   require 'git/multi'
 
@@ -64,6 +68,7 @@ if __FILE__ == $0
     def project.age_in_seconds
       (Time.now - pushed_at).to_i
     end
+
     def project.age_in_words
       time_distance_in_words(age_in_seconds)
     end
@@ -75,7 +80,7 @@ if __FILE__ == $0
   require 'erb'
 
   # generate HTML page with a dashboard of global GitHub repository activity:
-  puts ERB.new(File.read(File.join(__dir__, "git-dash.erb"))).result(binding)
+  puts ERB.new(File.read(File.join(__dir__, 'git-dash.erb'))).result(binding)
 
 end
 

data/exe/git-multi

@@ -31,7 +31,7 @@ when /\A--/
   else
     abort \
       "Unknown 'git multi' command: #{command}\n\n" \
-      "(use --help/-h to list all available commands)"
+      '(use --help/-h to list all available commands)'
   end
 when nil, '', '-h'
   Git::Multi::Commands.help

data/git-multi.gemspec

@@ -1,6 +1,7 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'git/multi/version'
+require 'git/multi/gemspec'
 
 Gem::Specification.new do |spec|
   spec.name          = Git::Multi::NAME

data/lib/ext/commify.rb

@@ -6,6 +6,6 @@ end
 
 class String
   def commify
-    gsub(/(\d)(?=(\d{3})+(\..*)?$)/,'\1,')
+    gsub(/(\d)(?=(\d{3})+(\..*)?$)/, '\1,')
   end
 end

data/lib/ext/dir.rb

@@ -1,9 +1,9 @@
 class Dir
   def git_repos(subdir = '*')
-    Dir.glob(File.join(self.path, subdir, '*', '.git')).map { |path_to_git_dir|
-      path_to_git_repo = File.dirname(path_to_git_dir) # without "/.git"
-      repo_name = path_to_git_repo[/[^\/]+\/[^\/]+\z/] # e.g. "pvdb/git-multi"
-      def repo_name.full_name() self ; end             # awesome duck-typing!
+    Dir.glob(File.join(path, subdir, '*', '.git')).map { |path_to_git_dir|
+      path_to_git_repo = File.dirname(path_to_git_dir)   # without "/.git"
+      repo_name = path_to_git_repo[%r{[^\/]+\/[^\/]+\z}] # e.g. "pvdb/git-multi"
+      def repo_name.full_name() self; end
       repo_name
     }
   end

data/lib/ext/kernel.rb

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

data/lib/ext/notify.rb

@@ -13,7 +13,7 @@ def notify(message, options = {}, verbose = false)
   # send a given message to the Mac OS X Notification Center
   # but only if the git-multi script is running interactively
   # and if the "terminal-notifier" gem has been installed...
-  if $INTERACTIVE && defined?(TerminalNotifier)
+  interactive? && defined?(TerminalNotifier) && begin
     options[:title] ||= 'git-multi'
     TerminalNotifier.notify(message, options, verbose)
   end

data/lib/ext/sawyer/resource.rb

@@ -1,5 +1,7 @@
 module Sawyer
   class Resource
-    def to_json(*args) to_h.to_json(args) ; end
+    def to_json(*args)
+      to_h.to_json(args)
+    end
   end
 end

data/lib/ext/string.rb

@@ -1,14 +1,18 @@
+# rubocop:disable Layout/EmptyLineBetweenDefs
+
 class String
 
-  def colorize(color_code) "\e[#{color_code}m#{self}\e[0m" ; end
+  def colorize(color_code) "\e[#{color_code}m#{self}\e[0m"; end
 
-  def bold()   colorize('1') ; end
-  def invert() colorize('7') ; end
+  def bold()   colorize('1'); end
+  def invert() colorize('7'); end
 
-  def red()   colorize('31') ; end
-  def blue()  colorize('34') ; end
-  def green() colorize('32') ; end
+  def red()   colorize('31'); end
+  def blue()  colorize('34'); end
+  def green() colorize('32'); end
 
-  def undent() gsub(/^.{#{slice(/^ +/).length}}/, '') ; end
+  def undent() gsub(/^.{#{slice(/^ +/).length}}/, ''); end
 
 end
+
+# rubocop:enable Layout/EmptyLineBetweenDefs

data/lib/git/hub.rb

@@ -21,8 +21,8 @@ module Git
 
     def client
       @client ||= Octokit::Client.new(
-        :access_token => Git::Multi::TOKEN,
-        :auto_paginate => true,
+        access_token: Git::Multi::TOKEN,
+        auto_paginate: true,
       )
     end
 
@@ -39,7 +39,7 @@ module Git
       end
     end
 
-    # FIXME update login as part of `--refresh`
+    # FIXME: update login as part of `--refresh`
 
     def login
       @login ||= begin
@@ -49,7 +49,7 @@ module Git
       end
     end
 
-    # FIXME update orgs as part of `--refresh`
+    # FIXME: update orgs as part of `--refresh`
 
     def orgs
       @orgs ||= begin
@@ -78,12 +78,14 @@ module Git
     @user_repositories = Hash.new { |repos, (user, type)|
       repos[[user, type]] = begin
         notify("Refreshing #{type} '#{user}' repositories from GitHub")
-        client.repositories(user, :type => type).
-        sort_by { |repo| repo[:name].downcase }
+        client
+          .repositories(user, type: type)
+          .sort_by { |repo| repo[:name].downcase }
       end
     }
 
-    def user_repositories(user, type = :owner) # all, owner, member
+    def user_repositories(user, type = :owner)
+      # type can be one of: all, owner, member
       @user_repositories[[user, type]]
     end
 
@@ -94,12 +96,14 @@ module Git
     @org_repositories = Hash.new { |repos, (org, type)|
       repos[[org, type]] = begin
         notify("Refreshing #{type} '#{org}' repositories from GitHub")
-        client.org_repositories(org, :type => type).
-        sort_by { |repo| repo[:name].downcase }
+        client
+          .org_repositories(org, type: type)
+          .sort_by { |repo| repo[:name].downcase }
       end
     }
 
-    def org_repositories(org, type = :owner) # all, public, private, forks, sources, member
+    def org_repositories(org, type = :owner)
+      # type can be one of: all, public, private, forks, sources, member
       @org_repositories[[org, type]]
     end
 

data/lib/git/multi/commands.rb

@@ -28,9 +28,8 @@ module Git
       end
 
       def report
-        if (missing_repos = Git::Multi::missing_repositories).any?
-          notify(missing_repos.map(&:full_name), :subtitle => "#{missing_repos.count} missing repos")
-        end
+        (missing_repos = Git::Multi.missing_repositories).any? &&
+          notify(missing_repos.map(&:full_name), subtitle: "#{missing_repos.count} missing repos")
       end
 
       def list
@@ -72,12 +71,12 @@ module Git
       def count
         # https://developer.github.com/v3/repos/#list-user-repositories
         user = Git::Multi::USER
-        %w{ all owner member }.each { |type|
+        %w[all owner member].each { |type|
           puts ["#{user}/#{type}", Git::Hub.user_repositories(user, type).count].join("\t")
         }
         # https://developer.github.com/v3/repos/#list-organization-repositories
-        for org in Git::Multi::ORGANIZATIONS
-          %w{ all public private forks sources member }.each { |type|
+        Git::Multi::ORGANIZATIONS.each do |org|
+          %w[all public private forks sources member].each { |type|
             puts ["#{org}/#{type}", Git::Hub.org_repositories(org, type).count].join("\t")
           }
         end
@@ -102,12 +101,12 @@ module Git
             ->(project) {
               Kernel.system "git clone -q #{project.rels[:ssh].href.shellescape}"
             },
-            :in_dir => :parent_dir
+            in: 'parent_dir'
           )
         end
       end
 
-      def query args = []
+      def query(args = [])
         Git::Multi.repositories.each do |repo|
           repo.just_do_it(
             ->(project) {
@@ -123,58 +122,54 @@ module Git
         end
       end
 
-      def system args = []
-        args.map!(&:shellescape)
+      def system(args = [])
+        cmd = args.map!(&:shellescape).join(' ')
         Git::Multi.cloned_repositories.each do |repo|
           repo.just_do_it(
-            ->(project) {
-              Kernel.system "#{args.join(' ')}"
+            ->(_project) {
+              Kernel.system cmd
             },
             ->(project) {
-              Kernel.system "#{args.join(' ')} 2>&1 | sed -e 's#^##{project.full_name.shellescape}: #'"
+              Kernel.system "#{cmd} 2>&1 | sed -e 's#^##{project.full_name.shellescape}: #'"
             },
-            :in_dir => :local_path
+            in: 'local_path'
           )
         end
       end
 
-      def raw args
+      def raw(args)
         args.unshift ['sh', '-c']
         system args.flatten
       end
 
-      def exec command, args = []
+      def exec(command, args = [])
         args.unshift ['git', '--no-pager', command]
         system args.flatten
       end
 
-      def find commands
+      def find(commands)
         Git::Multi.cloned_repositories.each do |repo|
           Dir.chdir(repo.local_path) do
-            begin
-              if repo.instance_eval(commands.join(' && '))
-                repo.just_do_it(
-                  ->(project) { nil ; },
-                  ->(project) { puts project.full_name ; },
-                )
-              end
-            rescue Octokit::NotFound
-              # project no longer exists on github.com
-              # consider running "git multi --stale"...
+            if repo.instance_eval(commands.join(' && '))
+              repo.just_do_it(
+                ->(_project) { nil },
+                ->(project) { puts project.full_name },
+              )
             end
+          rescue Octokit::NotFound
+            # project no longer exists on github.com
+            # consider running "git multi --stale"...
           end
         end
       end
 
-      def eval commands
+      def eval(commands)
         Git::Multi.cloned_repositories.each do |repo|
           Dir.chdir(repo.local_path) do
-            begin
-              repo.instance_eval(commands.join(' ; '))
-            rescue Octokit::NotFound
-              # project no longer exists on github.com
-              # consider running "git multi --stale"...
-            end
+            repo.instance_eval(commands.join(' ; '))
+          rescue Octokit::NotFound
+            # project no longer exists on github.com
+            # consider running "git multi --stale"...
           end
         end
       end

data/lib/git/multi/gemspec.rb

@@ -0,0 +1,19 @@
+module Git
+  module Multi
+    PIM = <<~"PIM".freeze # gem post_install_message, used in git-multi.gemspec
+
+      The required settings for \033[1mgit multi\33[0m are as follows:
+
+      \tgit config --global --add \033[1mgithub.user\033[0m <your_github_username>
+      \tgit config --global --add \033[1mgithub.organizations\033[0m <your_github_orgs>
+      \tgit config --global --add \033[1mgithub.token\033[0m <your_github_oauth_token>
+
+      Unless your top-level workarea is `${HOME}/Workarea` you should also set:
+
+      \tgit config --global --add \033[1mgit.multi.workarea\033[0m <your_root_workarea>
+
+      Thanks for using \033[1mgit multi\033[0m ... the ultimate multi-repo utility for git!
+
+    PIM
+  end
+end

data/lib/git/multi/settings.rb

@@ -2,23 +2,25 @@ module Git
   module Multi
     module Settings
 
-      TICK  = ["2714".hex].pack("U*").green.freeze
-      CROSS = ["2718".hex].pack("U*").red.freeze
-      ARROW = ["2794".hex].pack("U*").blue.freeze
+      TICK  = ['2714'.hex].pack('U*').green.freeze
+      CROSS = ['2718'.hex].pack('U*').red.freeze
+      ARROW = ['2794'.hex].pack('U*').blue.freeze
 
       module_function
 
-      def setting_status messages, valid, optional = false
+      def setting_status(messages, valid, optional = false)
         fields = messages.compact.join(' - ')
         icon = valid ? TICK : optional ? ARROW : CROSS
-        if $INTERACTIVE
-          print "   #{fields}" ; sleep 0.75 ; puts "\x0d#{icon}"
+        if interactive?
+          print "   #{fields}"
+          sleep 0.66
+          puts "\x0d#{icon}"
         else
           puts "#{icon}  #{fields}"
         end
       end
 
-      def file_status file, message = 'File'
+      def file_status(file, message = 'File')
         setting_status(
           [
             message,
@@ -30,7 +32,7 @@ module Git
         )
       end
 
-      def directory_status messages, directory
+      def directory_status(messages, directory)
         setting_status(
           messages,
           directory && !directory.empty? && File.directory?(directory),
@@ -38,7 +40,7 @@ module Git
         )
       end
 
-      def workarea_status message, workarea, owner
+      def workarea_status(message, workarea, owner)
         directory_status(
           [
             message,
@@ -49,37 +51,37 @@ module Git
         )
       end
 
-      def user_status user
-        setting_status(["User", user], user && !user.empty?)
+      def user_status(user)
+        setting_status(['User', user], user && !user.empty?)
       end
 
-      def organization_status orgs
-        for org in orgs
-          setting_status(["Organization", org], org && !org.empty?, true)
-          setting_status(["Organization", "member?"], Git::Hub.orgs.include?(org), !Git::Hub.connected?)
+      def organization_status(orgs)
+        orgs.each do |org|
+          setting_status(['Organization', org], org && !org.empty?, true)
+          setting_status(['Organization', 'member?'], Git::Hub.orgs.include?(org), !Git::Hub.connected?)
         end
       end
 
-      def token_status token
-        setting_status(["Token", symbolize(token), describe(token)], !token.nil? && !token.empty?)
-        setting_status(["Token", "valid?"], !token.nil? && !token.empty? && Git::Hub.login, !Git::Hub.connected?)
-        setting_status(["Token", "owned by #{Git::Multi::USER}?"], Git::Hub.login == Git::Multi::USER, !Git::Hub.connected?)
+      def token_status(token)
+        setting_status(['Token', symbolize(token), describe(token)], !token.nil? && !token.empty?)
+        setting_status(['Token', 'valid?'], !token.nil? && !token.empty? && Git::Hub.login, !Git::Hub.connected?)
+        setting_status(['Token', "owned by #{Git::Multi::USER}?"], Git::Hub.login == Git::Multi::USER, !Git::Hub.connected?)
       end
 
-      def home_status home
-        directory_status(["Home", home], home)
+      def home_status(home)
+        directory_status(['Home', home], home)
       end
 
-      def main_workarea_status workarea
-        directory_status(["Workarea (main)", abbreviate(workarea, :home)], workarea)
+      def main_workarea_status(workarea)
+        directory_status(['Workarea (main)', abbreviate(workarea, :home)], workarea)
       end
 
-      def user_workarea_status user
+      def user_workarea_status(user)
         workarea_status("Workarea (user: #{user})", Git::Multi::WORKAREA, user)
       end
 
-      def organization_workarea_status orgs
-        for org in orgs
+      def organization_workarea_status(orgs)
+        orgs.each do |org|
           workarea_status("Workarea (org: #{org})", Git::Multi::WORKAREA, org)
         end
       end

data/lib/git/multi/utils.rb

@@ -0,0 +1,53 @@
+module Git
+  module Multi
+
+    module Settings
+
+      module_function
+
+      def describe(token)
+        if token.nil?
+          '(nil)'
+        elsif token.empty?
+          '(empty)'
+        else
+          "#{'*' * 36}#{token[36..-1]}"
+        end
+      end
+
+      def symbolize(token)
+        case token
+        when Git::Multi.env_var('OCTOKIT_ACCESS_TOKEN')
+          then '${OCTOKIT_ACCESS_TOKEN}'
+        when Git::Multi.git_option('github.token')
+          then 'github.token'
+        else '(unset)'
+        end
+      end
+
+      def abbreviate(directory, root_dir = nil)
+        case root_dir
+        when :home
+          then directory.gsub(Git::Multi::HOME, '${HOME}')
+        when :workarea
+          then directory.gsub(Git::Multi::WORKAREA, '${WORKAREA}')
+        else abbreviate(abbreviate(directory, :workarea), :home)
+        end
+      end
+
+    end
+
+    module_function
+
+    def git_option(name, default = nil)
+      value = `git config #{name}`.chomp.freeze
+      value.empty? && default ? default : value
+    end
+
+    def env_var(name, default = nil)
+      value = ENV[name].freeze
+      (value.nil? || value.empty?) && default ? default : value
+    end
+
+  end
+end

data/lib/git/multi/version.rb

@@ -1,37 +1,20 @@
 require 'octokit'
 require 'sawyer'
-require 'psych'
+require 'faraday'
+require 'addressable'
 
 module Git
   module Multi
-    NAME = 'git-multi'
-    VERSION = '1.0.5'
+    NAME = 'git-multi'.freeze
+    VERSION = '1.0.6'.freeze
 
-    LONG_VERSION = "%s v%s (%s v%s, %s v%s, %s v%s)" % [
-      NAME,
-      VERSION,
-      'octokit.rb',
-      Octokit::VERSION,
-      'sawyer',
-      Sawyer::VERSION,
-      'psych',
-      Psych::VERSION,
-    ]
+    DEPENDENCY_VERSIONS = [
+      "octokit.rb v#{Octokit::VERSION}",
+      "sawyer v#{Sawyer::VERSION}",
+      "faraday v#{Faraday::VERSION}",
+      "addressable v#{Addressable::VERSION::STRING}",
+    ].join(', ').freeze
 
-    PIM = <<~"EOPIM" # gem post_install_message
-
-    The required settings for \033[1mgit multi\33[0m are as follows:
-
-    \tgit config --global --add \033[1mgithub.user\033[0m <your_github_username>
-    \tgit config --global --add \033[1mgithub.organizations\033[0m <your_github_orgs>
-    \tgit config --global --add \033[1mgithub.token\033[0m <your_github_oauth_token>
-
-    Unless your top-level workarea is `${HOME}/Workarea` you should also set:
-
-    \tgit config --global --add \033[1mgit.multi.workarea\033[0m <your_root_workarea>
-
-    Thanks for using \033[1mgit multi\033[0m ... the ultimate multi-repo utility for git!
-
-    EOPIM
+    LONG_VERSION = "#{NAME} v#{VERSION} (#{DEPENDENCY_VERSIONS})".freeze
   end
 end

data/lib/git/multi.rb

@@ -8,14 +8,15 @@ require 'octokit'
 require 'sawyer'
 
 require 'ext/dir'
-require 'ext/utils'
 require 'ext/string'
 require 'ext/notify'
+require 'ext/kernel'
 require 'ext/commify'
 require 'ext/sawyer/resource'
 
 require 'git/hub'
 
+require 'git/multi/utils'
 require 'git/multi/version'
 require 'git/multi/settings'
 require 'git/multi/commands'
@@ -86,18 +87,15 @@ module Git
 
     module Nike
 
-      def just_do_it interactive, pipeline, options = {}
-        working_dir = case options[:in_dir]
-          when :parent_dir then self.parent_dir
-          when :local_path then self.local_path
-          else Dir.pwd
-        end
+      def just_do_it(interactive, pipeline, 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 "%s (%s)" % [
-              self.full_name.invert,
-              self.fractional_index
-            ]
+          if interactive?
+            puts "#{full_name.invert} (#{fractional_index})"
             interactive.call(self)
           else
             pipeline.call(self)
@@ -109,6 +107,7 @@ module Git
 
     def repositories
       if File.size?(REPOSITORIES)
+        # rubocop:disable Security/MarshalLoad
         @repositories ||= Marshal.load(File.read(REPOSITORIES)).tap do |projects|
           notify "Finished loading #{REPOSITORIES}"
           projects.each_with_index do |project, index|
@@ -119,15 +118,17 @@ module Git
             project.local_path = Pathname.new(File.join(WORKAREA, project.full_name))
             project.fractional_index = "#{index + 1}/#{projects.count}"
             # fix 'project' => https://github.com/octokit/octokit.rb/issues/727
-            project.compliant_ssh_url = 'ssh://%s/%s' % project.ssh_url.split(':', 2)
+            project.compliant_ssh_url = 'ssh://' + project.ssh_url.split(':', 2).join('/')
             # remove optional '.git' suffix from 'git@github.com:pvdb/git-multi.git'
             project.abbreviated_ssh_url = project.ssh_url.chomp('.git')
             # extend 'project' with 'just do it' capabilities
             project.extend Nike
           end
         end
+        # rubocop:enable Security/MarshalLoad
       else
-        refresh_repositories and repositories
+        refresh_repositories
+        repositories # retry
       end
     end
 

data/man/git-multi.1

@@ -2,12 +2,12 @@
 .\"     Title: git-multi
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 09/22/2018
+.\"      Date: 09/23/2018
 .\"    Manual: Git Manual
 .\"    Source: Git 2.19.0.216.g2d3b1c576.dirty
 .\"  Language: English
 .\"
-.TH "GIT\-MULTI" "1" "09/22/2018" "Git 2\&.19\&.0\&.216\&.g2d3b1c" "Git Manual"
+.TH "GIT\-MULTI" "1" "09/23/2018" "Git 2\&.19\&.0\&.216\&.g2d3b1c" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 git-multi \- execute the same git command in multiple repositories
 .SH "VERSION"
 .sp
-This is \fBv1\&.0\&.5\fR of \fIgit multi\fR \&... hooray!
+This is \fBv1\&.0\&.6\fR of \fIgit multi\fR \&... hooray!
 .SH "SYNOPSIS"
 .sp
 There are some options for \fBgit multi\fR itself, in which case it is invoked as follows:

data/man/git-multi.html

@@ -748,7 +748,7 @@ git-multi(1) Manual Page
 <div class="sect1">
 <h2 id="_version">VERSION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>This is <code>v1.0.5</code> of <em>git multi</em> &#8230; hooray!</p></div>
+<div class="paragraph"><p>This is <code>v1.0.6</code> of <em>git multi</em> &#8230; hooray!</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1179,7 +1179,7 @@ the <code>jq</code> command-line utility:
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2018-09-22 08:14:58 BST
+ 2018-09-23 14:13:02 BST
 </div>
 </div>
 </body>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multi
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2018-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -91,14 +91,16 @@ files:
 - git-multi.gemspec
 - lib/ext/commify.rb
 - lib/ext/dir.rb
+- lib/ext/kernel.rb
 - lib/ext/notify.rb
 - lib/ext/sawyer/resource.rb
 - lib/ext/string.rb
-- lib/ext/utils.rb
 - lib/git/hub.rb
 - lib/git/multi.rb
 - lib/git/multi/commands.rb
+- lib/git/multi/gemspec.rb
 - lib/git/multi/settings.rb
+- lib/git/multi/utils.rb
 - lib/git/multi/version.rb
 - man/git-multi.1
 - man/git-multi.erb

data/lib/ext/utils.rb

@@ -1,31 +0,0 @@
-$INTERACTIVE = (STDOUT.tty? && STDERR.tty?)
-
-def git_option name, default = nil
-  value = `git config #{name}`.chomp.freeze
-  value.empty? && default ? default : value
-end
-
-def env_var name, default = nil
-  value = ENV[name].freeze
-  (value.nil? || value.empty?) && default ? default : value
-end
-
-def describe token
-  token.nil? ? '(nil)' : token.empty? ? '(empty)' : "#{'*'*36}#{token[36..-1]}"
-end
-
-def symbolize token
-  case token
-  when env_var('OCTOKIT_ACCESS_TOKEN') then '${OCTOKIT_ACCESS_TOKEN}'
-  when git_option('github.token')      then 'github.token'
-  else '(unset)'
-  end
-end
-
-def abbreviate directory, root_dir = nil
-  case root_dir
-  when :home     then directory.gsub(Git::Multi::HOME,     '${HOME}')
-  when :workarea then directory.gsub(Git::Multi::WORKAREA, '${WORKAREA}')
-  else abbreviate(abbreviate(directory, :workarea), :home)
-  end
-end