git-multirepo 78.0 → 79.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67bba471cade171734f7f9b6bdf68fc214d77d94117d91c4935d00db73547dde
-  data.tar.gz: 387d7fcd24da4d5d0880687987cd7728919b1dbbadfc2070fc59052a67624eec
+  metadata.gz: 2607f2a89a9e99220e469a8154c62e2e61b64d47c0c080568a002441a22b369f
+  data.tar.gz: 025b94d91a07f7bb469a119c4eca8212eaf49cc76efe6dd884b22f6077050378
 SHA512:
-  metadata.gz: d050eafad731d9f704975b8612364a2569152662fa9df35fea45bba821276435c841cae7f1ea81ea146c6ddd85f423b9ee4c9d78ef018ac844946e778af8c778
-  data.tar.gz: d384043a504f629792474fd179f91a162aa12637d5d4a25d5984f23654607a689c7c7d6f2d42644f6bc54b89882500ac2bb30c140d1d7aa2c3643d893040a530
+  metadata.gz: 86ee665305437643c2ba1931b76673bde8c40cb0f3c43f1a2229ff9543d9e9e3a18d03fe42c16c14e2408a2b919e35f44bbb598a243406b96815efc624d817b8
+  data.tar.gz: 942cccca638f978126046f539e43c698b4273a3c7bcc48a7b40cdf7d51f8e95233e93f712b873e3e22ec35b8e773dc9b963ca94026f9329522bd4314675f57a2

data/.gitignore

@@ -8,6 +8,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+/.tmp/
 
 ## Specific to RubyMotion:
 .dat*

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Releases
 
+## 79.0
+
+- **Breaking Change:** Require Ruby 3.4 or newer within Ruby 3. Install the gem into the Ruby 3 environment used by your terminal, Git GUI, and CI.
+- **Enhancement:** Update dependencies and development tooling for Ruby 3.
+- **Bug Fix:** Replace removed Ruby APIs and load existing YAML tracking files with explicitly permitted classes, preserving object tags and aliases.
+- **Bug Fix:** Show `multi add --help` and report missing paths without crashing.
+- **Bug Fix:** Support Unicode repository paths during dependency traversal.
+- **Bug Fix:** Populate the revision table printed by `multi install --ci`.
+- **Bug Fix:** Process shared dependencies before their dependents so tracking-file commits record the final dependency revisions.
+- **Bug Fix:** Discover dependencies from the current configuration during `multi update`, allowing stale lockfiles to be regenerated after adding, removing, or re-adding dependencies.
+
 ## 78.0
 
 The first official release! 🎉

data/Gemfile.lock

@@ -1,48 +1,68 @@
 PATH
   remote: .
   specs:
-    git-multirepo (1.0.0.beta74)
-      claide (~> 1.0.2)
+    git-multirepo (79.0)
+      claide (~> 1.1)
       colored (~> 1.2)
-      naturally (~> 2.2.0)
-      os (~> 1.0.0)
-      terminal-table (~> 1.8.0)
+      naturally (~> 2.3)
+      os (~> 1.1, >= 1.1.4)
+      terminal-table (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    claide (1.0.2)
+    claide (1.1.0)
     colored (1.2)
-    diff-lcs (1.3)
-    naturally (2.2.0)
-    os (1.0.1)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    diff-lcs (1.6.2)
+    naturally (2.3.0)
+    os (1.1.4)
+    rake (13.4.2)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.7)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.9)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.6.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.8)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    unicode-display_width (3.3.0)
+      unicode-emoji (~> 4.3)
+    unicode-emoji (4.3.0)
 
 PLATFORMS
   ruby
-  x64-mingw32
+  x64-mingw-ucrt
 
 DEPENDENCIES
-  bundler (~> 2.0.1)
+  bundler (~> 4.0, >= 4.0.24)
   git-multirepo!
-  rake (~> 12.3.2)
-  rspec (~> 3.8.0)
+  rake (~> 13.4, >= 13.4.2)
+  rspec (~> 3.13, >= 3.13.2)
+
+CHECKSUMS
+  bundler (4.0.24) sha256=16ca64e20816a0cf151a948fb141d788602996d2b4d73577b74388fe84fa98bc
+  claide (1.1.0) sha256=6d3c5c089dde904d96aa30e73306d0d4bd444b1accb9b3125ce14a3c0183f82e
+  colored (1.2) sha256=9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  git-multirepo (79.0)
+  naturally (2.3.0) sha256=459923cf76c2e6613048301742363200c3c7e4904c324097d54a67401e179e01
+  os (1.1.4) sha256=57816d6a334e7bd6aed048f4b0308226c5fb027433b67d90a9ab435f35108d3f
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.7) sha256=c64ff16d9788119805cbc6a3f4b6d87cc22417c2d25976a3330de136896b5469
+  rspec-expectations (3.13.6) sha256=bf538ca6d367ff5b0d85a87fdb5c0c6038f2cd1308a0eeba07476caa02d22f35
+  rspec-mocks (3.13.9) sha256=ea5c7ff3054a6098ca6039aacef80aec69d5a8a3ef80be8fc88337359b672a30
+  rspec-support (3.13.8) sha256=e4160030309b7e3e9d9863dfe720a35dfcc577162f5402cd68fc8c5258a0ffd6
+  terminal-table (4.0.0) sha256=f504793203f8251b2ea7c7068333053f0beeea26093ec9962e62ea79f94301d2
+  unicode-display_width (3.3.0) sha256=4b7aa66a4b11db50f6f7e98411215cd0dd10eaecb665d36eec5bcacb3fa0b613
+  unicode-emoji (4.3.0) sha256=11c02fa73290378c066bb0562cd4c87d8e1b706fbbe0059ca12746a4244de8ce
 
 BUNDLED WITH
-   2.0.2
+  4.0.24

data/README.md

@@ -8,23 +8,32 @@ Track multiple Git repositories side-by-side.
 
 An alternative approach to manage constantly evolving dependencies.
 
-Check out [the project's to-do list](https://www.pivotaltracker.com/n/projects/1256156) to get an idea of upcoming enhancements and read the [change log](https://github.com/fortinmike/git-multirepo/blob/master/CHANGELOG.md) for detailed information on git-multirepo releases.
+Check out [the project's to-do list](https://www.pivotaltracker.com/n/projects/1256156) to get an idea of upcoming enhancements and read the [change log](https://github.com/fortinmike/git-multirepo/blob/master/CHANGELOG.md) for detailed information on releases.
 
 You can download a handy cheat sheet [here](https://github.com/fortinmike/git-multirepo/raw/master/docs/git-multirepo-cheatsheet.docx).
 
 ## Installation
 
-git-multirepo is distributed as a Ruby Gem.
+git-multirepo is distributed as a Ruby Gem and requires Ruby 3.4 or newer within Ruby 3.
 
     $ gem install git-multirepo
 
 The `--pre` flag is necessary to install beta releases.
 
+Install the gem into the Ruby environment used by your terminal, Git GUI, and CI.
+The command and Git hooks select Ruby through `#!/usr/bin/env ruby`, so an installation
+under Ruby 2 is not available to Ruby 3. Existing hooks can keep using the same scripts,
+but their environment must select Ruby 3 with the gem installed.
+
 ## Development
 
-1. Install dependencies with `bundle install` (install the `bundler` gem beforehand if necessary)
-2. Run `rake install` to build and install the tool locally (`sudo` might be required based on how your Ruby was installed)
-3. Run it using the command `multi`
+1. Select Ruby 3.4 and install Bundler 4 with `gem install bundler` if necessary
+2. Install dependencies with `bundle install`
+3. Run `bundle exec rake install` to build and install the tool into that Ruby environment
+4. Run it using the command `multi`
+
+If you use Mise without making Ruby 3.4 your default, prefix these commands with
+`mise exec ruby@3.4 --`.
 
 ## Motivation
 

data/git-multirepo.gemspec

@@ -13,19 +13,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/fortinmike/git-multirepo"
   spec.license       = "MIT"
   
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '~> 3.4'
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
-  spec.add_development_dependency "rake", "~> 12.3.2"
-  spec.add_development_dependency "rspec", "~> 3.8.0"
+  spec.add_development_dependency "bundler", "~> 4.0", ">= 4.0.24"
+  spec.add_development_dependency "rake", "~> 13.4", ">= 13.4.2"
+  spec.add_development_dependency "rspec", "~> 3.13", ">= 3.13.2"
 
-  spec.add_runtime_dependency "claide", "~> 1.0.2"
+  spec.add_runtime_dependency "claide", "~> 1.1"
   spec.add_runtime_dependency "colored", "~> 1.2"
-  spec.add_runtime_dependency "os", "~> 1.0.0"
-  spec.add_runtime_dependency "terminal-table", "~> 1.8.0"
-  spec.add_runtime_dependency "naturally", "~> 2.2.0"
+  spec.add_runtime_dependency "os", "~> 1.1", ">= 1.1.4"
+  spec.add_runtime_dependency "terminal-table", "~> 4.0"
+  spec.add_runtime_dependency "naturally", "~> 2.3"
 end

data/lib/multirepo/commands/add-command.rb

@@ -11,7 +11,8 @@ module MultiRepo
     end
     
     def initialize(argv)
-      @path = with_trailing_slash(argv.shift_argument)
+      @path = argv.shift_argument
+      @path = with_trailing_slash(@path) if @path
       super
     end
     

data/lib/multirepo/commands/install-command.rb

@@ -150,7 +150,7 @@ module MultiRepo
       meta_file = MetaFile.new(".").load
       main_repo_branch = main_repo.current_branch
       
-      puts Terminal::Table.new do |t|
+      table = Terminal::Table.new do |t|
         t.title = "Revision Info"
         t.add_row ["Tracked Using", "git-multirepo #{meta_file.version}"]
         t.add_separator
@@ -161,6 +161,7 @@ module MultiRepo
           t.add_row [lock_entry.name, commit_info(lock_entry.head, branch_name)]
         end
       end
+      puts table
     end
 
     def commit_info(commit_id, branch_name)

data/lib/multirepo/commands/update-command.rb

@@ -1,6 +1,6 @@
 require "multirepo/utility/console"
 require "multirepo/utility/utils"
-require "multirepo/logic/performer"
+require "multirepo/logic/node"
 require "multirepo/logic/repo-selection"
 require "multirepo/files/tracking-files"
 require "multirepo/git/git-runner"
@@ -68,9 +68,10 @@ module MultiRepo
 
     def update_dependencies
       any_changed = false
-      Performer.depth_ordered_dependencies.each do |dependency|
-        path = dependency.config_entry.path
-        name = dependency.config_entry.name
+      # Discover dependencies from config while regenerating potentially stale locks
+      Node.new(".").ordered_descendants.each do |node|
+        path = node.path
+        name = node.name
         any_changed |= update_one(path, name) if Utils.multirepo_enabled?(path)
       end
       return any_changed

data/lib/multirepo/files/config-file.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "pathname"
+require "psych"
 
 require_relative "config-entry"
 
@@ -25,7 +26,8 @@ module MultiRepo
     
     def load_entries
       ensure_access(file, "Can't read config file (permissions)") { |stat| stat.readable? }
-      Psych.load(File.read(file))
+      # Preserve the object tags and aliases emitted by Psych.dump in existing files
+      Psych.safe_load(File.read(file), permitted_classes: [ConfigEntry], aliases: true)
     end
     
     def save_entries(entries)
@@ -46,7 +48,7 @@ module MultiRepo
     end
 
     def ensure_access(file, error_message, &check)
-      fail MultiRepoException, error_message if File.exists?(file) && !check.call(File.stat(file))
+      fail MultiRepoException, error_message if File.exist?(file) && !check.call(File.stat(file))
     end
   end
 end

data/lib/multirepo/files/lock-file.rb

@@ -27,7 +27,8 @@ module MultiRepo
     
     def load_entries
       ensure_access(file, "Can't read lock file (permissions)") { |stat| stat.readable? }
-      Psych.load(File.read(file))
+      # Preserve the object tags and aliases emitted by Psych.dump in existing files
+      Psych.safe_load(File.read(file), permitted_classes: [LockEntry], aliases: true)
     end
     
     def update
@@ -56,7 +57,7 @@ module MultiRepo
     end
 
     def ensure_access(file, error_message, &check)
-      fail MultiRepoException, error_message if File.exists?(file) && !check.call(File.stat(file))
+      fail MultiRepoException, error_message if File.exist?(file) && !check.call(File.stat(file))
     end
   end
 end

data/lib/multirepo/files/meta-file.rb

@@ -35,7 +35,8 @@ module MultiRepo
         
     def load
       ensure_access(file, "Can't read meta file (permissions)") { |stat| stat.readable? }
-      Psych.load(File.read(file))
+      # Preserve the object tags and aliases emitted by Psych.dump in existing files
+      Psych.safe_load(File.read(file), permitted_classes: [MetaFile], aliases: true)
     end
     
     def update
@@ -45,7 +46,7 @@ module MultiRepo
     end
 
     def ensure_access(file, error_message, &check)
-      fail MultiRepoException, error_message if File.exists?(file) && !check.call(File.stat(file))
+      fail MultiRepoException, error_message if File.exist?(file) && !check.call(File.stat(file))
     end
   end
 end

data/lib/multirepo/info.rb

@@ -1,5 +1,5 @@
 module MultiRepo
   NAME = "git-multirepo"
-  VERSION = "78.0"
+  VERSION = "79.0"
   DESCRIPTION = "Track multiple Git repositories side-by-side."
 end

data/lib/multirepo/logic/node.rb

@@ -33,7 +33,8 @@ module MultiRepo
       unique_paths = descendants.map(&:path).uniq
       unique_nodes = unique_paths.collect do |path|
         nodes_for_path = descendants.select { |d| d.path == path }
-        next nodes_for_path.sort_by(&:depth).first
+        # Keep the deepest occurrence so shared dependencies precede every dependent
+        next nodes_for_path.max_by(&:depth)
       end
       
       return unique_nodes.sort_by(&:depth).reverse

data/lib/multirepo/utility/utils.rb

@@ -1,14 +1,10 @@
 require "multirepo/multirepo-exception"
 require "fileutils"
-require "uri"
 
 module MultiRepo
   class Utils
     def self.standard_path(p)
-      path = URI.parse(p).path
-      path.insert(0, '/') if (path[0] != '/')
-      path.chomp!('/') if (path > '/')
-      path
+      File.expand_path(p)
     end
 
     def self.only_one_true?(*flags)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: '78.0'
+  version: '79.0'
 platform: ruby
 authors:
 - Michaël Fortin
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +15,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.24
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '13.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '13.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: '3.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.13.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +103,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: naturally
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
 description: Track multiple Git repositories side-by-side.
 email:
 - fortinmike@irradiated.net
@@ -208,7 +231,6 @@ homepage: https://github.com/fortinmike/git-multirepo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -216,15 +238,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Track multiple Git repositories side-by-side
 test_files: