* lib/rubygems: Update to RubyGems master ec8ed22. Notable changes

drbrain · drbrain · commit d6a5fe709ec4 · 2013-12-10T19:54:19.000Z
include:

  * Renamed extension_install_dir to extension_dir (backwards
    compatible).

  * Fixed creation of gem.deps.rb.lock file from
    TestGemRequestSet#test_install_from_gemdeps_install_dir

  * Fixed a typo and some documentation.

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+Wed Dec 11 04:54:03 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master ec8ed22.  Notable changes
+	  include:
+
+	  * Renamed extension_install_dir to extension_dir (backwards
+	    compatible).
+
+	  * Fixed creation of gem.deps.rb.lock file from
+	    TestGemRequestSet#test_install_from_gemdeps_install_dir
+
+	  * Fixed a typo and some documentation.
+
+	* test/rubygems:  ditto.
+
 Wed Dec 11 03:18:08 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* insns.def: Fix optimization bug of Float#/ [Bug #9238]
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
@@ -12,7 +12,7 @@ class Gem::BasicSpecification
   ##
   # Sets the directory where extensions for this gem will be installed.
 
-  attr_writer :extension_install_dir # :nodoc:
+  attr_writer :extension_dir # :nodoc:
 
   ##
   # The path this gemspec was loaded from.  This attribute is not persisted.
@@ -69,16 +69,10 @@ def default_gem?
   end
 
   ##
-  # The directory the named +extension+ was installed into after being built.
-  #
-  # Usage:
-  #
-  #   spec.extensions.each do |ext|
-  #     puts spec.extension_install_dir ext
-  #   end
+  # Returns full path to the directory where gem's extensions are installed.
 
-  def extension_install_dir
-    @extension_install_dir ||=
+  def extension_dir
+    @extension_dir ||=
       File.join base_dir, 'extensions', Gem::Platform.local.to_s,
                 Gem.extension_api_version, full_name
   end
@@ -123,7 +117,7 @@ def full_require_paths
       File.join full_gem_path, path
     end
 
-    full_paths.unshift extension_install_dir unless @extensions.empty?
+    full_paths.unshift extension_dir unless @extensions.empty?
 
     full_paths
   end
@@ -152,7 +146,7 @@ def gems_dir
   def loaded_from= path
     @loaded_from   = path && path.to_s
 
-    @extension_install_dir = nil
+    @extension_dir = nil
     @full_gem_path         = nil
     @gems_dir              = nil
     @base_dir              = nil
@@ -196,11 +190,11 @@ def raw_require_paths # :nodoc:
   def require_paths
     return @require_paths if @extensions.empty?
 
-    relative_extension_install_dir =
+    relative_extension_dir =
       File.join '..', '..', 'extensions', Gem::Platform.local.to_s,
                 Gem.extension_api_version, full_name
 
-    [relative_extension_install_dir].concat @require_paths
+    [relative_extension_dir].concat @require_paths
   end
 
   ##
diff --git a/lib/rubygems/commands/outdated_command.rb b/lib/rubygems/commands/outdated_command.rb
@@ -17,7 +17,7 @@ def initialize
 
   def description # :nodoc:
     <<-EOF
-The outdated command lists gems you way wish to upgrade to a newer version.
+The outdated command lists gems you may wish to upgrade to a newer version.
 
 You can check for dependency mismatches using the dependency command and
 update the gems with the update or install commands.
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
@@ -186,7 +186,7 @@ def build_extensions
       say "This could take a while..."
     end
 
-    dest_path = @spec.extension_install_dir
+    dest_path = @spec.extension_dir
 
     FileUtils.rm_f @spec.gem_build_complete_path
 
@@ -205,9 +205,9 @@ def build_extensions
   # Writes +output+ to gem_make.out in the extension install directory.
 
   def write_gem_make_out output # :nodoc:
-    destination = File.join @spec.extension_install_dir, 'gem_make.out'
+    destination = File.join @spec.extension_dir, 'gem_make.out'
 
-    FileUtils.mkdir_p @spec.extension_install_dir
+    FileUtils.mkdir_p @spec.extension_dir
 
     open destination, 'wb' do |io| io.puts output end
 
diff --git a/lib/rubygems/source/git.rb b/lib/rubygems/source/git.rb
@@ -191,7 +191,7 @@ def specs
             spec.loaded_from = loaded_from
             spec.base_dir = base_dir
 
-            spec.extension_install_dir =
+            spec.extension_dir =
               File.join base_dir, 'extensions', Gem::Platform.local.to_s,
                 Gem.extension_api_version, "#{name}-#{dir_shortref}"
 
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
@@ -1744,7 +1744,7 @@ def full_name
   # directory.
 
   def gem_build_complete_path # :nodoc:
-    File.join extension_install_dir, 'gem.build_complete'
+    File.join extension_dir, 'gem.build_complete'
   end
 
   ##
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
@@ -247,7 +247,7 @@ def remove(spec)
       File.writable?(spec.base_dir)
 
     FileUtils.rm_rf spec.full_gem_path
-    FileUtils.rm_rf spec.extension_install_dir
+    FileUtils.rm_rf spec.extension_dir
 
     old_platform_name = spec.original_name
     gemspec           = spec.spec_file
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
@@ -338,7 +338,7 @@ def test_self_ensure_gem_directories_write_protected_parents
     end
   end
 
-  def test_self_extension_install_dir_shared
+  def test_self_extension_dir_shared
     enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
       RbConfig::CONFIG['ENABLE_SHARED'], 'yes'
 
@@ -347,7 +347,7 @@ def test_self_extension_install_dir_shared
     RbConfig::CONFIG['ENABLE_SHARED'] = enable_shared
   end
 
-  def test_self_extension_install_dir_static
+  def test_self_extension_dir_static
     enable_shared, RbConfig::CONFIG['ENABLE_SHARED'] =
       RbConfig::CONFIG['ENABLE_SHARED'], 'no'
 
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
@@ -407,7 +407,7 @@ def test_install_dependency_existing_extension
     _, f1_gem = util_gem 'f', '1', 'e' => nil
 
     Gem::Installer.new(e1_gem).install
-    FileUtils.rm_r e1.extension_install_dir
+    FileUtils.rm_r e1.extension_dir
 
     FileUtils.mv e1_gem, @tempdir
     FileUtils.mv f1_gem, @tempdir
@@ -420,7 +420,7 @@ def test_install_dependency_existing_extension
 
     assert_equal %w[f-1], inst.installed_gems.map { |s| s.full_name }
 
-    assert_path_exists e1.extension_install_dir
+    assert_path_exists e1.extension_dir
   end
 
   def test_install_dependency_old
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb
@@ -124,10 +124,10 @@ def test_build_extensions
       @builder.build_extensions
     end
 
-    assert_path_exists @spec.extension_install_dir
+    assert_path_exists @spec.extension_dir
     assert_path_exists @spec.gem_build_complete_path
-    assert_path_exists File.join @spec.extension_install_dir, 'gem_make.out'
-    assert_path_exists File.join @spec.extension_install_dir, 'a.rb'
+    assert_path_exists File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_exists File.join @spec.extension_dir, 'a.rb'
     assert_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
     assert_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   end
@@ -140,11 +140,11 @@ def test_build_extensions_none
     assert_equal '', @ui.output
     assert_equal '', @ui.error
 
-    refute_path_exists File.join @spec.extension_install_dir, 'gem_make.out'
+    refute_path_exists File.join @spec.extension_dir, 'gem_make.out'
   end
 
   def test_build_extensions_rebuild_failure
-    FileUtils.mkdir_p @spec.extension_install_dir
+    FileUtils.mkdir_p @spec.extension_dir
     FileUtils.touch @spec.gem_build_complete_path
 
     @spec.extensions << nil
@@ -175,7 +175,7 @@ def test_build_extensions_extconf_bad
                  @ui.output
     assert_equal '', @ui.error
 
-    gem_make_out = File.join @spec.extension_install_dir, 'gem_make.out'
+    gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
 
     assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%,
                  File.read(gem_make_out)
@@ -187,7 +187,7 @@ def test_build_extensions_extconf_bad
 
   def test_build_extensions_unsupported
     FileUtils.mkdir_p @spec.gem_dir
-    gem_make_out = File.join @spec.extension_install_dir, 'gem_make.out'
+    gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
     @spec.extensions << nil
 
     e = assert_raises Gem::Ext::BuildError do
@@ -239,7 +239,7 @@ def test_build_extensions_with_build_args
     path = File.join @spec.gem_dir, "extconf_args"
 
     assert_equal args.inspect, File.read(path).strip
-    assert_path_exists @spec.extension_install_dir
+    assert_path_exists @spec.extension_dir
   end
 
   def test_initialize
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
@@ -937,7 +937,7 @@ def test_install_with_message
     assert_match %r|I am a shiny gem!|, @ui.output
   end
 
-  def test_install_extension_install_dir
+  def test_install_extension_dir
     gemhome2 = "#{@gemhome}2"
 
     @spec.extensions << "extconf.rb"
diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
@@ -72,18 +72,17 @@ def test_install_from_gemdeps_install_dir
     rs = Gem::RequestSet.new
     installed = []
 
-    Tempfile.open 'gem.deps.rb' do |io|
+    open 'gem.deps.rb', 'w' do |io|
       io.puts 'gem "a"'
-      io.flush
+    end
 
-      options = {
-        :gemdeps     => io.path,
-        :install_dir => "#{@gemhome}2",
-      }
+    options = {
+      :gemdeps     => 'gem.deps.rb',
+      :install_dir => "#{@gemhome}2",
+    }
 
-      rs.install_from_gemdeps options do |req, installer|
-        installed << req.full_name
-      end
+    rs.install_from_gemdeps options do |req, installer|
+      installed << req.full_name
     end
 
     assert_includes installed, 'a-2'
diff --git a/test/rubygems/test_gem_resolver_git_specification.rb b/test/rubygems/test_gem_resolver_git_specification.rb
@@ -77,7 +77,7 @@ def test_install_extension
 
     git_spec.install({})
 
-    assert_path_exists File.join git_spec.spec.extension_install_dir, 'b.rb'
+    assert_path_exists File.join git_spec.spec.extension_dir, 'b.rb'
   end
 
   def test_install_installed
diff --git a/test/rubygems/test_gem_source_git.rb b/test/rubygems/test_gem_source_git.rb
@@ -194,12 +194,12 @@ def test_specs
     assert_equal File.join(source.install_dir, 'a.gemspec'), a_spec.loaded_from
     assert_equal base_dir, a_spec.base_dir
 
-    extension_install_dir =
+    extension_dir =
       File.join Gem.dir, 'bundler', 'extensions',
         Gem::Platform.local.to_s, Gem.extension_api_version,
         "a-#{source.dir_shortref}"
 
-    assert_equal extension_install_dir, a_spec.extension_install_dir
+    assert_equal extension_dir, a_spec.extension_dir
 
     b_spec = specs.shift
 
@@ -208,7 +208,7 @@ def test_specs
                  b_spec.loaded_from
     assert_equal base_dir, b_spec.base_dir
 
-    assert_equal extension_install_dir, b_spec.extension_install_dir
+    assert_equal extension_dir, b_spec.extension_dir
   end
 
   def test_uri_hash
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
diff --git a/test/rubygems/test_gem_stub_specification.rb b/test/rubygems/test_gem_stub_specification.rb
diff --git a/test/rubygems/test_gem_uninstaller.rb b/test/rubygems/test_gem_uninstaller.rb
