rubygems-bundler 0.1.5 → 0.2.3

data/README.md

@@ -6,12 +6,14 @@ generated by rubygems aware of bundler.
 # Installation
 
     gem install rubygems-bundler
-    gem regenerate_binstubs [-V]
+
+And follow the on screen instructions
 
 # Description
 
 This gem is intended to fill in the integration gap between
-Bundler and Rubygems
+Bundler and Rubygems, it also backoports 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.
@@ -19,20 +21,16 @@ use bundler when asked for.
 Using this gem solves problem of calling `bundle exec ...`
 with your every command.
 
-<h3 style="color: red; letter-spacing: 3px;">NOTE</h3>
-
-Please note that method introduced by this gem is not approved
-by rubygems neither bundler teams becouse of the following problem:
-
-Beware, it is important you understand that this gem can make
-your gem executables load in versions specified in Gemfile!
+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.
+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
 
@@ -47,7 +45,7 @@ To force usage of bundler:
 
     export USE_BUNDLER=force
 
-To make your choice persistent put this into `~/.rvmrc` or `~/.bashrc`.
+To make your choice persistent put this into `~/.bashrc` or `~/.rvmrc`.
 
 # How it works
 
@@ -56,10 +54,7 @@ aware wrapper:
 
     gem install rubygems-bundler
 
-To make gems already installed aware of bundler call the following command,
-it will detect gems with executables and regenerate those executables:
-
-    gem regenerate_binstubs [-V]
+Follow onscreen instructions.
 
 Now for running haml can be controlled if it will using bundler code or not:
 
@@ -96,3 +91,4 @@ Now for running haml can be controlled if it will using bundler code or not:
  - Wayne E. Seguin : support in writing good code
  - Evan Phoenix    : support on rubygems internalls
  - Andre Arko      : claryfications how rubygems/bundler works
+ - Loren Segal     : shebang customization idea and explanations

data/bin/bundler_wrapper

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+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
+
+if try_bundler || force_bundler
+  begin
+    require 'bundler/setup'
+  rescue LoadError
+    raise "\n\nPlease 'gem install bundler' first.\n\n" if force_bundler
+  end
+end
+
+file=ARGV.shift
+eval File.read(file)

data/ext/wrapper_installer/extconf.rb

@@ -0,0 +1,18 @@
+# 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'
+wrapper=File.expand_path('../../bin/bundler_wrapper', Dir.getwd)
+destination=File.expand_path('bin/bundler_wrapper', Gem.dir)
+FileUtils.mkdir_p(File.join(Gem.dir, 'bin'), :verbose => true)
+FileUtils.cp(wrapper, destination, :verbose => true)
+File.chmod(0755, destination)

data/lib/rubygems_bundler/regenerate_binstubs_command.rb

@@ -36,14 +36,10 @@ class RegenerateBinstubsCommand < Gem::Command
         cache_gem = File.join(org_gem_path, 'cache', spec.file_name)
         if File.exist? cache_gem
           puts "#{spec.name} #{spec.version}"
-          inst = Gem::Installer.new Dir[cache_gem].first, :wrappers => true, :force => true
-          org_gem_path = File.join org_gem_path, 'gems'
-          inst.spec.instance_variable_set :@gems_dir, org_gem_path
-          inst.spec.instance_variable_set :@gem_dir, nil
-          inst.spec.loaded_from = org_gem_path
+          inst = Gem::Installer.new Dir[cache_gem].first, :wrappers => true, :force => true, :install_dir => org_gem_path
           RubyGemsBundlerInstaller.bundler_generate_bin(inst)
         else
-          puts "##{spec.name} #{spec.version} not found in GEM_HOME"
+          puts "##{spec.name} #{spec.version} not found in GEM_PATH"
         end
       end
     end
@@ -56,8 +52,5 @@ class RegenerateBinstubsCommand < Gem::Command
     else
       Gem.source_index.map{|name,spec| spec}
     end
-
-    Gem::VERSION > '1.8' ? Gem::Specification._all : Gem.source_index.map{|name,spec| spec}
-
   end
 end

data/lib/rubygems_bundler/rubygems_bundler_installer.rb

@@ -6,7 +6,7 @@ module RubyGemsBundlerInstaller
     bindir = inst.bin_dir ? inst.bin_dir : Gem.bindir(inst.gem_home)
     inst.spec.executables.each do |filename|
       filename.untaint
-      original = File.join inst.gem_dir, inst.spec.bindir, filename
+      original = File.join bindir, filename
       if File.exists?( original )
         bin_script_path = File.join bindir, inst.formatted_program_filename(filename)
         FileUtils.rm_f bin_script_path
@@ -21,12 +21,53 @@ module RubyGemsBundlerInstaller
     end
   end
 
+
+  def self.shebang(inst, bin_file_name)
+    ruby_name = Gem::ConfigMap[:ruby_install_name] if @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}
+    @@env_path ||= Gem::Installer::ENV_PATHS.find {|env_path| File.executable? env_path }
+
+    if /\A#!/ =~ first_line then
+      # Preserve extra words on shebang line, like "-w". Thanks RPA.
+      shebang = first_line.sub(/\A\#!.*?ruby\S*(?=(\s+\S+))/, "#!#{Gem.ruby}")
+      opts = $1
+      shebang.strip! # Avoid nasty ^M issues.
+    end
+
+    if which = Gem.configuration[:custom_shebang]
+      which = which.gsub(/\$(\w+)/) do
+        case $1
+        when "env"
+          @@env_path
+        when "ruby"
+          "#{Gem.ruby}#{opts}"
+        when "exec"
+          bin_file_name
+        when "name"
+          inst.spec.name
+        end
+      end
+
+      return "#!#{which}"
+    end
+
+    if not ruby_name then
+      "#!#{Gem.ruby}#{opts}"
+    elsif inst.opts then
+      "#!/bin/sh\n'exec' #{ruby_name.dump} '-x' \"$0\" \"$@\"\n#{shebang}"
+    else
+      "#!#{@@env_path} #{ruby_name}"
+    end
+  end
+
   # Return the text for an application file.
   def self.bundler_app_script_text(inst, bin_file_name)
     <<-TEXT
-#{inst.shebang bin_file_name}
+#{shebang inst, bin_file_name}
 #
-# This file was generated by RubyGems extended wrapper.
+# This file was generated by RubyGems.
 #
 # The application '#{inst.spec.name}' is installed as part of a gem, and
 # this file is here to facilitate running it.
@@ -34,29 +75,14 @@ module RubyGemsBundlerInstaller
 
 require 'rubygems'
 
-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
 version = "#{Gem::Requirement.default}"
 
-if try_bundler || force_bundler
-  begin
-    require 'bundler/setup'
-  rescue LoadError
-    raise '\n\nPlease \\\'gem install bundler\\\' first.\n\n' if force_bundler
-    try_bundler = false
-  end
-end
-
-unless try_bundler
-  if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-    version = $1
-    ARGV.shift
-  end
-  gem '#{inst.spec.name}', version
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
 end
 
+gem '#{inst.spec.name}', version
 load Gem.bin_path('#{inst.spec.name}', '#{bin_file_name}', version)
 TEXT
   end

data/lib/rubygems_plugin.rb

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

data/rubygems-bundler.gemspec

@@ -1,29 +1,33 @@
 Gem::Specification.new do |s|
   s.name = "rubygems-bundler"
-  s.version = "0.1.5"
-  s.date = "2011-06-08"
+  s.version = "0.2.3"
+  s.date = "2011-06-13"
   s.summary = "Make rubygems generate bundler aware executable wrappers"
   s.email = "mpapis@gmail.com"
   s.homepage = "https://github.com/mpapis/rubygems-bundler"
-  s.description = "Integrate Rubygems, Bundler and RVM"
+  s.description = "Integrate Rubygems and Bundler"
   s.has_rdoc = false
   s.authors = ["Michal Papis"]
   s.files = [
-              "lib/rubygems_bundler/regenerate_binstubs_command.rb",
-              "lib/rubygems_bundler/rubygems_bundler_installer.rb",
-              "lib/rubygems_bundler/fix_wrapper.rb",
-              "lib/rubygems_plugin.rb",
-              "README.md",
-              "rubygems-bundler.gemspec",
-              "LICENSE",
-            ]
+    "bin/bundler_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
-========================================================================
+===============================================================================
 
-Thanks for installing rubygems-bundler!
+rubygems-bundler allows running gem executables in Gemfile specified versions!
 
-It is important you understand that this gem can make your gem 
-executables load in versions specified in Gemfile!
+First step is to add following line to ~/.gemrc
+
+    custom_shebang: $env bundler_wrapper
 
 To make all the executables bundler compatible run:
 
@@ -33,7 +37,7 @@ To always use bundler add the following line to ~/.rvmrc or ~/.bashrc
 
     export USE_BUNDLER=force
 
-now relogin or call in every open shell:
+Relogin or call in every open shell:
 
     export USE_BUNDLER=force
 
@@ -41,6 +45,6 @@ For more information read:
 
     https://github.com/mpapis/rubygems-bundler
 
-========================================================================
+===============================================================================
 TEXT
 end

metadata

@@ -1,57 +1,88 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rubygems-bundler
-version: !ruby/object:Gem::Version
-  version: 0.1.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.3
 platform: ruby
-authors:
+authors: 
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-08 00:00:00.000000000Z
+
+date: 2011-06-13 00:00:00 Z
 dependencies: []
-description: Integrate Rubygems, Bundler and RVM
+
+description: Integrate Rubygems and Bundler
 email: mpapis@gmail.com
 executables: []
-extensions: []
+
+extensions: 
+- ext/wrapper_installer/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
+- bin/bundler_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
-- LICENSE
 homepage: https://github.com/mpapis/rubygems-bundler
 licenses: []
-post_install_message: ! "========================================================================\n\nThanks
-  for installing rubygems-bundler!\n\nIt is important you understand that this gem
-  can make your gem \nexecutables load in versions specified in Gemfile!\n\nTo make
-  all the executables bundler compatible run:\n\n    gem regenerate_binstubs # only
-  once\n\nTo always use bundler add the following line to ~/.rvmrc or ~/.bashrc\n\n
-  \   export USE_BUNDLER=force\n\nnow relogin or call in every open shell:\n\n    export
-  USE_BUNDLER=force\n\nFor more information read:\n\n    https://github.com/mpapis/rubygems-bundler\n\n========================================================================\n"
+
+post_install_message: |
+  ===============================================================================
+  
+  rubygems-bundler allows running gem executables in Gemfile specified versions!
+  
+  First step is to add following line to ~/.gemrc
+  
+      custom_shebang: $env 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
+  
+  ===============================================================================
+
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Make rubygems generate bundler aware executable wrappers
 test_files: []
+