rubygems-update 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d252b22411a732dda23b05c5127a9748c60875e1
-  data.tar.gz: a97c4c16f3c1501d40dca2649eed2f84f4e81b02
+  metadata.gz: cfb3f2be16ac3c109c54b92dab14a6e2aff80f78
+  data.tar.gz: 723dbd0b9f74a8859078e4669a8b99e0f6cf6090
 SHA512:
-  metadata.gz: 0050121aa08473845edf6930f719201d3d9fca03c206c5d22f48c900c2e13d260f7c06d8853de17365357e6b2bef0d8360b71bd96df11cb592b7de12ec17cf8a
-  data.tar.gz: 538dcbc95cb5f02f70dcd6b8b3907f60cf1f813969ca84ccd38d331e41240eb86d4ac0ef471f78639ac90f01c1a5cf388816e876a130766eec5634dcd5aceebe
+  metadata.gz: ef957d7732b7d0b8188c0bd6c7614c59f0092df36725464475eee3fcfd77ff059d0c835c1c461d66827a021da6659421aef071a0ffe01341736c16cee2cea58d
+  data.tar.gz: e5269c767f58470e66fcfe30eee0cd68ff2d1edf8de55e2d761c51828da542e7be48f211a9bc004f4e7b6f5a27db7380e8e3caecec05870af800502a45ce49b2

data/History.txt

@@ -1,5 +1,12 @@
 # coding: UTF-8
 
+=== 2.4.1 / 2014-07-17
+
+Bug fixes:
+
+* RubyGems can now be updated on Ruby implementations that do not support
+  vendordir in RbConfig::CONFIG.  Issue #974 by net1957.
+
 === 2.4.0 / 2014-07-16
 
 Minor enhancements:

data/lib/rubygems.rb

@@ -9,7 +9,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/commands/uninstall_command.rb

@@ -80,6 +80,10 @@ class Gem::Commands::UninstallCommand < Gem::Command
     add_option('--vendor',
                'Uninstall gem from the vendor directory.',
                'Only for use by gem repackagers.') do |value, options|
+      unless Gem.vendor_dir then
+        raise OptionParser::InvalidOption.new 'your platform is not supported'
+      end
+
       alert_warning 'Use your OS package manager to uninstall vendor gems'
       options[:vendor] = true
       options[:install_dir] = Gem.vendor_dir

data/lib/rubygems/defaults.rb

@@ -92,7 +92,7 @@ module Gem
     path = []
     path << user_dir if user_home && File.exist?(user_home)
     path << default_dir
-    path << vendor_dir if File.directory? vendor_dir
+    path << vendor_dir if vendor_dir and File.directory? vendor_dir
     path
   end
 
@@ -168,6 +168,8 @@ module Gem
       return vendor_dir.dup
     end
 
+    return nil unless RbConfig::CONFIG.key? 'vendordir'
+
     File.join RbConfig::CONFIG['vendordir'], 'gems',
               RbConfig::CONFIG['ruby_version']
   end

data/lib/rubygems/install_update_options.rb

@@ -68,6 +68,10 @@ module Gem::InstallUpdateOptions
     add_option(:"Install/Update", '--vendor',
                'Install gem into the vendor directory.',
                'Only for use by gem repackagers.') do |value, options|
+      unless Gem.vendor_dir then
+        raise OptionParser::InvalidOption.new 'your platform is not supported'
+      end
+
       options[:vendor] = true
       options[:install_dir] = Gem.vendor_dir
     end

data/test/rubygems/test_gem.rb

@@ -244,6 +244,19 @@ class TestGem < Gem::TestCase
     RbConfig::CONFIG['vendordir'] = orig_vendordir
   end
 
+  def test_default_path_missing_vendor
+    orig_vendordir = RbConfig::CONFIG['vendordir']
+    RbConfig::CONFIG.delete 'vendordir'
+
+    FileUtils.rm_rf Gem.user_home
+
+    expected = [Gem.default_dir]
+
+    assert_equal expected, Gem.default_path
+  ensure
+    RbConfig::CONFIG['vendordir'] = orig_vendordir
+  end
+
   def test_default_path_user_home
     orig_vendordir = RbConfig::CONFIG['vendordir']
     RbConfig::CONFIG['vendordir'] = File.join @tempdir, 'vendor'
@@ -1037,6 +1050,15 @@ class TestGem < Gem::TestCase
     refute Gem.vendor_dir.frozen?
   end
 
+  def test_self_vendor_dir_missing
+    orig_vendordir = RbConfig::CONFIG['vendordir']
+    RbConfig::CONFIG.delete 'vendordir'
+
+    assert_nil Gem.vendor_dir
+  ensure
+    RbConfig::CONFIG['vendordir'] = orig_vendordir
+  end
+
   def test_load_plugins
     skip 'Insecure operation - chdir' if RUBY_VERSION <= "1.8.7"
     plugin_path = File.join "lib", "rubygems_plugin.rb"

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -259,5 +259,23 @@ WARNING:  Use your OS package manager to uninstall vendor gems
     assert_equal expected, @ui.error
   end
 
+  def test_handle_options_vendor_missing
+    orig_vendordir = RbConfig::CONFIG['vendordir']
+    RbConfig::CONFIG.delete 'vendordir'
+
+    e = assert_raises OptionParser::InvalidOption do
+      @cmd.handle_options %w[--vendor]
+    end
+
+    assert_equal 'invalid option: --vendor your platform is not supported',
+                 e.message
+
+    refute @cmd.options[:vendor]
+    refute @cmd.options[:install_dir]
+
+  ensure
+    RbConfig::CONFIG['vendordir'] = orig_vendordir
+  end
+
 end
 

data/test/rubygems/test_gem_install_update_options.rb

@@ -163,4 +163,22 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
     assert_equal Gem.vendor_dir, @cmd.options[:install_dir]
   end
 
+  def test_vendor_missing
+    orig_vendordir = RbConfig::CONFIG['vendordir']
+    RbConfig::CONFIG.delete 'vendordir'
+
+    e = assert_raises OptionParser::InvalidOption do
+      @cmd.handle_options %w[--vendor]
+    end
+
+    assert_equal 'invalid option: --vendor your platform is not supported',
+                 e.message
+
+    refute @cmd.options[:vendor]
+    refute @cmd.options[:install_dir]
+
+  ensure
+    RbConfig::CONFIG['vendordir'] = orig_vendordir
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jim Weirich