mass_git_clone 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41218ffbf93b188fad40acce7a6916da34d299f831ce964f341053174c13048f
-  data.tar.gz: da292b0875d3ba36998c7d4e578f48adb927c97d20075017a208e70b118e5e0e
+  metadata.gz: 2d99032cd4324bcebc8fc4ce8ab96286a842e025d6987f2bd01ce241972c5327
+  data.tar.gz: 273485ce6b054fee8c4eff9f8ff0c772ccff1d54067beec64662adbfdb3c336d
 SHA512:
-  metadata.gz: 0e5dc0d167ff609cb2e86db46ace0c064273238863ac555903f5eb400606b31e8fe1424d3d2b9ee5741aa297e2d37f20df1814117163abe3a95bf481ab07a33d
-  data.tar.gz: c85e4402435b2c2d0c35cce951c84be433d5f1285c43d4d9f8ebfac785d6680aeb66971403ffc2e3ebf3f190b8a60ad60a07daab2cf2b1adcd33cfc504ebc2fa
+  metadata.gz: 144bc9ddb230d9ef7c8f30500af417f3d9d50d7a02842b00f2957cf3e3216c37af63dbf1be857a3816641dfdc07fe1ae2a0b4c9cbc22f7ed6ed2dff801bd91b4
+  data.tar.gz: 59278b2564eb8b39289fc3ec6bd812ab3c0fdae59cc57084a2d7a085a568f7d9a71cc5addf55d75d4c5a4efc4d671f7b24521454b257f547971ab8bf4e52a2d4

data/.github/workflows/ci.yml

@@ -13,12 +13,10 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "2.7"
-          - "3.0"
-          - "3.1"
+          - "3.3"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
@@ -38,10 +36,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Release Gem
-        uses: discourse/publish-rubygems-action@v2
+        uses: discourse/publish-rubygems-action@v3
         env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
           GIT_EMAIL: team@discourse.org

data/.rubocop.yml

@@ -2,4 +2,7 @@ inherit_gem:
   rubocop-discourse: stree-compat.yml
 
 Discourse/NoChdir:
-  Enabled: false
+  Enabled: false
+
+Discourse/Plugins/NamespaceMethods:
+  Enabled: false

data/bin/mass_git_clone

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../lib/mass_git_clone'
-
+require_relative "../lib/mass_git_clone"
 
 if ARGV[0].nil? || ARGV.size > 1 || STDIN.tty?
   STDERR.puts "Usage `mass_git_clone <repo_base_directory>`. Pass newline-separated repo list via STDIN."

data/lib/mass_git_clone.rb

@@ -2,7 +2,6 @@
 
 require "fileutils"
 require "open3"
-require "set"
 require "parallel"
 
 def run(*args)
@@ -30,11 +29,12 @@ end
 # Clone or update a repo with the given URL
 # On failure, return the repo url
 # On success, return nil
-def update_repo(repo_url)
-  dir_name = File.basename(repo_url, ".git")
+def update_repo(repo_url, dir_name)
   if Dir.exist?(dir_name)
     prefixed_puts "Updating #{dir_name}..."
 
+    run "git", "-C", dir_name, "stash", "-u", "--quiet", "-m", "autostashed by mass_git_clone"
+
     run "git", "-C", dir_name, "remote", "set-url", "origin", repo_url
     run "git", "-C", dir_name, "remote", "set-head", "origin", "-a"
 
@@ -69,21 +69,28 @@ module MassGitClone
         false
       end
 
-    all_repos = repo_list.map(&:strip).filter { |l| l.length > 0 }
-    if all_repos.size === 0
-      prefixed_puts "No plugin URLs supplied"
+    all_entries = repo_list.map(&:strip).filter { |l| l.length > 0 }
+    if all_entries.size === 0
+      prefixed_puts "No git repository URLs supplied"
       exit 1
     end
 
-    all_repos =
-      all_repos.map do |repo|
-        if !repo.match?(%r{\A[\w-]+/[\w-]+\z})
-          repo # Full URL, leave untouched
-        elsif use_ssh
-          "git@github.com:#{repo}"
-        else
-          "https://github.com/#{repo}"
-        end
+    all_entries =
+      all_entries.map do |entry|
+        repo, dir_name = entry.split(" ")
+
+        repo_url =
+          if !repo.match?(%r{\A[\w-]+/[\w-]+\z})
+            repo # Full URL, leave untouched
+          elsif use_ssh
+            "git@github.com:#{repo}"
+          else
+            "https://github.com/#{repo}"
+          end
+
+        dir_name ||= File.basename(repo_url, ".git")
+
+        [repo_url, dir_name]
       end
 
     Dir.mkdir(repo_base_dir) if !Dir.exist?(repo_base_dir)
@@ -91,13 +98,13 @@ module MassGitClone
     Dir.chdir(repo_base_dir) do
       failures =
         Parallel
-          .map(all_repos, in_threads: ENV["PARALLEL"]&.to_i || 10) do |repo_url|
-            update_repo(repo_url)
+          .map(all_entries, in_threads: ENV["PARALLEL"]&.to_i || 10) do |repo_url, dir_name|
+            update_repo(repo_url, dir_name)
           end
           .reject(&:nil?)
 
       final_dirs = Dir.glob("*")
-      expected_dirs = Set.new(all_repos.map { |r| File.basename(r, ".git") })
+      expected_dirs = Set.new(all_entries.map { |_, dir_name| dir_name })
       to_delete = final_dirs.reject { |dir| expected_dirs.include?(dir) }
 
       if to_delete.any?

data/mass_git_clone.gemspec

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "mass_git_clone"
-  spec.version       = "0.1.1"
+  spec.version       = "0.3.0"
   spec.authors       = ["Discourse Team"]
 
   spec.summary       = %q{Tool for maintaining clones of a large number of git repositories}

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mass_git_clone
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Discourse Team
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -95,7 +94,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Tool for maintaining clones of a large number of git repositories
-email: 
 executables:
 - mass_git_clone
 extensions: []
@@ -116,7 +114,6 @@ homepage: https://github.com/discourse/mass_git_clone
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Tool for maintaining clones of a large number of git repositories
 test_files: []