Fixed issue #571, don't handle Gemfile if we are outside a Padrino pr…

…oject

CHANGES.rdoc

@@ -26,6 +26,7 @@
 * Added Hungarian translation [Thanks to Kormány Zsolt]
 * Added Riak support through Ripple
 * Updated couchrest_model dependency to ~>1.1.0.rc1
+* Fixed issue #571, don't handle Gemfile if we are outside a Padrino project
 
 == 0.9.29
 

padrino-core/bin/padrino

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

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 File.exist?("Gemfile")
+require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
 
 padrino_gen_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)