rubygems-update 1.8.13 → 1.8.14

data/History.txt

@@ -1,5 +1,12 @@
 # coding: UTF-8
 
+=== 1.8.14 / 2012-01-05
+
+* 2 bug fixes:
+
+  * Ignore old/bad cache data in Version
+  * Make sure our YAML workarounds are loaded properly. Fixes #250.
+
 === 1.8.13 / 2011-12-21
 
 * 1 bug fix:

data/lib/rubygems.rb

@@ -118,7 +118,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.13'
+  VERSION = '1.8.14'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -639,10 +639,14 @@ module Gem
     index
   end
 
+  @yaml_loaded = false
+
   ##
   # Loads YAML, preferring Psych
 
   def self.load_yaml
+    return if @yaml_loaded
+
     begin
       gem 'psych', '~> 1.2', '>= 1.2.1' unless ENV['TEST_SYCK']
     rescue Gem::LoadError
@@ -661,6 +665,8 @@ module Gem
     # 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'
+
+    @yaml_loaded = true
   end
 
   ##

data/lib/rubygems/requirement.rb

@@ -4,6 +4,19 @@ require "rubygems/version"
 # A Requirement is a set of one or more version restrictions. It supports a
 # few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
 
+# REFACTOR: The fact that a requirement is singular or plural is kind of
+# awkward. Is Requirement the right name for this? Or should it be one
+# [op, number] pair, and we call the list of requirements something else?
+# Since a Requirement is held by a Dependency, maybe this should be made
+# singular and the list aspect should be pulled up into Dependency?
+
+require "rubygems/version"
+require "rubygems/deprecate"
+
+# If we're being loaded after yaml was already required, then
+# load our yaml + workarounds now.
+Gem.load_yaml if defined? ::YAML
+
 class Gem::Requirement
   include Comparable
 
@@ -174,6 +187,8 @@ class Gem::Requirement
   private
 
   def fix_syck_default_key_in_requirements
+    Gem.load_yaml
+
     # Fixup the Syck DefaultKey bug
     @requirements.each do |r|
       if r[0].kind_of? Gem::SyckDefaultKey

data/lib/rubygems/specification.rb

@@ -484,6 +484,8 @@ class Gem::Specification
   # +input+ can be anything that YAML.load() accepts: String or IO.
 
   def self.from_yaml(input)
+    Gem.load_yaml
+
     input = normalize_yaml_input input
     spec = YAML.load input
 

data/lib/rubygems/syck_hack.rb

@@ -17,6 +17,10 @@ module YAML
   if defined? ::Syck
     Syck = ::Syck
 
+  # JRuby's "Syck" is called "Yecht"
+  elsif defined? YAML::Yecht
+    Syck = YAML::Yecht
+
   # 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

data/lib/rubygems/version.rb

@@ -238,6 +238,12 @@ class Gem::Version
     initialize array[0]
   end
 
+  def yaml_initialize(tag, map)
+    @version = map['version']
+    @segments = nil
+    @hash = nil
+  end
+
   ##
   # A version is considered a prerelease if it contains a letter.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 1
   - 8
-  - 13
-  version: 1.8.13
+  - 14
+  version: 1.8.14
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-22 00:00:00 Z
+date: 2012-01-05 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: 17
+        hash: 11
         segments: 
         - 2
-        - 9
-        version: "2.9"
+        - 1
+        - 0
+        version: 2.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -126,9 +127,24 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -139,7 +155,7 @@ dependencies:
         - 12
         version: "2.12"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: |-
   RubyGems is a package management framework for Ruby.
   
@@ -383,7 +399,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.13 Documentation
+- --title=RubyGems 1.8.14 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -409,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby