rubygems-update 1.8.4 → 1.8.5

data/History.txt

@@ -1,4 +1,16 @@
-=== 1.8.4 / 2011-05-25
+=== 1.8.5 / 2011-05-31
+
+* 2 minor enhancement:
+
+  * The -u option to 'update local source cache' is official deprecated.
+  * Remove has_rdoc deprecations from Specification.
+
+* 2 bug fixes:
+
+  * Handle bad specs more gracefully.
+  * Reset any Gem paths changed in the installer.
+
+=== 1.8.4 / 2011-05-25
 
 * 1 minor enhancement:
 

data/lib/rubygems.rb

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

data/lib/rubygems/installer.rb

@@ -141,8 +141,11 @@ class Gem::Installer
   #     specifications/<gem-version>.gemspec #=> the Gem::Specification
 
   def install
+    current_home = Gem.dir
+    current_path = Gem.paths.path
+
     verify_gem_home(options[:unpack])
-    Gem.use_paths gem_home, Gem.paths.path # HACK: shouldn't need Gem.paths.path
+    Gem.use_paths gem_home, current_path # HACK: shouldn't need Gem.paths.path
 
     # If we're forcing the install then disable security unless the security
     # policy says that we only install signed gems.
@@ -210,6 +213,11 @@ class Gem::Installer
     return spec
   rescue Zlib::GzipFile::Error
     raise Gem::InstallError, "gzip error installing #{gem}"
+  ensure
+    # conditional since we might be here because we're erroring out early.
+    if current_path
+      Gem.use_paths current_home, current_path
+    end
   end
 
   ##

data/lib/rubygems/local_remote_options.rb

@@ -117,7 +117,7 @@ module Gem::LocalRemoteOptions
   # Add the --update-sources option
 
   def add_update_sources_option
-    add_option(:"Local/Remote", '-u', '--[no-]update-sources',
+    add_option(:Deprecated, '-u', '--[no-]update-sources',
                'Update local source cache') do |value, options|
       Gem.configuration.update_sources = value
     end

data/lib/rubygems/specification.rb

@@ -262,11 +262,18 @@ class Gem::Specification
 
   def self._all # :nodoc:
     unless defined?(@@all) && @@all then
-      @@all = self.dirs.reverse.map { |dir|
-        Dir[File.join(dir, "*.gemspec")].map { |path|
-          Gem::Specification.load path
+      specs = []
+
+      self.dirs.reverse_each { |dir|
+        Dir[File.join(dir, "*.gemspec")].each { |path|
+          spec = Gem::Specification.load path.untaint
+          # #load returns nil if the spec is bad, so we just ignore
+          # it at this stage
+          specs << spec if spec
         }
-      }.flatten
+      }
+
+      @@all = specs
       _resort!
     end
     @@all
@@ -2098,15 +2105,15 @@ class Gem::Specification
 
   deprecate :test_suite_file,     :test_file,  2011, 10
   deprecate :test_suite_file=,    :test_file=, 2011, 10
-  deprecate :has_rdoc,            :none,       2011, 10
-  deprecate :has_rdoc?,           :none,       2011, 10
-  deprecate :has_rdoc=,           :none,       2011, 10
   deprecate :loaded,              :activated,  2011, 10
   deprecate :loaded?,             :activated?, 2011, 10
   deprecate :loaded=,             :activated=, 2011, 10
   deprecate :installation_path,   :base_dir,   2011, 10
   deprecate :cache_gem,           :cache_file, 2011, 10
   # TODO:
+  # deprecate :has_rdoc,            :none,       2011, 10
+  # deprecate :has_rdoc?,           :none,       2011, 10
+  # deprecate :has_rdoc=,           :none,       2011, 10
   # deprecate :default_executable,  :none,       2011, 10
   # deprecate :default_executable=, :none,       2011, 10
   # deprecate :spec_name,           :spec_file,  2011, 10

data/test/rubygems/test_gem_installer.rb

@@ -683,6 +683,8 @@ load Gem.bin_path('a', 'executable', version)
 
     @installer = Gem::Installer.new @gem, :install_dir => gemhome2
 
+    gem_home = Gem.dir
+
     build_rake_in do
       use_ui @ui do
         @installer.install
@@ -690,6 +692,7 @@ load Gem.bin_path('a', 'executable', version)
     end
 
     assert File.exist?(File.join(gemhome2, 'gems', @spec.full_name))
+    assert_equal gem_home, Gem.dir
   end
 
   def test_install_force

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 1
   - 8
-  - 4
-  version: 1.8.4
+  - 5
+  version: 1.8.5
 platform: ruby
 authors: 
 - Jim Weirich
@@ -15,30 +15,10 @@ authors:
 - Eric Hodel
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
-  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
-  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
-  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
-  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
-  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
-  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
-  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
-  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
-  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
-  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
-  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
-  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
-  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
-  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
-  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
-  x52qPcexcYZR7w==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2011-05-26 00:00:00 Z
+date: 2011-05-31 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -51,9 +31,9 @@ dependencies:
         hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 2
-        version: 2.0.2
+        version: 2.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -399,6 +379,7 @@ files:
 - util/CL2notes
 - util/gem_prelude.rb
 - .gemtest
+has_rdoc: true
 homepage: http://rubygems.org
 licenses: []
 
@@ -406,7 +387,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.4 Documentation
+- --title=RubyGems 1.8.5 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -432,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby

data.tar.gz.sig

@@ -1,2 +0,0 @@
-/��u�Ġ$��;�����2�ۼ��Мr.Qg����{��K^�\2�S���S�R`�V�<�Ŗ�GQ	�����P�[8-�_����i@�J�̐z��w!J�9(�!����b�p�����$*kЩ
;m���;�#�Ԅ�P�=�V�w�kS��s���`��`K�!�M��Yۗ��>cAG)#5��|PG�k
-!!~��Ӆ��3����ӌ�9s�,[�;�sЮ9Y�v