diff options
| -rw-r--r-- | lib/rubygems/basic_specification.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/dependency.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/dependency_installer.rb | 10 | ||||
| -rw-r--r-- | lib/rubygems/ext/builder.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/installer.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/specification.rb | 8 | ||||
| -rw-r--r-- | lib/rubygems/version.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_install_command.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_setup_command.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_signin_command.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_dependency_installer.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_resolver.rb | 4 |
12 files changed, 22 insertions, 22 deletions
@@ -206,8 +206,8 @@ class Gem::BasicSpecification def internal_init # :nodoc: @extension_dir = nil - @full_gem_path = nil - @gem_dir = nil @ignored = nil end @@ -140,7 +140,7 @@ class Gem::Dependency if defined?(@version_requirement) && @version_requirement version = @version_requirement.instance_variable_get :@version - @version_requirement = nil @version_requirements = Gem::Requirement.new version end @@ -266,7 +266,7 @@ class Gem::Dependency end default = Gem::Requirement.default - self_req = self.requirement other_req = other.requirement return self.class.new name, self_req if other_req == default @@ -88,14 +88,14 @@ class Gem::DependencyInstaller @wrappers = options[:wrappers] @build_args = options[:build_args] @build_docs_in_background = options[:build_docs_in_background] - @install_as_default = options[:install_as_default] - @dir_mode = options[:dir_mode] - @data_mode = options[:data_mode] - @prog_mode = options[:prog_mode] # Indicates that we should not try to update any deps unless # we absolutely must. - @minimal_deps = options[:minimal_deps] @available = nil @installed_gems = [] @@ -108,7 +108,7 @@ class Gem::Ext::Builder @build_args = build_args @gem_dir = spec.full_gem_path - @ran_rake = false end ## @@ -698,7 +698,7 @@ class Gem::Installer @development = options[:development] @build_root = options[:build_root] - @build_args = options[:build_args] || Gem::Command.build_args unless @build_root.nil? require 'pathname' @@ -190,8 +190,8 @@ class Gem::Specification < Gem::BasicSpecification # Sentinel object to represent "not found" stubs NOT_FOUND = Struct.new(:to_spec, :this).new # :nodoc: - @@spec_with_requirable_file = {} - @@active_stub_with_requirable_file = {} ###################################################################### # :section: Required gemspec attributes @@ -1230,8 +1230,8 @@ class Gem::Specification < Gem::BasicSpecification @@all = nil @@stubs = nil @@stubs_by_name = {} - @@spec_with_requirable_file = {} - @@active_stub_with_requirable_file = {} _clear_load_cache unresolved = unresolved_deps unless unresolved.empty? @@ -392,7 +392,7 @@ class Gem::Version def _split_segments string_start = _segments.index {|s| s.is_a?(String) } - string_segments = segments numeric_segments = string_segments.slice!(0, string_start || string_segments.size) return numeric_segments, string_segments end @@ -670,7 +670,7 @@ ERROR: Possible alternatives: non_existent_with_hint @cmd.options[:args] = [a2.name] - gemdir = File.join @gemhome, 'specifications' a2_gemspec = File.join(gemdir, "a-2.gemspec") a1_gemspec = File.join(gemdir, "a-1.gemspec") @@ -222,7 +222,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase lib_bundler = File.join lib, 'bundler' lib_rubygems_defaults = File.join lib_rubygems, 'defaults' - securerandom_rb = File.join lib, 'securerandom.rb' engine_defaults_rb = File.join lib_rubygems_defaults, 'jruby.rb' os_defaults_rb = File.join lib_rubygems_defaults, 'operating_system.rb' @@ -87,7 +87,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase fetcher.data[data_key] = response Gem::RemoteFetcher.fetcher = fetcher - sign_in_ui = ui_stub || Gem::MockGemUi.new("#{email}\n#{password}\n") use_ui sign_in_ui do yield @@ -32,7 +32,7 @@ class TestGemDependencyInstaller < Gem::TestCase @a1_pre, @a1_pre_gem = util_gem 'a', '1.a' - @b1, @b1_gem = util_gem 'b', '1' do |s| s.add_dependency 'a' s.add_development_dependency 'aa' end @@ -740,7 +740,7 @@ class TestGemResolver < Gem::TestCase def test_select_local_platforms r = Gem::Resolver.new nil, nil - a1 = util_spec 'a', 1 a1_p1 = util_spec 'a', 1 do |s| s.platform = Gem::Platform.local @@ -756,7 +756,7 @@ class TestGemResolver < Gem::TestCase end def test_search_for_local_platform_partial_string_match - a1 = util_spec 'a', 1 a1_p1 = util_spec 'a', 1 do |s| s.platform = Gem::Platform.local.os |