rubygems-update 1.8.2 → 1.8.3

data/History.txt

@@ -1,4 +1,15 @@
-=== 1.8.2 / 2011-05-11
+=== 1.8.3 / 2011-05-19
+
+* 4 bug fixes:
+
+  * Fix independent testing of test_gem_package_tar_output.  Ruby Bug #4686 by
+    Shota Fukumori
+  * Fix test failures for systems with separate ruby versions.  Ruby Bug #3808
+    by Jeremy Evans
+  * Fixed some bad calls left behind after rolling out some refactorings.
+  * Syck has a parse error on (good) times output from Psych. (dazuma, et al)
+
+=== 1.8.2 / 2011-05-11
 
 * 2 minor enhancements:
 

data/Rakefile

@@ -93,6 +93,13 @@ task :package do
   end
 end
 
+task :upload_to_rubyforge do
+  v = hoe.version
+  sh "rubyforge add_release rubygems rubygems #{v} pkg/rubygems-update-#{v}.gem"
+  sh "rubyforge add_file rubygems rubygems #{v} pkg/rubygems-#{v}.zip"
+  sh "rubyforge add_file rubygems rubygems #{v} pkg/rubygems-#{v}.tgz"
+end
+
 # Misc Tasks ---------------------------------------------------------
 
 # These tasks expect to have the following directory structure:

data/lib/rubygems.rb

@@ -120,7 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.2'
+  VERSION = '1.8.3'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -421,7 +421,7 @@ module Gem
 
   def self.each_load_path(partials)
     partials.each do |gp|
-      base = gp.basename
+      base = File.basename gp
       specfn = dir.specifications.add(base + ".gemspec")
       if specfn.exist?
         spec = eval(specfn.read)
@@ -598,7 +598,7 @@ module Gem
   def self.latest_partials(gemdir)
     latest = {}
     all_partials(gemdir).each do |gp|
-      base = gp.basename
+      base = File.basename gp
 
       if base.to_s =~ /(.*)-((\d+\.)*\d+)/ then
         name, version = $1, $2

data/lib/rubygems/specification.rb

@@ -566,7 +566,11 @@ class Gem::Specification
   def self.normalize_yaml_input(input)
     result = input.respond_to?(:read) ? input.read : input
     result = "--- " + result unless result =~ /\A--- /
-    result.gsub(/ !!null \n/, " \n")
+    result.gsub!(/ !!null \n/, " \n")
+    # date: 2011-04-26 00:00:00.000000000Z
+    # date: 2011-04-26 00:00:00.000000000 Z
+    result.gsub!(/^(date: \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?)Z/, '\1 Z')
+    result
   end
 
   ##

data/test/rubygems/test_gem_dependency_installer.rb

@@ -254,7 +254,7 @@ class TestGemDependencyInstaller < Gem::TestCase
     inst = nil
 
     Dir.chdir @tempdir do
-      inst = Gem::DependencyInstaller.new :env_shebang => true, :wrappers => true
+      inst = Gem::DependencyInstaller.new :env_shebang => true, :wrappers => true, :format_executable => false
       inst.install 'a'
     end
 
@@ -534,7 +534,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
       @fetcher.data['http://gems.example.com/gems/a-1.gem'] = read_binary(@a1_gem)
 
-      inst = Gem::DependencyInstaller.new :wrappers => false
+      inst = Gem::DependencyInstaller.new :wrappers => false, :format_executable => false
       inst.install 'a'
 
       refute_match(%r|This file was generated by RubyGems.|,

data/test/rubygems/test_gem_package_tar_output.rb

@@ -1,5 +1,6 @@
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package/tar_output'
+require 'rubygems/security'
 
 class TestGemPackageTarOutput < Gem::Package::TarTestCase
 

data/test/rubygems/test_gem_specification.rb

@@ -114,6 +114,20 @@ end
     assert_equal @current_version, new_spec.specification_version
   end
 
+  def test_self_from_yaml_syck_bug
+    # This is equivalent to (and totally valid) psych 1.0 output and
+    # causes parse errors on syck.
+    yaml = @a1.to_yaml
+    yaml.sub!(/^date:.*/, "date: 2011-04-26 00:00:00.000000000Z")
+
+    new_spec = with_syck do
+      Gem::Specification.from_yaml yaml
+    end
+
+    assert_kind_of Time, @a1.date
+    assert_kind_of Time, new_spec.date
+  end
+
   def test_self_load
     full_path = @a2.spec_file
     write_file full_path do |io|
@@ -1384,4 +1398,22 @@ end
       end
     end
   end
+
+  def with_syck
+    begin
+      require "yaml"
+      old_engine = YAML::ENGINE.yamler
+      YAML::ENGINE.yamler = 'syck'
+    rescue NameError
+      # probably on 1.8, ignore
+    end
+
+    yield
+  ensure
+    begin
+      YAML::ENGINE.yamler = old_engine
+    rescue NameError
+      # ignore
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 8
-  - 2
-  version: 1.8.2
+  - 3
+  version: 1.8.3
 platform: ruby
 authors: 
 - Jim Weirich
@@ -38,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-05-12 00:00:00 Z
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -406,7 +406,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.2 Documentation
+- --title=RubyGems 1.8.3 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -432,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.1
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby