rubygems-update 1.8.16 → 1.8.17

data/History.txt

@@ -1,5 +1,20 @@
 # coding: UTF-8
 
+=== 1.8.17 / 2012-02-17
+
+* 2 minor enhancements:
+
+  * Add MacRuby to the list of special cases for platforms (ferrous26)
+  * Add a default for where to install rubygems itself
+
+* 3 bug fixes:
+
+  * Fixed gem loading issue caused by dependencies not resolving.
+  * Fixed umask error when stdlib is required and unresolved dependencies exist.
+  * Shebang munging would only take one arg after the cmd
+  * Define SUCKAGE better, ie only MRI 1.9.2
+  * Propagate env-shebang to the pristine command if set for install.
+
 === 1.8.16 / 2012-02-12
 
 * 3 bug fixes:

data/lib/rubygems.rb

@@ -7,7 +7,9 @@
 
 module Gem
   QUICKLOADER_SUCKAGE = RUBY_VERSION =~ /^1\.9\.1/
-  GEM_PRELUDE_SUCKAGE = RUBY_VERSION =~ /^1\.9\.2/
+
+  # Only MRI 1.9.2 has the custom prelude.
+  GEM_PRELUDE_SUCKAGE = RUBY_VERSION =~ /^1\.9\.2/ and RUBY_ENGINE == "ruby"
 end
 
 if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
@@ -118,7 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.16'
+  VERSION = '1.8.17'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -442,11 +444,11 @@ module Gem
   # problem, then we will silently continue.
 
   def self.ensure_gem_subdirectories dir = Gem.dir
-    require 'fileutils'
-
     old_umask = File.umask
     File.umask old_umask | 002
 
+    require 'fileutils'
+
     %w[cache doc gems specifications].each do |name|
       subdir = File.join dir, name
       next if File.exist? subdir

data/lib/rubygems/commands/pristine_command.rb

@@ -94,10 +94,14 @@ extensions.
       end
 
       # TODO use installer options
+      install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS['install']
+      installer_env_shebang = install_defaults.to_s['--env-shebang']
+      
       installer = Gem::Installer.new(gem,
                                      :wrappers => true,
                                      :force => true,
-                                     :install_dir => spec.base_dir)
+                                     :install_dir => spec.base_dir,
+                                     :env_shebang => installer_env_shebang)
       installer.install
 
       say "Restored #{spec.full_name}"

data/lib/rubygems/commands/setup_command.rb

@@ -252,9 +252,19 @@ TEXT
   end
 
   def make_destination_dirs(install_destdir)
-    lib_dir = nil
-    bin_dir = nil
+    lib_dir, bin_dir = Gem.default_rubygems_dirs
 
+    unless lib_dir
+      lib_dir, bin_dir = generate_default_dirs(install_destdir)
+    end
+
+    mkdir_p lib_dir
+    mkdir_p bin_dir
+
+    return lib_dir, bin_dir
+  end
+
+  def generate_default_dirs(install_destdir)
     prefix = options[:prefix]
     site_or_vendor = options[:site_or_vendor]
 
@@ -283,10 +293,7 @@ TEXT
       bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '')
     end
 
-    mkdir_p lib_dir
-    mkdir_p bin_dir
-
-    return lib_dir, bin_dir
+    [lib_dir, bin_dir]
   end
 
   def remove_old_bin_files(bin_dir)

data/lib/rubygems/custom_require.rb

@@ -55,7 +55,8 @@ module Kernel
       return gem_original_require path
     end
   rescue LoadError => load_error
-    if load_error.message.end_with?(path) and Gem.try_activate(path) then
+    if load_error.message.start_with?("Could not find") or
+        (load_error.message.end_with?(path) and Gem.try_activate(path)) then
       return gem_original_require(path)
     end
 

data/lib/rubygems/defaults.rb

@@ -43,6 +43,13 @@ module Gem
     @default_dir ||= File.join(*path)
   end
 
+  ##
+  # Paths where RubyGems' .rb files and bin files are installed
+
+  def self.default_rubygems_dirs
+    nil # default to standard layout
+  end
+
   ##
   # Path for gems in the user's home directory
 

data/lib/rubygems/installer.rb

@@ -366,7 +366,7 @@ class Gem::Installer
 
     if /\A#!/ =~ first_line then
       # Preserve extra words on shebang line, like "-w".  Thanks RPA.
-      shebang = first_line.sub(/\A\#!.*?ruby\S*(?=(\s+\S+))/, "#!#{Gem.ruby}")
+      shebang = first_line.sub(/\A\#!.*?ruby\S*((\s+\S+)+)/, "#!#{Gem.ruby}")
       opts = $1
       shebang.strip! # Avoid nasty ^M issues.
     end

data/lib/rubygems/platform.rb

@@ -68,6 +68,7 @@ class Gem::Platform
                       when /aix(\d+)/ then             [ 'aix',       $1  ]
                       when /cygwin/ then               [ 'cygwin',    nil ]
                       when /darwin(\d+)?/ then         [ 'darwin',    $1  ]
+                      when /^macruby$/ then            [ 'macruby',   nil ]
                       when /freebsd(\d+)/ then         [ 'freebsd',   $1  ]
                       when /hpux(\d+)/ then            [ 'hpux',      $1  ]
                       when /^java$/, /^jruby$/ then    [ 'java',      nil ]

data/test/rubygems/test_gem_platform.rb

@@ -43,6 +43,7 @@ class TestGemPlatform < Gem::TestCase
       'sparc-solaris2.9'       => ['sparc',     'solaris',   '2.9'],
       'universal-darwin8'      => ['universal', 'darwin',    '8'],
       'universal-darwin9'      => ['universal', 'darwin',    '9'],
+      'universal-macruby'      => ['universal', 'macruby',   nil],
       'i386-cygwin'            => ['x86',       'cygwin',    nil],
       'i686-darwin'            => ['x86',       'darwin',    nil],
       'i686-darwin8.4.1'       => ['x86',       'darwin',    '8'],
@@ -246,6 +247,12 @@ class TestGemPlatform < Gem::TestCase
     refute_match 'dotnet-2.0',            Gem::Platform.local
     assert_match 'dotnet-4.0',            Gem::Platform.local
 
+    util_set_arch 'universal-macruby-1.0'
+    assert_match 'universal-macruby',      Gem::Platform.local
+    assert_match 'macruby',                Gem::Platform.local
+    refute_match 'universal-macruby-0.10', Gem::Platform.local
+    assert_match 'universal-macruby-1.0',  Gem::Platform.local
+
     util_set_arch 'powerpc-darwin'
     assert_match 'powerpc-darwin', Gem::Platform.local
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 8
-  - 16
-  version: 1.8.16
+  - 17
+  version: 1.8.17
 platform: ruby
 authors: 
 - Jim Weirich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 Z
+date: 2012-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -399,7 +399,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.16 Documentation
+- --title=RubyGems 1.8.17 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -425,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.14
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby