slimgems 1.3.9.1 → 1.3.9.2

data/lib/rubygems.rb

@@ -7,7 +7,9 @@ gem_disabled = !defined? Gem
 
 unless gem_disabled
   # Nuke the Quickloader stuff
-  Gem::QuickLoader.remove if defined?(Gem::QuickLoader)
+  if defined?(Gem::QuickLoader) && Gem::QuickLoader.respond_to?(:remove)
+    Gem::QuickLoader.remove
+  end
 end
 
 require 'rubygems/defaults'
@@ -104,7 +106,7 @@ require 'thread'
 module Gem
   NAME = 'SlimGems'
   GEM_NAME = 'slimgems'
-  VERSION = '1.3.9.1'
+  VERSION = '1.3.9.2'
   SlimGemsVersion = RubyGemsVersion = VERSION
 
   ##

data/lib/rubygems/custom_require.rb

@@ -36,7 +36,22 @@ module Kernel
 
     raise load_error
   end
+  
+  if RUBY_VERSION < '1.8.7'
+    undef require
+    def require(path)
+      gem_original_require path
+    rescue LoadError => load_error
+      if load_error.message.rindex(path) == load_error.message.size - path.size
+        if Gem.try_activate(path)
+          return gem_original_require(path)
+        end
+      end
 
+      raise load_error
+    end
+  end
+  
   private :require
   private :gem_original_require
 

data/lib/rubygems/installer.rb

@@ -347,6 +347,17 @@ class Gem::Installer
   ##
   # Generates a #! line for +bin_file_name+'s wrapper copying arguments if
   # necessary.
+  #
+  # If the :custom_shebang config is set, then it is used as a template
+  # for how to create the shebang used for to run a gem's executables.
+  #
+  # The template supports 4 expansions:
+  #
+  #  $env    the path to the unix env utility
+  #  $ruby   the path to the currently running ruby interpreter
+  #  $exec   the path to the gem's executable
+  #  $name   the name of the gem the executable is for
+  #
 
   def shebang(bin_file_name)
     ruby_name = Gem::ConfigMap[:ruby_install_name] if @env_shebang
@@ -360,6 +371,25 @@ class Gem::Installer
       shebang.strip! # Avoid nasty ^M issues.
     end
 
+    if which = Gem.configuration[:custom_shebang]
+      which = which.gsub(/\$(\w+)/) do
+        case $1
+        when "env"
+          @env_path ||= ENV_PATHS.find do |env_path|
+                          File.executable? env_path
+                        end
+        when "ruby"
+          "#{Gem.ruby}#{opts}"
+        when "exec"
+          bin_file_name
+        when "name"
+          spec.name
+        end
+      end
+
+      return "#!#{which}"
+    end
+
     if not ruby_name then
       "#!#{Gem.ruby}#{opts}"
     elsif opts then

data/test/test_gem_installer.rb

@@ -2,6 +2,16 @@ require File.expand_path('../gem_installer_test_case', __FILE__)
 
 class TestGemInstaller < GemInstallerTestCase
 
+  def setup
+    super
+    @config = Gem.configuration
+  end
+
+  def teardown
+    super
+    Gem.configuration = @config
+  end
+
   def test_app_script_text
     util_make_exec '2', ''
 
@@ -817,6 +827,45 @@ load Gem.bin_path('a', 'my_exec', version)
     assert_equal "#!#{Gem.ruby} -ws", shebang
   end
 
+  def test_shebang_custom
+    conf = Gem::ConfigFile.new []
+    conf[:custom_shebang] = 'test'
+
+    Gem.configuration = conf
+
+    util_make_exec '2', "#!/usr/bin/ruby"
+
+    shebang = @installer.shebang 'my_exec'
+
+    assert_equal "#!test", shebang
+  end
+
+  def test_shebang_custom_with_expands
+    conf = Gem::ConfigFile.new []
+    conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec 4 $name'
+
+    Gem.configuration = conf
+
+    util_make_exec '2', "#!/usr/bin/ruby"
+
+    shebang = @installer.shebang 'my_exec'
+
+    assert_equal "#!1 /usr/bin/env 2 #{Gem.ruby} 3 my_exec 4 a", shebang
+  end
+
+  def test_shebang_custom_with_expands_and_arguments
+    conf = Gem::ConfigFile.new []
+    conf[:custom_shebang] = '1 $env 2 $ruby 3 $exec'
+
+    Gem.configuration = conf
+
+    util_make_exec '2', "#!/usr/bin/ruby -ws"
+
+    shebang = @installer.shebang 'my_exec'
+
+    assert_equal "#!1 /usr/bin/env 2 #{Gem.ruby} -ws 3 my_exec", shebang
+  end
+
   def test_unpack
     util_setup_gem
 

metadata

@@ -2,7 +2,7 @@
 name: slimgems
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.9.1
+  version: 1.3.9.2
 platform: ruby
 authors: 
 - Jim Weirich
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -04:00
+date: 2011-06-14 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -223,7 +223,7 @@ has_rdoc: true
 homepage: http://slimgems.github.com
 licenses: []
 
-post_install_message: "Upgraded from RubyGems to SlimGems 1.3.9.1\n\
+post_install_message: "Upgraded from RubyGems to SlimGems 1.3.9.2\n\
   \xEF\xBB\xBF=== 1.3.9.1 / 2011-06-03\n\n\
   SlimGems is a drop-in replacement for RubyGems. See README.md for more.\n\n\
   * Fixes slimgems getting uninstalled when `gem uninstall GEM` is called.\n\n"
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.1
+rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
 summary: SlimGems is a package management framework for Ruby