multi_repo 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437c3e990a7e7feb750b0a2d65744d076bc496ce3de3560d25d25f4df8b335e9
-  data.tar.gz: 695fca5f0b5ac72a1b91130381be208202a0bfbfcb11f866a6ce7f98b867e478
+  metadata.gz: bc809429c529e0f58d2274708e0785944edf7170ce7aa23858fc88031bb593e1
+  data.tar.gz: 7d58ebc46fe2202b9e2e285e6a26fc4b4a40556181301a651994d41b9e4c1d5f
 SHA512:
-  metadata.gz: fa5a942aabcf9a2ad1b04c594785992c9c553f58f7176d11d734707becbc09e02344dca9f0cba462e4a732e73b591e463f55f5dd9cd211bf5a6ed03bd9d6283b
-  data.tar.gz: c89faaec5c8931c84fac5a4706316723a6eeaa16160b1770a2f9e4dc457bddc821cd401487e8f76f90cb967f2dcade5e785dfabd1c8ac45f3e00605d141fd468
+  metadata.gz: 4828418ee29894ce72fd5d2ab2e705b99854f1aa5ba26f321a0235bfa7c7eadf45a5aada881897aa5df16fb6f83cdd1968113af80e0163d2a13a9e4dd354ee2d
+  data.tar.gz: b4b2ed2d3c9677e658ad4c60ec615779882dee381bc5ed4b771602d56ca0a5b72ade124e140d50568a359c5e838d99ce3c51a8a475925a096d0582b7adc0cf9e

data/.codeclimate.yml

@@ -12,5 +12,5 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: rubocop-0-82
+    channel: rubocop-1-56-3
 version: '2'

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,23 @@
+# 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.4.0] - 2024-03-29
+### Changed
+- Allow overriding the path for a repo [[#28](https://github.com/ManageIQ/multi_repo/pull/28)]
+
+### Fixed
+- [update_milestone] Fix issue where a due date was required to close a milestone [[#24](https://github.com/ManageIQ/multi_repo/pull/24)]
+- [GitHub service] Use newer method for actions-secrets creation [[#27](https://github.com/ManageIQ/multi_repo/pull/27)]
+
+## [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 [[#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
+[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/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/helpers/update_milestone.rb

@@ -1,5 +1,3 @@
-
-
 module MultiRepo::Helpers
   class UpdateMilestone
     attr_reader :repo_name, :title, :due_on, :close, :github
@@ -15,15 +13,19 @@ module MultiRepo::Helpers
     end
 
     def run
-      due_on_str = due_on.strftime("%Y-%m-%d").inspect
-
       existing = github.find_milestone_by_title(repo_name, title)
+
       if close
         if existing
           puts "Closing milestone #{title.inspect} (#{existing.number})"
-          github.close_milestone(repo_name, title, existing.number)
+          github.close_milestone(repo_name, existing.number)
         end
-      elsif existing
+        return
+      end
+
+      due_on_str = due_on.strftime("%Y-%m-%d").inspect
+
+      if existing
         puts "Updating milestone #{title.inspect} (#{existing.number}) with due date #{due_on_str}"
         github.update_milestone(repo_name, existing.number, due_on)
       else

data/lib/multi_repo/repo.rb

@@ -5,11 +5,11 @@ module MultiRepo
     attr_reader :name, :config, :path
     attr_accessor :dry_run
 
-    def initialize(name, config: nil, dry_run: false)
+    def initialize(name, path: nil, config: nil, dry_run: false)
       @name    = name
       @dry_run = dry_run
       @config  = OpenStruct.new(config || {})
-      @path    = MultiRepo.repos_dir.join(name)
+      @path    = path || MultiRepo.repos_dir.join(name)
     end
 
     alias to_s inspect

data/lib/multi_repo/service/github.rb

@@ -212,17 +212,19 @@ module MultiRepo::Service
       payload = encode_secret(repo_name, value)
 
       if dry_run
-        puts "** dry-run: github.create_or_update_secret(#{repo_name.inspect}, #{key.inspect}, #{payload.inspect})".light_black
+        puts "** dry-run: github.create_or_update_actions_secret(#{repo_name.inspect}, #{key.inspect}, #{payload.inspect})".light_black
       else
-        client.create_or_update_secret(repo_name, key, payload)
+        client.create_or_update_actions_secret(repo_name, key, payload)
       end
     end
 
     private def encode_secret(repo_name, value)
+      raise ArgumentError, "value to encode cannot be nil" if value.nil?
+
       require "rbnacl"
       require "base64"
 
-      repo_public_key = client.get_public_key(repo_name)
+      repo_public_key = client.get_actions_public_key(repo_name)
       decoded_repo_public_key = Base64.decode64(repo_public_key.key)
       public_key = RbNaCl::PublicKey.new(decoded_repo_public_key)
       box = RbNaCl::Boxes::Sealed.from_public_key(public_key)

data/lib/multi_repo/version.rb

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

data/multi_repo.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "licensee"
   spec.add_runtime_dependency "minigit"
   spec.add_runtime_dependency "more_core_extensions"
-  spec.add_runtime_dependency "octokit", ">=4.23.0"
+  spec.add_runtime_dependency "octokit", ">= 7.0.0"
   spec.add_runtime_dependency "optimist"
   spec.add_runtime_dependency "progressbar"
   spec.add_runtime_dependency "psych", ">=3"

data/renovate.json

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

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.4.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.23.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.23.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +279,7 @@ files:
 - ".rubocop_cc.yml"
 - ".rubocop_local.yml"
 - ".whitesource"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -309,6 +310,7 @@ files:
 - lib/multi_repo/service/travis.rb
 - lib/multi_repo/version.rb
 - multi_repo.gemspec
+- renovate.json
 - repos/.gitkeep
 - scripts/delete_labels
 - scripts/destroy_branch
@@ -358,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: MultiRepo is a library for managing multiple repositiories and running scripts