multi_repo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0211dacdb0aaeb7df692cbe637a7ab350e9a5ba8e3408f060caf864bc49f1355
-  data.tar.gz: 33224827cd2be7b34b7892c7eda346e91767c5581f42ef29346d969c201f4aef
+  metadata.gz: ff97c5d89d0a12946bcfeedc113427407e9858f72f687cad2c6c133db1bb41b4
+  data.tar.gz: 12f0b8884470a4dd1430cdc1b4bb131f3f93e5957bf66c5400ffa67d3fdbce78
 SHA512:
-  metadata.gz: c4a3f5db6fa142b395c5a063510656db34d5f4ae8d0667db83bb0e5cf17b6f63d4fd453b16d5601a484fa3d57f3dfead3b6633ca48715fe9cc0d1c9632c975ca
-  data.tar.gz: 646793b26e6a1e952e2f36fa0b88b81dad83b7bd582dbe447847e7327e8f344cc70c3dd463b0d90a3e55153a92c2a0e4e46d188a359ed932f05be926ef30ea62
+  metadata.gz: e562d3f593d9b5f3481cc8d1aafdc67aa0c938bd266f2ab939d07ebdd8fde31dbebf26026760451fcb0127613f0f356bf9f03ee7d264851f8b77d0747882f385
+  data.tar.gz: 03b147b28464d5179423794d5e96ee42feb3b8edc586d0407d9560769ba42ece76d498090692bebac3d339948defd498fe9e2820fc8e39dc24b8318fa512f6f8

data/.github/workflows/ci.yaml

@@ -1,11 +1,18 @@
 name: CI
-
 on:
-  push:
   pull_request:
+  push:
+    branches-ignore:
+    - dependabot/*
+    - renovate/*
   schedule:
-  - cron: '0 0 * * 0'
-
+  - cron: 0 0 * * 0
+  workflow_dispatch:
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+permissions:
+  contents: read
 jobs:
   ci:
     runs-on: ubuntu-latest
@@ -16,19 +23,13 @@ jobs:
         - '3.1'
         - '3.2'
         - '3.3'
-    env:
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: "${{ matrix.ruby-version }}"
         bundler-cache: true
       timeout-minutes: 30
     - name: Run tests
       run: bundle exec rake
-    - name: Report code coverage
-      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
-      continue-on-error: true
-      uses: paambaati/codeclimate-action@v9

data/CHANGELOG.md

@@ -4,6 +4,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.2.0] - 2026-04-14
+### Added
+- [Artifactory service] Add head and exists? methods [[#97](https://github.com/ManageIQ/multi_repo/pull/97)]
+- [pull_request_blaster_outer] Add ability to override message in the script [[#70](https://github.com/ManageIQ/multi_repo/pull/70)]
+- [pull_request_blaster_outer] Add ability to specify a different fork name [[#71](https://github.com/ManageIQ/multi_repo/pull/71)]
+- [show_org_repos] Add options include_forks and include_archived [[#73](https://github.com/ManageIQ/multi_repo/pull/73)]
+
+### Fixed
+- [Git service] Handle when tags move during a git fetch which would otherwise fail [[#75](https://github.com/ManageIQ/multi_repo/pull/75)]
+- [each_repo] Fix each_repo when the script needs to bundle [[#72](https://github.com/ManageIQ/multi_repo/pull/72)]
+- [delete_labels] Fix a constant problem [[#67](https://github.com/ManageIQ/multi_repo/pull/67)]
+
+### Removed
+- **BREAKING** Drop CodeClimate [[#74](https://github.com/ManageIQ/multi_repo/pull/74)]
+
 ## [1.1.0] - 2025-10-01
 ### Added
 - [show_commit_history] Add pr-changelog display format [[#49](https://github.com/ManageIQ/multi_repo/pull/49)]
@@ -44,7 +59,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - [pull_request_labeler] Fix cli description of --prs [[#30](https://github.com/ManageIQ/multi_repo/pull/30)]
-- [show_commit_history] Handle issue where PR may not be found [[#36](https://github.com/ManageIQ/multi_repo/pull/30)]
+- [show_commit_history] Handle issue where PR may not be found [[#36](https://github.com/ManageIQ/multi_repo/pull/36)]
 
 ## [0.4.0] - 2024-03-29
 ### Changed
@@ -60,7 +75,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [show_commit_history] Prevent missing ranges from failing the entire run [[#20](https://github.com/ManageIQ/multi_repo/pull/20)]
 - [pull_request_merger] Fixing issue passing kwargs on Ruby 3 [[#23](https://github.com/ManageIQ/multi_repo/pull/23)]
 
-[Unreleased]: https://github.com/ManageIQ/multi_repo/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/multi_repo/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/ManageIQ/multi_repo/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/ManageIQ/multi_repo/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/ManageIQ/multi_repo/compare/v0.6.0...v1.0.0
 [0.6.0]: https://github.com/ManageIQ/multi_repo/compare/v0.5.1...v0.6.0

data/README.md

@@ -4,7 +4,6 @@ MultiRepo is a tool for managing multiple git repositories.
 
 [![Gem Version](https://badge.fury.io/rb/multi_repo.svg)](http://badge.fury.io/rb/multi_repo)
 [![CI](https://github.com/ManageIQ/multi_repo/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/multi_repo/actions/workflows/ci.yaml)
-[![Code Climate](https://codeclimate.com/github/ManageIQ/multi_repo.svg)](https://codeclimate.com/github/ManageIQ/multi_repo)
 
 ## Installation
 
@@ -19,7 +18,7 @@ gem install multi_repo
 Typical usage will be from single scripts. In order to keep each script manageable, it can be preferable to use bundler/inline to define the gems needed by that script. To do this, add the following to the top of the script:
 
 ```ruby
-#/usr/bin/env ruby
+#!/usr/bin/env ruby
 
 require "bundler/inline"
 gemfile do
@@ -69,7 +68,7 @@ purposes
 - Go to https://github.com/settings/tokens
 - Choose "Generate New Token"
 - Give the token a description
-- At a mimimum, choose "repo" for the permissions.
+- At a minimum, choose "repo" for the permissions.
 - Click "Generate Token"
 - Copy the token given to you, and keep it in a safe location, as once you leave
   the page, the token is no longer accessible

data/lib/multi_repo/helpers/pull_request_blaster_outer.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module MultiRepo::Helpers
   class PullRequestBlasterOuter
-    attr_reader :repo, :base, :head, :script, :dry_run, :message, :title, :body, :force
+    attr_reader :repo, :base, :head, :script, :dry_run, :source_message, :source_title, :source_body, :force
 
     def initialize(repo, base:, head:, script:, dry_run:, message:, title: nil, body: nil, force: false, **)
       @repo    = repo
@@ -14,10 +14,11 @@ module MultiRepo::Helpers
         s.to_s
       end
       @dry_run = dry_run
-      @message = message
-      @title   = (title || message)[0, 72]
-      @body    = (body || message).gsub("\\n", "\n")
       @force   = force
+
+      @source_message = message&.gsub("\\n", "\n")
+      @source_title   = title
+      @source_body    = body&.gsub("\\n", "\n")
     end
 
     def blast
@@ -44,8 +45,10 @@ module MultiRepo::Helpers
         if dry_run
           puts "** dry-run: Skipping opening pull request. The pull request would look like:".light_black
           puts
+          puts "Pull Request Title:".light_black
           puts title.light_black
           puts
+          puts "Pull Request Body:".light_black
           puts body.light_black
 
           result = "dry run".light_black
@@ -73,19 +76,31 @@ module MultiRepo::Helpers
 
     private
 
+    attr_accessor :override_message
+
+    def message
+      override_message || source_message
+    end
+
+    def title
+      source_title || message.lines.first.chomp[0, 72]
+    end
+
+    def body
+      source_body || message.lines.drop(1).join.strip
+    end
+
     def github
       @github ||= MultiRepo::Service::Github.new(dry_run: dry_run)
     end
 
-    def forked?
-      # NOTE: There is an assumption here that the fork's name will match the source's name.
-      #   Ideally there would be a "forked from" field in the repo metadata, but there isn't.
-      github.client.repos(github.client.login, :type => "forks").any? { |m| m.name == repo.short_name }
+    def forked?(cache: true)
+      github.forks(cache: cache).any? { |f| f.name == repo.fork_short_name }
     end
 
     def fork_repo
       github.client.fork(repo.name)
-      until forked?
+      until forked?(cache: false)
         print "."
         sleep 3
       end
@@ -94,6 +109,10 @@ module MultiRepo::Helpers
     def run_script
       repo.chdir do
         Bundler.with_unbundled_env do
+          # Ensure any previous override commit message is removed
+          FileUtils.rm_f(".git/COMMIT_EDITMSG")
+          self.override_message = nil
+
           parts = []
           parts << "GITHUB_REPO=#{repo.name}"
           parts << "DRY_RUN=true" if dry_run
@@ -104,6 +123,10 @@ module MultiRepo::Helpers
             puts "!! Script execution failed.".light_red
             exit $?.exitstatus
           end
+
+          if File.exist?(".git/COMMIT_EDITMSG")
+            self.override_message = File.read(".git/COMMIT_EDITMSG")
+          end
         end
       end
     end

data/lib/multi_repo/repo.rb

@@ -27,6 +27,14 @@ module MultiRepo
       name.split("/").last
     end
 
+    def fork_name
+      config.fork_name
+    end
+
+    def fork_short_name
+      fork_name&.split("/")&.last || short_name
+    end
+
     def write_file(file, content, **kwargs)
       if dry_run
         puts "** dry-run: Writing #{path.join(file).expand_path}".light_black

data/lib/multi_repo/service/artifactory.rb

@@ -40,6 +40,18 @@ module MultiRepo::Service
       request(:get, path, **kwargs)
     end
 
+    def head(path, **kwargs)
+      path = path.to_s
+      request(:head, path, **kwargs)
+    end
+
+    def exists?(path, **kwargs)
+      head(path, **kwargs)
+      true
+    rescue RestClient::NotFound
+      false
+    end
+
     def list(folder, cache: @cache, **kwargs)
       folder = folder.to_s
       cache_file = "/tmp/artifactory-#{folder.tr("/", "_")}-#{Date.today}.txt"
@@ -94,6 +106,8 @@ module MultiRepo::Service
         "Accept"       => "application/json",
         "Content-Type" => "application/json"
       )
+      headers = headers.except("Accept") if verb == :head
+
       path = File.join(self.class.api_endpoint, path)
 
       puts "+ #{verb.to_s.upcase} #{path}".light_black if verbose

data/lib/multi_repo/service/git.rb

@@ -49,7 +49,7 @@ module MultiRepo::Service
     def fetch(output: false)
       client = output ? self.client : self.client.capturing
 
-      client.fetch(:all => true, :tags => true)
+      client.fetch(:all => true, :tags => true, :force => true)
     end
 
     def hard_checkout(branch, source = "origin/#{branch}", output: false)

data/lib/multi_repo/service/github.rb

@@ -90,6 +90,11 @@ module MultiRepo::Service
       client.workflows(repo_name)[:workflows].select { |w| w.state == "disabled_inactivity" }
     end
 
+    def self.forks(cache: true)
+      @forks = nil unless cache
+      @forks ||= client.repos(client.login, :type => "forks")
+    end
+
     PR_REGEX = %r{^([^/#]+/[^/#]+)#(\d+)$}
 
     # Parse a list of PRs that are in URL or org/repo#pr format into a Array of
@@ -125,6 +130,7 @@ module MultiRepo::Service
              :team_member_names,
              :team_ids_by_name,
              :team_names,
+             :forks,
              :disabled_workflows,
              :to => :class
 

data/lib/multi_repo/version.rb

@@ -1,3 +1,3 @@
 module MultiRepo
-  VERSION = "1.1.0".freeze
+  VERSION = "1.2.0".freeze
 end

data/lib/multi_repo.rb

@@ -11,7 +11,6 @@ require 'multi_repo/repo'
 require 'multi_repo/repo_set'
 
 require 'multi_repo/service/artifactory'
-require 'multi_repo/service/code_climate'
 require 'multi_repo/service/docker'
 require 'multi_repo/service/git'
 require 'multi_repo/service/github'

data/multi_repo.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rest-client"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "manageiq-style", ">= 1.5.4"
+  spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.0"
   spec.add_development_dependency "simplecov", ">= 0.21.2"

data/scripts/delete_labels

@@ -13,7 +13,7 @@ opts = Optimist.options do
 
   MultiRepo::CLI.common_options(self, :repo_set_default => nil)
 end
-opts[:repo] = MultiRepo::Helpers::Labels.all.keys.sort unless opts[:repo] || opts[:repo_set]
+opts[:repo] = MultiRepo::Labels.all.keys.sort unless opts[:repo] || opts[:repo_set]
 
 github = MultiRepo::Service::Github.new(dry_run: opts[:dry_run])
 

data/scripts/each_repo

@@ -19,7 +19,9 @@ MultiRepo::CLI.each_repo(**opts) do |repo|
   repo.git.fetch
   repo.git.hard_checkout(opts[:ref])
   repo.chdir do
-    puts "+ #{opts[:command]}".light_black
-    system(opts[:command])
+    Bundler.with_unbundled_env do
+      puts "+ #{opts[:command]}".light_black
+      system(opts[:command])
+    end
   end
 end

data/scripts/pull_request_blaster_outer

@@ -14,13 +14,25 @@ opts = Optimist.options do
   opt :base,    "The target branch for the changes.",                         :type => :string, :required => true
   opt :head,    "The name of the branch to create on your fork.",             :type => :string, :required => true
   opt :script,  "The path to the script that will update the desired files.", :type => :string, :required => true
-  opt :message, "The commit message for this change.",                        :type => :string, :required => true
-  opt :title,   "The PR title for this change. (default is --message)",       :type => :string
-  opt :body,    "The PR body for this change. (default is --message)",        :type => :string
+  opt :force,   "Force creation of the pull request without asking.",         :default => false
 
-  opt :force,   "Force creation of the pull request without asking.", :default => false
+  see_below = "See \"Notes on commit messages\" section below."
+  opt :message, "The commit message for this change. #{see_below}", :type => :string, :required => true
+  opt :title,   "The PR title for this change. #{see_below}",       :type => :string
+  opt :body,    "The PR body for this change. #{see_below}",        :type => :string
 
   MultiRepo::CLI.common_options(self)
+  opt :help, "Show this message" # Ensure help appears above the notes sections
+
+  banner ""
+  banner <<~EOS
+    Notes on commit messages:
+      * The --message and --body options can accept '\\n' characters to support multiline messages.
+      * In a script, you can override --message by writing the commit message contents to .git/COMMIT_EDITMSG.
+      * The --title will default to the first line of the message.
+      * The --body will default to the rest of the message.
+      * If you want to override the title or body, you can do so with the --title and --body options, respectively.
+  EOS
 end
 
 results = {}

data/scripts/show_commit_history

@@ -15,7 +15,7 @@ opts = Optimist.options do
   synopsis "Show the git commit log between two refs for all git repos."
 
   opt :from,    "The commit log 'from' ref", :type => :string,  :required => true
-  opt :to,      "The commit log 'to' ref" ,  :type => :string,  :required => true
+  opt :to,      "The commit log 'to' ref",   :type => :string,  :required => true
   opt :display, "How to display the history. Valid values are: #{DISPLAY_FORMATS.join(", ")}", :default => "commit"
   opt :summary, "Display a summary of the repos.", :default => false
 

data/scripts/show_org_repos

@@ -10,6 +10,9 @@ opts = Optimist.options do
   synopsis "List all repos in an org."
 
   opt :org, "The org to list the repos for", :type => :string, :required => true
+
+  opt :include_forks, "Include forked repos", :default => false
+  opt :include_archived, "Include archived repos", :default => false
 end
 
-puts MultiRepo::Service::Github.org_repo_names(opts[:org])
+puts MultiRepo::Service::Github.org_repo_names(opts[:org], **opts.slice(:include_forks, :include_archived))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_repo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ManageIQ Authors
@@ -197,14 +197,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -256,12 +256,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
 - ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_cc.yml"
 - ".rubocop_local.yml"
 - ".whitesource"
 - CHANGELOG.md
@@ -286,7 +284,6 @@ files:
 - lib/multi_repo/repo.rb
 - lib/multi_repo/repo_set.rb
 - lib/multi_repo/service/artifactory.rb
-- lib/multi_repo/service/code_climate.rb
 - lib/multi_repo/service/docker.rb
 - lib/multi_repo/service/git.rb
 - lib/multi_repo/service/git/minigit_capturing_patch.rb
@@ -343,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 4.0.7
 specification_version: 4
 summary: MultiRepo is a library for managing multiple repositiories and running scripts
   against them.

data/.codeclimate.yml

@@ -1,16 +0,0 @@
-prepare:
-  fetch:
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml
-    path: ".rubocop_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
-    path: ".rubocop_cc_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml
-    path: styles/base.yml
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml
-    path: styles/cc_base.yml
-plugins:
-  rubocop:
-    enabled: true
-    config: ".rubocop_cc.yml"
-    channel: rubocop-1-56-3
-version: '2'

data/.rubocop_cc.yml

@@ -1,4 +0,0 @@
-inherit_from:
-- ".rubocop_base.yml"
-- ".rubocop_cc_base.yml"
-- ".rubocop_local.yml"

data/lib/multi_repo/service/code_climate.rb

@@ -1,119 +0,0 @@
-module MultiRepo::Service
-  class CodeClimate
-    def self.api_token
-      @api_token ||= ENV["CODECLIMATE_API_TOKEN"]
-    end
-
-    def self.api_token=(token)
-      @api_token = token
-    end
-
-    def self.badge_name
-      "Code Climate"
-    end
-
-    def self.badge_details(repo)
-      {
-        "description" => badge_name,
-        "image"       => "https://codeclimate.com/github/#{repo.name}.svg",
-        "url"         => "https://codeclimate.com/github/#{repo.name}"
-      }
-    end
-
-    def self.coverage_badge_name
-      "Test Coverage"
-    end
-
-    def self.coverage_badge_details(repo)
-      {
-        "description" => coverage_badge_name,
-        "image"       => "https://codeclimate.com/github/#{repo.name}/badges/coverage.svg",
-        "url"         => "https://codeclimate.com/github/#{repo.name}/coverage"
-      }
-    end
-
-    attr_reader :repo, :dry_run
-
-    def initialize(repo, dry_run: false, **_)
-      @repo    = repo
-      @dry_run = dry_run
-    end
-
-    def save!
-      write_codeclimate_yaml
-      write_rubocop_yamls
-    end
-
-    def enable
-      ensure_enabled
-    end
-
-    def badge_details
-      self.class.badge_details(repo)
-    end
-
-    def coverage_badge_details
-      self.class.coverage_badge_details(repo)
-    end
-
-    def test_reporter_id
-      ensure_enabled
-      @response.dig("data", 0, "attributes", "test_reporter_id")
-    end
-
-    def create_repo_secret
-      Github.new(dry_run: dry_run).create_or_update_repository_secret(repo.name, "CC_TEST_REPORTER_ID", test_reporter_id)
-    end
-
-    private
-
-    def ensure_enabled
-      return if @enabled
-
-      require 'rest-client'
-      require 'json'
-
-      @response =
-        if dry_run
-          puts "** dry-run: RestClient.get(\"https://api.codeclimate.com/v1/repos?github_slug=#{repo.name}\", #{headers})".light_black
-          {"data" => [{"attributes" => {"badge_token" => "0123456789abdef01234", "test_reporter_id" => "0123456789abcedef0123456789abcedef0123456789abcedef0123456789abc"}}]}
-        else
-          JSON.parse(RestClient.get("https://api.codeclimate.com/v1/repos?github_slug=#{repo.name}", headers))
-        end
-
-      if @response["data"].empty?
-        payload = {"data" => {"type" => "repos", "attributes" => {"url" => "https://github.com/#{repo.name}"}}}.to_json
-        @response = JSON.parse(RestClient.post("https://api.codeclimate.com/v1/github/repos", payload, headers))
-        @response["data"] = [@response["data"]]
-      end
-
-      @enabled = true
-    end
-
-    def headers
-      token = self.class.api_token
-      raise "Missing CodeClimate API Token" if token.nil?
-
-      {
-        :accept        => "application/vnd.api+json",
-        :content_type  => "application/vnd.api+json",
-        :authorization => "Token token=#{token}"
-      }
-    end
-
-    def write_codeclimate_yaml
-      write_generator_file(".codeclimate.yml")
-    end
-
-    def write_rubocop_yamls
-      %w[.rubocop.yml .rubocop_cc.yml .rubocop_local.yml].each do |file|
-        write_generator_file(file)
-      end
-    end
-
-    def write_generator_file(file)
-      content = RestClient.get("https://raw.githubusercontent.com/ManageIQ/manageiq/master/lib/generators/manageiq/plugin/templates/#{file}").body
-      repo.write_file(file, content, dry_run: dry_run)
-    end
-  end
-end