drbrain	2013-10-19 07:14:56 +0900 (Sat, 19 Oct 2013)

  New Revision: 43359

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43359

  Log:
    * lib/rubygems:  Update to RubyGems master 42543b6.  Changes:
    
      Fix `gem update` for gems with multiple platforms.
    
    * test/rubygems:  ditto.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/commands/update_command.rb
    trunk/test/rubygems/test_gem_commands_update_command.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43358)
+++ ChangeLog	(revision 43359)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Oct 19 07:14:40 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems:  Update to RubyGems master 42543b6.  Changes:
+
+	  Fix `gem update` for gems with multiple platforms.
+
+	* test/rubygems:  ditto.
+
 Sat Oct 19 06:55:52 2013  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems:  Update to RubyGems master 0a3814b.  Changes:
Index: lib/rubygems/commands/update_command.rb
===================================================================
--- lib/rubygems/commands/update_command.rb	(revision 43358)
+++ lib/rubygems/commands/update_command.rb	(revision 43359)
@@ -112,7 +112,9 @@ command to remove old versions. https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/update_command.rb#L112
 
     spec_tuples, errors = fetcher.search_for_dependency dependency
 
-    raise errors.first unless errors.empty?
+    error = errors.find { |errors| errors.respond_to? :exception }
+
+    raise error if error
 
     spec_tuples
   end
Index: test/rubygems/test_gem_commands_update_command.rb
===================================================================
--- test/rubygems/test_gem_commands_update_command.rb	(revision 43358)
+++ test/rubygems/test_gem_commands_update_command.rb	(revision 43359)
@@ -390,6 +390,20 @@ class TestGemCommandsUpdateCommand < Gem https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_commands_update_command.rb#L390
     end
   end
 
+  def test_fetch_remote_gems_mismatch
+    platform = Gem::Platform.new 'x86-freebsd9'
+    a2_p = quick_spec 'a', 2 do |s| s.platform = platform end
+
+    util_setup_spec_fetcher @a2, a2_p
+
+    expected = [
+      [Gem::NameTuple.new('a', v(2), Gem::Platform::RUBY),
+        Gem::Source.new(@gem_repo)],
+    ]
+
+    assert_equal expected, @cmd.fetch_remote_gems(@a1)
+  end
+
   def test_fetch_remote_gems_prerelease
     @cmd.options[:prerelease] = true
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/