rubygems-bundler 1.0.7 → 1.1.0

data/.gem.config

@@ -0,0 +1 @@
+gem_tag_prefix=v

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.1.0
+date: 2012-09-05
+
+ - move precheck to the beginning - fix `bundle _1.0.7_ ...`
+ - fix #33, do not pollute global namespace
+ - allow disabling with `NOEXEC_DISABLE=1` and deprecate `NOEXEC=0`
+
 ## 1.0.7
 date: 2012-08-21
 

data/README.md

@@ -30,46 +30,51 @@ you can define it in `~/.gemrc` to override the default:
 
 ### ./.noexec.yaml
 
-Though you can let noexec do it's own thing and rely on looking up your binary via your Gemfile, 
-you can also specify which binaries you want included or excluded. 
-Create a .noexec.yaml file along side any Gemfiles you want to use. 
-Then, to enable (or disable) the usage of your particular binary into your bundle, 
+Though you can let noexec do it's own thing and rely on looking up your binary via your Gemfile,
+you can also specify which binaries you want included or excluded.
+Create a .noexec.yaml file along side any Gemfiles you want to use.
+Then, to enable (or disable) the usage of your particular binary into your bundle,
 add an include or exclude section. For example:
 
 ```yml
 exclude: [rake]
 ```
-Or, 
+Or,
 
 ```yml
 include: [haml]
 ```
 
-### NOEXEC=skip
+### Disabling
 
-In case you need explicitly skip loading Bundler.setup, prefix your command with `NOEXEC=0`:
+In case you need explicitly skip loading `Bundler.setup`, prefix your command with `NOEXEC_DISABLE=1`:
+
+    NOEXEC_DISABLE=1
+
+The old method is still available and might kick in if your tools use `NOEXEC` environment variable:
 
     NOEXEC=0 rails new app
     NOEXEC=skip gist
 
-both `0` and `skip` will work, choose the one that sounds better for you.
+both `0` and `skip` will disable the gem, this method is deprecated and will be removed with 1.2.0.
 
 ## Problems?
 
-Things not going the way you'd like? Try your command again with 
+Things not going the way you'd like? Try your command again with
 `NOEXEC_DEBUG=1` set and create a ticket. I'll fix it right away!
 
 ### IRC support:
 
 [#rubygems-bundler on irc.freenode.net](http://webchat.freenode.net/?channels=#rubygems-bundler)
 
+If you do not get relatively fast an answer make sure to leave an email to secure an later answer.
 
 ## How does this work (ruby_noexec_wrapper)
 
 It modifies gem wrappers shebang to load `ruby_noexec_wrapper`.
 Then, when you run gem binaries, it takes a look at your working directory,
-and every directory above it until it can find a `Gemfile`. 
-If the executable you're running is present in your Gemfile, 
+and every directory above it until it can find a `Gemfile`.
+If the executable you're running is present in your Gemfile,
 it switches to using that `Gemfile` instead (via `Bundle.setup`).
 
 Rubygems and Bundler integration, makes executable wrappers
@@ -84,6 +89,12 @@ rubygems-bundler was merged with [noexec gem](https://github.com/joshbuddy/noexe
 
 this will set all gems to `/usr/bin/env ruby` which is one of the safest choices (especially when using rvm).
 
+In case of rvm additional steps will ensure this gem is removed and not installed again:
+
+    rvm get stable --without-gems=rubygems-bundler
+    rvm all-gemsets do gem uninstall --all --executables rubygems-bundler
+
+
 ## Authors
 
  - Joshua Hull <joshbuddy@gmail.com>

data/lib/rubygems-bundler/noexec.rb

@@ -1,81 +1,93 @@
-DEBUG = ENV.key?('NOEXEC_DEBUG')
+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['BUNDLE_GEMFILE'] && ENV['BUNDLE_BIN_PATH'] && ENV['RUBYOPT']
+  puts "Noexec - already in 'bundle exec'" if RubygemsBundler::DEBUG
+
+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
 
-begin
-  require "rubygems"
-  require "bundler"
+else
+  begin
+    puts "Noexec - starting check" if RubygemsBundler::DEBUG
+    require "rubygems"
+    require "bundler"
 
-  module Bundler
-    class << self
-      def reset!
-        @load = nil
+    module Bundler
+      class << self
+        def reset!
+          @load = nil
+        end
       end
     end
-  end
 
-  module Noexec
-    CURRENT = Dir.pwd
+    module Noexec
+      RubygemsBundler::CURRENT = Dir.pwd
 
-    extend self
+      extend self
 
-    def log(msg)
-      puts msg if DEBUG
-    end
+      def log(msg)
+        puts msg if RubygemsBundler::DEBUG
+      end
 
-    def candidate?(gemfile, bin)
-      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
+      def candidate?(gemfile, bin)
+        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
-        log "Config based matching didn't find it, resorting to Gemfile lookup"
-      end
-      ENV['BUNDLE_GEMFILE'] = gemfile
-      Bundler.load.specs.each do |spec|
-        next if spec.name == 'bundler'
-        return true if %w(ruby irb).include?(bin) || spec.executables.include?(bin)
+        ENV['BUNDLE_GEMFILE'] = gemfile
+        Bundler.load.specs.each do |spec|
+          next if spec.name == 'bundler'
+          return true if %w(ruby irb).include?(bin) || spec.executables.include?(bin)
+        end
+        false
+      rescue Bundler::BundlerError => e
+        warn "Ignoring candidate #{gemfile}:\n#{e}" if RubygemsBundler::DEBUG
+        false
+      ensure
+        Bundler.reset!
+        ENV['BUNDLE_GEMFILE'] = nil
       end
-      false
-    rescue Bundler::BundlerError => e
-      warn "Ignoring candidate #{gemfile}:\n#{e}" if DEBUG
-      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'] && ENV['BUNDLE_BIN_PATH'] && ENV['RUBYOPT']
-      return if %w(0 skip).include?( ENV['NOEXEC'] )
-      gemfile = ENV['BUNDLE_GEMFILE'] || File.join(CURRENT, "Gemfile")
-      while true
-        if File.file?(gemfile)
-          log "Examining #{gemfile}"
-          if Noexec.candidate?(gemfile, File.basename($0))
-            log "Using #{gemfile}"
-            ENV['BUNDLE_GEMFILE'] = gemfile
-            Bundler.setup
-            return
+      def setup
+        gemfile = ENV['BUNDLE_GEMFILE'] || File.join(RubygemsBundler::CURRENT, "Gemfile")
+        while true
+          if File.file?(gemfile)
+            log "Examining #{gemfile}"
+            if Noexec.candidate?(gemfile, File.basename($0))
+              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
         end
-        new_gemfile = File.expand_path("../../Gemfile", gemfile)
-        break if new_gemfile == gemfile
-        gemfile = new_gemfile
+        log "No valid Gemfile found, moving on"
       end
-      log "No valid Gemfile found, moving on"
     end
-  end
 
-  Noexec.setup
-rescue LoadError
-  warn "bundler not being used, unable to load" if DEBUG
+    Noexec.setup
+  rescue LoadError
+    warn "bundler not being used, unable to load" if RubygemsBundler::DEBUG
+  end
 end

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "1.0.7"
+  VERSION = "1.1.0"
 end

data/rubygems-bundler.gemspec

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rubygems-bundler/version"
+
+Kernel.load File.expand_path("../lib/rubygems-bundler/version.rb", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rubygems-bundler"
@@ -17,7 +17,5 @@ Gem::Specification.new do |s|
   s.executables = %w( rubygems-bundler-uninstaller )
 
   s.add_development_dependency "tf"
-  # 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"
+  #s.add_development_dependency "smf-gem"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 7
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-21 00:00:00 Z
+date: 2012-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tf
@@ -32,34 +32,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
 description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.
 email: 
 - joshbuddy@gmail.com
@@ -71,6 +43,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gem.config
 - .gitignore
 - .noexec.yml
 - .travis.yml
@@ -78,7 +51,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - bin/ruby_noexec_wrapper
 - bin/rubygems-bundler-uninstaller
 - lib/rubygems-bundler/fix_wrapper.rb

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"