rubygems-update 1.8.11 → 1.8.12

data/History.txt

@@ -1,5 +1,11 @@
 # coding: UTF-8
 
+=== 1.8.12 / 2011-12-02
+
+* Bug fix:
+  * Handle more cases where Syck's DefaultKey showed up in requirements
+    and wasn't cleaned out.
+
 === 1.8.11 / 2011-10-03
 
 * Bug fix:

data/Manifest.txt

@@ -94,6 +94,7 @@ lib/rubygems/server.rb
 lib/rubygems/source_index.rb
 lib/rubygems/spec_fetcher.rb
 lib/rubygems/specification.rb
+lib/rubygems/syck_hack.rb
 lib/rubygems/test_case.rb
 lib/rubygems/test_utilities.rb
 lib/rubygems/text.rb

data/lib/rubygems.rb

@@ -118,7 +118,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.11'
+  VERSION = '1.8.12'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -658,16 +658,9 @@ module Gem
       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
+    # Now that we're sure some kind of yaml library is loaded, pull
+    # in our hack to deal with Syck's DefaultKey ugliness.
+    require 'rubygems/syck_hack'
   end
 
   ##

data/lib/rubygems/format.rb

@@ -28,7 +28,7 @@ class Gem::Format
   # representing the data in the gem
 
   def self.from_file_by_path(file_path, security_policy = nil)
-    unless File.exist?(file_path)
+    unless File.file?(file_path)
       raise Gem::Exception, "Cannot load gem at [#{file_path}] in #{Dir.pwd}"
     end
 

data/lib/rubygems/requirement.rb

@@ -1,31 +1,5 @@
 require "rubygems/version"
 
-# :stopdoc:
-
-# 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
-        def to_s
-          '='
-        end
-      end
-    end
-  end
-end
-
-# :startdoc:
-
 ##
 # A Requirement is a set of one or more version restrictions. It supports a
 # few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
@@ -147,6 +121,18 @@ class Gem::Requirement
     fix_syck_default_key_in_requirements
   end
 
+  def yaml_initialize(tag, vals) # :nodoc:
+    vals.each do |ivar, val|
+      instance_variable_set "@#{ivar}", val
+    end
+
+    fix_syck_default_key_in_requirements
+  end
+
+  def init_with coder # :nodoc:
+    yaml_initialize coder.tag, coder.map
+  end
+
   def prerelease?
     requirements.any? { |r| r.last.prerelease? }
   end
@@ -190,7 +176,7 @@ class Gem::Requirement
   def fix_syck_default_key_in_requirements
     # Fixup the Syck DefaultKey bug
     @requirements.each do |r|
-      if r[0].kind_of? YAML::Syck::DefaultKey
+      if r[0].kind_of? Gem::SyckDefaultKey
         r[0] = "="
       end
     end

data/lib/rubygems/syck_hack.rb

@@ -0,0 +1,61 @@
+# :stopdoc:
+
+# Hack to handle syck's DefaultKey bug
+#
+# This file is always loaded AFTER either syck or psych are already
+# loaded. It then looks at what constants are available and creates
+# a consistent view on all rubys.
+#
+# 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
+  # In newer 1.9.2, there is a Syck toplevel constant instead of it
+  # being underneith YAML. If so, reference it back under YAML as
+  # well.
+  if defined? ::Syck
+    Syck = ::Syck
+
+  # Otherwise, if there is no YAML::Syck, then we've got just psych
+  # loaded, so lets define a stub for DefaultKey.
+  elsif !defined? YAML::Syck
+    module Syck
+      class DefaultKey
+      end
+    end
+  end
+
+  # Now that we've got something that is always here, define #to_s
+  # so when code tries to use this, it at least just shows up like it
+  # should.
+  module Syck
+    class DefaultKey
+      def to_s
+        '='
+      end
+    end
+  end
+end
+
+# Sometime in the 1.9 dev cycle, the Syck constant was moved from under YAML
+# to be a toplevel constant. So gemspecs created under these versions of Syck
+# will have references to Syck::DefaultKey.
+#
+# So we need to be sure that we reference Syck at the toplevel too so that
+# we can always load these kind of gemspecs.
+#
+if !defined?(Syck)
+  Syck = YAML::Syck
+end
+
+# Now that we've got Syck setup in all the right places, store
+# a reference to the DefaultKey class inside Gem. We do this so that
+# if later on YAML, etc are redefined, we've still got a consistent
+# place to find the DefaultKey class for comparison.
+
+module Gem
+  SyckDefaultKey = YAML::Syck::DefaultKey
+end
+
+# :startdoc:

data/test/rubygems/test_gem_format.rb

@@ -57,7 +57,7 @@ class TestGemFormat < Gem::Package::TarTestCase
 
   def test_class_from_file_by_path_nonexistent
     assert_raises Gem::Exception do
-      Gem::Format.from_file_by_path '/nonexistent'
+      Gem::Format.from_file_by_path '/a/path/that/is/nonexistent'
     end
   end
 

data/test/rubygems/test_gem_specification.rb

@@ -129,7 +129,6 @@ end
   end
 
   def test_self_from_yaml_syck_default_key_bug
-    skip 'syck default_key bug is only for ruby 1.8' unless RUBY_VERSION < '1.9'
     # This is equivalent to (and totally valid) psych 1.0 output and
     # causes parse errors on syck.
     yaml = <<-YAML
@@ -137,7 +136,7 @@ end
 name: posix-spawn
 version: !ruby/object:Gem::Version
   version: 0.3.6
-  prerelease: 
+  prerelease:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -160,9 +159,81 @@ bindir:
       Gem::Specification.from_yaml yaml
     end
 
+    op = new_spec.dependencies.first.requirement.requirements.first.first
+    refute_kind_of YAML::Syck::DefaultKey, op
+
+    refute_match %r%DefaultKey%, new_spec.to_ruby
+  end
+
+  def test_self_from_yaml_cleans_up_defaultkey
+    yaml = <<-YAML
+--- !ruby/object:Gem::Specification
+name: posix-spawn
+version: !ruby/object:Gem::Version
+  version: 0.3.6
+  prerelease:
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &70243867725240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !ruby/object:YAML::Syck::DefaultKey {}
+
+      - !ruby/object:Gem::Version
+        version: 0.7.6
+  type: :development
+  prerelease: false
+  version_requirements: *70243867725240
+platform: ruby
+files: []
+test_files: []
+bindir:
+    YAML
+
+    new_spec = Gem::Specification.from_yaml yaml
+
+    op = new_spec.dependencies.first.requirement.requirements.first.first
+    refute_kind_of YAML::Syck::DefaultKey, op
+
     refute_match %r%DefaultKey%, new_spec.to_ruby
   end
 
+  def test_self_from_yaml_cleans_up_defaultkey_from_newer_192
+    yaml = <<-YAML
+--- !ruby/object:Gem::Specification
+name: posix-spawn
+version: !ruby/object:Gem::Version
+  version: 0.3.6
+  prerelease:
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &70243867725240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !ruby/object:Syck::DefaultKey {}
+
+      - !ruby/object:Gem::Version
+        version: 0.7.6
+  type: :development
+  prerelease: false
+  version_requirements: *70243867725240
+platform: ruby
+files: []
+test_files: []
+bindir:
+    YAML
+
+    new_spec = Gem::Specification.from_yaml yaml
+
+    op = new_spec.dependencies.first.requirement.requirements.first.first
+    refute_kind_of YAML::Syck::DefaultKey, op
+
+    refute_match %r%DefaultKey%, new_spec.to_ruby
+  end
+
+
   def test_self_load
     full_path = @a2.spec_file
     write_file full_path do |io|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 47
   prerelease: 
   segments: 
   - 1
   - 8
-  - 11
-  version: 1.8.11
+  - 12
+  version: 1.8.12
 platform: ruby
 authors: 
 - Jim Weirich
@@ -15,30 +15,9 @@ authors:
 - Eric Hodel
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
-  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
-  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
-  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
-  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
-  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
-  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
-  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
-  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
-  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
-  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
-  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
-  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
-  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
-  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
-  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
-  x52qPcexcYZR7w==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2011-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -46,13 +25,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 2
-        - 6
-        version: "2.6"
+        - 1
+        - 0
+        version: 2.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -161,6 +141,21 @@ dependencies:
         version: "2.12"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id009
 description: |-
   RubyGems is a package management framework for Ruby.
   
@@ -297,6 +292,7 @@ files:
 - lib/rubygems/source_index.rb
 - lib/rubygems/spec_fetcher.rb
 - lib/rubygems/specification.rb
+- lib/rubygems/syck_hack.rb
 - lib/rubygems/test_case.rb
 - lib/rubygems/test_utilities.rb
 - lib/rubygems/text.rb
@@ -403,7 +399,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.11 Documentation
+- --title=RubyGems 1.8.12 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement