[padrino-gen] Prevent bundler gem clashing

[padrino-core] Minor withespace fix
oddlyzen · Mar 6, 2010 · f5e8150 · f5e8150
1 parent 217e29b
commit f5e8150
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/padrino-core/lib/padrino-core/tasks.rb b/padrino-core/lib/padrino-core/tasks.rb
@@ -19,6 +19,5 @@ module Tasks
     def self.files
       @files ||= []
     end
-
   end # Tasks
 end # Padrino
diff --git a/padrino-gen/lib/padrino-gen.rb b/padrino-gen/lib/padrino-gen.rb
@@ -1,4 +1,3 @@
-require 'padrino-core/support_lite'
 require 'padrino-core/tasks'
 
 module Padrino

diff --git a/padrino-gen/lib/padrino-gen/generators/cli.rb b/padrino-gen/lib/padrino-gen/generators/cli.rb
@@ -1,5 +1,4 @@
 require 'thor/group'
-require 'padrino-core/support_lite'
 
 module Padrino
   module Generators
@@ -19,10 +18,12 @@ class Cli < Thor::Group
       def load_boot
         begin
           ENV['PADRINO_LOG_LEVEL'] ||= "test"
-          if options[:root]
-            require File.join(options[:root], 'config/boot.rb') if File.exist?(File.join(options[:root], 'config/boot.rb'))
+          boot = options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb'
+          if File.exist?(boot)
+            require boot
           else
-            require 'config/boot.rb' if File.exist?('config/boot.rb')
+            # If we are outside app we need to load support_lite
+            require 'padrino-core/support_lite'
           end
         rescue Exception => e
           puts "=> Problem loading config/boot.rb"