rubygems-bundler 1.3.0.rc1 → 1.3.0.rc2

data/lib/rubygems-bundler/noexec.rb

@@ -33,7 +33,7 @@ else
         puts msg if RubygemsBundler::DEBUG
       end
 
-      def candidate?(gemfile, bin)
+      def candidate?(gemfile, bin, rubygems_spec)
         config_file = File.expand_path('../.noexec.yaml', gemfile)
         log "Considering #{config_file.inspect}"
         if File.exist?(config_file)
@@ -49,12 +49,21 @@ else
           end
           log "Config based matching didn't find it, resorting to Gemfile lookup"
         end
+        return true if %w(ruby irb).include?(bin)
         ENV['BUNDLE_GEMFILE'] = gemfile
-        Bundler.with_bundle do |bundler|
-          bundler.specs.each do |spec|
-            next if spec.name == 'bundler'
-            return true if %w(ruby irb).include?(bin) || spec.executables.include?(bin)
+        Bundler.with_bundle do |runtime|
+          if rubygems_spec
+            missing_spec = runtime.
+              instance_variable_get(:@definition).
+              missing_specs.
+              detect{|spec| spec.name == rubygems_spec.name}
+            if missing_spec
+              puts "\e[31mCould not find proper version of #{missing_spec.to_s} in any of the sources\e[0m"
+              puts "\e[33mRun `bundle install` to install missing gems.\e[0m"
+              exit Bundler::GemNotFound.new.status_code
+            end
           end
+          return true if runtime.specs.detect{ |spec| spec.executables.include?(bin) }
         end
         false
       rescue Bundler::BundlerError, Bundler::GemfileError => e
@@ -62,12 +71,13 @@ else
         false
       end
 
-      def setup
+      def setup(bin)
         gemfile = ENV['BUNDLE_GEMFILE'] || File.join(RubygemsBundler::CURRENT, "Gemfile")
+        rubygems_spec = Bundler.rubygems.plain_specs.detect{|spec| spec.executables.include?(bin) }
         while true
           if File.file?(gemfile)
             log "Examining #{gemfile}"
-            if Noexec.candidate?(gemfile, File.basename($0))
+            if Noexec.candidate?(gemfile, bin, rubygems_spec)
               log "Using #{gemfile}"
               ENV['BUNDLE_GEMFILE'] = gemfile
               Bundler.setup
@@ -82,7 +92,7 @@ else
       end
     end
 
-    Noexec.setup
+    Noexec.setup(File.basename($0))
   rescue LoadError
     warn "bundler not being used, unable to load" if RubygemsBundler::DEBUG
   end

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.3.0.rc1"
+  VERSION = "1.3.0.rc2"
 end

data/test/dtf/bundler_comment_test.sh

@@ -10,20 +10,20 @@ gem install bundler          # status=0
 bundle install
 
 : exclusion
-head -n 1 $(which haml)      # match=/env ruby_noexec_wrapper/
+head -n 1 $(which haml)      # match=/env ruby_executable_hooks/
 NOEXEC_DEBUG=1 haml --version # match=/Using .*/rubygems-bunelr_bundler-test/Gemfile/; match!=/Binary excluded by config/
 printf "exclude:\n - haml\n" > ${BUNDLE_GEMFILE%/*}/.noexec.yaml
 NOEXEC_DEBUG=1 haml --version # match!=/Using .*/rubygems-bunelr_bundler-test/Gemfile/; match=/Binary excluded by config/
 
 : generated/removed
-head -n 1 $(which haml)      # match=/env ruby_noexec_wrapper/
-which ruby_noexec_wrapper    # status=0
+head -n 1 $(which haml)      # match=/env ruby_executable_hooks/
+which ruby_executable_hooks    # status=0
 
 gem list                     # match=/haml/
-rubygems-bundler-uninstaller # match=/haml/
+executable-hooks-uninstaller # match=/haml/
 
-head -n 1 $(which haml)      # match!=/env ruby_noexec_wrapper/
-which ruby_noexec_wrapper    # status=1
+head -n 1 $(which haml)      # match!=/env ruby_executable_hooks/
+which ruby_executable_hooks    # status=1
 
 gem uninstall -ax haml       # match=/Successfully uninstalled/
 rm -rf ${BUNDLE_GEMFILE%/*}  # status=0

data/test/dtf/rubygems_comment_test.sh

@@ -3,13 +3,13 @@ sm gem install # match=/installed/
 
 yes | gem install haml          # match=/1 gem installed/
 
-head -n 1 $(which haml)   # match=/env ruby_noexec_wrapper/
-which ruby_noexec_wrapper # status=0
+head -n 1 $(which haml)   # match=/env ruby_executable_hooks/
+which ruby_executable_hooks # status=0
 
 gem list                     # match=/haml/
-rubygems-bundler-uninstaller # match=/haml/
+executable-hooks-uninstaller # match=/haml/
 
-head -n 1 $(which haml)   # match!=/env ruby_noexec_wrapper/
-which ruby_noexec_wrapper # status=1
+head -n 1 $(which haml)   # match!=/env ruby_executable_hooks/
+which ruby_executable_hooks # status=1
 
 gem uninstall -x haml     # match=/Successfully uninstalled/

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: -1228271734
-  prerelease: true
+  hash: 995727847
+  prerelease: 6
   segments: 
   - 1
   - 3
   - 0
-  - rc1
-  version: 1.3.0.rc1
+  - rc
+  - 2
+  version: 1.3.0.rc2
 platform: ruby
 authors: 
 - Josh Hull
@@ -17,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-11 00:00:00 +02:00
-default_executable: 
+date: 2013-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler-unload
@@ -92,7 +92,6 @@ files:
 - test/dtf/bundler_comment_test.sh
 - test/dtf/rails_and_gemfile_comment_test.sh
 - test/dtf/rubygems_comment_test.sh
-has_rdoc: true
 homepage: http://mpapis.github.com/rubygems-bundler
 licenses: []
 
@@ -124,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Stop using bundle exec