rubygems-bundler 0.9.0 → 0.9.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.9.1
+date: 2012-05-05
+
+ - fix #15 respect --env-shebang
+ - add latest rubygems changes
+
 ## 0.9.0
 date: 2012-04-03
 

data/README.md

@@ -16,11 +16,6 @@ Next run (once):
 
 And you're done!
 
-Alternatively, in your .bashrc (or somewhere you can set env variables):
-
-    export RUBYOPT="-r`noexec`"
-
-
 ## Configuration
 
 Though you can let noexec do it's own thing and rely on looking up your binary via your Gemfile, 

data/lib/rubygems-bundler/rubygems_bundler_installer.rb

@@ -23,15 +23,14 @@ module RubyGemsBundlerInstaller
 
 
   def self.shebang(inst, bin_file_name)
-    ruby_name = Gem::ConfigMap[:ruby_install_name] if @env_shebang
+    ruby_name = Gem::ConfigMap[:ruby_install_name] if inst.options[:env_shebang]
     bindir = inst.bin_dir ? inst.bin_dir : Gem.bindir(inst.gem_home)
     path = File.join bindir, inst.formatted_program_filename(bin_file_name)
     first_line = File.open(path, "rb") {|file| file.gets}
-    @@env_path ||= Gem::Installer::ENV_PATHS.find {|env_path| File.executable? env_path }
 
     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
@@ -40,7 +39,7 @@ module RubyGemsBundlerInstaller
       which = which.gsub(/\$(\w+)/) do
         case $1
         when "env"
-          @@env_path
+          @env_path ||= Gem::Installer::ENV_PATHS.find {|env_path| File.executable? env_path }
         when "ruby"
           "#{Gem.ruby}#{opts}"
         when "exec"
@@ -58,7 +57,8 @@ module RubyGemsBundlerInstaller
     elsif inst.opts then
       "#!/bin/sh\n'exec' #{ruby_name.dump} '-x' \"$0\" \"$@\"\n#{shebang}"
     else
-      "#!#{@@env_path} #{ruby_name}"
+      @env_path ||= Gem::Installer::ENV_PATHS.find {|env_path| File.executable? env_path }
+      "#!#{@env_path} #{ruby_name}"
     end
   end
 

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/rubygems-bundler.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name        = "rubygems-bundler"
   s.version     = RubygemsBundler::VERSION
   s.authors     = ["Josh Hull", "Michal Papis"]
-  s.email       = ["joshbuddy@gmail.com", "mpapis@gmail.conf"]
+  s.email       = ["joshbuddy@gmail.com", "mpapis@gmail.com"]
   s.homepage    = "http://mpapis.github.com/rubygems-bundler"
   s.summary     = %q{Stop using bundle exec}
   s.description = %q{Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.}
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables = ["noexec"]
   s.extensions  = ["ext/wrapper_installer/extconf.rb"]
 
-  # Can do we have to depend on those two ? Can we have two simple tasks doing the same ?
+  # Do we have to depend on those two ? Can we have two simple tasks doing the same ?
   s.add_development_dependency "rake"
   s.add_development_dependency "bundler"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,12 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-09 00:00:00 Z
+date: 2012-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
   type: :development
-  version_requirements: *id002
 description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.
 email: 
 - joshbuddy@gmail.com
-- mpapis@gmail.conf
+- mpapis@gmail.com
 executables: 
 - noexec
 extensions: 
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Stop using bundle exec