rubygems-update 1.8.18 → 1.8.19

data/History.txt

@@ -1,5 +1,13 @@
 # coding: UTF-8
 
+=== 1.8.19 / 2012-03-14
+
+* 3 bug fixes:
+
+  * Handle loading psych vs syck properly. Fixes #298
+  * Make sure Date objects don't leak in via Marshal
+  * Perform Date => Time coercion on yaml loading. Fixes #266
+
 === 1.8.18 / 2012-03-11
 
 * 4 bug fixes:

data/lib/rubygems.rb

@@ -120,7 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.18'
+  VERSION = '1.8.19'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -649,22 +649,39 @@ module Gem
   def self.load_yaml
     return if @yaml_loaded
 
-    begin
-      gem 'psych', '~> 1.2', '>= 1.2.1' unless ENV['TEST_SYCK']
-    rescue Gem::LoadError
-      # It's OK if the user does not have the psych gem installed.  We will
-      # attempt to require the stdlib version
-    end
+    test_syck = ENV['TEST_SYCK']
 
-    begin
-      # Try requiring the gem version *or* stdlib version of psych.
-      require 'psych' unless ENV['TEST_SYCK']
-    rescue ::LoadError
-    ensure
-      require 'yaml'
+    unless test_syck
+      begin
+        gem 'psych', '~> 1.2', '>= 1.2.1'
+      rescue Gem::LoadError
+        # It's OK if the user does not have the psych gem installed.  We will
+        # attempt to require the stdlib version
+      end
+
+      begin
+        # Try requiring the gem version *or* stdlib version of psych.
+        require 'psych'
+      rescue ::LoadError
+        # If we can't load psych, thats fine, go on.
+      else
+        # If 'yaml' has already been required, then we have to
+        # be sure to switch it over to the newly loaded psych.
+        if defined?(YAML::ENGINE) && YAML::ENGINE.yamler != "psych"
+          YAML::ENGINE.yamler = "psych"
+        end
+
+        require 'rubygems/psych_tree'
+      end
     end
 
-    require 'rubygems/psych_tree'
+    require 'yaml'
+
+    # If we're supposed to be using syck, then we may have to force
+    # activate it via the YAML::ENGINE API.
+    if test_syck and defined?(YAML::ENGINE)
+      YAML::ENGINE.yamler = "syck" unless YAML::ENGINE.syck?
+    end
 
     # Now that we're sure some kind of yaml library is loaded, pull
     # in our hack to deal with Syck's DefaultKey ugliness.

data/lib/rubygems/commands/fetch_command.rb

@@ -61,9 +61,9 @@ class Gem::Commands::FetchCommand < Gem::Command
       file = "#{spec.full_name}.gem"
       remote_path = source_uri + "gems/#{file}"
 
-      f = Gem::RemoteFetcher.fetcher
+      fetch = Gem::RemoteFetcher.fetcher
 
-      gem = f.fetch_path remote_path
+      gem = fetch.fetch_path remote_path
 
       File.open file, "wb" do |f|
         f.write gem

data/lib/rubygems/psych_tree.rb

@@ -1,5 +1,5 @@
 module Gem
-  if defined? ::Psych
+  if defined? ::Psych::Visitors
     class NoAliasYAMLTree < Psych::Visitors::YAMLTree
       def visit_String(str)
         return super unless str == '=' # or whatever you want

data/lib/rubygems/specification.rb

@@ -670,7 +670,7 @@ class Gem::Specification
     # spec version
     spec.instance_variable_set :@name,                      array[2]
     spec.instance_variable_set :@version,                   array[3]
-    spec.instance_variable_set :@date,                      array[4]
+    spec.date =                                             array[4]
     spec.instance_variable_set :@summary,                   array[5]
     spec.instance_variable_set :@required_ruby_version,     array[6]
     spec.instance_variable_set :@required_rubygems_version, array[7]
@@ -1923,6 +1923,13 @@ class Gem::Specification
 
   def to_yaml(opts = {}) # :nodoc:
     if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
+      # Because the user can switch the YAML engine behind our
+      # back, we have to check again here to make sure that our
+      # psych code was properly loaded, and load it if not.
+      unless Gem.const_defined?(:NoAliasYAMLTree)
+        require 'rubygems/psych_tree'
+      end
+
       builder = Gem::NoAliasYAMLTree.new({})
       builder << self
       ast = builder.tree
@@ -2116,7 +2123,13 @@ class Gem::Specification
   # FIX: have this handle the platform/new_platform/original_platform bullshit
   def yaml_initialize(tag, vals) # :nodoc:
     vals.each do |ivar, val|
-      instance_variable_set "@#{ivar}", val
+      case ivar
+      when "date"
+        # Force Date to go through the extra coerce logic in date=
+        self.date = val.untaint
+      else
+        instance_variable_set "@#{ivar}", val.untaint
+      end
     end
 
     @original_platform = @platform # for backwards compatibility

data/test/rubygems/test_gem_specification.rb

@@ -233,6 +233,57 @@ bindir:
     refute_match %r%DefaultKey%, new_spec.to_ruby
   end
 
+  def test_self_from_yaml_cleans_up_Date_objects
+    yaml = <<-YAML
+--- !ruby/object:Gem::Specification
+rubygems_version: 0.8.1
+specification_version: 1
+name: diff-lcs
+version: !ruby/object:Gem::Version
+  version: 1.1.2
+date: 2004-10-20
+summary: Provides a list of changes that represent the difference between two sequenced collections.
+require_paths:
+  - lib
+author: Austin Ziegler
+email: diff-lcs@halostatue.ca
+homepage: http://rubyforge.org/projects/ruwiki/
+rubyforge_project: ruwiki
+description: "Test"
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement
+  requirements:
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  version:
+platform: ruby
+files:
+  - tests/00test.rb
+rdoc_options:
+  - "--title"
+  - "Diff::LCS -- A Diff Algorithm"
+  - "--main"
+  - README
+  - "--line-numbers"
+extra_rdoc_files:
+  - README
+  - ChangeLog
+  - Install
+executables:
+  - ldiff
+  - htmldiff
+extensions: []
+requirements: []
+dependencies: []
+    YAML
+
+    new_spec = Gem::Specification.from_yaml yaml
+
+    assert_kind_of Time, new_spec.date
+  end
 
   def test_self_load
     full_path = @a2.spec_file
@@ -1491,6 +1542,15 @@ end
     assert_equal Gem::Version.new('1'), @a1.version
   end
 
+  def test__load_fixes_Date_objects
+    spec = new_spec "a", 1
+    spec.instance_variable_set :@date, Date.today
+
+    spec = Marshal.load Marshal.dump(spec)
+
+    assert_kind_of Time, spec.date
+  end
+
   def test_load_errors_contain_filename
     specfile = Tempfile.new(self.class.name.downcase)
     specfile.write "raise 'boom'"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 8
-  - 18
-  version: 1.8.18
+  - 19
+  version: 1.8.19
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -25,13 +25,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 37
         segments: 
         - 2
         - 11
-        version: "2.11"
+        - 3
+        version: 2.11.3
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -133,11 +134,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 35
         segments: 
         - 2
-        - 14
-        version: "2.14"
+        - 16
+        version: "2.16"
   type: :development
   version_requirements: *id008
 description: |-
@@ -384,7 +385,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.18 Documentation
+- --title=RubyGems 1.8.19 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -410,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.15
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby