rubygems-update 1.8.1 → 1.8.2

data/History.txt

@@ -1,4 +1,17 @@
-=== 1.8.1 / 2011-05-05
+=== 1.8.2 / 2011-05-11
+
+* 2 minor enhancements:
+
+  * Moved #outdated from OutdatedCommand to Specification (for Isolate).
+  * Print out a warning about missing executables.
+
+* 3 bug fixes:
+
+  * Added missing requires to fix various upgrade issues.
+  * `gem pristine` respects multiple gem repositories.
+  * setup.rb now execs with --disable-gems when possible
+
+=== 1.8.1 / 2011-05-05
 
 * 1 minor enhancement:
 

data/lib/rubygems.rb

@@ -120,7 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the

data/lib/rubygems/commands/outdated_command.rb

@@ -16,7 +16,7 @@ class Gem::Commands::OutdatedCommand < Gem::Command
   end
 
   def execute
-    outdated.sort.each do |name|
+    Gem::Specification.outdated.sort.each do |name|
       local   = Gem::Specification.find_all_by_name(name).max
       dep     = Gem::Dependency.new local.name, ">= #{local.version}"
       remotes = Gem::SpecFetcher.fetcher.fetch dep
@@ -27,21 +27,4 @@ class Gem::Commands::OutdatedCommand < Gem::Command
       say "#{local.name} (#{local.version} < #{remote.version})"
     end
   end
-
-  def outdated
-    outdateds = []
-
-    fetcher = Gem::SpecFetcher.fetcher
-
-    Gem::Specification.latest_specs.each do |local|
-      dependency = Gem::Dependency.new local.name, ">= #{local.version}"
-      remotes    = fetcher.find_matching dependency
-      remotes    = remotes.map { |(_, version, _), _| version }
-      latest     = remotes.sort.last
-
-      outdateds << local.name if latest and local.version < latest
-    end
-
-    outdateds
-  end
 end

data/lib/rubygems/commands/pristine_command.rb

@@ -94,12 +94,13 @@ extensions.
       end
 
       # TODO use installer options
-      installer = Gem::Installer.new gem, :wrappers => true, :force => true
+      installer = Gem::Installer.new(gem,
+                                     :wrappers => true,
+                                     :force => true,
+                                     :install_dir => spec.base_dir)
       installer.install
 
       say "Restored #{spec.full_name}"
     end
   end
-
 end
-

data/lib/rubygems/dependency.rb

@@ -240,7 +240,7 @@ class Gem::Dependency
     # TODO: check Gem.activated_spec[self.name] in case matches falls outside
 
     if matches.empty? then
-      specs = Gem::Specification.map(&:full_name).join ", "
+      specs = Gem::Specification.all_names.join ", "
       error = Gem::LoadError.new "Could not find #{name} (#{requirement}) amongst [#{specs}]"
       error.name        = self.name
       error.requirement = self.requirement

data/lib/rubygems/gem_path_searcher.rb

@@ -1,3 +1,6 @@
+require "rubygems"
+require "rubygems/deprecate"
+
 ##
 # GemPathSearcher has the capability to find loadable files inside
 # gems.  It generates data up front to speed up searches later.

data/lib/rubygems/gem_runner.rb

@@ -4,6 +4,7 @@
 # See LICENSE.txt for permissions.
 #++
 
+require "rubygems"
 require 'rubygems/command_manager'
 require 'rubygems/config_file'
 require 'rubygems/doc_manager'

data/lib/rubygems/installer.rb

@@ -283,11 +283,15 @@ class Gem::Installer
     spec.executables.each do |filename|
       filename.untaint
       bin_path = File.expand_path File.join(gem_dir, spec.bindir, filename)
-      if File.exist? bin_path
-        mode = File.stat(bin_path).mode | 0111
-        FileUtils.chmod mode, bin_path
+
+      unless File.exist? bin_path
+        warn "Hey?!?! Where did #{bin_path} go??"
+        next
       end
 
+      mode = File.stat(bin_path).mode | 0111
+      FileUtils.chmod mode, bin_path
+
       if @wrappers then
         generate_bin_script filename, bindir
       else

data/lib/rubygems/specification.rb

@@ -569,6 +569,28 @@ class Gem::Specification
     result.gsub(/ !!null \n/, " \n")
   end
 
+  ##
+  # Return a list of all outdated specifications. This method is HEAVY
+  # as it must go fetch specifications from the server.
+
+  def self.outdated
+    outdateds = []
+
+    # TODO: maybe we should switch to rubygems' version service?
+    fetcher = Gem::SpecFetcher.fetcher
+
+    latest_specs.each do |local|
+      dependency = Gem::Dependency.new local.name, ">= #{local.version}"
+      remotes    = fetcher.find_matching dependency
+      remotes    = remotes.map { |(_, version, _), _| version }
+      latest     = remotes.sort.last
+
+      outdateds << local.name if latest and local.version < latest
+    end
+
+    outdateds
+  end
+
   ##
   # Removes +spec+ from the known specs.
 

data/setup.rb

@@ -6,7 +6,7 @@
 #++
 
 # Make sure rubygems isn't already loaded.
-if ENV['RUBYOPT'] and defined? Gem then
+if ENV['RUBYOPT'] or defined? Gem then
   ENV.delete 'RUBYOPT'
 
   require 'rbconfig'
@@ -15,7 +15,10 @@ if ENV['RUBYOPT'] and defined? Gem then
   ruby = File.join config::CONFIG['bindir'], config::CONFIG['ruby_install_name']
   ruby << config::CONFIG['EXEEXT']
 
-  exec(ruby, 'setup.rb', *ARGV)
+  cmd = [ruby, 'setup.rb', *ARGV].compact
+  cmd[1,0] = "--disable-gems" if RUBY_VERSION > "1.9"
+
+  exec(*cmd)
 end
 
 Dir.chdir File.dirname(__FILE__)

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -111,6 +111,36 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_empty out, out.inspect
   end
 
+  def test_execute_many_multi_repo
+    a = quick_spec 'a'
+    install_gem a
+
+    Gem.clear_paths
+    gemhome2 = File.join @tempdir, 'gemhome2'
+    Gem.paths = { "GEM_PATH" => [gemhome2, @gemhome], "GEM_HOME" => gemhome2 }
+
+    b = quick_spec 'b'
+    install_gem b
+
+    @cmd.options[:args] = %w[a b]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+
+    assert_equal "Restoring gems to pristine condition...", out.shift
+    assert_equal "Restored #{a.full_name}", out.shift
+    assert_equal "Restored #{b.full_name}", out.shift
+    assert_empty out, out.inspect
+
+    assert_path_exists File.join(@gemhome, "gems", 'a-2')
+    refute_path_exists File.join(gemhome2, "gems", 'a-2')
+    assert_path_exists File.join(gemhome2, "gems", 'b-2')
+    refute_path_exists File.join(@gemhome, "gems", 'b-2')
+  end
+
   def test_execute_missing_cache_gem
     a_2 = quick_spec 'a', 2
     a_3 = quick_spec 'a', 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 1
   - 8
-  - 1
-  version: 1.8.1
+  - 2
+  version: 1.8.2
 platform: ruby
 authors: 
 - Jim Weirich
@@ -38,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-05-06 00:00:00 Z
+date: 2011-05-12 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.1 Documentation
+- --title=RubyGems 1.8.2 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.0
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby