multi_repo 0.6.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1005b52e2327efcb525b5af5351ae70667393a8660fb00526017866b3800279f
-  data.tar.gz: 601ffda846034e6c341c955da8d5e7c8477335a50a47702bc1d43a9334ff538e
+  metadata.gz: 0211dacdb0aaeb7df692cbe637a7ab350e9a5ba8e3408f060caf864bc49f1355
+  data.tar.gz: 33224827cd2be7b34b7892c7eda346e91767c5581f42ef29346d969c201f4aef
 SHA512:
-  metadata.gz: 326bf128ad550baa31c39d25335567da18b89bffb7c677d9df087a7aaf70246d90414f2cf82bacccef7bdda4d65dcd8cae515a9bc9e4670c8b95b7b362fbf8b8
-  data.tar.gz: 982b95bcc4d815d95aba56b809e0f802020fee99a9ebfe501e17e0fcaad75dce5e8d0d68ad7692b2c173a2a78dad471f6c6fc277da06b02a3c8159d491949b3a
+  metadata.gz: c4a3f5db6fa142b395c5a063510656db34d5f4ae8d0667db83bb0e5cf17b6f63d4fd453b16d5601a484fa3d57f3dfead3b6633ca48715fe9cc0d1c9632c975ca
+  data.tar.gz: 646793b26e6a1e952e2f36fa0b88b81dad83b7bd582dbe447847e7327e8f344cc70c3dd463b0d90a3e55153a92c2a0e4e46d188a359ed932f05be926ef30ea62

data/.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ jobs:
     env:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -4,6 +4,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.1.0] - 2025-10-01
+### Added
+- [show_commit_history] Add pr-changelog display format [[#49](https://github.com/ManageIQ/multi_repo/pull/49)]
+- [pull_request_blaster_outer] Prevent git show paging when using --force [[#53](https://github.com/ManageIQ/multi_repo/pull/53)]
+
+### Changed
+- Update licensee to at least 9.7.0 [[#54](https://github.com/ManageIQ/multi_repo/pull/54)]
+- Separate progress bar options from creation of the progress bar [[#55](https://github.com/ManageIQ/multi_repo/pull/55)]
+
+## [1.0.0] - 2025-04-24
+### Added
+- Allow blank overrides on the command line [[#46](https://github.com/ManageIQ/multi_repo/pull/46)]
+
+### Removed
+- **BREAKING**: Remove travis gem dependency and service helper [[#48](https://github.com/ManageIQ/multi_repo/pull/48)]
+
 ## [0.6.0] - 2025-02-27
 ### Added
 - [pull_request_blaster_outer] Option to force creation of the pull request without asking [[#40](https://github.com/ManageIQ/multi_repo/pull/40)]
@@ -44,8 +60,11 @@ 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/more_core_extensions/compare/v0.5.1...HEAD
-[0.5.1]: https://github.com/ManageIQ/more_core_extensions/compare/v0.5.0...v0.5.1
-[0.5.0]: https://github.com/ManageIQ/more_core_extensions/compare/v0.4.0...v0.5.0
-[0.4.0]: https://github.com/ManageIQ/more_core_extensions/compare/v0.3.1...v0.4.0
-[0.3.1]: https://github.com/ManageIQ/more_core_extensions/compare/v0.3.0...v0.3.1
+[Unreleased]: https://github.com/ManageIQ/multi_repo/compare/v1.1.0...HEAD
+[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
+[0.5.1]: https://github.com/ManageIQ/multi_repo/compare/v0.5.0...v0.5.1
+[0.5.0]: https://github.com/ManageIQ/multi_repo/compare/v0.4.0...v0.5.0
+[0.4.0]: https://github.com/ManageIQ/multi_repo/compare/v0.3.1...v0.4.0
+[0.3.1]: https://github.com/ManageIQ/multi_repo/compare/v0.3.0...v0.3.1

data/lib/multi_repo/cli.rb

@@ -1,6 +1,7 @@
 require "multi_repo"
 require "optimist"
 require "colorize"
+require "more_core_extensions/core_ext/array/deletes"
 
 module MultiRepo
   module CLI
@@ -15,14 +16,15 @@ module MultiRepo
     end
 
     def self.repos_for(repo: nil, repo_set: nil, dry_run: false, **_)
-      Optimist.die("options --repo or --repo_set must be specified") unless repo || repo_set
+      repo = Array(repo).delete_blanks
+      Optimist.die("options --repo or --repo_set must be specified") if repo.blank? && repo_set.blank?
 
-      if repo_set
+      if repo_set.present?
         repos = MultiRepo::RepoSet[repo_set]&.deep_dup
         Optimist.die(:repo_set, "#{repo_set.inspect} was not found in the config") if repos.nil?
 
-        if repo
-          repo_names = Set.new(Array(repo))
+        if repo.any?
+          repo_names = Set.new(repo)
           repos.select! { |r| repo_names.include?(r.name) }
         end
 
@@ -30,7 +32,7 @@ module MultiRepo
 
         repos
       else
-        Array(repo).map { |n| MultiRepo::Repo.new(n, dry_run: dry_run) }
+        repo.map { |n| MultiRepo::Repo.new(n, dry_run: dry_run) }
       end
     end
 
@@ -53,7 +55,7 @@ module MultiRepo
         msg = "Individual repo(s) to work with"
         if subset.include?(:repo_set)
           sub_opts = {}
-          msg << "; Overrides --repo-set"
+          msg << " from the --repo-set"
         else
           sub_opts = {:required => true}
         end
@@ -82,11 +84,15 @@ module MultiRepo
 
     def self.progress_bar(total = 100)
       require "progressbar"
-      ProgressBar.create(
+      ProgressBar.create(progress_bar_options(total))
+    end
+
+    def self.progress_bar_options(total = 100)
+      {
         :format => "%j%% |%B| %E",
         :length => HEADER_SIZE,
         :total  => total
-      )
+      }
     end
   end
 end

data/lib/multi_repo/helpers/pull_request_blaster_outer.rb

@@ -2,9 +2,9 @@ require 'pathname'
 
 module MultiRepo::Helpers
   class PullRequestBlasterOuter
-    attr_reader :repo, :base, :head, :script, :dry_run, :message, :title, :force
+    attr_reader :repo, :base, :head, :script, :dry_run, :message, :title, :body, :force
 
-    def initialize(repo, base:, head:, script:, dry_run:, message:, title: nil, force: false, **)
+    def initialize(repo, base:, head:, script:, dry_run:, message:, title: nil, body: nil, force: false, **)
       @repo    = repo
       @base    = base
       @head    = head
@@ -16,6 +16,7 @@ module MultiRepo::Helpers
       @dry_run = dry_run
       @message = message
       @title   = (title || message)[0, 72]
+      @body    = (body || message).gsub("\\n", "\n")
       @force   = force
     end
 
@@ -41,7 +42,12 @@ module MultiRepo::Helpers
         puts
 
         if dry_run
-          puts "** dry-run: Skipping opening pull request".light_black
+          puts "** dry-run: Skipping opening pull request. The pull request would look like:".light_black
+          puts
+          puts title.light_black
+          puts
+          puts body.light_black
+
           result = "dry run".light_black
         else
           answer =
@@ -112,7 +118,11 @@ module MultiRepo::Helpers
     end
 
     def show_commit
-      repo.git.client.show
+      if force
+        repo.git.raw("--no-pager", "show")
+      else
+        repo.git.client.show
+      end
     end
 
     def blast_remote
@@ -134,7 +144,7 @@ module MultiRepo::Helpers
     end
 
     def open_pull_request
-      pr = github.client.create_pull_request(repo.name, base, pr_head, title, title)
+      pr = github.client.create_pull_request(repo.name, base, pr_head, title, body)
       pr.html_url
     rescue => err
       raise unless err.message.include?("A pull request already exists")

data/lib/multi_repo/service/git.rb

@@ -18,18 +18,21 @@ module MultiRepo::Service
       retry
     end
 
-    def self.clone(clone_source:, path:)
+    def self.raw(*args, quiet: false)
       require "minigit"
       require "shellwords"
 
-      args = ["clone", clone_source, path]
       command = Shellwords.join(["git", *args])
-      command << " &>/dev/null" unless ENV["GIT_DEBUG"]
+      command << " &>/dev/null" if quiet && !ENV["GIT_DEBUG"]
       puts "+ #{command}" if ENV["GIT_DEBUG"] # Matches the output of MiniGit
 
       raise MiniGit::GitError.new(args, $?) unless system(command)
     end
 
+    def self.clone(clone_source:, path:)
+      raw("clone", clone_source, path, quiet: true)
+    end
+
     attr_reader :dry_run, :client
 
     def initialize(path:, clone_source:, dry_run: false)
@@ -39,6 +42,10 @@ module MultiRepo::Service
       @client  = self.class.client(path: path, clone_source: clone_source)
     end
 
+    def raw(*args)
+      Dir.chdir(client.git_dir) { self.class.raw(*args) }
+    end
+
     def fetch(output: false)
       client = output ? self.client : self.client.capturing
 

data/lib/multi_repo/version.rb

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

data/lib/multi_repo.rb

@@ -1,6 +1,9 @@
 require 'pathname'
 require 'pp'
 
+require 'logger'
+require 'active_support'
+
 require 'multi_repo/version'
 
 require 'multi_repo/labels'
@@ -13,7 +16,6 @@ require 'multi_repo/service/docker'
 require 'multi_repo/service/git'
 require 'multi_repo/service/github'
 require 'multi_repo/service/rubygems_stub'
-require 'multi_repo/service/travis'
 
 require 'multi_repo/helpers/git_mirror'
 require 'multi_repo/helpers/license'

data/multi_repo.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "colorize"
   spec.add_runtime_dependency "config"
-  spec.add_runtime_dependency "json", "~> 2.9.1" # Pin json due to https://github.com/ruby/json/issues/752
-  spec.add_runtime_dependency "licensee"
+  spec.add_runtime_dependency "licensee", ">= 9.7.0"
   spec.add_runtime_dependency "minigit"
   spec.add_runtime_dependency "more_core_extensions"
   spec.add_runtime_dependency "octokit", ">= 7.0.0"
@@ -35,10 +34,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "psych", ">=3"
   spec.add_runtime_dependency "rbnacl"
   spec.add_runtime_dependency "rest-client"
-  spec.add_runtime_dependency "travis"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "manageiq-style"
+  spec.add_development_dependency "manageiq-style", ">= 1.5.4"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.0"
   spec.add_development_dependency "simplecov", ">= 0.21.2"

data/scripts/pull_request_blaster_outer

@@ -16,6 +16,7 @@ opts = Optimist.options do
   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
 

data/scripts/restart_travis_builds

@@ -4,6 +4,7 @@ require "bundler/inline"
 gemfile do
   source "https://rubygems.org"
   gem "multi_repo", require: "multi_repo/cli", path: File.expand_path("..", __dir__)
+  gem "travis"
 end
 require 'travis'
 require 'travis/pro/auto_login'

data/scripts/show_commit_history

@@ -7,8 +7,9 @@ gemfile do
 end
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/string/inflections"
+require "more_core_extensions/core_ext/hash/deletes"
 
-DISPLAY_FORMATS = %w[commit pr-title pr-label]
+DISPLAY_FORMATS = %w[commit pr-title pr-label pr-changelog]
 
 opts = Optimist.options do
   synopsis "Show the git commit log between two refs for all git repos."
@@ -33,30 +34,32 @@ repos_with_changes = []
 MultiRepo::CLI.repos_for(**opts).each do |repo|
   next if opts[:skip].include?(repo.name)
 
-  puts MultiRepo::CLI.header(repo.name)
+  puts MultiRepo::CLI.header(repo.name) unless opts[:display] == "pr-changelog"
   repo.git.fetch(output: false)
 
   case opts[:display]
-  when "pr-label", "pr-title"
+  when "pr-label", "pr-title", "pr-changelog"
     github ||= MultiRepo::Service::Github.client
-    pr_label_display = opts[:display] == "pr-label"
 
     results = {}
-    if pr_label_display
-      results["bug"] = []
-      results["enhancement"] = []
+    if %w[pr-label pr-changelog].include?(opts[:display])
+      results["bug"] = Set.new
+      results["enhancement"] = Set.new
     end
-    results["other"] = []
+    results["other"] = Set.new
 
     log =
       begin
         repo.git.client.capturing.log({:oneline => true}, range)
       rescue MiniGit::GitError
-        puts "ERROR: commit range not found.".light_red
-        puts
+        unless opts[:display] == "pr-changelog"
+          puts "ERROR: commit range not found.".light_red
+          puts
+        end
         next
       end
 
+    pr_index = {}
     log.lines.each do |line|
       next unless (match = line.match(/Merge pull request #(\d+)\b/))
 
@@ -66,23 +69,31 @@ MultiRepo::CLI.repos_for(**opts).each do |repo|
         rescue Octokit::NotFound
           next # PR not found could mean this was a cherry-pick from a different repo, so the PR doesn't exist.
         end
+
+      pr_index[pr.number] = pr
       label = pr.labels.detect { |l| results.key?(l.name) }&.name || "other"
-      results[label] << pr
+      results[label] << pr.number
     end
+    results.delete_blanks
 
-    changes_found = false
-
-    results.each do |label, prs|
-      next if prs.blank?
-      changes_found = true
+    if results.present? && opts[:display] == "pr-changelog"
+      puts "\n## <i class=\"fa-brands fa-github\"></i> [#{repo.name}](https://github.com/#{repo.name}/compare/#{opts[:from]}...#{opts[:to]})"
+    end
 
-      puts "\n## #{label.titleize}\n\n" if pr_label_display
-      prs.each do |pr|
+    results.each do |label, pr_numbers|
+      case opts[:display]
+      when "pr-label"
+        puts "\n## #{label.titleize}\n\n"
+      when "pr-changelog"
+        puts "\n### #{label.titleize}\n\n"
+      end
+      pr_numbers.each do |pr_number|
+        pr = pr_index[pr_number]
         puts "* #{pr.title} [[##{pr.number}]](#{pr.html_url})"
       end
     end
 
-    repos_with_changes << repo if changes_found
+    repos_with_changes << repo if results.present?
   when "commit"
     output =
       begin

data/scripts/show_travis_status

@@ -5,6 +5,7 @@ gemfile do
   source "https://rubygems.org"
   gem "multi_repo", require: "multi_repo/cli", path: File.expand_path("..", __dir__)
   gem "action_view"
+  gem "travis"
 end
 
 require 'more_core_extensions/core_ext/array/tableize'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: multi_repo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,34 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: licensee
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.7.0
 - !ruby/object:Gem::Dependency
   name: minigit
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +177,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: travis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +197,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +292,6 @@ files:
 - lib/multi_repo/service/git/minigit_capturing_patch.rb
 - lib/multi_repo/service/github.rb
 - lib/multi_repo/service/rubygems_stub.rb
-- lib/multi_repo/service/travis.rb
 - lib/multi_repo/version.rb
 - multi_repo.gemspec
 - renovate.json
@@ -359,7 +329,6 @@ homepage: http://github.com/ManageIQ/multi_repo
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -374,8 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: MultiRepo is a library for managing multiple repositiories and running scripts
   against them.

data/lib/multi_repo/service/travis.rb

@@ -1,68 +0,0 @@
-require 'yaml'
-
-module MultiRepo::Service
-  class Travis
-    def self.api_token
-      @api_token ||= ENV["TRAVIS_API_TOKEN"]
-    end
-
-    def self.api_token=(token)
-      @api_token = token
-    end
-
-    def self.client
-      @client ||= begin
-        raise "Missing Travis API Token" if travis_api_token.nil?
-
-        require 'travis/client'
-        ::Travis::Client.new(
-          :uri           => ::Travis::Client::COM_URI,
-          :access_token  => api_token
-        )
-      end
-    end
-
-    def self.badge_name
-      "Build Status"
-    end
-
-    def self.badge_details(repo, branch)
-      {
-        "description" => badge_name,
-        "image"       => "https://travis-ci.com/#{repo.name}.svg?branch=#{branch}",
-        "url"         => "https://travis-ci.com/#{repo.name}"
-      }
-    end
-
-    attr_reader :repo, :dry_run
-
-    def initialize(repo, dry_run: false, **_)
-      @repo    = repo
-      @dry_run = dry_run
-    end
-
-    def badge_details
-      self.class.badge_details(repo, "master")
-    end
-
-    def enable
-      if dry_run
-        puts "** dry-run: travis login --com --github-token $GITHUB_API_TOKEN".light_black
-        puts "** dry-run: travis enable --com".light_black
-      else
-        `travis login --com --github-token $GITHUB_API_TOKEN`
-        `travis enable --com`
-      end
-    end
-
-    def set_env(hash)
-      hash.each do |key, value|
-        if dry_run
-          puts "** dry-run: travis env set #{key} #{value}".light_black
-        else
-          `travis env set #{key} #{value}`
-        end
-      end
-    end
-  end
-end