gem-repair 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7cc3c257647d2c9fc203ea0c429a4ff4962bdf333af226a103042777d636ef8
-  data.tar.gz: f3a0b102dc4b3c4c2de7ffd1f089eb34b8f0cb6edd09d0c1c5d203aa65865277
+  metadata.gz: de1546b65c1f9dd21344f01ffdb924dd21b1d1ad18a837645702b875f331c468
+  data.tar.gz: 20493791f64c066be2bd29303d7f846ef82d9837f0d271ad13226054f9642a73
 SHA512:
-  metadata.gz: b152ae8bab08597374d9c2d9fd078866e0e755d817bab48f4abae03de05baac0a0b561c45b08190524dca7eafdf00d8c4967c165dd755b9d7c71f8e64890f040
-  data.tar.gz: 9bacb491ae4cdf206828dabf9dfc0f261b49d32a804d3b299b77b7431bb4f37af24d227b1df367137a84d42e01fb8a312f8a819f56cf74c46a664741574c4d45
+  metadata.gz: ac1791aead1e4f8ad1ee21a824a99c0f7bf8d114ed1e12a030d951f3bdfc1bd44dde72e0b79c5958e5ede695a785f286fb47443480356e3cc030b0575d715ae7
+  data.tar.gz: 974848b02311245c9ae757046b3e2d12d4a6e059c562c0888c05d21a6170bd549ed31a0baa45227ca5835e443784792bc517facf62b0151e5022e6b4c0f0437e

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Hiroshi SHIBATA
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -44,7 +44,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/hsbt/hsbt. # TODO: Update if you have a different repo
+Bug reports and pull requests are welcome on GitHub at https://github.com/hsbt/gem-repare.
 
 ## License
 

data/lib/rubygems/commands/repair_command.rb

@@ -53,47 +53,60 @@ Use -j to specify the number of parallel threads (default: 4).
 
     say "Found #{specs.count} gem(s) to repair: #{specs.map(&:full_name).join(', ')}"
 
-    queue = Queue.new
-    specs.each { |spec| queue << spec }
-
-    threads = []
     # Get number of threads from -j option, default to 4
     num_threads = options[:jobs] || 4
+    # Running Gem::Installer in multiple threads deadlocks on old Rubies
+    # (fatal "No live threads left" on Ruby 2.3), so repair sequentially there.
+    num_threads = 1 if RUBY_VERSION < "2.6"
+
+    if num_threads > 1
+      say "Repairing gems using #{num_threads} parallel threads..."
 
-    say "Repairing gems using #{num_threads} parallel threads..."
-
-    num_threads.times do
-      threads << Thread.new do
-        while !queue.empty? && (spec = queue.pop(true) rescue nil)
-          begin
-            say "Repairing #{spec.full_name}..."
-            # Ensure spec.base_dir is correct and writable
-            # The installer might need specific options, ensure they are correctly set up
-            installer_options = {
-              wrappers: true,
-              force: true, # Reinstall even if it appears installed
-              install_dir: spec.base_dir, # Install into the same location
-              env_shebang: true,
-              build_args: spec.build_args,
-              # Add other options as needed, e.g., :user_install => false if installing to system gems
-              # ignore_dependencies: true # Usually good for a restore/pristine operation
-            }
-
-            # Use spec.cache_file if available and valid, otherwise the installer might re-download
-            # Forcing a specific installer might be needed if default behavior isn't right
-            installer = Gem::Installer.at(spec.cache_file, installer_options)
-            installer.install
-            say "Successfully repaired #{spec.full_name} to #{spec.base_dir}"
-          rescue Gem::Ext::BuildError, Gem::Package::FormatError, Gem::InstallError, Zlib::BufError, NameError => e
-            alert_error "Failed to repair #{spec.full_name}: #{e.message}\n  Backtrace: #{e.backtrace.join("\n             ")}"
-          rescue => e
-            alert_error "An unexpected error occurred while repairing #{spec.full_name}: #{e.message}\n  Backtrace: #{e.backtrace.join("\n             ")}"
+      queue = Queue.new
+      specs.each { |spec| queue << spec }
+
+      threads = num_threads.times.map do
+        Thread.new do
+          while (spec = (queue.pop(true) rescue nil))
+            repair_gem(spec)
           end
         end
       end
+
+      threads.each(&:join)
+    else
+      say "Repairing gems sequentially..."
+
+      specs.each { |spec| repair_gem(spec) }
     end
 
-    threads.each(&:join)
     say "Gem repair process complete."
   end
+
+  private
+
+  def repair_gem(spec)
+    say "Repairing #{spec.full_name}..."
+    # Ensure spec.base_dir is correct and writable
+    # The installer might need specific options, ensure they are correctly set up
+    installer_options = {
+      wrappers: true,
+      force: true, # Reinstall even if it appears installed
+      install_dir: spec.base_dir, # Install into the same location
+      env_shebang: true,
+      build_args: spec.build_args,
+      # Add other options as needed, e.g., :user_install => false if installing to system gems
+      # ignore_dependencies: true # Usually good for a restore/pristine operation
+    }
+
+    # Use spec.cache_file if available and valid, otherwise the installer might re-download
+    # Forcing a specific installer might be needed if default behavior isn't right
+    installer = Gem::Installer.at(spec.cache_file, installer_options)
+    installer.install
+    say "Successfully repaired #{spec.full_name} to #{spec.base_dir}"
+  rescue Gem::Ext::BuildError, Gem::Package::FormatError, Gem::InstallError, Zlib::BufError, NameError => e
+    alert_error "Failed to repair #{spec.full_name}: #{e.message}\n  Backtrace: #{e.backtrace.join("\n             ")}"
+  rescue => e
+    alert_error "An unexpected error occurred while repairing #{spec.full_name}: #{e.message}\n  Backtrace: #{e.backtrace.join("\n             ")}"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-repair
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Hiroshi SHIBATA
@@ -17,11 +17,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - lib/rubygems/commands/repair_command.rb
 - lib/rubygems_plugin.rb
 homepage: https://github.com/hsbt/gem-repair
-licenses: []
+licenses:
+- MIT
 metadata: {}
 rdoc_options: []
 require_paths: