rubygems-bundler 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: a54f0dfa7d84cec266825776da8b2d3cc8acb8992da8aff941755c43471fb558a57b43d99323ae1d416095458fe68bd3dd46ee2182c09e3659dd3ef913d7d924
-  data.tar.gz: df2ba5391f44296308697923b6bf209f055b915dc9fd7a839c8f13a289d96e5d1edcfca9a79d70a19f2f07c1a4617acf4e44d31bf9467c4bcf507fc0374e6a02
 SHA1: 
-  metadata.gz: 4ebd360e100158d71eb1d75c43667822379dd5ec
-  data.tar.gz: 0dabcd502c996177c54f1c8ac18224bcb61ba541
+  data.tar.gz: e2924818f0358170cdbc6b2161193baf44e36c8f
+  metadata.gz: ed28cbeb5191d6e07851576bee9540ef6d1aa440
+SHA512: 
+  data.tar.gz: ee9c2c15fb987ea87265835216f3317175f1d684e807dd49e7d5397560541f0484dee2c52ca186a54af111ba2698599070d56366fd8649369cad64e67d789797
+  metadata.gz: 1e3fc6e5079a460e9ddef58c661a70326972a178642efd811640e7067e1d59c0069cbc021ab4c1084c4390eeb6d18f41ace1ae1a23fa960d940785a4ef3dd4d0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.0
+date: 2013-10-20
+
+ - skip unload! / load round trip when binary found in Gemfile, avoids mpapis/bundler-unload#3
+
 ## 1.3.4
 date: 2013-10-04
 

data/lib/rubygems-bundler/noexec.rb

@@ -1,10 +1,10 @@
 require "rubygems"
 
 class Noexec
-  DEBUG   = ENV.key?('NOEXEC_DEBUG')
+  DEBUG   = ENV['NOEXEC_DEBUG']
   CURRENT = Dir.pwd
 
-  attr_reader :bin
+  attr_reader :bin, :gemfile, :rubygems_specs
 
   def initialize(bin)
     log "Bin used: #{bin}"
@@ -17,14 +17,20 @@ class Noexec
     puts msg if Noexec::DEBUG
   end
 
-  def candidate?(gemfile)
+  def log2(msg)
+    puts msg if Noexec::DEBUG == "2"
+  end
+
+  def candidate?
+    log "Examining #{gemfile}"
     config_file = File.expand_path('../.noexec.yaml', gemfile)
-    log "Considering #{config_file.inspect}"
     if File.exist?(config_file)
       log "Using config file at #{config_file}"
       require "yaml"
       config = YAML::load_file(config_file)
-      raise "You cannot have both an include and exclude section in your #{config_file.inspect}" unless config['include'].nil? ^ config['exclude'].nil?
+      unless config['include'].nil? ^ config['exclude'].nil?
+        raise "You cannot have both an include and exclude section in your #{config_file.inspect}"
+      end
       if config['include'] && config['include'].include?(bin)
         log "Binary included by config"
         return true
@@ -34,22 +40,24 @@ class Noexec
       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 |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
+    runtime = Bundler.load
+    log2 "runtime specs: #{runtime.specs.map{|g| "#{g.name}-#{g.version}"}*" "}"
+    if rubygems_spec # that single gem
+      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
-      return true if runtime.specs.detect{ |spec| spec.executables.include?(bin) }
     end
+    if runtime.specs.detect{ |spec| spec.executables.include?(bin) }
+      return true
+    end
+    Bundler.unload!(rubygems_specs)
     false
   rescue Bundler::BundlerError, Bundler::GemfileError => e
     warn "Ignoring candidate #{gemfile}:\n#{e}" if Noexec::DEBUG
@@ -57,27 +65,26 @@ class Noexec
   end
 
   def rubygems_spec
-    @rubygems_spec ||= Bundler.rubygems.plain_specs.detect{|spec| spec.executables.include?(bin) }
+    @rubygems_spec ||= rubygems_specs.detect{|spec| spec.executables.include?(bin) }
   end
 
   def setup
     puts "Noexec - starting check" if Noexec::DEBUG
     require "bundler-unload"
 
-    gemfile = ENV['BUNDLE_GEMFILE'] || File.join(Noexec::CURRENT, "Gemfile")
+    @rubygems_specs = Bundler.rubygems.plain_specs # save it for unloading and checking binary
+    log2 "rubygems_specs: #{rubygems_specs.map{|g| "#{g.name}-#{g.version}"}*" "}"
+
+    @gemfile = ENV['BUNDLE_GEMFILE'] || File.join(Noexec::CURRENT, "Gemfile")
+
     while true
-      if File.file?(gemfile)
-        log "Examining #{gemfile}"
-        if candidate?(gemfile)
-          log "Using #{gemfile}"
-          ENV['BUNDLE_GEMFILE'] = gemfile
-          Bundler.setup
-          return
-        end
+      if File.file?(gemfile) && candidate?
+        log "Keeping #{gemfile} loaded"
+        return
       end
       new_gemfile = File.expand_path("../../Gemfile", gemfile)
       break if new_gemfile == gemfile
-      gemfile = new_gemfile
+      @gemfile = new_gemfile
     end
     log "No valid Gemfile found, moving on"
   rescue LoadError
@@ -101,6 +108,7 @@ class Noexec
 
     else
       setup
+
     end
   end
 

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.3.4"
+  VERSION = "1.4.0"
 end

data/rubygems-bundler.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.add_dependency "bundler-unload", ">=1.0.2"
-  s.add_dependency "executable-hooks", ">=1.2.3"
+  s.add_dependency "executable-hooks", ">=1.2.5"
   s.add_development_dependency "tf"
   #s.add_development_dependency "smf-gem"
 end

data/test/dtf/bundler_comment_test.sh

@@ -13,9 +13,9 @@ bundle install # status=0
 
 : exclusion
 head -n 1 "$(which haml)"     # match=/env ruby_executable_hooks/
-haml --version # match=/Using .*/rubygems-bunelr_bundler-test/Gemfile/; match!=/Binary excluded by config/
+haml --version # match=/Keeping .*/rubygems-bunelr_bundler-test/Gemfile loaded/; match!=/Binary excluded by config/
 printf "exclude:\n - haml\n" > ${BUNDLE_GEMFILE%/*}/.noexec.yaml
-haml --version # match!=/Using .*/rubygems-bunelr_bundler-test/Gemfile/; match=/Binary excluded by config/
+haml --version # match!=/Keeping .*/rubygems-bunelr_bundler-test/Gemfile loaded/; match=/Binary excluded by config/
 
 : generated/removed
 head -n 1 "$(which haml)"    # match=/env ruby_executable_hooks/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors: 
 - Josh Hull
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-04 00:00:00 Z
+date: 2013-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler-unload
@@ -29,7 +29,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.2.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.10
+rubygems_version: 2.0.12
 signing_key: 
 specification_version: 4
 summary: Stop using bundle exec