rubygems-bundler 0.3.0 → 0.9.0

data/.gitignore

@@ -0,0 +1,5 @@
+.idea
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/.ruby-version

@@ -0,0 +1 @@
+1.8.7

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+## 0.9.0
+date: 2012-04-03
+
+ - joining forces with noexec from
+   [Joshua Hull - @joshbuddy](https://github.com/joshbuddy)
+
+## 0.3.0
+date: 2012-04-02
+
+ - add support for [noexec gem](https://github.com/joshbuddy/noexec)
+   from [Joshua Hull - @joshbuddy](https://github.com/joshbuddy)
+
+## 0.2.8
+date: 2011-12-27
+
+ - fix #8 fixed bindir for systems with Gem.bindir outside of Gem.dir
+ - merge #9 Prepend "ruby_" to wrapper filename
+
+## 0.2.7
+date: 2011-09-21
+
+ - added uninstallation note
+ - possibly fixed installation issue for older rubygems version (yaml related)
+
+## 0.2.6
+date: 2011-09-16
+
+ - improved default blacklist handling
+ - set $PROGRAM_NAME - update for thin
+ - add group write permisions for binary
+
+## 0.2.5
+date: 2011-06-28
+
+ - let `bundle*` commands handle bundler by itself

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Michal Papis
+Copyright (c) 2011-2012 Josh Hull and Michal Papis
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,15 +1,64 @@
-# About
+# rubygems-bundler && Noexec
 
-Rubygems and Bundler integration, makes executable wrappers
-generated by rubygems aware of bundler.
+Let's stop using bundle exec, kthx.
 
-# Installation
+## Installation
 
     gem install rubygems-bundler
 
-And follow the on screen instructions
+Add / Change a line in ~/.gemrc to:
+
+    custom_shebang: $env ruby_noexec_wrapper
+
+Next run (once):
+
+    gem regenerate_binstubs
+
+And you're done!
+
+Alternatively, in your .bashrc (or somewhere you can set env variables):
+
+    export RUBYOPT="-r`noexec`"
+
+
+## Configuration
+
+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:
+
+### .noexec.yaml
+
+    exclude: [rake]
+
+Or, 
+
+    include: [irb, ruby]
+
+## Problems?
 
-# Description
+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)
+
+
+## How does this work?
+
+It adds a script to every execution of ruby via the RUBYOPT environment variable. 
+Then, when you run ruby, 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, 
+it switches to using that `Gemfile` instead (via `Bundle.setup`).
+
+Rubygems and Bundler integration, makes executable wrappers
+generated by rubygems aware of bundler.
+
+# Old description
 
 This gem is intended to fill in the integration gap between
 Bundler and Rubygems, it also backports shebang customization
@@ -32,91 +81,53 @@ and does not contain `Gemfile`
 Last note is that bundler handling can be used only when bundler is
 installed, but you will be warned when it is 
 
-# Controlling the wrapper
-
-Wrappers generated by this gem will replace original rubygems wrapper,
-but it will not change wrapper behavior unless explicitly asked for.
-
-To allow using bundler when available, but fallback to rubygems when not:
-
-    export USE_BUNDLER=try
-
-To force usage of bundler:
-
-    export USE_BUNDLER=force
+# Uninstallation
 
-Some gems should not be called with bundler support,
-to blacklist them use the following line:
+Before uninstalling change a line in `~/.gemrc` to:
 
-    BUNDLER_BLACKLIST="cheat heroku"
+    custom_shebang: $env ruby
 
-To make your choices persistent put them into `~/.bashrc` or `~/.rvmrc`.
+and run `gem regenerate_binstubs`
 
-# Alternate use with noexec
+this will set all gems to `/usr/bin/env ruby` which is one of the safest choices (especially when using rvm).
 
-[Joshua Hull - @joshbuddy](https://github.com/joshbuddy) created
-[noexec gem](https://github.com/joshbuddy/noexec),
-It allows detecting Gemfile and loading Bundler only when it is required.
+# Controlling the wrapper - the old way, the old wrapper
 
-To automatically use noexec change a line in ~/.gemrc to:
+Add / Change a line in ~/.gemrc to:
 
-    custom_shebang: $env ruby_noexec_wrapper
+    custom_shebang: $env ruby_bundler_wrapper
 
-And run (once):
+Next run (once):
 
     gem regenerate_binstubs
 
+Wrappers generated by this gem will replace original rubygems wrapper,
+but it will not change wrapper behavior unless explicitly asked for.
 
-# How it works
-
-Installation of gem will make any new installed gem use new bundler
-aware wrapper:
-
-    gem install rubygems-bundler
-
-Follow onscreen instructions.
-
-Now for running haml can be controlled if it will using bundler code or not:
-
-    mpapis@niczsoft:~/test> USE_BUNDLER=no haml -v
-    Haml 3.1.1 (Separated Sally)
-    
-    mpapis@niczsoft:~/test> USE_BUNDLER=try haml -v
-    Haml/Sass 3.0.0 (Classy Cassidy)
-
-    mpapis@niczsoft:~/test> gem uninstall bundler
-    Remove executables:
-        bundle
-    in addition to the gem? [Yn]  y
-    Removing bundle
-    Successfully uninstalled bundler-1.0.14
-
-    mpapis@niczsoft:~/test> USE_BUNDLER=force haml -v
-    /home/mpapis/.rvm/gems/ruby-1.9.2-p180@test-bundler/bin/haml:25:in `rescue in <main>':  (RuntimeError)
-
-    Please install bundler first.
+To allow using bundler when available, but fallback to rubygems when not:
 
-        from /home/mpapis/.rvm/gems/ruby-1.9.2-p180@test-bundler/bin/haml:18:in `<main>'
+    export USE_BUNDLER=try
 
-    mpapis@niczsoft:~/test> USE_BUNDLER=try haml -v
-    Haml 3.1.1 (Separated Sally)
+To force usage of bundler:
 
-# Uninstallation
+    export USE_BUNDLER=force
 
-Before uninstalling change a line in `~/.gemrc` to:
+Some gems should not be called with bundler support,
+to blacklist them use the following line:
 
-    custom_shebang: $env ruby
+    BUNDLER_BLACKLIST="cheat heroku"
 
-and run `gem regenerate_binstubs`
+To make your choices persistent put them into `~/.bashrc` or `~/.rvmrc`.
 
-this will set all gems to `/usr/bin/env ruby` which is one of the safest choices (especially when using rvm).
 
-# Author
+# Authors
 
+ - Joshua Hull <joshbuddy@gmail.com>
  - Michal Papis <mpapis@gmail.com>
 
 # Thanks
 
+ - Carl Lerche     : help with the noexec code
  - Yehuda Katz     : the initial patch code
  - Wayne E. Seguin : support in writing good code
  - Evan Phoenix    : support on rubygems internalls

data/Rakefile

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

data/bin/noexec

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+print File.expand_path(File.expand_path("../../lib/rubygems-bundler/noexec.rb", __FILE__))

data/bin/ruby_noexec_wrapper

@@ -6,8 +6,9 @@ $PROGRAM_NAME=original_file
 
 require 'rubygems'
 begin
-  require 'noexec/auto'
+  require 'rubygems-bundler/noexec'
 rescue LoadError
+  warn "unable to load rubygems-bundler/noexec" if ENV.key?('NOEXEC_DEBUG')
 end
 
 eval File.read(original_file), binding, original_file

data/lib/rubygems-bundler/noexec.rb

@@ -0,0 +1,76 @@
+DEBUG = ENV.key?('NOEXEC_DEBUG')
+
+begin
+  require "rubygems"
+  require "bundler"
+
+  module Bundler
+    class << self
+      def reset!
+        @load = nil
+      end
+    end
+  end
+
+  module Noexec
+    CURRENT = Dir.pwd
+
+    extend self
+
+    def log(msg)
+      puts msg if 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
+        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)
+      end
+      false
+    ensure
+      Bundler.reset!
+    end
+
+    def setup
+      log "Noexec"
+      return if File.basename($0) == 'bundle'
+      return if ENV['BUNDLE_GEMFILE']
+      gemfile = File.join(CURRENT, "Gemfile")
+      while true
+        if File.exist?(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
+      log "No valid Gemfile found, moving on"
+    end
+  end
+
+  Noexec.setup
+rescue LoadError
+  warn "bundler not being used, unable to load" if DEBUG
+end

data/lib/rubygems-bundler/version.rb

@@ -0,0 +1,3 @@
+module RubygemsBundler
+  VERSION = "0.9.0"
+end

data/lib/rubygems_plugin.rb

@@ -1,8 +1,9 @@
 require 'rubygems/command_manager'
-require 'rubygems_bundler/rubygems_bundler_installer'
-require 'rubygems_bundler/regenerate_binstubs_command'
+require 'rubygems-bundler/rubygems_bundler_installer'
+require 'rubygems-bundler/regenerate_binstubs_command'
+
 if Gem::VERSION < '1.9' then
-  require 'rubygems_bundler/fix_wrapper'
+  require 'rubygems-bundler/fix_wrapper'
 end
 
 Gem::CommandManager.instance.register_command :regenerate_binstubs

data/rubygems-bundler.gemspec

@@ -1,53 +1,23 @@
-Gem::Specification.new do |s|
-  s.name = "rubygems-bundler"
-  s.version = "0.3.0"
-  s.date = "2012-04-02"
-  s.summary = "Make rubygems generate bundler aware executable wrappers"
-  s.email = "mpapis@gmail.com"
-  s.homepage = "http://mpapis.github.com/rubygems-bundler"
-  s.description = "Integrate Rubygems and Bundler"
-  s.has_rdoc = false
-  s.authors = ["Michal Papis"]
-  s.files = [
-    "bin/ruby_bundler_wrapper",
-    "bin/ruby_noexec_wrapper",
-    "ext/wrapper_installer/extconf.rb",
-    "lib/rubygems_bundler/regenerate_binstubs_command.rb",
-    "lib/rubygems_bundler/rubygems_bundler_installer.rb",
-    "lib/rubygems_bundler/fix_wrapper.rb",
-    "lib/rubygems_plugin.rb",
-    "LICENSE",
-    "README.md",
-    "rubygems-bundler.gemspec",
-  ]
-  s.extensions = ["ext/wrapper_installer/extconf.rb"]
-  s.post_install_message = <<-TEXT
-==================================================================================
-
-rubygems-bundler allows running gem executables in Gemfile specified versions!
-
-Note: from 0.2.8 the wrapper name changes, you need to repeat instructions bellow.
-
-First step is to add following line to ~/.gemrc
-
-    custom_shebang: $env ruby_bundler_wrapper
-
-To make all the executables bundler compatible run:
-
-    gem regenerate_binstubs # only once
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rubygems-bundler/version"
 
-To always use bundler add the following line to ~/.rvmrc or ~/.bashrc
-
-    export USE_BUNDLER=force
-
-Relogin or call in every open shell:
-
-    export USE_BUNDLER=force
-
-For more information read:
-
-    https://github.com/mpapis/rubygems-bundler
-
-==================================================================================
-TEXT
+Gem::Specification.new do |s|
+  s.name        = "rubygems-bundler"
+  s.version     = RubygemsBundler::VERSION
+  s.authors     = ["Josh Hull", "Michal Papis"]
+  s.email       = ["joshbuddy@gmail.com", "mpapis@gmail.conf"]
+  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.files       = `git ls-files`.split("\n")
+  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = ["noexec"]
+  s.extensions  = ["ext/wrapper_installer/extconf.rb"]
+
+  # Can 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"
 end

metadata

@@ -1,74 +1,84 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 9
   - 0
-  version: 0.3.0
+  version: 0.9.0
 platform: ruby
 authors: 
+- Josh Hull
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-04-02 00:00:00 Z
-dependencies: []
-
-description: Integrate Rubygems and Bundler
-email: mpapis@gmail.com
-executables: []
-
+date: 2012-04-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  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
+description: Stop using bundle exec. Integrate Rubygems and Bundler. Make rubygems generate bundler aware executable wrappers.
+email: 
+- joshbuddy@gmail.com
+- mpapis@gmail.conf
+executables: 
+- noexec
 extensions: 
 - ext/wrapper_installer/extconf.rb
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- .ruby-version
+- CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/noexec
 - bin/ruby_bundler_wrapper
 - bin/ruby_noexec_wrapper
 - ext/wrapper_installer/extconf.rb
-- lib/rubygems_bundler/regenerate_binstubs_command.rb
-- lib/rubygems_bundler/rubygems_bundler_installer.rb
-- lib/rubygems_bundler/fix_wrapper.rb
+- lib/rubygems-bundler/fix_wrapper.rb
+- lib/rubygems-bundler/noexec.rb
+- lib/rubygems-bundler/regenerate_binstubs_command.rb
+- lib/rubygems-bundler/rubygems_bundler_installer.rb
+- lib/rubygems-bundler/version.rb
 - lib/rubygems_plugin.rb
-- LICENSE
-- README.md
 - rubygems-bundler.gemspec
 homepage: http://mpapis.github.com/rubygems-bundler
 licenses: []
 
-post_install_message: |
-  ==================================================================================
-  
-  rubygems-bundler allows running gem executables in Gemfile specified versions!
-  
-  Note: from 0.2.8 the wrapper name changes, you need to repeat instructions bellow.
-  
-  First step is to add following line to ~/.gemrc
-  
-      custom_shebang: $env ruby_bundler_wrapper
-  
-  To make all the executables bundler compatible run:
-  
-      gem regenerate_binstubs # only once
-  
-  To always use bundler add the following line to ~/.rvmrc or ~/.bashrc
-  
-      export USE_BUNDLER=force
-  
-  Relogin or call in every open shell:
-  
-      export USE_BUNDLER=force
-  
-  For more information read:
-  
-      https://github.com/mpapis/rubygems-bundler
-  
-  ==================================================================================
-
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -97,6 +107,6 @@ rubyforge_project:
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Make rubygems generate bundler aware executable wrappers
+summary: Stop using bundle exec
 test_files: []