diff options
Diffstat (limited to 'lib/rubygems/dependency_installer.rb')
-rw-r--r-- | lib/rubygems/dependency_installer.rb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index 89ce9afe29..346208603c 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -66,7 +66,7 @@ class Gem::DependencyInstaller # :wrappers:: See Gem::Installer::new # :build_args:: See Gem::Installer::new - def initialize options = {} + def initialize(options = {}) @only_install_dir = !!options[:install_dir] @install_dir = options[:install_dir] || Gem.dir @build_root = options[:build_root] @@ -110,7 +110,7 @@ class Gem::DependencyInstaller #-- # TODO remove at RubyGems 4, no longer used - def add_found_dependencies to_do, dependency_list # :nodoc: + def add_found_dependencies(to_do, dependency_list) # :nodoc: seen = {} dependencies = Hash.new { |h, name| h[name] = Gem::Dependency.new name } @@ -164,8 +164,8 @@ class Gem::DependencyInstaller # Creates an AvailableSet to install from based on +dep_or_name+ and # +version+ - def available_set_for dep_or_name, version # :nodoc: - if String === dep_or_name then + def available_set_for(dep_or_name, version) # :nodoc: + if String === dep_or_name find_spec_by_name_and_version dep_or_name, version, @prerelease else dep = dep_or_name.dup @@ -198,7 +198,7 @@ class Gem::DependencyInstaller # sources. Gems are sorted with newer gems preferred over older gems, and # local gems preferred over remote gems. - def find_gems_with_sources dep, best_only=false # :nodoc: + def find_gems_with_sources(dep, best_only=false) # :nodoc: set = Gem::AvailableSet.new if consider_local? @@ -272,16 +272,16 @@ class Gem::DependencyInstaller # +version+. Returns an Array of specs and sources required for # installation of the gem. - def find_spec_by_name_and_version gem_name, + def find_spec_by_name_and_version(gem_name, version = Gem::Requirement.default, - prerelease = false + prerelease = false) set = Gem::AvailableSet.new if consider_local? - if gem_name =~ /\.gem$/ and File.file? gem_name then + if gem_name =~ /\.gem$/ and File.file? gem_name src = Gem::Source::SpecificFile.new(gem_name) set.add src.spec, src - elsif gem_name =~ /\.gem$/ then + elsif gem_name =~ /\.gem$/ Dir[gem_name].each do |name| begin src = Gem::Source::SpecificFile.new name @@ -341,7 +341,7 @@ class Gem::DependencyInstaller Gem::Specification.include?(spec) } - unless dependency_list.ok? or @ignore_dependencies or @force then + unless dependency_list.ok? or @ignore_dependencies or @force reason = dependency_list.why_not_ok?.map { |k,v| "#{k} requires #{v.join(", ")}" }.join("; ") @@ -352,7 +352,7 @@ class Gem::DependencyInstaller end deprecate :gather_dependencies, :none, 2018, 12 - def in_background what # :nodoc: + def in_background(what) # :nodoc: fork_happened = false if @build_docs_in_background and Process.respond_to?(:fork) begin @@ -381,7 +381,7 @@ class Gem::DependencyInstaller # c-1.a, b-1 and a-1.a will be installed. b-1.a will need to be installed # separately. - def install dep_or_name, version = Gem::Requirement.default + def install(dep_or_name, version = Gem::Requirement.default) request_set = resolve_dependencies dep_or_name, version @installed_gems = [] @@ -425,16 +425,16 @@ class Gem::DependencyInstaller end def install_development_deps # :nodoc: - if @development and @dev_shallow then + if @development and @dev_shallow :shallow - elsif @development then + elsif @development :all else :none end end - def resolve_dependencies dep_or_name, version # :nodoc: + def resolve_dependencies(dep_or_name, version) # :nodoc: request_set = Gem::RequestSet.new request_set.development = @development request_set.development_shallow = @dev_shallow @@ -446,11 +446,11 @@ class Gem::DependencyInstaller installer_set.ignore_installed = @only_install_dir if consider_local? - if dep_or_name =~ /\.gem$/ and File.file? dep_or_name then + if dep_or_name =~ /\.gem$/ and File.file? dep_or_name src = Gem::Source::SpecificFile.new dep_or_name installer_set.add_local dep_or_name, src.spec, src version = src.spec.version if version == Gem::Requirement.default - elsif dep_or_name =~ /\.gem$/ then + elsif dep_or_name =~ /\.gem$/ Dir[dep_or_name].each do |name| begin src = Gem::Source::SpecificFile.new name @@ -463,9 +463,9 @@ class Gem::DependencyInstaller end dependency = - if spec = installer_set.local?(dep_or_name) then + if spec = installer_set.local?(dep_or_name) Gem::Dependency.new spec.name, version - elsif String === dep_or_name then + elsif String === dep_or_name Gem::Dependency.new dep_or_name, version else dep_or_name @@ -479,7 +479,7 @@ class Gem::DependencyInstaller request_set.always_install = installer_set.always_install - if @ignore_dependencies then + if @ignore_dependencies installer_set.ignore_dependencies = true request_set.ignore_dependencies = true request_set.soft_missing = true |