From 1daa0b113d853bfa57b776cc569939b61ca14292 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 13 Sep 2013 19:58:57 +0000
Subject: * lib/rubygems:  Update to RubyGems 2.1.3

  Fixed installing platform gems

  Restored concurrent requires

  Fixed installing gems with extensions with --install-dir

  Fixed `gem fetch -v` to install the latest version

  Fixed installing gems with "./" in their files entries

* test/rubygems/test_gem_package.rb:  Tests for the above.

* NEWS:  Updated for RubyGems 2.1.3


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/commands/pristine_command.rb | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'lib/rubygems/commands/pristine_command.rb')

diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 3f3bca45be..8d479211ac 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -31,12 +31,6 @@ class Gem::Commands::PristineCommand < Gem::Command
       options[:only_executables] = value
     end
 
-    add_option('-E', '--[no-]env-shebang',
-               'Rewrite executables with a shebang',
-               'of /usr/bin/env') do |value, options|
-      options[:env_shebang] = value
-    end
-
     add_version_option('restore to', 'pristine condition')
   end
 
@@ -111,21 +105,16 @@ with an extension.
         Gem::RemoteFetcher.fetcher.download_to_cache dep
       end
 
-      env_shebang =
-        if options.include? :env_shebang then
-          options[:env_shebang]
-        else
-          install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS['install']
-          install_defaults.to_s['--env-shebang']
-        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,
-                                     :env_shebang => env_shebang,
+                                     :env_shebang => installer_env_shebang,
                                      :build_args => spec.build_args)
-
       if options[:only_executables] then
         installer.generate_bin
       else
-- 
cgit v1.2.3