[macruby-changes] [5157] MacRuby/trunk/lib

[source_changes at macosforge.org]

Revision: 5157
          http://trac.macosforge.org/projects/ruby/changeset/5157
Author:   lsansonetti at apple.com
Date:     2011-01-10 20:22:50 -0800 (Mon, 10 Jan 2011)
Log Message:
-----------
merge 1.4.2 changes

Modified Paths:
--------------
    MacRuby/trunk/lib/rubygems/commands/update_command.rb
    MacRuby/trunk/lib/rubygems.rb

Modified: MacRuby/trunk/lib/rubygems/commands/update_command.rb
===================================================================
--- MacRuby/trunk/lib/rubygems/commands/update_command.rb	2011-01-11 01:56:10 UTC (rev 5156)
+++ MacRuby/trunk/lib/rubygems/commands/update_command.rb	2011-01-11 04:22:50 UTC (rev 5157)
@@ -62,6 +62,19 @@
       hig['rubygems-update'] = rubygems_update
 
       options[:user_install] = false
+
+      Gem.source_index.refresh!
+
+      update_gems = Gem.source_index.find_name 'rubygems-update'
+
+      latest_update_gem = update_gems.sort_by { |s| s.version }.last
+
+      say "Updating RubyGems to #{latest_update_gem.version}"
+      installed = do_rubygems_update latest_update_gem.version
+
+      say "RubyGems system software updated" if installed
+
+      return
     else
       say "Updating installed gems"
 
@@ -99,35 +112,22 @@
       end
     end
 
-    if gems_to_update.include? "rubygems-update" then
-      Gem.source_index.refresh!
-
-      update_gems = Gem.source_index.find_name 'rubygems-update'
-
-      latest_update_gem = update_gems.sort_by { |s| s.version }.last
-
-      say "Updating RubyGems to #{latest_update_gem.version}"
-      installed = do_rubygems_update latest_update_gem.version
-
-      say "RubyGems system software updated" if installed
+    if updated.empty? then
+      say "Nothing to update"
     else
-      if updated.empty? then
-        say "Nothing to update"
-      else
-        say "Gems updated: #{updated.map { |spec| spec.name }.join ', '}"
+      say "Gems updated: #{updated.map { |spec| spec.name }.join ', '}"
 
-        if options[:generate_ri] then
-          updated.each do |gem|
-            Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri
-          end
-
-          Gem::DocManager.update_ri_cache
+      if options[:generate_ri] then
+        updated.each do |gem|
+          Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri
         end
 
-        if options[:generate_rdoc] then
-          updated.each do |gem|
-            Gem::DocManager.new(gem, options[:rdoc_args]).generate_rdoc
-          end
+        Gem::DocManager.update_ri_cache
+      end
+
+      if options[:generate_rdoc] then
+        updated.each do |gem|
+          Gem::DocManager.new(gem, options[:rdoc_args]).generate_rdoc
         end
       end
     end

Modified: MacRuby/trunk/lib/rubygems.rb
===================================================================
--- MacRuby/trunk/lib/rubygems.rb	2011-01-11 01:56:10 UTC (rev 5156)
+++ MacRuby/trunk/lib/rubygems.rb	2011-01-11 04:22:50 UTC (rev 5157)
@@ -116,7 +116,7 @@
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.4.1'
+  RubyGemsVersion = VERSION = '1.4.2'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20110110/4e9a774b/attachment.html>