rubygems-update 1.8.5 → 1.8.6

data/History.txt

@@ -1,4 +1,26 @@
-=== 1.8.5 / 2011-05-31
+=== 1.8.6 / 2011-07-25
+
+* 1 major enhancement:
+
+  * Restore behavior of Gem::Specification#loaded?  Ruby Bug #5032
+
+* 1 minor enhancement:
+
+  * Add autorequires and delay startup of RubyGems until require is called.
+    See Ruby bug #4962
+
+* 1 bug fix:
+
+  * Clean up SourceIndex.add_specs to not be so damn noisy. (tadman)
+  * Added missing APPLE_GEM_HOME in paths.
+  * Extend YAML::Syck::DefaultKey fixing to `marshal_dump` as well.
+  * Fix #29216: check correct bin_dir in check_that_user_bin_dir_is_in_path.
+  * Revert Gem.latest_load_paths to working order (PathSupport revert).
+  * Restore normalization of GEM_HOME.
+  * Handle the Syck DefaultKey problem once and for all.
+  * Fix SystemStackError occurring with "gem list -r -a" on 1.9.
+
+=== 1.8.5 / 2011-05-31
 
 * 2 minor enhancement:
 

data/lib/rubygems.rb

@@ -26,8 +26,6 @@ if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
 end
 
 require 'rubygems/defaults'
-require "rubygems/dependency_list"
-require 'rubygems/path_support'
 require 'rbconfig'
 require "rubygems/deprecate"
 
@@ -120,7 +118,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.5'
+  VERSION = '1.8.6'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -422,15 +420,15 @@ module Gem
   def self.each_load_path(partials)
     partials.each do |gp|
       base = File.basename gp
-      specfn = dir.specifications.add(base + ".gemspec")
-      if specfn.exist?
-        spec = eval(specfn.read)
+      specfn = File.join(dir, "specifications", "#{base}.gemspec")
+      if File.exists? specfn
+        spec = eval(File.read(specfn))
         spec.require_paths.each do |rp|
-          yield(gp.add(rp))
+          yield File.join(gp,rp)
         end
       else
-        filename = dir.add(gp, 'lib')
-        yield(filename) if filename.exist?
+        filename = File.join(gp, 'lib')
+        yield(filename) if File.exists? filename
       end
     end
   end
@@ -585,7 +583,7 @@ module Gem
 
     Gem.path.each do |gemdir|
       each_load_path(latest_partials(gemdir)) do |load_path|
-        result << gemdir.add(load_path).expand_path
+        result << load_path
       end
     end
 
@@ -640,10 +638,23 @@ module Gem
   # Loads YAML, preferring Psych
 
   def self.load_yaml
-    require 'psych'
-  rescue ::LoadError
-  ensure
-    require 'yaml'
+    begin
+      require 'psych'
+    rescue ::LoadError
+    ensure
+      require 'yaml'
+    end
+
+    # Hack to handle syck's DefaultKey bug with psych.
+    # See the note at the top of lib/rubygems/requirement.rb for
+    # why we end up defining DefaultKey more than once.
+    if !defined? YAML::Syck
+      YAML.module_eval do
+          const_set 'Syck', Module.new {
+            const_set 'DefaultKey', Class.new
+          }
+        end
+    end
   end
 
   ##
@@ -1136,11 +1147,13 @@ module Gem
   autoload :Version,         'rubygems/version'
   autoload :Requirement,     'rubygems/requirement'
   autoload :Dependency,      'rubygems/dependency'
+  autoload :DependencyList,  'rubygems/dependency_list'
   autoload :GemPathSearcher, 'rubygems/gem_path_searcher'
   autoload :SpecFetcher,     'rubygems/spec_fetcher'
   autoload :Specification,   'rubygems/specification'
   autoload :Cache,           'rubygems/source_index'
   autoload :SourceIndex,     'rubygems/source_index'
+  autoload :PathSupport,     'rubygems/path_support'
   autoload :Platform,        'rubygems/platform'
   autoload :Builder,         'rubygems/builder'
   autoload :ConfigFile,      'rubygems/config_file'
@@ -1232,8 +1245,6 @@ end
 
 require 'rubygems/custom_require'
 
-Gem.clear_paths
-
 module Gem
   class << self
     extend Deprecate

data/lib/rubygems/commands/server_command.rb

@@ -44,7 +44,7 @@ class Gem::Commands::ServerCommand < Gem::Command
       options[:addresses].push(*address)
     end
 
-    add_option '-l', '--launch[=COMMAND]', 
+    add_option '-l', '--launch[=COMMAND]',
                'launches a browser window',
                "COMMAND defaults to 'start' on Windows",
                "and 'open' on all other platforms" do |launch, options|

data/lib/rubygems/ext/builder.rb

@@ -13,7 +13,7 @@ class Gem::Ext::Builder
 
   def self.make(dest_path, results)
     unless File.exist? 'Makefile' then
-      raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}" 
+      raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}"
     end
 
     mf = File.read('Makefile')

data/lib/rubygems/installer.rb

@@ -433,7 +433,7 @@ class Gem::Installer
   end
 
   def check_that_user_bin_dir_is_in_path
-    user_bin_dir = File.join gem_home, "bin"
+    user_bin_dir = @bin_dir || Gem.bindir(gem_home)
     unless ENV['PATH'].split(File::PATH_SEPARATOR).include? user_bin_dir then
       unless self.class.path_warning then
         alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t  gem executables will not run."

data/lib/rubygems/package/tar_writer.rb

@@ -230,7 +230,7 @@ class Gem::Package::TarWriter
       name = newname
 
       if name.size > 100 or prefix.size > 155 then
-        raise Gem::Package::TooLongFileName 
+        raise Gem::Package::TooLongFileName
       end
     end
 

data/lib/rubygems/path_support.rb

@@ -22,6 +22,11 @@ class Gem::PathSupport
 
     # note 'env' vs 'ENV'...
     @home     = env["GEM_HOME"] || ENV["GEM_HOME"] || Gem.default_dir
+
+    if File::ALT_SEPARATOR then
+      @home   = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
+    end
+
     self.path = env["GEM_PATH"] || ENV["GEM_PATH"]
   end
 
@@ -62,8 +67,8 @@ class Gem::PathSupport
     else
       gem_path = Gem.default_path + [@home]
 
-      if defined?(Gem::APPLE_GEM_HOME)
-        gem_path << Gem::APPLE_GEM_HOME
+      if defined?(APPLE_GEM_HOME)
+        gem_path << APPLE_GEM_HOME
       end
     end
 

data/lib/rubygems/requirement.rb

@@ -1,5 +1,24 @@
 require "rubygems/version"
 
+# Hack to handle syck's DefaultKey bug with psych
+#
+# Quick note! If/when psych loads in 1.9, it will redefine
+# YAML to point to Psych by removing the YAML constant.
+# Thusly, over in Gem.load_yaml, we define DefaultKey again
+# after proper yaml library has been loaded.
+#
+# All this is so that there is always a YAML::Syck::DefaultKey
+# class no matter if the full yaml library has loaded or not.
+#
+module YAML
+  if !defined? Syck
+    module Syck
+      class DefaultKey
+      end
+    end
+  end
+end
+
 ##
 # A Requirement is a set of one or more version restrictions. It supports a
 # few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
@@ -110,11 +129,15 @@ class Gem::Requirement
   end
 
   def marshal_dump # :nodoc:
+    fix_syck_default_key_in_requirements
+
     [@requirements]
   end
 
   def marshal_load array # :nodoc:
     @requirements = array[0]
+
+    fix_syck_default_key_in_requirements
   end
 
   def prerelease?
@@ -154,6 +177,17 @@ class Gem::Requirement
   def <=> other # :nodoc:
     to_s <=> other.to_s
   end
+
+  private
+
+  def fix_syck_default_key_in_requirements
+    # Fixup the Syck DefaultKey bug
+    @requirements.each do |r|
+      if r[0].kind_of? YAML::Syck::DefaultKey
+        r[0] = "="
+      end
+    end
+  end
 end
 
 # :stopdoc:

data/lib/rubygems/source_index.rb

@@ -193,8 +193,10 @@ class Gem::SourceIndex
   # Add gem specifications to the source index.
 
   def add_specs(*gem_specs)
-    gem_specs.each do |spec|
-      add_spec spec
+    Deprecate.skip_during do
+      gem_specs.each do |spec|
+        add_spec spec
+      end
     end
   end
 

data/lib/rubygems/spec_fetcher.rb

@@ -167,7 +167,7 @@ class Gem::SpecFetcher
 
     found.each do |source_uri, specs|
       uri_str = source_uri.to_s
-      specs_and_sources.push(*specs.map { |spec| [spec, uri_str] })
+      specs_and_sources.concat(specs.map { |spec| [spec, uri_str] })
     end
 
     [specs_and_sources, errors]

data/lib/rubygems/specification.rb

@@ -213,9 +213,9 @@ class Gem::Specification
   ##
   # True when this gemspec has been activated. This attribute is not persisted.
 
-  attr_accessor :loaded
+  attr_accessor :loaded # :nodoc:
 
-  alias :loaded? :loaded
+  alias :loaded? :loaded # :nodoc:
 
   ##
   # True when this gemspec has been activated. This attribute is not persisted.
@@ -683,6 +683,7 @@ class Gem::Specification
     spec.instance_variable_set :@platform,                  array[16].to_s
     spec.instance_variable_set :@license,                   array[17]
     spec.instance_variable_set :@loaded,                    false
+    spec.instance_variable_set :@activated,                 false
 
     spec
   end
@@ -742,7 +743,8 @@ class Gem::Specification
     add_self_to_load_path
 
     Gem.loaded_specs[self.name] = self
-    self.activated = true
+    @activated = true
+    @loaded = true
 
     return true
   end
@@ -1318,6 +1320,7 @@ class Gem::Specification
 
   def initialize name = nil, version = nil
     @loaded = false
+    @activated = false
     @loaded_from = nil
     @original_platform = nil
 
@@ -2120,3 +2123,6 @@ class Gem::Specification
   # deprecate :file_name,           :cache_file, 2011, 10
   # deprecate :full_gem_path,     :cache_file, 2011, 10
 end
+
+Gem.clear_paths
+

data/test/rubygems/test_gem.rb

@@ -712,7 +712,7 @@ class TestGem < Gem::TestCase
   def test_self_path_default
     util_path
 
-    if defined? APPLE_GEM_HOME
+    if defined?(APPLE_GEM_HOME)
       orig_APPLE_GEM_HOME = APPLE_GEM_HOME
       Object.send :remove_const, :APPLE_GEM_HOME
     end
@@ -721,7 +721,7 @@ class TestGem < Gem::TestCase
 
     assert_equal [Gem.default_path, Gem.dir].flatten.uniq, Gem.path
   ensure
-    Object.const_set :APPLE_GEM_HOME, orig_APPLE_GEM_HOME
+    Object.const_set :APPLE_GEM_HOME, orig_APPLE_GEM_HOME if orig_APPLE_GEM_HOME
   end
 
   unless win_platform?
@@ -730,11 +730,14 @@ class TestGem < Gem::TestCase
 
       Gem.clear_paths
       apple_gem_home = File.join @tempdir, 'apple_gem_home'
-      Gem.const_set :APPLE_GEM_HOME, apple_gem_home
+
+      old, $-w = $-w, nil
+      Object.const_set :APPLE_GEM_HOME, apple_gem_home
+      $-w = old
 
       assert_includes Gem.path, apple_gem_home
     ensure
-      Gem.send :remove_const, :APPLE_GEM_HOME
+      Object.send :remove_const, :APPLE_GEM_HOME
     end
 
     def test_self_path_APPLE_GEM_HOME_GEM_PATH
@@ -1070,6 +1073,23 @@ class TestGem < Gem::TestCase
     assert_equal :loaded, TEST_PLUGIN_EXCEPTION rescue nil
   end
 
+  def test_latest_load_paths
+    spec = quick_spec 'a', '4' do |s|
+      s.require_paths = ["lib"]
+    end
+
+    install_gem spec
+
+    # @exec_path = File.join spec.full_gem_path, spec.bindir, 'exec'
+    # @abin_path = File.join spec.full_gem_path, spec.bindir, 'abin'
+    # FileUtils.mkdir_p File.join(stem, "gems", "test-3")
+
+    Deprecate.skip_during do
+      expected = [File.join(@gemhome, "gems", "a-4", "lib")]
+      assert_equal expected, Gem.latest_load_paths
+    end
+  end
+
   def with_plugin(path)
     test_plugin_path = File.expand_path("test/rubygems/plugin/#{path}",
                                         @@project_dir)

data/test/rubygems/test_gem_installer.rb

@@ -207,6 +207,24 @@ load Gem.bin_path('a', 'executable', version)
     assert_match %r|generated by RubyGems|, wrapper
   end
 
+  def test_generate_bin_bindir_with_user_install_warning
+
+    options = {
+      :bin_dir => "/usr/bin",
+      :install_dir => "/non/existant"
+    }
+
+    inst = Gem::Installer.new nil, options
+
+    Gem::Installer.path_warning = false
+
+    use_ui @ui do
+      inst.check_that_user_bin_dir_is_in_path
+    end
+
+    assert_equal "", @ui.error
+  end
+
   def test_generate_bin_script
     @installer.wrappers = true
     util_make_exec

data/test/rubygems/test_gem_path_support.rb

@@ -28,6 +28,15 @@ class TestGemPathSupport < Gem::TestCase
     assert_equal expected, ps.path
   end
 
+  if defined?(File::ALT_SEPARATOR) and File::ALT_SEPARATOR
+    def test_initialize_home_normalize
+      alternate = @tempdir.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+      ps = Gem::PathSupport.new "GEM_HOME" => alternate
+
+      assert_equal @tempdir, ps.home, "normalize values"
+    end
+  end
+
   def test_initialize_path
     ps = Gem::PathSupport.new "GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar]
 

data/test/rubygems/test_gem_specification.rb

@@ -319,6 +319,16 @@ end
     assert_equal 'old_platform', same_spec.original_platform
   end
 
+  def test_activate
+    @a2.activate
+
+    assert @a2.activated?
+
+    Deprecate.skip_during do
+      assert @a2.loaded?
+    end
+  end
+
   def test_add_dependency_with_explicit_type
     gem = quick_spec "awesome", "1.0" do |awesome|
       awesome.add_development_dependency "monkey"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 1
   - 8
-  - 5
-  version: 1.8.5
+  - 6
+  version: 1.8.6
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -07:00
-default_executable: 
+date: 2011-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -379,7 +378,6 @@ files:
 - util/CL2notes
 - util/gem_prelude.rb
 - .gemtest
-has_rdoc: true
 homepage: http://rubygems.org
 licenses: []
 
@@ -387,7 +385,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.5 Documentation
+- --title=RubyGems 1.8.6 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -413,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.4.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby