diff options
| author | Vít Ondruch <[email protected]> | 2019-07-22 14:31:10 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2019-07-31 07:47:02 +0800 |
| commit | a3b784b3a068ddd9a395b8951e9977035eca5066 () | |
| tree | 1f88477341eacd8c4b00ae4704441511cc79d2d2 | |
| parent | d1806bd8da963c597ccd8c0b63ceac4dbe3ff3ae (diff) | |
[rubygems/rubygems] Move default specifications dir definition out of BasicSpecification.
This was never the right place. The method got there just by evolution, not by design. Move it within default methods, where it suits better. Since this method is presumably used just internally, it should be safe to deprecate it and remove later. https://.com/rubygems/rubygems/commit/0c0dd9458a
| -rw-r--r-- | lib/rubygems/basic_specification.rb | 11 | ||||
| -rw-r--r-- | lib/rubygems/commands/setup_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/defaults.rb | 7 | ||||
| -rw-r--r-- | lib/rubygems/installer.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/specification.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/uninstaller.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_setup_command.rb | 6 | ||||
| -rw-r--r-- | test/rubygems/test_gem_specification.rb | 6 |
8 files changed, 27 insertions, 13 deletions
@@ -35,7 +35,14 @@ class Gem::BasicSpecification end def self.default_specifications_dir - File.join(Gem.default_dir, "specifications", "default") end ## @@ -84,7 +91,7 @@ class Gem::BasicSpecification def default_gem? loaded_from && - File.dirname(loaded_from) == self.class.default_specifications_dir end ## @@ -382,7 +382,7 @@ By default, this RubyGems will install gem as: end def install_default_bundler_gem(bin_dir) - specs_dir = Gem::Specification.default_specifications_dir specs_dir = File.join(options[:destdir], specs_dir) unless Gem.win_platform? mkdir_p specs_dir, :mode => 0755 @@ -71,6 +71,13 @@ module Gem end ## # Path for gems in the user's home directory def self.user_dir @@ -448,7 +448,7 @@ class Gem::Installer # def default_spec_file - File.join Gem::Specification.default_specifications_dir, "#{spec.full_name}.gemspec" end ## @@ -819,7 +819,7 @@ class Gem::Specification < Gem::BasicSpecification def self.default_stubs(pattern = "*.gemspec") base_dir = Gem.default_dir gems_dir = File.join base_dir, "gems" - gemspec_stubs_in(default_specifications_dir, pattern) do |path| Gem::StubSpecification.default_gemspec_stub(path, base_dir, gems_dir) end end @@ -858,7 +858,7 @@ class Gem::Specification < Gem::BasicSpecification # Loads the default specifications. It should be called only once. def self.load_defaults - each_spec([default_specifications_dir]) do |spec| # #load returns nil if the spec is bad, so we just ignore # it at this stage Gem.register_default_spec(spec) @@ -80,7 +80,7 @@ class Gem::Uninstaller dirs = Gem::Specification.dirs + - [Gem::Specification.default_specifications_dir] Gem::Specification.each_spec dirs do |spec| next unless dependency.matches_spec? spec @@ -67,7 +67,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase io.puts gemspec.to_ruby end - open(File.join(Gem::Specification.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io| gemspec.version = "1.15.4" io.puts gemspec.to_ruby end @@ -181,7 +181,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase @cmd.install_default_bundler_gem bin_dir bundler_spec = Gem::Specification.load("bundler/bundler.gemspec") - default_spec_path = File.join(Gem::Specification.default_specifications_dir, "#{bundler_spec.full_name}.gemspec") spec = Gem::Specification.load(default_spec_path) spec.executables.each do |e| @@ -192,7 +192,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase assert_path_exists File.join bin_dir, Gem.default_exec_format % e end - default_dir = Gem::Specification.default_specifications_dir # expect to remove other versions of bundler gemspecs on default specification directory. refute_path_exists File.join(default_dir, "bundler-1.15.4.gemspec") @@ -1126,7 +1126,7 @@ dependencies: [] Gem::Specification.class_variable_set(:@@stubs, nil) dir_standard_specs = File.join Gem.dir, 'specifications' - dir_default_specs = Gem::BasicSpecification.default_specifications_dir # Create gemspecs in three locations used in stubs loaded_spec = Gem::Specification.new 'a', '3' @@ -1146,7 +1146,7 @@ dependencies: [] Gem::Specification.class_variable_set(:@@stubs, nil) dir_standard_specs = File.join Gem.dir, 'specifications' - dir_default_specs = Gem::BasicSpecification.default_specifications_dir # Create gemspecs in three locations used in stubs loaded_spec = Gem::Specification.new 'a', '3' @@ -2049,7 +2049,7 @@ dependencies: [] def test_base_dir_default default_dir = - File.join Gem::Specification.default_specifications_dir, @a1.spec_name @a1.instance_variable_set :@loaded_from, default_dir |