rubygems-bundler 1.3.0.rc2 → 1.3.0.rc3

data/lib/rubygems-bundler/noexec.rb

@@ -1,99 +1,106 @@
+require "rubygems"
 require "yaml"
 
-module RubygemsBundler
-end
-RubygemsBundler::DEBUG = ENV.key?('NOEXEC_DEBUG')
-
-if %w(bundle rubygems-bundler-uninstaller).include?(File.basename($0))
-  puts "Noexec - skipped binary: #{File.basename($0)}" if RubygemsBundler::DEBUG
-
-elsif ENV['NOEXEC_EXCLUDE'] && ENV['NOEXEC_EXCLUDE'].split(/ /).include?(File.basename($0))
-  puts "Noexec - ENV skipped binary: #{File.basename($0)}" if RubygemsBundler::DEBUG
-
-elsif ENV['BUNDLE_GEMFILE'] && ENV['BUNDLE_BIN_PATH'] && ENV['RUBYOPT']
-  puts "Noexec - already in 'bundle exec'" if RubygemsBundler::DEBUG
+class Noexec
+  DEBUG   = ENV.key?('NOEXEC_DEBUG')
+  CURRENT = Dir.pwd
 
-elsif %w(0 skip).include?( ENV['NOEXEC'] ) || ENV.key?('NOEXEC_DISABLE')
-  #TODO: deprecated in 1.1.0, to be removed in 1.2.0 -- 2012.09.05
-  $stderr.puts "Warning, 'NOEXEC' environment variable is deprecated, switch to 'NOEXEC_DISABLE=1'." if ENV.key?('NOEXEC')
-  puts "Noexec - disabled with environment variable" if RubygemsBundler::DEBUG
+  attr_reader :bin
 
-else
-  begin
-    puts "Noexec - starting check" if RubygemsBundler::DEBUG
-    require "rubygems"
-    require "bundler-unload"
-
-    module Noexec
-      RubygemsBundler::CURRENT = Dir.pwd
+  def initialize(bin)
+    @bin = bin
+  end
 
-      extend self
+  def log(msg)
+    puts msg if Noexec::DEBUG
+  end
 
-      def log(msg)
-        puts msg if RubygemsBundler::DEBUG
+  def candidate?(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}"
+      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?
+      if config['include'] && config['include'].include?(bin)
+        log "Binary included by config"
+        return true
+      elsif config['exclude'] && config['exclude'].include?(bin)
+        log "Binary excluded by config"
+        return false
       end
-
-      def candidate?(gemfile, bin, rubygems_spec)
-        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}"
-          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?
-          if config['include'] && config['include'].include?(bin)
-            log "Binary included by config"
-            return true
-          elsif config['exclude'] && config['exclude'].include?(bin)
-            log "Binary excluded by config"
-            return false
-          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
-          end
-          return true if runtime.specs.detect{ |spec| spec.executables.include?(bin) }
+      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
-        false
-      rescue Bundler::BundlerError, Bundler::GemfileError => e
-        warn "Ignoring candidate #{gemfile}:\n#{e}" if RubygemsBundler::DEBUG
-        false
       end
+      return true if runtime.specs.detect{ |spec| spec.executables.include?(bin) }
+    end
+    false
+  rescue Bundler::BundlerError, Bundler::GemfileError => e
+    warn "Ignoring candidate #{gemfile}:\n#{e}" if Noexec::DEBUG
+    false
+  end
 
-      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, bin, rubygems_spec)
-              log "Using #{gemfile}"
-              ENV['BUNDLE_GEMFILE'] = gemfile
-              Bundler.setup
-              return
-            end
-          end
-          new_gemfile = File.expand_path("../../Gemfile", gemfile)
-          break if new_gemfile == gemfile
-          gemfile = new_gemfile
+  def rubygems_spec
+    @rubygems_spec ||= Bundler.rubygems.plain_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")
+    while true
+      if File.file?(gemfile)
+        log "Examining #{gemfile}"
+        if candidate?(gemfile)
+          log "Using #{gemfile}"
+          ENV['BUNDLE_GEMFILE'] = gemfile
+          Bundler.setup
+          return
         end
-        log "No valid Gemfile found, moving on"
       end
+      new_gemfile = File.expand_path("../../Gemfile", gemfile)
+      break if new_gemfile == gemfile
+      gemfile = new_gemfile
     end
-
-    Noexec.setup(File.basename($0))
+    log "No valid Gemfile found, moving on"
   rescue LoadError
-    warn "bundler not being used, unable to load" if RubygemsBundler::DEBUG
+    warn "bundler not being used, unable to load" if Noexec::DEBUG
   end
+
+  def check
+    if %w(bundle rubygems-bundler-uninstaller).include?(bin)
+      log "Noexec - skipped binary: #{bin}"
+
+    elsif ENV['NOEXEC_EXCLUDE'] && ENV['NOEXEC_EXCLUDE'].split(/ /).include?(bin)
+      log "Noexec - ENV skipped binary: #{bin}"
+
+    elsif ENV['BUNDLE_GEMFILE'] && ENV['BUNDLE_BIN_PATH'] && ENV['RUBYOPT']
+      log "Noexec - already in 'bundle exec'"
+
+    elsif %w(0 skip).include?( ENV['NOEXEC'] ) || ENV.key?('NOEXEC_DISABLE')
+      #TODO: deprecated in 1.1.0, to be removed later -- 2012.09.05
+      $stderr.puts "Warning, 'NOEXEC' environment variable is deprecated, switch to 'NOEXEC_DISABLE=1'." if ENV.key?('NOEXEC')
+      log "Noexec - disabled with environment variable"
+
+    else
+      setup
+    end
+  end
+
 end
+
+Noexec.new(File.basename($0)).check

data/lib/rubygems-bundler/version.rb

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

data/rubygems-bundler.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   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.}
+  s.license     = 'Apache License, Version 2.0'
 
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 995727847
+  hash: -1353073098
   prerelease: 6
   segments: 
   - 1
   - 3
   - 0
   - rc
-  - 2
-  version: 1.3.0.rc2
+  - 3
+  version: 1.3.0.rc3
 platform: ruby
 authors: 
 - Josh Hull
@@ -93,8 +93,8 @@ files:
 - test/dtf/rails_and_gemfile_comment_test.sh
 - test/dtf/rubygems_comment_test.sh
 homepage: http://mpapis.github.com/rubygems-bundler
-licenses: []
-
+licenses: 
+- Apache License, Version 2.0
 post_install_message: 
 rdoc_options: []