multi_repo 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f35b21a8b627819ec3d5884167260ba7d3887d3766cf5ea14d93ec717e1faaf
-  data.tar.gz: 1c1ba25b23f728b5284cf5947b44527482ba1bd2967a7a3d3026b7ba2c3b145e
+  metadata.gz: b2f8e962cb396736c017c1dd641f20503dde65b5dadaf20d38bb98a1811d3f4c
+  data.tar.gz: da90a0d13d0e8c999e80a40979627470f64551d55b89f2a08b629040e07130ef
 SHA512:
-  metadata.gz: 6022d318abee6743deddfdf0bd3e33a421161682c9c9f5e5bade18049e2c0982cb46651a96d05c369334ae969bb9ec17dd4eeba776bea36e48964d9f5dc19d34
-  data.tar.gz: 21ce3ed99d97f4fc2538e9e31ea610ff65420fe2937ed77c3418bceaac63def8033e5104b7232612459a89a6f2099554a89cf09c5189ac2f2372d725c5c48056
+  metadata.gz: ffa32e47da1036891d73af604b0ddc1bd9f02d1ab053c1b84c6ba4604ca52ef6c842cb214636020ed1f79e2d6a4d50bc47ffdbd40e22e787a9e2eddce659284f
+  data.tar.gz: '055905a0eb895e8cfd4377d5f73018465911d3a3a72e88e052acae945619f000b05cfb8264a105b1fada75087c96343ea0aafe860221b37eaee995007418b77a'

data/README.md

@@ -4,7 +4,7 @@ MultiRepo is a tool for managing multiple git repositories.
 
 [![Gem Version](https://badge.fury.io/rb/multi_repo.svg)](http://badge.fury.io/rb/multi_repo)
 [![CI](https://github.com/ManageIQ/multi_repo/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/multi_repo/actions/workflows/ci.yaml)
-[![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/multi_repo.svg)](https://codeclimate.com/github/ManageIQ/multi_repo)
+[![Code Climate](https://codeclimate.com/github/ManageIQ/multi_repo.svg)](https://codeclimate.com/github/ManageIQ/multi_repo)
 
 ## Installation
 

data/lib/multi_repo/helpers/git_mirror.rb

@@ -164,7 +164,7 @@ module MultiRepo::Helpers
 
       success =
         system("git checkout -B #{dest_name} #{start_point}") &&
-        system("git pull --rebase=merges #{source_remote} #{source_name}") &&
+        system("git pull --no-rebase #{source_remote} #{source_name}") &&
         system("git push -f #{dest_remote} #{dest_name}")
 
       if backup_remote_defined?

data/lib/multi_repo/helpers/update_milestone.rb

@@ -15,18 +15,20 @@ 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, title, existing.number)
         end
       elsif existing
-        puts "Updating milestone #{title.inspect} (#{existing.number}) with due date #{due_on_str.inspect}"
-        github.update_milestone(repo.name, existing.number, due_on)
+        puts "Updating milestone #{title.inspect} (#{existing.number}) with due date #{due_on_str}"
+        github.update_milestone(repo_name, existing.number, due_on)
       else
-        puts "Creating milestone #{title.inspect} with due date #{due_on_str.inspect}"
-        github.create_milestone(repo.name, title, due_on)
+        puts "Creating milestone #{title.inspect} with due date #{due_on_str}"
+        github.create_milestone(repo_name, title, due_on)
       end
     end
   end

data/lib/multi_repo/service/docker.rb

@@ -44,14 +44,15 @@ module MultiRepo::Service
       exit($?.exitstatus) unless system?(command, **kwargs)
     end
 
-    attr_accessor :registry, :cache, :dry_run
+    attr_accessor :registry, :default_headers, :cache, :dry_run
 
-    def initialize(registry: self.class.registry, cache: true, dry_run: false)
+    def initialize(registry: self.class.registry, default_headers: nil, cache: true, dry_run: false)
       require "rest-client"
       require "fileutils"
       require "json"
 
       @registry = registry
+      @default_headers = default_headers
 
       @cache   = cache
       @dry_run = dry_run
@@ -135,6 +136,8 @@ module MultiRepo::Service
     def request(verb, path, body: nil, headers: {}, verbose: true)
       path = File.join(registry, path)
 
+      headers = default_headers.merge(headers) if default_headers
+
       if dry_run && %i[delete put post patch].include?(verb)
         puts "+ dry_run: #{verb.to_s.upcase} #{path}".light_black if verbose
         {}

data/lib/multi_repo/service/github.rb

@@ -71,12 +71,12 @@ module MultiRepo::Service
     end
 
     def self.team_ids_by_name(org)
-      @team_ids ||= {}
-      @team_ids[org] ||= client.org_teams(org).map { |t| [t.slug, t.id] }.sort.to_h
+      @team_ids_by_name ||= {}
+      @team_ids_by_name[org] ||= client.org_teams(org).map { |t| [t.slug, t.id] }.sort.to_h
     end
 
     def self.team_names(org)
-      team_ids(org).keys
+      team_ids_by_name(org).keys
     end
 
     def self.disabled_workflows(repo_name)

data/lib/multi_repo/version.rb

@@ -1,3 +1,3 @@
 module MultiRepo
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/scripts/make_alumni

@@ -14,7 +14,7 @@ opts = Optimist.options do
 end
 
 class MultiRepo::MakeAlumni
-  attr_reader :org, :dry_run
+  attr_reader :org, :dry_run, :github
 
   def initialize(org:, dry_run:, **_)
     @org     = org
@@ -23,13 +23,14 @@ class MultiRepo::MakeAlumni
   end
 
   def run(user)
-    progress = MultiRepo.progress_bar(teams.size + repos.size)
+    progress = MultiRepo::CLI.progress_bar(teams.size + repos.size)
 
     github.add_team_membership(org, "alumni", user)
     progress.increment
 
-    non_alumni_teams = github.team_names(org) - ["alumni"]
-    non_alumni_teams.each do |team|
+    teams.each do |team|
+      next if team == "alumni"
+
       github.remove_team_membership(org, team, user)
       progress.increment
     end
@@ -41,6 +42,16 @@ class MultiRepo::MakeAlumni
 
     progress.finish
   end
+
+  private
+
+  def teams
+    @teams ||= github.team_names(org)
+  end
+
+  def repos
+    @repos ||= github.client.org_repos(org).reject(&:archived?).map(&:full_name).sort
+  end
 end
 
 make_alumni = MultiRepo::MakeAlumni.new(**opts)

data/scripts/reenable_repo_workflows

@@ -11,7 +11,7 @@ opts = Optimist.options do
   opt :extra_repos, "Extra repos to reenable workflows in", :type => :strings, :default => []
 
   MultiRepo::CLI.common_options(self, :only => :dry_run)
-ende
+end
 
 github = MultiRepo::Service::Github.new(**opts.slice(:dry_run))
 
@@ -19,11 +19,11 @@ repos = (github.org_repo_names(opts[:org]) + opts[:extra_repos]).sort
 repos.each do |repo_name|
   puts MultiRepo::CLI.header(repo_name)
 
-  disabled_workflows = github.disabled_workflows
+  disabled_workflows = github.disabled_workflows(repo_name)
   if disabled_workflows.any?
     disabled_workflows.each do |w|
       puts "** Enabling #{w.html_url} (#{w.id})"
-      github.enable_workflow(github, repo_name, w.html_url, w.id)
+      github.enable_workflow(repo_name, w.id)
     end
   else
     puts "** No disabled workflows found"

data/scripts/update_milestone

@@ -14,7 +14,7 @@ opts = Optimist.options do
   MultiRepo::CLI.common_options(self)
 end
 Optimist.die(:due_on, "is required") if !opts[:close] && !opts[:due_on]
-Optimist.die(:due_on, "must be a date format") if opts[:due_on] && !MultiRepo::Service::GitHub.valid_milestone_date?(opts[:due_on])
+Optimist.die(:due_on, "must be a date format") if opts[:due_on] && !MultiRepo::Service::Github.valid_milestone_date?(opts[:due_on])
 
 MultiRepo::CLI.each_repo(**opts) do |repo|
   MultiRepo::Helpers::UpdateMilestone.new(repo.name, **opts).run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_repo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport