multi_repo 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc3d56275cbe25e40cecabf411913805b1a83f59395ac0bf721b52130bc1795
-  data.tar.gz: b10b82500c86b84030488e687e86bfed2283b83de8911092211dae510c8eb22b
+  metadata.gz: a65fcbfd465cabf43b5382db582a7516ad14d37ddaccb9dde5de7522879bf28a
+  data.tar.gz: eebc43a34102d63149ec5ca32369576814ec9182b402c0e823178b7b4f4c90ea
 SHA512:
-  metadata.gz: 551aad598181333a741eeb5ab881642f8e455645acb9eea1870494c3f5ce83d5d7a2e7fcbfaf1fa797e652ac8a4c3513907b211db4c5d37560e229bb62c40064
-  data.tar.gz: 352099fa70f24b0bd5ecd5493fc7d62dd9ec3c2eb6cdad3b7dde9bef8803b69d1532e303dfe8e37b27a007f9b298a61b515437413e492b21e70eb0bf3eb25c83
+  metadata.gz: 51f252cfde3038b0cc51c8c254b45e9153d3e09ad535493b1a978e1dc7a3408d26aabbadf4f81fead3e7c93d2f9995c59f6d4eacd700736081a134e98e70ebdb
+  data.tar.gz: 1bdcbab162f091ea83e96db96a81252e866f8aa87a50b9f96ec64239d54b8f9805c676d8c02544ba0f3f031ae11d472d03bf831c00fc8628b16a8292ea2439c3

data/CHANGELOG.md

@@ -4,6 +4,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [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)]
+
 ## [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)]
@@ -40,8 +51,10 @@ 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.0.0...HEAD
+[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

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
+    attr_reader :repo, :base, :head, :script, :dry_run, :message, :title, :force
 
-    def initialize(repo, base:, head:, script:, dry_run:, message:, title: nil, **)
+    def initialize(repo, base:, head:, script:, dry_run:, message:, title: 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]
+      @force   = force
     end
 
     def blast
@@ -43,8 +44,14 @@ module MultiRepo::Helpers
           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
+          answer =
+            if force
+              "Y"
+            else
+              print "Do you want to open a pull request on #{repo.name} with the above changes? (y/N): "
+              $stdin.gets.chomp
+            end
+
           if answer.upcase.start_with?("Y")
             fork_repo unless forked?
             push_branch

data/lib/multi_repo/version.rb

@@ -1,3 +1,3 @@
 module MultiRepo
-  VERSION = "0.5.1".freeze
+  VERSION = "1.0.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,7 +25,6 @@ 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"
@@ -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

@@ -17,6 +17,8 @@ opts = Optimist.options do
   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 :force,   "Force creation of the pull request without asking.", :default => false
+
   MultiRepo::CLI.common_options(self)
 end
 

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_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,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_repo
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - ManageIQ Authors
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -51,20 +52,6 @@ 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
@@ -191,20 +178,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
@@ -225,14 +198,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
@@ -320,7 +293,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
@@ -358,6 +330,7 @@ homepage: http://github.com/ManageIQ/multi_repo
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -372,7 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.5.22
+signing_key:
 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