rubygems-update 1.8.19 → 1.8.20

data/History.txt

@@ -1,5 +1,14 @@
 # coding: UTF-8
 
+=== 1.8.20 / 2012-03-21
+
+* 4 bug fixes:
+
+  * Add --force to `gem build` to skip validation. Fixes #297
+  * Gracefully deal with YAML::PrivateType objects in Marshal'd gemspecs
+  * Treat the source as a proper url base. Fixes #304
+  * Warn when updating the specs cache fails. Fixes #300
+
 === 1.8.19 / 2012-03-14
 
 * 3 bug fixes:

data/Manifest.txt

@@ -86,6 +86,7 @@ lib/rubygems/package/tar_writer.rb
 lib/rubygems/package_task.rb
 lib/rubygems/path_support.rb
 lib/rubygems/platform.rb
+lib/rubygems/psych_additions.rb
 lib/rubygems/psych_tree.rb
 lib/rubygems/remote_fetcher.rb
 lib/rubygems/require_paths_builder.rb
@@ -109,6 +110,7 @@ setup.rb
 test/rubygems/bogussources.rb
 test/rubygems/data/gem-private_key.pem
 test/rubygems/data/gem-public_cert.pem
+test/rubygems/data/null-type.gemspec.rz
 test/rubygems/fake_certlib/openssl.rb
 test/rubygems/fix_openssl_warnings.rb
 test/rubygems/foo/discover.rb

data/lib/rubygems.rb

@@ -120,7 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.19'
+  VERSION = '1.8.20'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -671,6 +671,7 @@ module Gem
           YAML::ENGINE.yamler = "psych"
         end
 
+        require 'rubygems/psych_additions'
         require 'rubygems/psych_tree'
       end
     end

data/lib/rubygems/builder.rb

@@ -32,9 +32,9 @@ class Gem::Builder
   # Builds the gem from the specification.  Returns the name of the file
   # written.
 
-  def build
+  def build(skip_validation=false)
     @spec.mark_version
-    @spec.validate
+    @spec.validate unless skip_validation
     @signer = sign
     write_package
     say success if Gem.configuration.verbose

data/lib/rubygems/commands/build_command.rb

@@ -4,7 +4,11 @@ require 'rubygems/builder'
 class Gem::Commands::BuildCommand < Gem::Command
 
   def initialize
-    super('build', 'Build a gem from a gemspec')
+    super 'build', 'Build a gem from a gemspec'
+
+    add_option '--force', 'skip validation of the spec' do |value, options|
+      options[:force] = true
+    end
   end
 
   def arguments # :nodoc:
@@ -22,7 +26,7 @@ class Gem::Commands::BuildCommand < Gem::Command
       spec = load_gemspec gemspec
 
       if spec then
-        Gem::Builder.new(spec).build
+        Gem::Builder.new(spec).build options[:force]
       else
         alert_error "Error loading gemspec. Aborting."
         terminate_interaction 1

data/lib/rubygems/commands/fetch_command.rb

@@ -59,11 +59,11 @@ class Gem::Commands::FetchCommand < Gem::Command
       end
 
       file = "#{spec.full_name}.gem"
-      remote_path = source_uri + "gems/#{file}"
+      remote_path = URI.parse(source_uri) + "gems/#{file}"
 
       fetch = Gem::RemoteFetcher.fetcher
 
-      gem = fetch.fetch_path remote_path
+      gem = fetch.fetch_path remote_path.to_s
 
       File.open file, "wb" do |f|
         f.write gem

data/lib/rubygems/psych_additions.rb

@@ -0,0 +1,9 @@
+# This exists just to satify bugs in marshal'd gemspecs that
+# contain a reference to YAML::PrivateType. We prune these out
+# in Specification._load, but if we don't have the constant, Marshal
+# blows up.
+
+module Psych
+  class PrivateType
+  end
+end

data/lib/rubygems/spec_fetcher.rb

@@ -255,8 +255,12 @@ class Gem::SpecFetcher
     loaded     = false
 
     if File.exist? local_file then
-      spec_dump =
-        @fetcher.fetch_path(spec_path, File.mtime(local_file)) rescue nil
+      begin
+        spec_dump =
+          @fetcher.fetch_path(spec_path, File.mtime(local_file))
+      rescue Gem::RemoteFetcher::FetchError => e
+        alert_warning "Error fetching data: #{e.message}"
+      end
 
       loaded = true if spec_dump
 

data/lib/rubygems/specification.rb

@@ -666,6 +666,11 @@ class Gem::Specification
       raise TypeError, "invalid Gem::Specification format #{array.inspect}"
     end
 
+    # Cleanup any YAML::PrivateType. They only show up for an old bug
+    # where nil => null, so just convert them to nil based on the type.
+
+    array.map! { |e| e.kind_of?(YAML::PrivateType) ? nil : e }
+
     spec.instance_variable_set :@rubygems_version,          array[0]
     # spec version
     spec.instance_variable_set :@name,                      array[2]

data/test/rubygems/test_gem_commands_build_command.rb

@@ -98,5 +98,21 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal "this is a summary", spec.summary
   end
 
+  def test_execute_force
+    @gem.instance_variable_set :@required_rubygems_version, nil
+
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
+
+    File.open gemspec_file, 'w' do |gs|
+      gs.write @gem.to_yaml
+    end
+
+    @cmd.options[:args] = [gemspec_file]
+    @cmd.options[:force] = true
+
+    util_test_build_gem @gem, gemspec_file
+  end
+
+
 end
 

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -73,5 +73,30 @@ class TestGemCommandsFetchCommand < Gem::TestCase
            "#{@a1.full_name} not fetched"
   end
 
+  def test_execute_handles_sources_properly
+    repo = "http://gems.example.com"
+    @uri = URI.parse repo
+
+    Gem.sources.replace [repo]
+
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher @a1, @a2
+
+    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
+      File.read(@a1.cache_file)
+
+    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:version] = Gem::Requirement.new '1'
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert File.exist?(File.join(@tempdir, @a1.file_name)),
+           "#{@a1.full_name} not fetched"
+  end
+
 end
 

data/test/rubygems/test_gem_commands_install_command.rb

@@ -178,6 +178,38 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     assert_match(/ould not find a valid gem 'nonexistent'/, @ui.error)
   end
 
+  def test_execute_bad_source
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher
+
+    # This is needed because we need to exercise the cache path
+    # within SpecFetcher
+    path = File.join Gem.user_home, '.gem', 'specs', "not-there.nothing%80",
+                                    "latest_specs.4.8"
+
+    FileUtils.mkdir_p File.dirname(path)
+
+    File.open path, "w" do |f|
+      f.write Marshal.dump([])
+    end
+
+    Gem.sources.replace ["http://not-there.nothing"]
+
+    @cmd.options[:args] = %w[nonexistent]
+
+    use_ui @ui do
+      e = assert_raises Gem::SystemExitException do
+        @cmd.execute
+      end
+      assert_equal 2, e.exit_code
+    end
+
+    errs = @ui.error.split("\n")
+
+    assert_match(/WARNING:  Error fetching data/, errs.shift)
+    assert_match(/ould not find a valid gem 'nonexistent'/, errs.shift)
+  end
+
   def test_execute_nonexistent_with_hint
     misspelled = "nonexistent_with_hint"
     correctly_spelled = "non_existent_with_hint"

data/test/rubygems/test_gem_specification.rb

@@ -406,6 +406,16 @@ dependencies: []
     assert_equal expected, Gem::Specification.normalize_yaml_input(input)
   end
 
+  DATA_PATH = File.expand_path "../data", __FILE__
+
+  def test_handles_private_null_type
+    path = File.join DATA_PATH, "null-type.gemspec.rz"
+
+    data = Marshal.load Gem.inflate(File.read(path))
+
+    assert_equal nil, data.rubyforge_project
+  end
+
   def test_initialize
     spec = Gem::Specification.new do |s|
       s.name = "blah"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 8
-  - 19
-  version: 1.8.19
+  - 20
+  version: 1.8.20
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-14 00:00:00 Z
+date: 2012-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -269,6 +269,7 @@ files:
 - lib/rubygems/package_task.rb
 - lib/rubygems/path_support.rb
 - lib/rubygems/platform.rb
+- lib/rubygems/psych_additions.rb
 - lib/rubygems/psych_tree.rb
 - lib/rubygems/remote_fetcher.rb
 - lib/rubygems/require_paths_builder.rb
@@ -292,6 +293,7 @@ files:
 - test/rubygems/bogussources.rb
 - test/rubygems/data/gem-private_key.pem
 - test/rubygems/data/gem-public_cert.pem
+- test/rubygems/data/null-type.gemspec.rz
 - test/rubygems/fake_certlib/openssl.rb
 - test/rubygems/fix_openssl_warnings.rb
 - test/rubygems/foo/discover.rb
@@ -385,7 +387,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.19 Documentation
+- --title=RubyGems 1.8.20 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement