git-multi 6.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c0aa5b5dc19107281de9fe6c8dae2d956f77954b7f645f70102d2d693a69bd
-  data.tar.gz: b5033965b46ce4c2d4a7d781d3e1efa55a6b3f87f63563fde4e913461bcac1f1
+  metadata.gz: 6fc5756a97dd43c7ca903ed1060715223b162d5413258bafd1961236f78e1cba
+  data.tar.gz: 5a86de46ae41373db370b8d8cfe3a030f5dbc402f93f9bd866cbed861a2ceab7
 SHA512:
-  metadata.gz: f76f76d736d13581e3a280118a4ec112cfeb8239a0ebb91d708ad22704b384d5ee0b85e1cd231af76e536ce0903953eaafc7d04e45073606d32b0f3d2ac6dd3a
-  data.tar.gz: 8b1fb3fe50001711983dbc9e998af763a6d5c8c57cdea814bb7bc2d5e7a1828e5291d0f0630f3cd69b30140334091fd318708fe2099bb50639f32d79c2303bbd
+  metadata.gz: 775ba9085768be324c346075e72d57dcab01bdbc4292a56906c44fcfff4798cdcd078bf75032b1847bde27e9a2f624d7dbb275434ba0c3880a5ab3bede5662bd
+  data.tar.gz: 13e1998772853d33aae8b4adaa2d0a277dc40e002d0a07bfc890952136edc110eb079718c9faa67db57ac7cd4e92596e5e1bd25a0d137cfe498534c36b586efb

data/.ruby-version

@@ -1 +1 @@
-2.6.9
+2.6.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-multi (6.0.0)
+    git-multi (8.0.1)
       faraday (~> 1)
       octokit (~> 4)
 
@@ -12,7 +12,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     coderay (1.1.3)
-    faraday (1.9.3)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -28,22 +28,23 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     interception (0.5)
+    json (2.6.2)
     method_source (1.0.0)
-    minitest (5.15.0)
-    multipart-post (2.1.1)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    minitest (5.16.2)
+    multipart-post (2.2.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -51,32 +52,33 @@ GEM
     pry-rescue (1.5.2)
       interception (>= 0.5)
       pry (>= 0.12.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.25.0)
+    rubocop (1.32.0)
+      json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.19.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-minitest (0.17.1)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
+    rubocop-minitest (0.20.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    unicode-display_width (2.1.0)
+      faraday (>= 0.17.3, < 3)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby
@@ -93,4 +95,4 @@ DEPENDENCIES
   rubocop-rake
 
 BUNDLED WITH
-   2.3.6
+   2.3.19

data/git-multi.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/pvdb/git-multi'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = ['>= 2.6.0', '< 2.7.0']
+  spec.required_ruby_version = ['>= 2.6.0', '< 3.0.0']
 
   spec.metadata['homepage_uri']    = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

data/lib/git/multi/config.rb

@@ -7,8 +7,8 @@ module Git
       value.empty? && default ? default : value
     end
 
-    def full_names_for(superproject)
-      list = `git config --get-all superproject.#{superproject}.repo`
+    def global_options(name)
+      list = `git config --global --get-all #{name}`
       list.split($RS).map(&:strip).map(&:freeze)
     end
 
@@ -22,8 +22,7 @@ module Git
     end
 
     def env_var(name, default = nil)
-      value = ENV[name]
-      (value.nil? || value.empty?) && default ? default : value
+      ENV.fetch(name, default)
     end
   end
 end

data/lib/git/multi/gemspec.rb

@@ -16,6 +16,13 @@ module Git
 
       \tgit config --global --add \033[1mgit.multi.workarea\033[0m <your_root_workarea>
 
+      You can specify a list of user or organization repositories to ignore:
+
+      \tgit config --global --add \033[1mgit.multi.exclude\033[0m <org_name>/<repo_name>
+      \tgit config --global --add \033[1mgit.multi.exclude\033[0m <user_name>/<repo_name>
+
+      (can be used multiple times to exclude multiple user or organization repositories)
+
       Thanks for using \033[1mgit multi\033[0m ... the ultimate multi-repo utility for git!
 
     PIM

data/lib/git/multi/report.rb

@@ -35,6 +35,9 @@ module Git
         Git::Multi.missing_repositories_for(owner).each do |missing|
           setting_status(["\tmissing", missing.full_name], valid: false, optional: false)
         end
+        Git::Multi.excluded_repositories_for(owner).each do |excluded|
+          setting_status(["\texcluded", excluded.full_name], valid: false, optional: false)
+        end
         setting_status(["\tsubdirs", subdir_count, "(#{surplus_count} surplus)"])
       end
 
@@ -44,7 +47,7 @@ module Git
         if github_count.zero?
           setting_status([message, 'listed but not configured'], valid: false, optional: false)
         else
-          setting_status([message], true)
+          setting_status([message], valid: true)
           Git::Multi.repositories_for(superproject).each do |repo|
             if File.directory? repo.local_path
               setting_status(["\tcloned ", repo.full_name], valid: true)

data/lib/git/multi/version.rb

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

data/lib/git/multi.rb

@@ -1,5 +1,6 @@
 require 'etc'
 require 'json'
+require 'tmpdir'
 require 'pathname'
 require 'fileutils'
 require 'shellwords'
@@ -36,9 +37,6 @@ module Git
     TOKEN            = global_option('github.token', DEFAULT_TOKEN)
 
     GIT_MULTI_DIR    = File.join(HOME, '.git', 'multi')
-
-    FileUtils.mkdir_p(GIT_MULTI_DIR) # ensure `~/.git/multi` directory exists
-
     GITHUB_CACHE     = File.join(GIT_MULTI_DIR, 'repositories.byte')
 
     USERS            = global_list('git.multi.users')
@@ -46,6 +44,7 @@ module Git
     SUPERPROJECTS    = global_list('git.multi.superprojects')
 
     MULTI_REPOS      = (USERS + ORGANIZATIONS + SUPERPROJECTS)
+    EXCLUDED_REPOS   = global_options('git.multi.exclude')
 
     MAN_PAGE         = File.expand_path('../../man/git-multi.1', __dir__)
     HTML_PAGE        = File.expand_path('../../man/git-multi.html', __dir__)
@@ -129,6 +128,9 @@ module Git
     #
 
     def refresh_repositories
+      # ensure `~/.git/multi` directory exists
+      FileUtils.mkdir_p(GIT_MULTI_DIR)
+
       File.open(GITHUB_CACHE, 'wb') do |file|
         Marshal.dump(github_repositories, file)
       end
@@ -152,7 +154,7 @@ module Git
             $stdout.puts "#{full_name.invert} (#{fractional_index})"
             interactive.call(self)
           elsif $stderr.tty? && captured
-            errors = File.join(ENV['TMPDIR'], "git-multi.#{$PID}")
+            errors = File.join(Dir.tmpdir, "git-multi.#{$PID}")
             captured.call(self, errors)
             if File.exist?(errors) && !File.zero?(errors)
               # rubocop:disable Style/StderrPuts
@@ -194,6 +196,8 @@ module Git
             repo.parent_dir = Pathname.new(File.join(WORKAREA, repo.owner.login))
             repo.local_path = Pathname.new(File.join(WORKAREA, repo.full_name))
             repo.fractional_index = "#{index + 1}/#{repos.count}"
+            # git multi will "hard ignore" all excluded repos
+            repo.excluded = EXCLUDED_REPOS.include?(repo.full_name)
             # fix 'repo' => https://github.com/octokit/octokit.rb/issues/727
             repo.compliant_ssh_url = "ssh://#{repo.ssh_url.split(':', 2).join('/')}"
             # remove optional '.git' suffix from 'git@github.com:pvdb/git-multi.git'
@@ -213,7 +217,11 @@ module Git
     # lists of repos for a given multi-repo
     #
 
-    def repositories_for(multi_repo = nil)
+    def full_names_for(superproject)
+      global_options("superproject.#{superproject}.repo")
+    end
+
+    def all_repositories_for(multi_repo = nil)
       case (owner = superproject = full_names = multi_repo)
       when nil
         repositories # all of them
@@ -226,26 +234,34 @@ module Git
           repository.owner.login == owner
         }
       when *SUPERPROJECTS
-        repositories_for(full_names_for(superproject))
+        all_repositories_for(full_names_for(superproject))
       else
         raise ArgumentError, multi_repo
       end
     end
 
+    def repositories_for(multi_repo = nil)
+      all_repositories_for(multi_repo).delete_if(&:excluded)
+    end
+
     #
     # lists of repositories with a given state
     #
 
     def archived_repositories_for(multi_repo = nil)
-      repositories_for(multi_repo).find_all(&:archived)
+      all_repositories_for(multi_repo).find_all(&:archived)
     end
 
     def forked_repositories_for(multi_repo = nil)
-      repositories_for(multi_repo).find_all(&:fork)
+      all_repositories_for(multi_repo).find_all(&:fork)
     end
 
     def private_repositories_for(multi_repo = nil)
-      repositories_for(multi_repo).find_all(&:private)
+      all_repositories_for(multi_repo).find_all(&:private)
+    end
+
+    def excluded_repositories_for(multi_repo = nil)
+      all_repositories_for(multi_repo).find_all(&:excluded)
     end
 
     #

data/man/git-multi.1

@@ -2,12 +2,12 @@
 .\"     Title: git-multi
 .\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 02/02/2022
+.\"      Date: 08/01/2022
 .\"    Manual: Git Manual
-.\"    Source: Git 2.35.1.4.g5d01301f2b.dirty
+.\"    Source: Git 2.35.1.455.g1a4874565f.dirty
 .\"  Language: English
 .\"
-.TH "GIT\-MULTI" "1" "02/02/2022" "Git 2\&.35\&.1\&.4\&.g5d01301f" "Git Manual"
+.TH "GIT\-MULTI" "1" "08/01/2022" "Git 2\&.35\&.1\&.455\&.g1a4874" "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 \fBv6\&.0\&.0\fR of \fIgit multi\fR \&... hooray!
+This is \fBv8\&.0\&.1\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:
@@ -517,7 +517,7 @@ subscribers_url      subscription_url     svn_url
 tags_url             teams_url            temp_clone_token
 topics               trees_url            updated_at
 url                  visibility           watchers
-watchers_count
+watchers_count       web_commit_signoff_required
 .fi
 .if n \{\
 .RE
@@ -585,11 +585,6 @@ root directory where repos will been cloned
 .RS 4
 local, binary cache of GitHub repository metadata
 .RE
-.PP
-\fB${HOME}/\&.git/multi/superprojects\&.config\fR
-.RS 4
-definitions for so\-called "superproject" multi\-repos
-.RE
 .SH "REFERENCES"
 .sp
 .RS 4

data/man/git-multi.erb

@@ -268,9 +268,6 @@ FILES
 `${HOME}/.git/multi/repositories.byte`::
 	local, binary cache of GitHub repository metadata
 
-`${HOME}/.git/multi/superprojects.config`::
-	definitions for so-called "superproject" multi-repos
-
 REFERENCES
 ----------
 

data/man/git-multi.html

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 10.1.1" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
 <title>git-multi(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -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>v6.0.0</code> of <em>git multi</em> &#8230; hooray!</p></div>
+<div class="paragraph"><p>This is <code>v8.0.1</code> of <em>git multi</em> &#8230; hooray!</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1140,7 +1140,7 @@ subscribers_url      subscription_url     svn_url
 tags_url             teams_url            temp_clone_token
 topics               trees_url            updated_at
 url                  visibility           watchers
-watchers_count</code></pre>
+watchers_count       web_commit_signoff_required</code></pre>
 </div></div>
 </div>
 </div>
@@ -1200,14 +1200,6 @@ git multi ++&lt;multi_repo&gt; --find 'language == "Ruby"' | git multi --raw 'ca
         local, binary cache of GitHub repository metadata
 </p>
 </dd>
-<dt class="hdlist1">
-<code>${HOME}/.git/multi/superprojects.config</code>
-</dt>
-<dd>
-<p>
-        definitions for so-called "superproject" multi-repos
-</p>
-</dd>
 </dl></div>
 </div>
 </div>
@@ -1241,7 +1233,7 @@ the <code>jq</code> command-line utility:
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2022-02-02 12:24:05 GMT
+ 2022-08-01 12:35:33 BST
 </div>
 </div>
 </body>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multi
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -204,7 +204,11 @@ post_install_message: "\nThe only required setting for \e[1mgit multi\e[0m is:\n
   config --global --add \e[1mgit.multi.users\e[0m <list_of_github_users>\n\tgit config
   --global --add \e[1mgit.multi.organizations\e[0m <list_of_github_orgs>\n\nUnless
   your top-level workarea is `${HOME}/Workarea` you should also set:\n\n\tgit config
-  --global --add \e[1mgit.multi.workarea\e[0m <your_root_workarea>\n\nThanks for using
+  --global --add \e[1mgit.multi.workarea\e[0m <your_root_workarea>\n\nYou can specify
+  a list of user or organization repositories to ignore:\n\n\tgit config --global
+  --add \e[1mgit.multi.exclude\e[0m <org_name>/<repo_name>\n\tgit config --global
+  --add \e[1mgit.multi.exclude\e[0m <user_name>/<repo_name>\n\n(can be used multiple
+  times to exclude multiple user or organization repositories)\n\nThanks for using
   \e[1mgit multi\e[0m ... the ultimate multi-repo utility for git!\n\n"
 rdoc_options: []
 require_paths:
@@ -216,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="