rubygems-bundler 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.1
+date: 2012-05-17
+
+ - fix #20, #22 improved detection of Bundler.setup
+ - fix #19, #25 no more failing for git gems
+
 ## 1.0.0
 date: 2012-05-09
 

data/lib/rubygems-bundler/noexec.rb

@@ -45,14 +45,15 @@ begin
       false
     ensure
       Bundler.reset!
+      ENV['BUNDLE_GEMFILE'] = nil
     end
 
     def setup
       log "Noexec"
-      return if %w(bundle rubygems-bundler-uninstaller).include?(File.basename($0))
-      return if ENV['BUNDLE_GEMFILE']
+      return if %w(bundle rubygems-bundler-uninstaller).include?(File.basename($0))   
+      return if ENV['BUNDLE_GEMFILE'] && ENV['BUNDLE_BIN_PATH'] && ENV['RUBYOPT']
       return if %w(0 skip).include?( ENV['NOEXEC'] )
-      gemfile = File.join(CURRENT, "Gemfile")
+      gemfile = ENV['BUNDLE_GEMFILE'] || File.join(CURRENT, "Gemfile")
       while true
         if File.exist?(gemfile)
           log "Examining #{gemfile}"

data/lib/rubygems-bundler/rubygems_bundler_installer.rb

@@ -24,7 +24,7 @@ module RubyGemsBundlerInstaller
 
   def self.shebang(inst, bin_file_name)
     # options were defined first in 1.5, we want to support back to 1.3.7
-    ruby_name = Gem::ConfigMap[:ruby_install_name] if inst.respond_to?('options') ? inst.options[:env_shebang] :inst.instance_variable_get(:@env_shebang)
+    ruby_name = Gem::ConfigMap[:ruby_install_name] if inst.instance_variable_get(:@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}

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-14 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dtf