allow bundler binstubs, instruct instead of Gem::LoadError, closes #2013

CHANGES.rdoc

@@ -4,6 +4,7 @@
 
 - NEW Remove RightJS, Riot, Steak support (@ujifgc)
 - NEW Allow shortened mailer render calls with default mailer and message names (@ujifgc)
+- FIX delegate padrino and padrino-gen to bundler binstubs
 
 == 0.13.2 (May 9th 2016)
 

padrino-core/bin/padrino

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
+require 'padrino-core/cli/binstub'
+Padrino.replace_with_binstub('padrino')
 
 padrino_core_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)

padrino-core/lib/padrino-core/cli/binstub.rb

@@ -0,0 +1,27 @@
+module Padrino
+  ##
+  # Replaces the current process with it's binstub.
+  #
+  def self.replace_with_binstub(executable)
+    begin
+      return if Bundler.definition.missing_specs.empty?
+    rescue NameError, NoMethodError
+    end
+
+    project_root = Dir.pwd
+    until project_root.empty?
+      break if File.file?(File.join(project_root, 'Gemfile'))
+      project_root = project_root.rpartition('/').first
+    end
+
+    if %w(Gemfile .components).all? { |file| File.file?(File.join(project_root, file)) }
+      binstub = File.join(project_root, 'bin', executable)
+      if File.file?(binstub)
+        exec Gem.ruby, binstub, *ARGV
+      else
+        puts 'Please run `bundler install --binstubs` from your project root to generate bundle-specific executables'
+        exit!
+      end
+    end
+  end
+end

padrino-gen/bin/padrino-gen

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require 'rubygems' unless defined?(Gem) # Useful only on --dev mode
-require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
+require 'padrino-core/cli/binstub'
+Padrino.replace_with_binstub('padrino-gen')
 
 padrino_gen_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)

padrino-gen/lib/padrino-gen/generators/project.rb

@@ -136,7 +136,7 @@ def finish_message
         say "#{name} is ready for development!", :green
         say '=' * 65, :green
         say "$ cd #{options[:root]}/#{name}"
-        say "$ bundle" unless options[:bundle]
+        say "$ bundle --binstubs" unless options[:bundle]
         say "=" * 65, :green
         say
       end