mirror of
https://github.com/ruby/ruby.git
synced 2026-01-28 13:04:22 +00:00
f88e797090
- Fix https://github.com/ruby/rubygems/pull/9186 - ### Problem Running `bundle pristine` in a Gemfile where there is many git gem pointing to the same repository will result in a error "Another git process seems to be running in this repository". ### Context This error is a regression since https://github.com/ruby/rubygems/commit/a555fd6ccd17 where `bundle pristine` now runs in parallel which could lead to running simultaneous git operations in the same repository. ### Solution When Bundler pristine a git gem it does a `git reset --hard` without specifying a path. This means the whole repository will be reset. In this case, we can leverage that by just pristining one gem per unique git sources. This is also more efficient. https://github.com/ruby/rubygems/commit/710ba514a8
65 lines
2.1 KiB
Ruby
65 lines
2.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Bundler
|
|
class CLI::Pristine
|
|
def initialize(gems)
|
|
@gems = gems
|
|
end
|
|
|
|
def run
|
|
CLI::Common.ensure_all_gems_in_lockfile!(@gems)
|
|
definition = Bundler.definition
|
|
definition.validate_runtime!
|
|
installer = Bundler::Installer.new(Bundler.root, definition)
|
|
git_sources = []
|
|
|
|
ProcessLock.lock do
|
|
installed_specs = definition.specs.reject do |spec|
|
|
next if spec.name == "bundler" # Source::Rubygems doesn't install bundler
|
|
next if !@gems.empty? && !@gems.include?(spec.name)
|
|
|
|
gem_name = "#{spec.name} (#{spec.version}#{spec.git_version})"
|
|
gem_name += " (#{spec.platform})" if !spec.platform.nil? && spec.platform != Gem::Platform::RUBY
|
|
|
|
case source = spec.source
|
|
when Source::Rubygems
|
|
cached_gem = spec.cache_file
|
|
unless File.exist?(cached_gem)
|
|
Bundler.ui.error("Failed to pristine #{gem_name}. Cached gem #{cached_gem} does not exist.")
|
|
next
|
|
end
|
|
|
|
FileUtils.rm_rf spec.full_gem_path
|
|
when Source::Git
|
|
if source.local?
|
|
Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.")
|
|
next
|
|
end
|
|
|
|
source.remote!
|
|
if extension_cache_path = source.extension_cache_path(spec)
|
|
FileUtils.rm_rf extension_cache_path
|
|
end
|
|
FileUtils.rm_rf spec.extension_dir
|
|
FileUtils.rm_rf spec.full_gem_path
|
|
|
|
next if git_sources.include?(source)
|
|
git_sources << source
|
|
else
|
|
Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
|
|
next
|
|
end
|
|
|
|
true
|
|
end.map(&:name)
|
|
|
|
jobs = installer.send(:installation_parallelization)
|
|
pristine_count = definition.specs.count - installed_specs.count
|
|
# allow a pristining a single gem to skip the parallel worker
|
|
jobs = [jobs, pristine_count].min
|
|
ParallelInstaller.call(installer, definition.specs, jobs, false, true, skip: installed_specs)
|
|
end
|
|
end
|
|
end
|
|
end
|