multi_repo 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc809429c529e0f58d2274708e0785944edf7170ce7aa23858fc88031bb593e1
-  data.tar.gz: 7d58ebc46fe2202b9e2e285e6a26fc4b4a40556181301a651994d41b9e4c1d5f
+  metadata.gz: bfc3d56275cbe25e40cecabf411913805b1a83f59395ac0bf721b52130bc1795
+  data.tar.gz: b10b82500c86b84030488e687e86bfed2283b83de8911092211dae510c8eb22b
 SHA512:
-  metadata.gz: 4828418ee29894ce72fd5d2ab2e705b99854f1aa5ba26f321a0235bfa7c7eadf45a5aada881897aa5df16fb6f83cdd1968113af80e0163d2a13a9e4dd354ee2d
-  data.tar.gz: b4b2ed2d3c9677e658ad4c60ec615779882dee381bc5ed4b771602d56ca0a5b72ade124e140d50568a359c5e838d99ce3c51a8a475925a096d0582b7adc0cf9e
+  metadata.gz: 551aad598181333a741eeb5ab881642f8e455645acb9eea1870494c3f5ce83d5d7a2e7fcbfaf1fa797e652ac8a4c3513907b211db4c5d37560e229bb62c40064
+  data.tar.gz: 352099fa70f24b0bd5ecd5493fc7d62dd9ec3c2eb6cdad3b7dde9bef8803b69d1532e303dfe8e37b27a007f9b298a61b515437413e492b21e70eb0bf3eb25c83

data/.github/workflows/ci.yaml

@@ -14,6 +14,8 @@ jobs:
         ruby-version:
         - '3.0'
         - '3.1'
+        - '3.2'
+        - '3.3'
     env:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
@@ -29,4 +31,4 @@ jobs:
     - name: Report code coverage
       if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v5
+      uses: paambaati/codeclimate-action@v9

data/CHANGELOG.md

@@ -4,6 +4,28 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.5.1] - 2025-02-20
+### Added
+- Add debugging of octokit request/response if DEBUG env var set [[#38](https://github.com/ManageIQ/multi_repo/pull/38)]
+
+### Fixed
+- Pin json gem to 2.9.1 since 2.10.0+ is broken [[#41](https://github.com/ManageIQ/multi_repo/pull/41)]
+
+## [0.5.0] - 2024-11-12
+### Added
+- [pull_request_labeler] Add ability to also add a comment about why the labels are changing [[#30](https://github.com/ManageIQ/multi_repo/pull/30)]
+- [pull_request_labeler] Add normalization of PR formats to org/repo#pr format [[#30](https://github.com/ManageIQ/multi_repo/pull/30)]
+- [pull_request_merger] Add URL support to pull_request_merger [[#37](https://github.com/ManageIQ/multi_repo/pull/37)]
+- [Git Service, GitHub service] Move helper methods into services [[#31](https://github.com/ManageIQ/multi_repo/pull/31)]
+- Add testing with ruby 3.2, 3.3 [[#35](https://github.com/ManageIQ/multi_repo/pull/35)]
+
+### Changed
+- [pull_request_labeler] Make add and remove optional [[#30](https://github.com/ManageIQ/multi_repo/pull/30)]
+
+### 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)]
+
 ## [0.4.0] - 2024-03-29
 ### Changed
 - Allow overriding the path for a repo [[#28](https://github.com/ManageIQ/multi_repo/pull/28)]
@@ -18,6 +40,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/more_core_extensions/compare/v0.4.0...HEAD
+[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

data/lib/multi_repo/service/git.rb

@@ -83,6 +83,17 @@ module MultiRepo::Service
       true
     end
 
+    def destroy_remote(remote)
+      if dry_run
+        puts "** dry-run: git remote rm #{remote}".light_black
+      else
+        client.remote("rm", remote)
+      end
+    rescue MiniGit::GitError
+      # Ignore missing remotes because we want them destroyed anyway
+      nil
+    end
+
     def remote_branch?(remote, branch)
       client.capturing.ls_remote(remote, branch).present?
     end

data/lib/multi_repo/service/github.rb

@@ -29,6 +29,13 @@ module MultiRepo::Service
         }.compact
 
         require 'octokit'
+
+        if ENV["DEBUG"]
+          middleware = Octokit.middleware.dup
+          middleware.response :logger
+          Octokit.middleware = middleware
+        end
+
         Octokit::Client.new(params)
       end
     end
@@ -83,6 +90,24 @@ module MultiRepo::Service
       client.workflows(repo_name)[:workflows].select { |w| w.state == "disabled_inactivity" }
     end
 
+    PR_REGEX = %r{^([^/#]+/[^/#]+)#(\d+)$}
+
+    # Parse a list of PRs that are in URL or org/repo#pr format into a Array of
+    # [repo_name, pr_number] entries.
+    def self.parse_prs(*prs)
+      prs.flatten.map do |pr|
+        # Normalize to org/repo#pr
+        normalized_pr = pr.sub("https://github.com/", "").sub("/pull/", "#")
+
+        if (match = PR_REGEX.match(normalized_pr))
+          repo_name, pr_number = match.captures
+          [repo_name, pr_number.to_i]
+        else
+          raise ArgumentError, "Invalid PR '#{pr}'. PR must be a GitHub URL or in org/repo#pr format."
+        end
+      end
+    end
+
     attr_reader :dry_run
 
     def initialize(dry_run: false)
@@ -138,6 +163,44 @@ module MultiRepo::Service
       end
     end
 
+    def add_labels_to_an_issue(repo_name, issue_number, labels)
+      labels = Array(labels)
+      if dry_run
+        puts "** dry-run: github.add_labels_to_an_issue(#{repo_name.inspect}, #{issue_number.inspect}, #{labels.inspect})".light_black
+      else
+        client.add_labels_to_an_issue(repo_name, issue_number, labels)
+      end
+    end
+
+    def remove_labels_from_an_issue(repo_name, issue_number, labels)
+      Array(labels).each do |label|
+        if dry_run
+          puts "** dry-run: github.remove_label(#{repo_name.inspect}, #{issue_number.inspect}, #{label.inspect})".light_black
+        else
+          client.remove_label(repo_name, issue_number, label)
+        end
+      rescue Octokit::NotFound
+        # Ignore labels that are not found, because we want them removed anyway
+      end
+    end
+
+    def add_comment(repo_name, issue_number, body)
+      if dry_run
+        puts "** dry-run: github.add_comment(#{repo_name.inspect}, #{issue_number.inspect}, #{body.pretty_inspect.chomp})".light_black
+      else
+        client.add_comment(repo_name, issue_number, body)
+      end
+    end
+
+    def assign_user(repo_name, issue_number, assignee)
+      assignee = assignee[1..] if assignee.start_with?("@")
+      if dry_run
+        puts "** dry-run: github.update_issue(#{repo_name.inspect}, #{issue_number.inspect}, \"assignee\" => #{assignee.inspect})".light_black
+      else
+        client.update_issue(repo_name, issue_number, "assignee" => assignee)
+      end
+    end
+
     def create_milestone(repo_name, title, due_on)
       if dry_run
         puts "** dry-run: github.create_milestone(#{repo_name.inspect}, #{title.inspect}, :due_on => #{due_on.strftime("%Y-%m-%d").inspect})".light_black
@@ -208,6 +271,14 @@ module MultiRepo::Service
       end
     end
 
+    def merge_pull_request(repo_name, pr_number)
+      if dry_run
+        puts "** dry-run: github.merge_pull_request(#{repo_name.inspect}, #{pr_number.inspect})".light_black
+      else
+        client.merge_pull_request(repo_name, pr_number)
+      end
+    end
+
     def create_or_update_repository_secret(repo_name, key, value)
       payload = encode_secret(repo_name, value)
 

data/lib/multi_repo/version.rb

@@ -1,3 +1,3 @@
 module MultiRepo
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.1".freeze
 end

data/multi_repo.gemspec

@@ -25,6 +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 "minigit"
   spec.add_runtime_dependency "more_core_extensions"

data/renovate.json

@@ -1,6 +1,5 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ]
+  "inheritConfig": true,
+  "inheritConfigRepoName": "manageiq/renovate-config"
 }

data/scripts/destroy_remote

@@ -20,9 +20,5 @@ MultiRepo::CLI.each_repo(**opts) do |repo|
     next
   end
 
-  if opts[:dry_run]
-    puts "** dry-run: git remote rm #{opts[:remote]}".light_black
-  else
-    repo.git.client.remote("rm", opts[:remote])
-  end
+  repo.git.destroy_remote(opts[:remote])
 end

data/scripts/pull_request_labeler

@@ -9,53 +9,32 @@ end
 opts = Optimist.options do
   synopsis "Add or remove labels on a set of pull requests."
 
-  opt :prs,    "The list of PRs to merge", :type => :strings, :required => true
-  opt :add,    "Labels to add",            :type => :strings, :required => true
-  opt :remove, "Labels to remove",         :type => :strings, :required => true
+  opt :prs,    "The list of PRs to label", :type => :strings, :required => true
+  opt :add,    "Labels to add",            :type => :strings
+  opt :remove, "Labels to remove",         :type => :strings
 
-  MultiRepo::CLI.common_options(self, :only => :dry_run)
-end
-
-# TODO: Normalize any PR format to `org/repo#pr`
-PR_REGEX = %r{^([^/#]+/[^/#]+)#([^/#]+)$}
-Optimist.die :prs, "must be in the form `org/repo#pr`" unless opts[:prs].all? { |pr| pr.match?(PR_REGEX) }
-
-def github
-  MultiRepo::Service::Github.client
-end
+  opt :comment, "Comment explaining the label change", :type => :string
 
-def add_labels(repo_name, pr_number, labels:, dry_run:, **_)
-  labels = Array(labels)
-  if dry_run
-    puts "** dry-run: github.add_labels_to_an_issue(#{repo_name.inspect}, #{pr_number.inspect}, #{labels.inspect})".light_black
-  else
-    github.add_labels_to_an_issue(repo_name, pr_number, labels)
-  end
+  MultiRepo::CLI.common_options(self, :only => :dry_run)
 end
 
-def remove_labels(repo_name, pr_number, labels:, dry_run:, **_)
-  Array(labels).each do |label|
-    remove_label(repo_name, pr_number, label: label, dry_run: dry_run)
-  end
-end
+Optimist.die "at least one of --add or --remove is required" unless opts[:add_given] || opts[:remove_given]
 
-def remove_label(repo_name, pr_number, label:, dry_run:, **_)
-  if dry_run
-    puts "** dry-run: github.remove_label(#{repo_name.inspect}, #{pr_number.inspect}, #{label.inspect})".light_black
-  else
-    github.remove_label(repo_name, pr_number, label)
+prs =
+  begin
+    MultiRepo::Service::Github.parse_prs(opts[:prs])
+  rescue ArgumentError => err
+    Optimist.die :prs, err.message
   end
-rescue Octokit::NotFound
-  # Ignore labels that are not found, because we want them removed anyway
-end
 
-opts[:prs].each do |pr|
-  puts MultiRepo::CLI.header(pr)
+github = MultiRepo::Service::Github.new(:dry_run => opts[:dry_run])
 
-  repo_name, pr_number = PR_REGEX.match(pr).captures
+prs.each do |repo_name, pr_number|
+  puts MultiRepo::CLI.header("#{repo_name}##{pr_number}")
 
-  add_labels(repo_name, pr_number, labels: opts[:add], **opts)
-  remove_labels(repo_name, pr_number, labels: opts[:remove], **opts)
+  github.add_labels_to_an_issue(repo_name, pr_number, opts[:add]) if opts[:add].present?
+  github.remove_labels_from_an_issue(repo_name, pr_number, opts[:remove]) if opts[:remove].present?
+  github.add_comment(repo_name, pr_number, opts[:comment]) if opts[:comment].present?
 
   puts
 end

data/scripts/pull_request_merger

@@ -16,50 +16,28 @@ opts = Optimist.options do
   MultiRepo::CLI.common_options(self)
 end
 
-# TODO: Normalize any PR format to `org/repo#pr`
-PR_REGEX = %r{^([^/#]+/[^/#]+)#([^/#]+)$}
-Optimist.die :prs, "must be in the form `org/repo#pr`" unless opts[:prs].all? { |pr| pr.match?(PR_REGEX) }
-
-def merge_pull_request(repo_name, pr_number, dry_run:, **_)
-  if dry_run
-    puts "** dry-run: github.merge_pull_request(#{repo_name.inspect}, #{pr_number.inspect})".light_black
-  else
-    begin
-      MultiRepo::Service::Github.client.merge_pull_request(repo_name, pr_number)
-    rescue Octokit::MethodNotAllowed => err
-      raise unless err.to_s.include?("Pull Request is not mergeable")
-
-      puts "** WARN: Pull Request is not mergeable"
-    end
+prs =
+  begin
+    MultiRepo::Service::Github.parse_prs(opts[:prs])
+  rescue ArgumentError => err
+    Optimist.die :prs, err.message
   end
-end
 
-def add_labels(repo_name, pr_number, labels:, dry_run:, **_)
-  labels = Array(labels)
-  if dry_run
-    puts "** dry-run: github.add_labels_to_an_issue(#{repo_name.inspect}, #{pr_number.inspect}, #{labels.inspect})".light_black
-  else
-    MultiRepo::Service::Github.client.add_labels_to_an_issue(repo_name, pr_number, labels)
-  end
-end
+github = MultiRepo::Service::Github.new(:dry_run => opts[:dry_run])
 
-def assign_user(repo_name, pr_number, assignee:, dry_run:, **_)
-  assignee = assignee[1..] if assignee.start_with?("@")
-  if dry_run
-    puts "** dry-run: github.update_issue(#{repo_name.inspect}, #{pr_number.inspect}, \"assignee\" => #{assignee.inspect})".light_black
-  else
-    MultiRepo::Service::Github.client.update_issue(repo_name, pr_number, "assignee" => assignee)
-  end
-end
+prs.each do |repo_name, pr_number|
+  puts MultiRepo::CLI.header("#{repo_name}##{pr_number}")
 
-opts[:prs].each do |pr|
-  puts MultiRepo::CLI.header(pr)
+  begin
+    github.merge_pull_request(repo_name, pr_number)
+  rescue Octokit::MethodNotAllowed => err
+    raise unless err.to_s.include?("Pull Request is not mergeable")
 
-  repo_name, pr_number = PR_REGEX.match(pr).captures
+    puts "** WARN: Pull Request is not mergeable".light_yellow
+  end
 
-  merge_pull_request(repo_name, pr_number, **opts)
-  add_labels(repo_name, pr_number, **opts) if opts[:labels].present?
-  assign_user(repo_name, pr_number, **opts)
+  github.add_labels_to_an_issue(repo_name, pr_number, opts[:labels]) if opts[:labels].present?
+  github.assign_user(repo_name, pr_number, opts[:assignee])
 
   puts
 end

data/scripts/show_commit_history

@@ -60,7 +60,12 @@ MultiRepo::CLI.repos_for(**opts).each do |repo|
     log.lines.each do |line|
       next unless (match = line.match(/Merge pull request #(\d+)\b/))
 
-      pr = github.pull_request(repo.name, match[1])
+      pr =
+        begin
+          github.pull_request(repo.name, match[1])
+        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
       label = pr.labels.detect { |l| results.key?(l.name) }&.name || "other"
       results[label] << pr
     end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: multi_repo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +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
@@ -345,7 +358,6 @@ homepage: http://github.com/ManageIQ/multi_repo
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -360,8 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: MultiRepo is a library for managing multiple repositiories and running scripts
   against them.