rubygems-bundler 0.9.2 → 1.0.0

data/.noexec.yml

@@ -0,0 +1,2 @@
+exclude: [dtf]
+

data/.travis.yml

@@ -0,0 +1,26 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+before_install:
+  - 'rm -rf $rvm_path/gems/*/{bin,gems}/rubygems-bundler-* $rvm_path/gems/*/bin/ruby_*_wrapper'
+  - hash -r
+install: gem install dtf
+before_script:
+  - unset BUNDLE_GEMFILE
+script: dtf --text test/dtf/*
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#rubygems-bundler"
+  email:
+    recipients:
+      - mpapis@gmail.com
+    on_failure: change
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.0
+date: 2012-05-09
+
+ - removed the need to modify ~/.gemrc
+ - change extensions code to an automatic installer
+ - added uninstaller
+ - removed old parts - there is only one way
+ - fix bug with rubygems < 1.5
+
 ## 0.9.2
 date: 2012-05-05
 

data/README.md

@@ -1,15 +1,16 @@
+[![Build Status](https://secure.travis-ci.org/mpapis/rubygems-bundler.png?branch=1.0.0)](http://travis-ci.org/mpapis/rubygems-bundler)
+[![Dependency Status](https://gemnasium.com/mpapis/rubygems-bundler.png)](https://gemnasium.com/mpapis/rubygems-bundler)
+
 # rubygems-bundler && Noexec
 
-Let's stop using bundle exec, kthx.
+Let's stop using `bundle exec`, kthx.
+
+Introduction of the 1.0.0 release: http://niczsoft.com/2012/05/rubygems-bundler-integration-gem-1-0-0/
 
 ## Installation
 
     gem install rubygems-bundler
 
-Add / Change a line in ~/.gemrc to:
-
-    custom_shebang: $env ruby_noexec_wrapper
-
 Next run (once):
 
     gem regenerate_binstubs
@@ -18,34 +19,55 @@ And you're done!
 
 ## Configuration
 
+### ~/.gemrc
+
+It's no more required to modify `~/.gemrc` anymore,
+just remove the old entry to be sure it works as expected.
+In case you need to use your own `custom_shebang`
+you can define it in `~/.gemrc` to override the default:
+
+    custom_shebang: $env <your_custom_shebang_program>
+
+### ./.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, 
 add an include or exclude section. For example:
 
-### .noexec.yaml
+```yml
+exclude: [rake]
+```
+Or, 
 
-    exclude: [rake]
+```yml
+include: [haml]
+```
 
-Or, 
+### NOEXEC=skip
 
-    include: [irb, ruby]
+In case you need explicitly skip loading Bundler.setup, prefix your command with `NOEXEC=0`:
+
+    NOEXEC=0 rails new app
+    NOEXEC=skip gist
+
+both `0` and `skip` will work, choose the one that sounds better for you.
 
 ## Problems?
 
 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!
+`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?
+## How does this work (ruby_noexec_wrapper)
 
-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, 
+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, 
 it switches to using that `Gemfile` instead (via `Bundle.setup`).
@@ -53,78 +75,25 @@ 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
-from rubygems 1.9 to older versions - down to 1.3.7.
-
-With this gem rubygems generated wrappers will allow to
-use bundler when asked for.
-
-Using this gem solves problem of calling `bundle exec ...`
-with your every command.
-
-Please note that this gem can make your gem executables
-load in versions specified in Gemfile!
-
-The problem with Gemfile is that you can have few of them,
-so expect that gem version for executable will be taken from
-`~/Gemfile` when your project is in `~/projects/my_project`
-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 
-
-# Uninstallation
+rubygems-bundler was merged with [noexec gem](https://github.com/joshbuddy/noexec) in version **0.9.0**.
 
-Before uninstalling change a line in `~/.gemrc` to:
+## Uninstallation
 
-    custom_shebang: $env ruby
-
-and run `gem regenerate_binstubs`
+    rubygems-bundler-uninstaller
+    gem uninstall rubygems-bundler
 
 this will set all gems to `/usr/bin/env ruby` which is one of the safest choices (especially when using rvm).
 
-# Controlling the wrapper - the old way, the old wrapper
-
-Add / Change a line in ~/.gemrc to:
-
-    custom_shebang: $env ruby_bundler_wrapper
-
-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.
-
-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
-
-Some gems should not be called with bundler support,
-to blacklist them use the following line:
-
-    BUNDLER_BLACKLIST="cheat heroku"
-
-To make your choices persistent put them into `~/.bashrc` or `~/.rvmrc`.
-
-
-# Authors
+## Authors
 
  - Joshua Hull <joshbuddy@gmail.com>
  - Michal Papis <mpapis@gmail.com>
 
-# Thanks
+## 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
- - Andre Arko      : claryfications how rubygems/bundler works
+ - Yehuda Katz     : the initial patch code, helping on making it even more usable
  - Loren Segal     : shebang customization idea and explanations
+ - Wayne E. Seguin : support in writing good code
+ - André Arko      : clarifications how rubygems/bundler works

data/bin/rubygems-bundler-uninstaller

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'rubygems-bundler/uninstaller'
+
+RubygemsBundler.uninstall

data/lib/rubygems-bundler/fix_wrapper.rb

@@ -1,5 +1,13 @@
-module Gem
-  post_install do |inst|
-    RubyGemsBundlerInstaller.bundler_generate_bin(inst)
-  end
-end
+msg = "\n\nOlder rubygems-bundler found, please uninstall it with:\n\n    "
+
+error_source = caller.find{|s| s=~/\/rubygems-bundler-/ }.split(/:/).first
+gem_source = File.expand_path("../../../..", error_source)
+gem_version = error_source.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
+
+if ENV['GEM_HOME'] or ENV['GEM_PATH']
+  msg << "GEM_HOME=\"#{gem_source}\" " unless ENV['GEM_HOME'] == gem_source
+end
+
+msg << "gem uninstall -ax rubygems-bundler -v #{gem_version}\n\n"
+
+raise msg

data/lib/rubygems-bundler/noexec.rb

@@ -49,8 +49,9 @@ begin
 
     def setup
       log "Noexec"
-      return if File.basename($0) == 'bundle'
+      return if %w(bundle rubygems-bundler-uninstaller).include?(File.basename($0))
       return if ENV['BUNDLE_GEMFILE']
+      return if %w(0 skip).include?( ENV['NOEXEC'] )
       gemfile = File.join(CURRENT, "Gemfile")
       while true
         if File.exist?(gemfile)

data/lib/rubygems-bundler/regenerate_binstubs_command.rb

@@ -1,4 +1,7 @@
+require 'rubygems/command_manager'
 require 'rubygems/installer'
+require 'rubygems/version'
+require 'rubygems-bundler/wrapper'
 
 class RegenerateBinstubsCommand < Gem::Command
   def initialize
@@ -26,6 +29,17 @@ class RegenerateBinstubsCommand < Gem::Command
   end
 
   def execute
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('2.0.0') then
+      # https://github.com/rubygems/rubygems/issues/326
+      puts "try also: gem pristine --binstubs"
+    end
+    Gem.configuration[:custom_shebang] ||= '$env ruby_noexec_wrapper'
+    RubygemsBundler::Wrapper.install
+    execute_no_wrapper
+  end
+
+  def execute_no_wrapper
+    require 'rubygems-bundler/rubygems_bundler_installer'
     name = get_one_optional_argument || ''
     specs = installed_gems.select{|spec| spec.name =~ /^#{name}/i }
     specs.each do |spec|
@@ -53,4 +67,4 @@ class RegenerateBinstubsCommand < Gem::Command
       Gem.source_index.map{|name,spec| spec}
     end
   end
-end
+end

data/lib/rubygems-bundler/rubygems_bundler_installer.rb

@@ -23,7 +23,8 @@ module RubyGemsBundlerInstaller
 
 
   def self.shebang(inst, bin_file_name)
-    ruby_name = Gem::ConfigMap[:ruby_install_name] if inst.options[:env_shebang]
+    # options were defined first in 1.5, we want to support back to 1.3.7
+    ruby_name = Gem::ConfigMap[:ruby_install_name] if inst.respond_to?('options') ? inst.options[:env_shebang] :inst.instance_variable_get(:@env_shebang)
     bindir = inst.bin_dir ? inst.bin_dir : Gem.bindir(inst.gem_home)
     path = File.join bindir, inst.formatted_program_filename(bin_file_name)
     first_line = File.open(path, "rb") {|file| file.gets}
@@ -88,3 +89,7 @@ TEXT
   end
 
 end
+
+Gem.post_install do |inst|
+  RubyGemsBundlerInstaller.bundler_generate_bin(inst)
+end

data/lib/rubygems-bundler/uninstaller.rb

@@ -0,0 +1,10 @@
+require 'rubygems-bundler/wrapper'
+require 'rubygems-bundler/regenerate_binstubs_command'
+
+module RubygemsBundler
+  def self.uninstall
+    Gem.configuration[:custom_shebang] = '$env ruby'
+    RegenerateBinstubsCommand.new.execute_no_wrapper
+    Wrapper.uninstall
+  end
+end

data/lib/rubygems-bundler/version.rb

@@ -1,3 +1,3 @@
 module RubygemsBundler
-  VERSION = "0.9.2"
+  VERSION = "1.0.0"
 end

data/lib/rubygems-bundler/wrapper.rb

@@ -0,0 +1,38 @@
+# install / uninstall wrapper
+require 'fileutils'
+require 'rubygems'
+
+module RubygemsBundler
+  module Wrapper
+    def self.wrapper_name
+      'ruby_noexec_wrapper'
+    end
+    def self.bindir
+      Gem.respond_to?(:bindir,true) ? Gem.send(:bindir) : File.join(Gem.dir, 'bin')
+    end
+    def self.destination
+      File.expand_path( wrapper_name, bindir )
+    end
+    def self.install
+      rubygems_bundler_spec =
+        if Gem::Specification.respond_to?(:find_by_name)
+          Gem::Specification.find_by_name("rubygems-bundler")
+        else
+          Gem.source_index.find_name("rubygems-bundler").last
+        end
+
+      if rubygems_bundler_spec
+        wrapper_path = File.expand_path( "bin/#{wrapper_name}", rubygems_bundler_spec.full_gem_path )
+      end
+
+      if rubygems_bundler_spec && File.exist?(wrapper_path) && !File.exist?(destination)
+        FileUtils.mkdir_p(bindir)
+        FileUtils.cp(wrapper_path, destination)
+        File.chmod(0775, destination)
+      end
+    end
+    def self.uninstall
+      FileUtils.rm_f(destination) if File.exist?(destination)
+    end
+  end
+end

data/lib/rubygems_plugin.rb

@@ -1,9 +1,42 @@
-require 'rubygems/command_manager'
-require 'rubygems-bundler/rubygems_bundler_installer'
-require 'rubygems-bundler/regenerate_binstubs_command'
+rubygems_bundler_spec =
+  if Gem::Specification.respond_to?(:find_by_name)
+    Gem::Specification.find_by_name("rubygems-bundler")
+  else
+    Gem.source_index.find_name("rubygems-bundler").last
+  end
 
-if Gem::VERSION < '1.9' then
-  require 'rubygems-bundler/fix_wrapper'
-end
+called_version = __FILE__.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
+
+# continue only if loaded and called versions all the same
+if rubygems_bundler_spec and rubygems_bundler_spec.version.to_s == called_version
+  require 'rubygems/version'
+  require 'rubygems-bundler/wrapper'
+
+  # Set the custom_shebang if user did not set one
+  Gem.pre_install do |inst|
+    Gem.configuration[:custom_shebang] ||= '$env ruby_noexec_wrapper'
+    RubygemsBundler::Wrapper.install
+  end
+
+  if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.0') then
+    # Add custom_shebang support to rubygems
+    require 'rubygems-bundler/rubygems_bundler_installer'
+  end
+
+  require 'rubygems-bundler/regenerate_binstubs_command'
+  Gem::CommandManager.instance.register_command :regenerate_binstubs
+elsif ENV.key?('NOEXEC_DEBUG')
+  msg = "Older rubygems-bundler found, loaded: #{rubygems_bundler_spec.version}, called: #{called_version}, you can uninstall it with:\n\n    "
 
-Gem::CommandManager.instance.register_command :regenerate_binstubs
+  error_source = __FILE__
+  gem_source = File.expand_path("../../../..", error_source)
+  gem_version = error_source.sub(/^.*\/rubygems-bundler-([^\/]+)\/.*$/,'\1')
+
+  if ENV['GEM_HOME'] or ENV['GEM_PATH']
+    msg << "GEM_HOME=\"#{gem_source}\" " unless ENV['GEM_HOME'] == gem_source
+  end
+
+  msg << "gem uninstall -ax rubygems-bundler -v #{gem_version}\n\n"
+
+  puts msg
+end

data/rubygems-bundler.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
 
   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"]
+  s.executables = %w( rubygems-bundler-uninstaller )
 
+  s.add_development_dependency "dtf"
   # 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"

data/test/dtf/bundler_comment_test.sh

@@ -0,0 +1,21 @@
+: init
+export BUNDLE_GEMFILE=${TMPDIR:-/tmp}/Gemfile
+printf "source :rubygems\n\ngem 'haml'\n" > ${BUNDLE_GEMFILE}
+
+rake build
+rake install # match=/installed/
+gem install bundler # status=0
+
+bundle install
+
+head -n 1 $(which haml)   # match=/env ruby_noexec_wrapper/
+which ruby_noexec_wrapper # status=0
+
+gem list                     # match=/haml/
+rubygems-bundler-uninstaller # match=/haml/
+
+head -n 1 $(which haml)   # match!=/env ruby_noexec_wrapper/
+which ruby_noexec_wrapper # status=1
+
+gem uninstall -x haml     # match=/Successfully uninstalled/
+rm -f ${BUNDLE_GEMFILE}

data/test/dtf/rails_and_gemfile_comment_test.sh

@@ -0,0 +1,21 @@
+: init
+typeset test_dir="${TMPDIR:-/tmp}/fdkngfk"
+export GEM_HOME="${test_dir}/fake_gem_home"
+export PATH="${test_dir}/fake_gem_home/bin:$PATH"
+
+mkdir -p "${GEM_HOME}"
+printf "source :rubygems\n\ngem 'rails'\n" > "${test_dir}/Gemfile"
+
+rake build
+rake install        # match=/installed/
+gem install bundler # status=0
+
+: test
+builtin cd "${test_dir}"
+bundle install             # match=/Installing rails/
+NOEXEC=0 rails new app1
+[[ -f app1/Gemfile ]]      # status=0
+[[ -f app1/Gemfile.lock ]] # status=0
+
+: cleanup
+rm -rf "${test_dir}"

data/test/dtf/rubygems_comment_test.sh

@@ -0,0 +1,16 @@
+: init
+rake build
+rake install # match=/installed/
+
+gem install haml          # match=/1 gem installed/
+
+head -n 1 $(which haml)   # match=/env ruby_noexec_wrapper/
+which ruby_noexec_wrapper # status=0
+
+gem list                     # match=/haml/
+rubygems-bundler-uninstaller # match=/haml/
+
+head -n 1 $(which haml)   # match!=/env ruby_noexec_wrapper/
+which ruby_noexec_wrapper # status=1
+
+gem uninstall -x haml     # match=/Successfully uninstalled/

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-bundler
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 9
-  - 2
-  version: 0.9.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Josh Hull
@@ -16,12 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-05 00:00:00 Z
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: dtf
   prerelease: false
-  name: rake
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +30,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   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
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,37 +58,42 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   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
 - mpapis@gmail.com
 executables: 
-- noexec
-extensions: 
-- ext/wrapper_installer/extconf.rb
+- rubygems-bundler-uninstaller
+extensions: []
+
 extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .noexec.yml
 - .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/noexec
-- bin/ruby_bundler_wrapper
 - bin/ruby_noexec_wrapper
-- ext/wrapper_installer/extconf.rb
+- bin/rubygems-bundler-uninstaller
 - 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/uninstaller.rb
 - lib/rubygems-bundler/version.rb
+- lib/rubygems-bundler/wrapper.rb
 - lib/rubygems_plugin.rb
 - rubygems-bundler.gemspec
+- test/dtf/bundler_comment_test.sh
+- test/dtf/rails_and_gemfile_comment_test.sh
+- test/dtf/rubygems_comment_test.sh
 homepage: http://mpapis.github.com/rubygems-bundler
 licenses: []
 
@@ -104,9 +123,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Stop using bundle exec
-test_files: []
-
+test_files: 
+- test/dtf/bundler_comment_test.sh
+- test/dtf/rails_and_gemfile_comment_test.sh
+- test/dtf/rubygems_comment_test.sh

data/bin/noexec

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

data/bin/ruby_bundler_wrapper

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-
-original_file=ARGV[0]
-original_file_name=File.basename(original_file)
-use_bundler = (ENV['USE_BUNDLER']||'').downcase
-try_bundler = %w{try check possibly}.include? use_bundler
-force_bundler = %w{force require yes true on}.include? use_bundler
-blacklist = (ENV['BUNDLER_BLACKLIST']||'').split(/\s/) + %w{ bundle }
-blacklisted = blacklist.include? original_file_name
-$PROGRAM_NAME=original_file
-
-if !blacklisted && (try_bundler || force_bundler)
-  begin
-    require 'bundler/setup'
-  rescue LoadError
-    raise "\n\nPlease 'gem install bundler' first.\n\n" if force_bundler
-  end
-end
-
-ARGV.shift
-eval File.read(original_file), binding, original_file

data/ext/wrapper_installer/extconf.rb

@@ -1,22 +0,0 @@
-# Fake building extension
-File.open('Makefile', 'w') { |f| f.write "all:\n\ninstall:\n\n" }
-File.open('make', 'w') do |f|
-  f.write '#!/bin/sh'
-  f.chmod f.stat.mode | 0111
-end
-File.open('wrapper_installer.so', 'w') {}
-File.open('wrapper_installer.dll', 'w') {}
-File.open('nmake.bat', 'w') { |f| }
-
-# Copy wrapper
-require 'fileutils'
-require 'rubygems'
-bindir = Gem.respond_to?(:bindir,true) ? Gem.send(:bindir) : File.join(Gem.dir, 'bin')
-FileUtils.mkdir_p(bindir, :verbose => true)
-
-%w( ruby_bundler_wrapper ruby_noexec_wrapper ).each do |f|
-  wrapper     = File.expand_path("../../bin/#{f}", Dir.getwd)
-  destination = File.expand_path(f, bindir)
-  FileUtils.cp(wrapper, destination, :verbose => true)
-  File.chmod(0775, destination)
-end