rubygems-update 0.9.5 → 1.0.0

data/ChangeLog

@@ -1,3 +1,138 @@
+2007-12-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Revert change that only wrapped
+	executables with #!.
+	* lib/rubygems/specification.rb:  Warn about a lot of things that
+	could be wrong with gemspecs on build, including missing #!.  Use
+	'x86-mswin32' for legacy 'mswin32' platform, fix CURRENT platform.
+	Paired with Luis Lavena.
+	* lib/rubygems/remote_installer.rb:  Deleted.
+	* lib/rubygems.rb:  Removed Kernel#require_gem.
+	* doc/release_notes/rel_1_0_0.rdoc:  RubyGems 1.0 release notes.
+	* lib/rubygems/rubygems_version.rb:  1.0.0.
+
+2007-12-18  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/commands/mirror_command.rb: Work around URI::parse
+	processing file:// scheme and drive paths on Windows.
+	* test/test_gem_commands_mirror_command.rb: ditto.
+
+2007-12-17  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Copy files into bindir if they don't
+	have a shebang.  Bug reported by Luis Lavena.
+	* lib/rubygems/server.rb:  Handle platforms in Gem::Server#quick.
+	Exactly match gem names.  Bugs reported by Chad Woolley.
+	* lib/rubygems/platform.rb:  Remove platform constants in favor of
+	Gem::Platform::CURRENT.  Bug reported by Luis Lavena.
+	* lib/rubygems/dependency_installer.rb:  Work around Dir::glob not
+	understanding File::ALT_SEPARATOR.  Bug submitted by Luis Lavena.
+
+2007-12-16  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/remote_fetcher.rb:  Be more verbose in error messages
+	from OpenURI.
+	* lib/rubygems/server.rb:  Be more verbose in error/missing responses.
+
+2007-12-15  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Output extension build results when
+	really verbose.  From bug #15853 John Croisant.
+	* lib/rubygems/specification.rb:  Fix backwards compatibility with
+	0.9.4, don't allow the platform to be nil or an empty string.  Bug
+	#16177 by Dan Manges.
+	* setup.rb:  Re-exec setup.rb if rubygems is loaded and RUBYOPT is
+	set.  Fixes bug #15974 by Joshua Sierles.
+	* lib/rubygems/update_command.rb:  Tweak formatting of updated
+	message.  Bug #15625 by Bil Kleb.
+	* lib/rubygems/remote_fetcher.rb:  Add URI to exception message for
+	Gem::RemoteFetcher#fetch_size.  Bug #14801 by Bil Kleb.
+
+2007-12-14  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/query_command.rb:  Don't display duplicate
+	version numbers.  Bug #15828 by Tim Fletcher.
+	* setup.rb:  Fix my stupidity with --help.  Patch #16308 by Stephen
+	Bannasch.  Fix --prefix= argument.  Bug #16002 by Piglop.
+
+2007-12-13  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/server_command.rb:  Fix --no-daemon.  Bug by
+	Chad Woolley.
+	* lib/rubygems/server.rb:  Fix Marshal quick index.  Bug by Chad
+	Woolley.
+	* lib/rubygems/installer.rb: Respect Gem::Specification#bindir.  Bug
+	#16202 by Suraj Kurapati.
+	* lib/rubygems/commands/update_command.rb: Fix `gem update mysql`.
+	Bug #16244 by Stephen Bannasch.
+
+2007-12-12  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/installer.rb:  Add --format-executable option to
+	install executables with ruby's program-suffix and prefix.  Patch
+	#14688 by Jeremy Kemper.  Also, installing in really-verbose mode
+	prints out written files.
+	* setup.rb:  Add --format-executable option to install gem with ruby's
+	program-suffix and prefix.  Add --help.  Fixes bug #16056 by Chad
+	Woolley.
+	* lib/rubygems/uninstaller.rb:  Fallback to original_platform_name
+	correctly.  Patch #15960 by Nicola Piccinini's friend.
+
+2007-12-11  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/validator.rb:  Correct test run failures when no tests
+	are provided.  Patch #15701 by Jérémy Zurcher.
+	* lib/rubygems/commands/mirror_command.rb:  Don't File.join a
+	URI::HTTP.  Patch #16116 by Morgan Nelson.
+	* lib/rubygems/commands/unpack_command.rb:  Add --target option to
+	`gem unpack`.  Patch #16154 by Kevin Barnes.
+
+2007-12-10  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency_installer.rb:  Revert to nil for the default
+	security policy to avoid requiring OpenSSL.
+	* lib/rubygems/defaults.rb: Consolidate defaults for easier editing.
+	Patch #15150 by Donavan Pantke.
+
+2007-11-27  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/source_index.rb: Remove dependency on forwadable.
+	Patch by Koichi Sasada.
+	* lib/rubygems/specification.rb: Reduce dependency on time.rb.  Patch
+	by Koichi Sasada.
+
+2007-11-26  Rich Kilmer <rich@infoether.com>
+
+	* lib/rubygems/version.rb: Fix bug 15948 with version bump
+	* test/test_gem_version.rb: Test for bug 15948 with version bump
+	* util/gem_prelude.rb: wrap init code with exception handler
+	and skip badly formed directory names
+
+2007-11-23  Rich Kilmer <rich@infoether.com>
+
+	* lib/rubygems.rb: Centralize all CONFIG options into Hash
+	Gem::ConfigMap with keys as symbols, change all references
+	to CONFIG to ConfigMap
+	* lib/rubygems/require_paths_builder.rb: Added to support 
+	building .require_paths file
+	* lib/rubygems/installer.rb: Add building of .require_paths if
+	needed
+	* lib/rubygems/platform.rb: Use new ConfigMap hash for arch
+	* lib/rubygems
+	* util/gem_prelude.rb: new gem prelude for Ruby 1.9
+	* test/test_gem_installer.rb: change to use ConfigMap hash
+	* test/gemutilities.rb: change to use ConfigMap hash
+
+2007-11-21  Daniel Berger <djberg96@gmail.com>
+
+	* lib/rubygems/platform.rb: Gem::Platform.new now returns
+	Gem::Platform.local if the arch matches Gem::Platform::CURRENT.
+	Bugs #15815 and #15782 submitted by Daniel Berger.
+
+2007-11-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/platform.rb: Handle bare 'mswin32' platform's CPU.
+
 2007-11-19  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems/rubygems_version.rb: 0.9.5.

data/Rakefile

@@ -384,13 +384,14 @@ task :update_ruby do
   sh "rsync #{options} bin/gem #{ruby_dir}/bin/gem"
   sh "rsync #{options} lib/ #{ruby_dir}/lib"
   sh "rsync #{options} test/ #{ruby_dir}/test/rubygems"
+  sh "rsync #{options} util/gem_prelude.rb #{ruby_dir}/gem_prelude.rb"
 end
 
 desc "Diffs Ruby HEAD with the currently checked-out copy of RubyGems."
 task :diff_ruby do
   ruby_dir = ENV['RUBY_PATH'] || '../../ruby/trunk'
 
-  options = "-urpN --exclude '*svn*' --exclude '*swp'"
+  options = "-urpN --exclude '*svn*' --exclude '*swp' --exclude '*rbc'"
 
   sh "diff #{options} bin/gem #{ruby_dir}/bin/gem; true"
   sh "diff #{options} lib/ubygems.rb #{ruby_dir}/lib/ubygems.rb; true"
@@ -398,5 +399,6 @@ task :diff_ruby do
   sh "diff #{options} lib/rubygems #{ruby_dir}/lib/rubygems; true"
   sh "diff #{options} lib/rbconfig #{ruby_dir}/lib/rbconfig; true"
   sh "diff #{options} test #{ruby_dir}/test/rubygems; true"
+  sh "diff #{options} util/gem_prelude.rb #{ruby_dir}/gem_prelude.rb; true"
 end
 

data/lib/rubygems.rb

@@ -5,8 +5,8 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rbconfig'
 require 'rubygems/rubygems_version'
+require 'rubygems/defaults'
 require 'thread'
 
 module Gem
@@ -30,8 +30,8 @@ module Kernel
   # version).
   #
   # You can define the environment variable GEM_SKIP as a way to not
-  # load specified gems.  you might do this to test out changes that
-  # haven't been intsalled yet.  Example:
+  # load specified gems.  You might do this to test out changes that
+  # haven't been installed yet.  Example:
   #
   #   GEM_SKIP=libA:libB ruby-I../libA -I../libB ./mycode.rb
   #
@@ -50,17 +50,6 @@ module Kernel
     active_gem_with_options(gem_name, version_requirements)
   end
 
-  # Same as the +gem+ command, but will also require a file if the gem
-  # provides an auto-required file name.
-  #
-  # DEPRECATED!  Use +gem+ instead.
-  #
-  def require_gem(gem_name, *version_requirements)
-    file, lineno = location_of_caller
-    warn "#{file}:#{lineno}:Warning: require_gem is obsolete.  Use gem instead."
-    active_gem_with_options(gem_name, version_requirements, :auto_require=>true)
-  end
-
   # Return the file name (string) and line number (integer) of the caller of
   # the caller of this method.
   def location_of_caller
@@ -82,11 +71,27 @@ end
 #
 module Gem
 
+  ConfigMap = {} unless defined?(ConfigMap)
+  require 'rbconfig'
+  ConfigMap.merge!(
+      :BASERUBY => RbConfig::CONFIG["BASERUBY"],
+      :EXEEXT => RbConfig::CONFIG["EXEEXT"],
+      :RUBY_INSTALL_NAME => RbConfig::CONFIG["RUBY_INSTALL_NAME"],
+      :RUBY_SO_NAME => RbConfig::CONFIG["RUBY_SO_NAME"],
+      :arch => RbConfig::CONFIG["arch"],
+      :bindir => RbConfig::CONFIG["bindir"],
+      :libdir => RbConfig::CONFIG["libdir"],
+      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
+      :ruby_version => RbConfig::CONFIG["ruby_version"],
+      :sitedir => RbConfig::CONFIG["sitedir"],
+      :sitelibdir => RbConfig::CONFIG["sitelibdir"]
+  )
+
   MUTEX = Mutex.new
 
   RubyGemsPackageVersion = RubyGemsVersion
 
-  DIRECTORIES = %w[cache doc gems specifications]
+  DIRECTORIES = %w[cache doc gems specifications] unless defined?(DIRECTORIES)
 
   @@source_index = nil
   @@win_platform = nil
@@ -120,7 +125,7 @@ module Gem
 
   def self.prefix
     prefix = File.dirname File.expand_path(__FILE__)
-    if prefix == Config::CONFIG['sitelibdir'] then
+    if prefix == ConfigMap[:sitelibdir] then
       nil
     else
       File.dirname prefix
@@ -194,10 +199,6 @@ module Gem
       @sources
     end
 
-    # An Array of the default sources that come with RubyGems.
-    def default_sources
-      %w[http://gems.rubyforge.org]
-    end
 
     # Provide an alias for the old name.
     alias cache source_index
@@ -221,7 +222,7 @@ module Gem
       if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
         '/usr/bin'
       else # generic install
-        Config::CONFIG['bindir']
+        ConfigMap[:bindir]
       end
     end
 
@@ -280,9 +281,9 @@ module Gem
     # Return the Ruby command to use to execute the Ruby interpreter.
     def ruby
       if @ruby.nil? then
-        @ruby = File.join(Config::CONFIG['bindir'],
-                          Config::CONFIG['ruby_install_name'])
-        @ruby << Config::CONFIG['EXEEXT']
+        @ruby = File.join(ConfigMap[:bindir],
+                          ConfigMap[:ruby_install_name])
+        @ruby << ConfigMap[:EXEEXT]
       end
 
       @ruby
@@ -342,7 +343,7 @@ module Gem
         File.join spec.full_gem_path, path
       end
 
-      sitelibdir = Config::CONFIG['sitelibdir']
+      sitelibdir = ConfigMap[:sitelibdir]
 
       # gem directories must come after -I and ENV['RUBYLIB']
       $:.insert($:.index(sitelibdir), *require_paths)
@@ -523,18 +524,6 @@ module Gem
       end
     end
 
-    public
-
-    # Default home directory path to be used if an alternate value is
-    # not specified in the environment.
-    def default_dir
-      if defined? RUBY_FRAMEWORK_VERSION
-        return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems", Config::CONFIG['ruby_version'])
-      else
-        File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
-      end
-    end
-
   end
 
 end
@@ -549,7 +538,7 @@ module Config # :nodoc:
     # Return the path to the data directory associated with the named
     # package.  If the package is loaded as a gem, return the gem
     # specific data directory.  Otherwise return a path to the share
-    # area as define by "#{Config::CONFIG['datadir']}/#{package_name}".
+    # area as define by "#{ConfigMap[:datadir]}/#{package_name}".
     def datadir(package_name)
       Gem.datadir(package_name) || Config.gem_original_datadir(package_name)
     end

data/lib/rubygems/commands/install_command.rb

@@ -17,6 +17,7 @@ class Gem::Commands::InstallCommand < Gem::Command
       :generate_rdoc => true,
       :generate_ri   => true,
       :install_dir => Gem.dir,
+      :format_executable => false,
       :test => false,
       :version => Gem::Requirement.default,
     })
@@ -56,6 +57,7 @@ class Gem::Commands::InstallCommand < Gem::Command
       :env_shebang => options[:env_shebang],
       :domain => options[:domain],
       :force => options[:force],
+      :format_executable => options[:format_executable],
       :ignore_dependencies => options[:ignore_dependencies],
       :install_dir => options[:install_dir],
       :security_policy => options[:security_policy],

data/lib/rubygems/commands/mirror_command.rb

@@ -60,10 +60,16 @@ Multiple sources and destinations may be specified.
       if get_from.scheme.nil? then
         get_from = get_from.to_s
       elsif get_from.scheme == 'file' then
-        get_from = get_from.to_s[5..-1]
+        # check if specified URI contains a drive letter (file:/D:/Temp)
+        get_from = get_from.to_s
+        get_from = if get_from =~ /^file:.*[a-z]:/i then
+                     get_from[6..-1]
+                   else
+                     get_from[5..-1]
+                   end
       end
 
-      open File.join(get_from, "Marshal.#{Gem.marshal_version}.Z"), "rb" do |y|
+      open File.join(get_from.to_s, "Marshal.#{Gem.marshal_version}.Z"), "rb" do |y|
         sourceindex_data = Zlib::Inflate.inflate y.read
         open File.join(save_to, "Marshal.#{Gem.marshal_version}"), "wb" do |out|
           out.write sourceindex_data

data/lib/rubygems/commands/query_command.rb

@@ -82,8 +82,10 @@ class Gem::Commands::QueryCommand < Gem::Command
       end
 
       entry = gem_name.dup
+
       if options[:versions] then
-        entry << " (#{list_of_matching.map{|gem| gem.version.to_s}.join(", ")})"
+        versions = list_of_matching.map { |s| s.version }.uniq
+        entry << " (#{versions.join ', '})"
       end
 
       entry << "\n" << format_text(list_of_matching[0].summary, 68, 4) if

data/lib/rubygems/commands/server_command.rb

@@ -7,17 +7,17 @@ class Gem::Commands::ServerCommand < Gem::Command
     super 'server', 'Documentation and gem repository HTTP server',
           :port => 8808, :gemdir => Gem.dir, :daemon => false
 
-    add_option '-p', '--port=PORT',
+    add_option '-p', '--port=PORT', Integer,
                'port to listen on' do |port, options|
       options[:port] = port
     end
 
     add_option '-d', '--dir=GEMDIR',
                'directory from which to serve gems' do |gemdir, options|
-      options[:gemdir] = gemdir
+      options[:gemdir] = File.expand_path gemdir
     end
 
-    add_option '--[no]-daemon', 'run as a daemon' do |daemon, options|
+    add_option '--[no-]daemon', 'run as a daemon' do |daemon, options|
       options[:daemon] = daemon
     end
   end

data/lib/rubygems/commands/unpack_command.rb

@@ -9,7 +9,13 @@ class Gem::Commands::UnpackCommand < Gem::Command
 
   def initialize
     super 'unpack', 'Unpack an installed gem to the current directory',
-          :version => Gem::Requirement.default
+          :version => Gem::Requirement.default,
+          :target  => Dir.pwd
+
+    add_option('--target', 'target directory for unpacking') do |value, options|
+      options[:target] = value
+    end
+
     add_version_option
   end
 
@@ -32,10 +38,11 @@ class Gem::Commands::UnpackCommand < Gem::Command
   def execute
     gemname = get_one_gem_name
     path = get_path(gemname, options[:version])
-    if path
-      target_dir = File.basename(path).sub(/\.gem$/, '')
+    if path then
+      basename = File.basename(path).sub(/\.gem$/, '')
+      target_dir = File.expand_path File.join(options[:target], basename)
       FileUtils.mkdir_p target_dir
-      Gem::Installer.new(path).unpack(File.expand_path(target_dir))
+      Gem::Installer.new(path).unpack target_dir
       say "Unpacked gem: '#{target_dir}'"
     else
       alert_error "Gem '#{gemname}' not installed."

data/lib/rubygems/commands/update_command.rb

@@ -4,146 +4,152 @@ require 'rubygems/local_remote_options'
 require 'rubygems/source_info_cache'
 require 'rubygems/version_option'
 
-module Gem
-  module Commands
-    class UpdateCommand < Command
+class Gem::Commands::UpdateCommand < Gem::Command
 
-      include Gem::InstallUpdateOptions
-      include Gem::LocalRemoteOptions
-      include Gem::VersionOption
+  include Gem::InstallUpdateOptions
+  include Gem::LocalRemoteOptions
+  include Gem::VersionOption
 
-      def initialize
-        super(
-          'update',
+  def initialize
+    super 'update',
           'Update the named gems (or all installed gems) in the local repository',
-          {
-            :generate_rdoc => true, 
-            :generate_ri => true, 
-            :force => false, 
-            :test => false,
-            :install_dir => Gem.dir
-          })
-
-        add_install_update_options
-
-        add_option('--system',
-          'Update the RubyGems system software') do |value, options|
-          options[:system] = value
-        end
+      :generate_rdoc => true, 
+      :generate_ri => true, 
+      :force => false, 
+      :test => false,
+      :install_dir => Gem.dir
 
-        add_local_remote_options
+    add_install_update_options
 
-        add_platform_option
-      end
+    add_option('--system',
+               'Update the RubyGems system software') do |value, options|
+      options[:system] = value
+    end
 
-      def arguments # :nodoc:
-        "GEMNAME       name of gem to update"
-      end
+    add_local_remote_options
 
-      def defaults_str # :nodoc:
-        "--rdoc --ri --no-force --no-test\n" +
-        "--install-dir #{Gem.dir}"
-      end
+    add_platform_option
+  end
+
+  def arguments # :nodoc:
+    "GEMNAME       name of gem to update"
+  end
 
-      def usage # :nodoc:
-        "#{program_name} GEMNAME [GEMNAME ...]"
+  def defaults_str # :nodoc:
+    "--rdoc --ri --no-force --no-test --install-dir #{Gem.dir}"
+  end
+
+  def usage # :nodoc:
+    "#{program_name} GEMNAME [GEMNAME ...]"
+  end
+
+  def execute
+    if options[:system] then
+      say "Updating RubyGems..."
+
+      unless options[:args].empty? then
+        fail "No gem names are allowed with the --system option"
       end
 
-      def execute
-        if options[:system] then
-          say "Updating RubyGems..."
+      options[:args] = ["rubygems-update"]
+    else
+      say "Updating installed gems..."
+    end
 
-          unless options[:args].empty? then
-            fail "No gem names are allowed with the --system option"
-          end
+    hig = highest_installed_gems = {}
 
-          options[:args] = ["rubygems-update"]
-        else
-          say "Updating installed gems..."
-        end
+    Gem::SourceIndex.from_installed_gems.each do |name, spec|
+      if hig[spec.name].nil? or hig[spec.name].version < spec.version then
+        hig[spec.name] = spec
+      end
+    end
 
-        hig = highest_installed_gems = {}
+    remote_gemspecs = Gem::SourceInfoCache.search(//)
 
-        Gem::SourceIndex.from_installed_gems.each do |name, spec|
-          if hig[spec.name].nil? or hig[spec.name].version < spec.version
-            hig[spec.name] = spec
-          end
-        end
+    gems_to_update = if options[:args].empty? then
+                       which_to_update(highest_installed_gems, remote_gemspecs)
+                     else
+                       options[:args]
+                     end
 
-        remote_gemspecs = Gem::SourceInfoCache.search(//)
+    options[:domain] = :remote # install from remote source
 
-        gems_to_update = if options[:args].empty? then
-                           which_to_update(highest_installed_gems, remote_gemspecs)
-                         else
-                           options[:args]
-                         end
+    # HACK use the real API
+    install_command = Gem::CommandManager.instance['install']
 
-        options[:domain] = :remote # install from remote source
+    gems_to_update.uniq.sort.each do |name|
+      say "Attempting remote update of #{name}"
+      options[:args] = [name]
+      options[:ignore_dependencies] = true # HACK skip seen gems instead
+      install_command.merge_options(options)
+      install_command.execute
+    end
 
-        # HACK use the real API
-        install_command = Gem::CommandManager.instance['install']
+    if gems_to_update.include? "rubygems-update" then
+      latest_ruby_gem = remote_gemspecs.select do |s|
+        s.name == 'rubygems-update'
+      end
 
-        gems_to_update.uniq.sort.each do |name|
-          say "Attempting remote update of #{name}"
-          options[:args] = [name]
-          options[:ignore_dependencies] = true # HACK skip seen gems instead
-          install_command.merge_options(options)
-          install_command.execute
-        end
+      latest_ruby_gem = latest_ruby_gem.sort_by { |s| s.version }.last
 
-        if gems_to_update.include?("rubygems-update") then
-          latest_ruby_gem = remote_gemspecs.select { |s|
-            s.name == 'rubygems-update'
-          }.sort_by { |s|
-            s.version
-          }.last
+      say "Updating version of RubyGems to #{latest_ruby_gem.version}"
+      installed = do_rubygems_update latest_ruby_gem.version
 
-          say "Updating version of RubyGems to #{latest_ruby_gem.version}"
-          installed = do_rubygems_update(latest_ruby_gem.version.to_s)
+      say "RubyGems system software updated" if installed
+    else
+      updated = gems_to_update.uniq.sort.collect { |g| g.to_s }
 
-          say "RubyGems system software updated" if installed
-        else
-          say "Gems: [#{gems_to_update.uniq.sort.collect{|g| g.to_s}.join(', ')}] updated"
-        end
+      if updated.empty? then
+        say "Nothing to update"
+      else
+        say "Gems updated: #{updated.join ', '}"
       end
+    end
+  end
 
-      def do_rubygems_update(version_string)
-        args = []
-        args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
-        args << '--no-rdoc' unless options[:generate_rdoc]
-        args << '--no-ri' unless options[:generate_ri]
+  def do_rubygems_update(version)
+    args = []
+    args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
+    args << '--no-rdoc' unless options[:generate_rdoc]
+    args << '--no-ri' unless options[:generate_ri]
 
-        update_dir = File.join(Gem.dir, 'gems',
-                               "rubygems-update-#{version_string}")
+    update_dir = File.join Gem.dir, 'gems', "rubygems-update-#{version}"
 
-        success = false
+    success = false
 
-        Dir.chdir update_dir do
-          say "Installing RubyGems #{version_string}"
-          setup_cmd = "#{Gem.ruby} setup.rb #{args.join ' '}"
+    Dir.chdir update_dir do
+      say "Installing RubyGems #{version}"
+      setup_cmd = "#{Gem.ruby} setup.rb #{args.join ' '}"
 
-          # Make sure old rubygems isn't loaded
-          if Gem.win_platform? then
-            system "set RUBYOPT= & #{setup_cmd}"
-          else
-            system "RUBYOPT=\"\" #{setup_cmd}"
-          end
-        end
+      # Make sure old rubygems isn't loaded
+      if Gem.win_platform? then
+        system "set RUBYOPT= & #{setup_cmd}"
+      else
+        system "RUBYOPT=\"\" #{setup_cmd}"
       end
+    end
+  end
+
+  def which_to_update(highest_installed_gems, remote_gemspecs)
+    result = []
 
-      def which_to_update(highest_installed_gems, remote_gemspecs)
-        result = []
-        highest_installed_gems.each do |l_name, l_spec|
-          highest_remote_gem =
-            remote_gemspecs.select  { |spec| spec.name == l_name }.
-                            sort_by { |spec| spec.version }.
-                            last
-          if highest_remote_gem and l_spec.version < highest_remote_gem.version
-            result << l_name
-          end
+    highest_installed_gems.each do |l_name, l_spec|
+      matching_gems = remote_gemspecs.select do |spec|
+        spec.name == l_name and Gem.platforms.any? do |platform|
+          platform == spec.platform
         end
-        result
+      end
+
+      highest_remote_gem = matching_gems.sort_by { |spec| spec.version }.last
+
+      if highest_remote_gem and
+         l_spec.version < highest_remote_gem.version then
+        result << l_name
       end
     end
+
+    result
   end
+
 end
+