multi_repo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437c3e990a7e7feb750b0a2d65744d076bc496ce3de3560d25d25f4df8b335e9
-  data.tar.gz: 695fca5f0b5ac72a1b91130381be208202a0bfbfcb11f866a6ce7f98b867e478
+  metadata.gz: 313d72f8febb801872f9f65ade31381a3104b32a21d1628e8c56ee3186b78164
+  data.tar.gz: 1850ed479241b145ba84295dcfe0a0cde15bce8d28f81c2fb11df90e69349d40
 SHA512:
-  metadata.gz: fa5a942aabcf9a2ad1b04c594785992c9c553f58f7176d11d734707becbc09e02344dca9f0cba462e4a732e73b591e463f55f5dd9cd211bf5a6ed03bd9d6283b
-  data.tar.gz: c89faaec5c8931c84fac5a4706316723a6eeaa16160b1770a2f9e4dc457bddc821cd401487e8f76f90cb967f2dcade5e785dfabd1c8ac45f3e00605d141fd468
+  metadata.gz: 9e5ce408edfeab47540e55241c6508cc6d0d84be9e31cc9531ecf7136d44c2b8be3797c7a909128fa22a0ba67f864e485eac32f121c68bd5afba674d983845be
+  data.tar.gz: c178885fe71a1f399d25f661081cb7560bdaba988d9b4a4ac1ec0c4b207858c798f18b751da988c7aa864a6a1854af96d6de361b55530b37ac8069699e9241e8

data/.github/workflows/ci.yaml

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

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [0.3.1] - 2024-01-31
+### Fixed
+- [pull_request_blaster_outer] Various fixes and cleanup output [[#21](https://github.com/ManageIQ/multi_repo/pull/21)]
+- [show_commit_history] Prevent missing ranges from failing the entire run [[#22](https://github.com/ManageIQ/multi_repo/pull/22)]
+- [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.3.1...HEAD
+[0.3.1]: https://github.com/ManageIQ/more_core_extensions/compare/v0.3.0...v0.3.1

data/lib/multi_repo/helpers/pull_request_blaster_outer.rb

@@ -9,8 +9,7 @@ module MultiRepo::Helpers
       @base    = base
       @head    = head
       @script  = begin
-        s = Pathname.new(script)
-        s = Pathname.new(Dir.pwd).join(script) if s.relative?
+        s = Pathname.new(script).expand_path
         raise "File not found #{s}" unless s.exist?
         s.to_s
       end
@@ -20,12 +19,10 @@ module MultiRepo::Helpers
     end
 
     def blast
-      puts "+++ blasting #{repo.name}..."
-
       repo.git.fetch
 
       unless repo.git.remote_branch?("origin", base)
-        puts "!!! Skipping #{repo.name}: 'origin/#{base}' not found"
+        puts "!! Skipping #{repo.name}: 'origin/#{base}' not found".light_yellow
         return
       end
 
@@ -33,20 +30,31 @@ module MultiRepo::Helpers
       run_script
 
       result = false
-      if !commit_changes
-        puts "!!! Failed to commit changes. Perhaps the script is wrong or #{repo.name} is already updated."
-      elsif dry_run
-        result = "Committed but is dry run"
+      if !changes_found?
+        puts
+        puts "!! Skipping #{repo.name}: No changes found".light_yellow
+        result = "no changes".light_yellow
       else
-        puts "Do you want to open a pull request on #{repo.name} with the above changes? (Y/N)"
-        answer = $stdin.gets.chomp
-        if answer.upcase.start_with?("Y")
-          fork_repo unless forked?
-          push_branch
-          result = open_pull_request
+        commit_changes
+        show_commit
+        puts
+
+        if dry_run
+          puts "** dry-run: Skipping opening pull request".light_black
+          result = "dry run".light_black
+        else
+          print "Do you want to open a pull request on #{repo.name} with the above changes? (y/N): "
+          answer = $stdin.gets.chomp
+          if answer.upcase.start_with?("Y")
+            fork_repo unless forked?
+            push_branch
+            result = open_pull_request
+          else
+            puts "!! Skipping #{repo.name}: User ignored".light_yellow
+            result = "ignored".light_yellow
+          end
         end
       end
-      puts "--- blasting #{repo.name} complete"
       result
     end
 
@@ -57,7 +65,9 @@ module MultiRepo::Helpers
     end
 
     def forked?
-      github.client.repos(github.client.login).any? { |m| m.name == repo.name }
+      # 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 }
     end
 
     def fork_repo
@@ -70,41 +80,41 @@ module MultiRepo::Helpers
 
     def run_script
       repo.chdir do
-        parts = []
-        parts << "GITHUB_REPO=#{repo.name}"
-        parts << "DRY_RUN=true" if dry_run
-        parts << script
-        cmd = parts.join(" ")
-
-        unless system(cmd)
-          puts "!!! Script execution failed."
-          exit $?.exitstatus
+        Bundler.with_unbundled_env do
+          parts = []
+          parts << "GITHUB_REPO=#{repo.name}"
+          parts << "DRY_RUN=true" if dry_run
+          parts << script
+          cmd = parts.join(" ")
+
+          unless system(cmd)
+            puts "!! Script execution failed.".light_red
+            exit $?.exitstatus
+          end
         end
       end
     end
 
+    def changes_found?
+      repo.git.client.capturing.status("--porcelain").chomp.present?
+    end
+
     def commit_changes
-      repo.chdir do
-        begin
-          repo.git.client.add("-v", ".")
-          repo.git.client.commit("-m", message)
-          repo.git.client.show
-          if dry_run
-            puts "!!! --dry-run enabled: If the above commit in #{repo.path} looks good, run again without dry run to fork the repo, push the branch and open a pull request."
-          end
-          true
-        rescue MiniGit::GitError => e
-          e.status.exitstatus == 0
-        end
-      end
+      repo.git.client.add("-v", ".")
+      repo.git.client.commit("-m", message)
+    end
+
+    def show_commit
+      repo.git.client.show
     end
 
-    def origin_remote
+    def blast_remote
       "pr_blaster_outer"
     end
 
-    def origin_url
-      "git@github.com:#{github.client.login}/#{repo.name}.git"
+    def blast_remote_url
+      # NOTE: Similar to `forked?`, there is an assumption here that the fork's name will match the source's name.
+      "git@github.com:#{github.client.login}/#{repo.short_name}.git"
     end
 
     def pr_head
@@ -112,10 +122,8 @@ module MultiRepo::Helpers
     end
 
     def push_branch
-      repo.chdir do
-        repo.git.client.remote("add", origin_remote, origin_url) unless repo.git.remote?(origin_remote)
-        repo.git.client.push("-f", origin_remote, "#{head}:#{head}")
-      end
+      repo.git.client.remote("add", blast_remote, blast_remote_url) unless repo.git.remote?(blast_remote)
+      repo.git.client.push("-f", blast_remote, "#{head}:#{head}")
     end
 
     def open_pull_request
@@ -123,7 +131,7 @@ module MultiRepo::Helpers
       pr.html_url
     rescue => err
       raise unless err.message.include?("A pull request already exists")
-      puts "!!! Skipping.  #{err.message}"
+      puts "!! Skipping #{repo.name}: #{err.message}".light_yellow
     end
   end
 end

data/lib/multi_repo/version.rb

@@ -1,3 +1,3 @@
 module MultiRepo
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/scripts/pull_request_blaster_outer

@@ -4,7 +4,9 @@ require "bundler/inline"
 gemfile do
   source "https://rubygems.org"
   gem "multi_repo", require: "multi_repo/cli", path: File.expand_path("..", __dir__)
+  gem "more_core_extensions"
 end
+require "more_core_extensions/core_ext/array/tableize"
 
 opts = Optimist.options do
   synopsis "Create a pull request on all repos."
@@ -19,8 +21,11 @@ opts = Optimist.options do
 end
 
 results = {}
-MultiRepo::CLI.each_repo(**opts) do |repo|
-  results[repo.name] = MultiRepo::Helpers::PullRequestBlasterOuter.new(repo, **opts).blast
+begin
+  MultiRepo::CLI.each_repo(**opts) do |repo|
+    results[repo.name] = MultiRepo::Helpers::PullRequestBlasterOuter.new(repo, **opts).blast
+  end
+ensure
+  puts "Summary:"
+  puts results.to_a.tableize(:header => false) unless results.empty?
 end
-
-pp results

data/scripts/pull_request_merger

@@ -57,9 +57,9 @@ opts[:prs].each do |pr|
 
   repo_name, pr_number = PR_REGEX.match(pr).captures
 
-  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)
+  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)
 
   puts
 end

data/scripts/show_commit_history

@@ -48,7 +48,15 @@ MultiRepo::CLI.repos_for(**opts).each do |repo|
     end
     results["other"] = []
 
-    log = repo.git.client.capturing.log({:oneline => true}, range)
+    log =
+      begin
+        repo.git.client.capturing.log({:oneline => true}, range)
+      rescue MiniGit::GitError
+        puts "ERROR: commit range not found.".light_red
+        puts
+        next
+      end
+
     log.lines.each do |line|
       next unless (match = line.match(/Merge pull request #(\d+)\b/))
 
@@ -71,7 +79,15 @@ MultiRepo::CLI.repos_for(**opts).each do |repo|
 
     repos_with_changes << repo if changes_found
   when "commit"
-    output = repo.git.client.capturing.log({:oneline => true, :decorate => true, :graph => true}, range)
+    output =
+      begin
+        repo.git.client.capturing.log({:oneline => true, :decorate => true, :graph => true}, range)
+      rescue MiniGit::GitError
+        puts "ERROR: commit range not found.".light_red
+        puts
+        next
+      end
+
     puts output
     repos_with_changes << repo if output.present?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_repo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -279,6 +279,7 @@ files:
 - ".rubocop_cc.yml"
 - ".rubocop_local.yml"
 - ".whitesource"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md