padrino-gen 0.6.3 → 0.6.7

data/lib/padrino-gen/generators/components/orms/sequel_gen.rb

@@ -6,13 +6,11 @@ module Padrino
         module SequelGen
 
           SEQUEL = (<<-SEQUEL).gsub(/^ {10}/, '')
-          module DatabaseSetup
-            def self.registered(app)
-              Sequel::Model.plugin(:schema)
-              app.configure(:development) { Sequel.connect("sqlite3://" + Padrino.root('db', "development.db"), :loggers => [logger]) }
-              app.configure(:production)  { Sequel.connect("sqlite3://" + Padrino.root('db', "production.db"), :loggers => [logger]) }
-              app.configure(:test)        { Sequel.connect("sqlite3://" + Padrino.root('db', "test.db"), :loggers => [logger]) }
-            end
+          Sequel::Model.plugin(:schema)
+          case Padrino.env
+            when :development then Sequel.connect("sqlite3://" + Padrino.root('db', "development.db"), :loggers => [logger])
+            when :production  then Sequel.connect("sqlite3://" + Padrino.root('db', "production.db"),  :loggers => [logger])
+            when :test        then Sequel.connect("sqlite3://" + Padrino.root('db', "test.db"),        :loggers => [logger])
           end
           SEQUEL
 
@@ -29,8 +27,7 @@ module Padrino
           MODEL
 
           def create_model_file(name, fields)
-            model_path = app_root_path('app/models/', "#{name.to_s.underscore}.rb")
-            return false if File.exist?(model_path)
+            model_path = destination_root('app/models/', "#{name.to_s.underscore}.rb")
             model_contents = SQ_MODEL.gsub(/!NAME!/, name.to_s.downcase.camelize)
             create_file(model_path, model_contents)
           end

data/lib/padrino-gen/generators/components/renderers/haml_gen.rb

@@ -19,8 +19,7 @@ module Padrino
 
           def setup_renderer
             require_dependencies 'haml'
-            create_file 'config/initializers/sass.rb', SASS_INIT
-            empty_directory 'public/stylesheets/sass'
+            create_file destination_root('/config/initializers/sass.rb'), SASS_INIT
           end
         end
 

data/lib/padrino-gen/generators/components/scripts/jquery_gen.rb

@@ -5,8 +5,8 @@ module Padrino
         
         module JqueryGen
           def setup_script
-            copy_file('templates/scripts/jquery.js', "public/javascripts/jquery.js")
-            create_file('public/javascripts/application.js', "// Put your application scripts here")
+            copy_file('templates/scripts/jquery.js', destination_root("/app/public/javascripts/jquery.js"))
+            create_file(destination_root('/app/public/javascripts/application.js'), "// Put your application scripts here")
           end
         end
         

data/lib/padrino-gen/generators/components/scripts/prototype_gen.rb

@@ -5,9 +5,9 @@ module Padrino
         
         module PrototypeGen
           def setup_script
-            copy_file('templates/scripts/protopak.js', "public/javascripts/protopak.js")
-            copy_file('templates/scripts/lowpro.js', "public/javascripts/lowpro.js")
-            create_file('public/javascripts/application.js', "// Put your application scripts here")
+            copy_file('templates/scripts/protopak.js', destination_root("/app/public/javascripts/protopak.js"))
+            copy_file('templates/scripts/lowpro.js', destination_root("/app/public/javascripts/lowpro.js"))
+            create_file(destination_root('/app/public/javascripts/application.js'), "// Put your application scripts here")
           end
         end
         

data/lib/padrino-gen/generators/components/scripts/rightjs_gen.rb

@@ -5,12 +5,10 @@ module Padrino
         
         module RightjsGen
           def setup_script
-            copy_file('templates/scripts/right.js', "public/javascripts/right.js")
-            create_file('public/javascripts/application.js', "// Put your application scripts here")
+            copy_file('templates/scripts/right.js', destination_root("/app/public/javascripts/right.js"))
+            create_file(destination_root('/app/public/javascripts/application.js'), "// Put your application scripts here")
           end
         end
-        
-        
       end
     end
   end

data/lib/padrino-gen/generators/components/tests/bacon_test_gen.rb

@@ -32,9 +32,9 @@ module Padrino
           TEST
 
           # Generates a controller test given the controllers name
-          def generate_controller_test(name, root)
+          def generate_controller_test(name)
             bacon_contents = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file app_root_path("test/controllers/","#{name}_controller_test.rb"), bacon_contents, :skip => true
+            create_file destination_root("test/controllers/","#{name}_controller_test.rb"), bacon_contents, :skip => true
           end
 
           BACON_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -50,7 +50,7 @@ module Padrino
 
           def generate_model_test(name)
             bacon_contents = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), bacon_contents, :skip => true
+            create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), bacon_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/riot_test_gen.rb

@@ -31,9 +31,9 @@ module Padrino
           TEST
 
           # Generates a controller test given the controllers name
-          def generate_controller_test(name, root)
+          def generate_controller_test(name)
             riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), riot_contents, :skip => true
+            create_file destination_root("test/controllers/#{name}_controller_test.rb"), riot_contents, :skip => true
           end
 
           RIOT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -49,7 +49,7 @@ module Padrino
 
           def generate_model_test(name)
             riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), riot_contents, :skip => true
+            create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), riot_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/rspec_test_gen.rb

@@ -33,9 +33,9 @@ module Padrino
 
           # TODO move to spec directory to follow convention
           # Generates a controller test given the controllers name
-          def generate_controller_test(name, root)
+          def generate_controller_test(name)
             rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_spec.rb"), rspec_contents, :skip => true
+            create_file destination_root("test/controllers/#{name}_controller_spec.rb"), rspec_contents, :skip => true
           end
 
           RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -51,7 +51,7 @@ module Padrino
 
           def generate_model_test(name)
             rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_spec.rb"), rspec_contents, :skip => true
+            create_file destination_root("test/models/#{name.to_s.downcase}_spec.rb"), rspec_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/shoulda_test_gen.rb

@@ -36,9 +36,9 @@ module Padrino
           TEST
 
           # Generates a controller test given the controllers name
-          def generate_controller_test(name, root)
+          def generate_controller_test(name)
             shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), shoulda_contents, :skip => true
+            create_file destination_root("test/controllers/#{name}_controller_test.rb"), shoulda_contents, :skip => true
           end
 
           SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -56,7 +56,7 @@ module Padrino
 
           def generate_model_test(name)
             shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), shoulda_contents, :skip => true
+            create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), shoulda_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/components/tests/testspec_test_gen.rb

@@ -31,9 +31,9 @@ module Padrino
           TEST
 
           # Generates a controller test given the controllers name
-          def generate_controller_test(name, root)
+          def generate_controller_test(name)
             testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file File.join(root, "test/controllers/#{name}_controller_test.rb"), testspec_contents, :skip => true
+            create_file destination_root("test/controllers/#{name}_controller_test.rb"), testspec_contents, :skip => true
           end
 
           TESTSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
@@ -49,7 +49,7 @@ module Padrino
 
           def generate_model_test(name)
             tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
-            create_file app_root_path("test/models/#{name.to_s.downcase}_test.rb"), tests_contents, :skip => true
+            create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), tests_contents, :skip => true
           end
 
         end

data/lib/padrino-gen/generators/controller.rb

@@ -21,7 +21,7 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino controller"
       argument :fields, :desc => "The fields for the controller", :type => :array, :default => []
-      class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
@@ -31,16 +31,17 @@ module Padrino
       end
 
       def create_controller
-        if in_app_root?(options[:root])
+        self.destination_root = options[:root]
+        if in_app_root?
           @app_name = fetch_app_name(options[:root])
           @actions = controller_actions(fields)
           self.behavior = :revoke if options[:destroy]
-          # inject_into_file app_root_path("config/urls.rb"), controller_routes(name,fields), :after => "urls do\n"
-          template "templates/controller.rb.tt", app_root_path("app/controllers", "#{name}.rb")
-          template "templates/helper.rb.tt",     app_root_path("app/helpers", "#{name}_helper.rb")
-          empty_directory app_root_path("app/views/#{name}")
-          include_component_module_for(:test, options[:root])
-          generate_controller_test(name, options[:root] || '.')
+          # inject_into_file destination_root("config/urls.rb"), controller_routes(name,fields), :after => "urls do\n"
+          template "templates/controller.rb.tt", destination_root("app/controllers", "#{name}.rb")
+          template "templates/helper.rb.tt",     destination_root("app/helpers", "#{name}_helper.rb")
+          empty_directory destination_root("app/views/#{name}")
+          include_component_module_for(:test)
+          generate_controller_test(name)
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end

data/lib/padrino-gen/generators/mailer.rb

@@ -20,7 +20,7 @@ module Padrino
       desc "Description:\n\n\tpadrino-gen mailer generates a new Padrino mailer"
 
       argument :name, :desc => "The name of your padrino mailer"
-      class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
@@ -30,14 +30,15 @@ module Padrino
       end
 
       def create_mailer
-        if in_app_root?(options[:root])
+        self.destination_root = options[:root]
+        if in_app_root?
           self.behavior = :revoke if options[:destroy]
           simple_name = name.to_s.gsub(/mailer/i, '')
           @mailer_basename = "#{simple_name.downcase.underscore}_mailer"
           @mailer_klass    = "#{simple_name.downcase.camelize}Mailer"
-          template "templates/mailer_initializer.rb.tt", app_root_path("config/initializers/mailer.rb"), :skip => true
-          template "templates/mailer.rb.tt", app_root_path("app/mailers", "#{@mailer_basename}.rb")
-          empty_directory app_root_path('app/views/', @mailer_basename)
+          template "templates/mailer_initializer.rb.tt", destination_root("config/initializers/mailer.rb"), :skip => true
+          template "templates/mailer.rb.tt", destination_root("app/mailers", "#{@mailer_basename}.rb")
+          empty_directory destination_root('app/views/', @mailer_basename)
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end

data/lib/padrino-gen/generators/migration.rb

@@ -21,7 +21,7 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino migration"
       argument :columns, :desc => "The columns for the migration", :type => :array, :default => []
-      class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
@@ -30,11 +30,11 @@ module Padrino
         super
       end
 
-      def create_model
-        if in_app_root?(options[:root])
-          remove_migration(name) if options[:destroy]
-          include_component_module_for(:orm, options[:root])
+      def create_migration
+        self.destination_root = options[:root]
+        if in_app_root?
           self.behavior = :revoke if options[:destroy]
+          include_component_module_for(:orm)
           create_migration_file(name, name, columns)
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?

data/lib/padrino-gen/generators/model.rb

@@ -21,7 +21,7 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino model"
       argument :fields, :desc => "The fields for the model", :type => :array, :default => []
-      class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
 
@@ -32,11 +32,11 @@ module Padrino
       end
 
       def create_model
-        if in_app_root?(options[:root])
-          remove_model_migration(name) if options[:destroy]
+        self.destination_root = options[:root]
+        if in_app_root?
           self.behavior = :revoke if options[:destroy]
-          include_component_module_for(:orm, options[:root])
-          include_component_module_for(:test, options[:root])
+          include_component_module_for(:orm)
+          include_component_module_for(:test)
           migration_name = "create_#{name.pluralize.underscore}"
           create_model_file(name, fields)
           generate_model_test(name)

data/lib/padrino-gen/generators.rb

@@ -24,22 +24,26 @@ module Padrino
       # Include related modules
       include Thor::Actions
 
-      class_option :root, :aliases => '-r', :default => nil, :type => :string
+      class_option :root, :desc => "The root destination", :aliases => '-r', :default => nil, :type => :string
 
       # We need to TRY to load boot because some of our app dependencies maybe have 
       # custom generators, so is necessary know who are.
       def load_boot
-        if options[:root]
-          require File.join(options[:root], 'config/boot.rb') if File.exist?(File.join(options[:root], 'config/boot.rb'))
-        else
-          require 'config/boot.rb' if File.exist?('config/boot.rb')
+        require 'padrino-gen/generators/actions'
+        Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
+
+        begin
+          if options[:root]
+            require File.join(options[:root], 'config/boot.rb') if File.exist?(File.join(options[:root], 'config/boot.rb'))
+          else
+            require 'config/boot.rb' if File.exist?('config/boot.rb')
+          end
+        rescue Exception => e
+          puts "=> Problem loading config/boot.rb"
         end
       end
 
       def setup
-        require 'padrino-gen/generators/actions'
-        Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
-
         Padrino::Generators.lockup!
 
         generator_kind  = ARGV.delete_at(0).to_s.downcase.to_sym if ARGV[0].present?

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -15,7 +15,7 @@ if defined?(ActiveRecord)
           #  development:
           #    database: blog_development
           #    <<: *defaults
-          next unless config['database']
+          next unless config[:database]
           # Only connect to local databases
           local_database?(config) { create_database(config) }
         end
@@ -29,12 +29,13 @@ if defined?(ActiveRecord)
 
     def create_database(config)
       begin
-        if config['adapter'] =~ /sqlite/
-          if File.exist?(config['database'])
-            $stderr.puts "#{config['database']} already exists"
+        if config[:adapter] =~ /sqlite/
+          if File.exist?(config[:database])
+            $stderr.puts "#{config[:database]} already exists"
           else
             begin
               # Create the SQLite database
+              Dir.mkdir File.dirname(config[:database])
               ActiveRecord::Base.establish_connection(config)
               ActiveRecord::Base.connection
             rescue
@@ -48,38 +49,38 @@ if defined?(ActiveRecord)
           ActiveRecord::Base.connection
         end
       rescue
-        case config['adapter']
+        case config[:adapter]
         when 'mysql'
           @charset   = ENV['CHARSET']   || 'utf8'
           @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
-          creation_options = {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
+          creation_options = {:charset => (config[:charset] || @charset), :collation => (config[:collation] || @collation)}
           begin
-            ActiveRecord::Base.establish_connection(config.merge('database' => nil))
-            ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+            ActiveRecord::Base.establish_connection(config.merge(:database => nil))
+            ActiveRecord::Base.connection.create_database(config[:database], creation_options)
             ActiveRecord::Base.establish_connection(config)
           rescue Mysql::Error => sqlerr
             if sqlerr.errno == Mysql::Error::ER_ACCESS_DENIED_ERROR
               print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
               root_password = $stdin.gets.strip
-              grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
-                "TO '#{config['username']}'@'localhost' " \
-                "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
+              grant_statement = "GRANT ALL PRIVILEGES ON #{config[:database]}.* " \
+                "TO '#{config[:username]}'@'localhost' " \
+                "IDENTIFIED BY '#{config[:password]}' WITH GRANT OPTION;"
               ActiveRecord::Base.establish_connection(config.merge(
-                  'database' => nil, 'username' => 'root', 'password' => root_password))
-              ActiveRecord::Base.connection.create_database(config['database'], creation_options)
+                  :database => nil, 'username' => 'root', 'password' => root_password))
+              ActiveRecord::Base.connection.create_database(config[:database], creation_options)
               ActiveRecord::Base.connection.execute grant_statement
               ActiveRecord::Base.establish_connection(config)
             else
               $stderr.puts sqlerr.error
-              $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
-              $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+              $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config[:charset] || @charset}, collation: #{config[:collation] || @collation}"
+              $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config[:charset]
             end
           end
         when 'postgresql'
           @encoding = config[:encoding] || ENV['CHARSET'] || 'utf8'
           begin
-            ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-            ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
+            ActiveRecord::Base.establish_connection(config.merge(:database => 'postgres', 'schema_search_path' => 'public'))
+            ActiveRecord::Base.connection.create_database(config[:database], config.merge('encoding' => @encoding))
             ActiveRecord::Base.establish_connection(config)
           rescue
             $stderr.puts $!, *($!.backtrace)
@@ -87,7 +88,7 @@ if defined?(ActiveRecord)
           end
         end
       else
-        $stderr.puts "#{config['database']} already exists"
+        $stderr.puts "#{config[:database]} already exists"
       end
     end
 
@@ -96,12 +97,12 @@ if defined?(ActiveRecord)
       task :all => :environment do
         ActiveRecord::Base.configurations.each_value do |config|
           # Skip entries that don't have a database key
-          next unless config['database']
+          next unless config[:database]
           begin
             # Only connect to local databases
             local_database?(config) { drop_database(config) }
           rescue Exception => e
-            puts "Couldn't drop #{config['database']} : #{e.inspect}"
+            puts "Couldn't drop #{config[:database]} : #{e.inspect}"
           end
         end
       end
@@ -113,15 +114,15 @@ if defined?(ActiveRecord)
       begin
         drop_database(config)
       rescue Exception => e
-        puts "Couldn't drop #{config['database']} : #{e.inspect}"
+        puts "Couldn't drop #{config[:database]} : #{e.inspect}"
       end
     end
 
     def local_database?(config, &block)
-      if %w( 127.0.0.1 localhost ).include?(config['host']) || config['host'].blank?
+      if %w( 127.0.0.1 localhost ).include?(config[:host]) || config[:host].blank?
         yield
       else
-        puts "This task only modifies local databases. #{config['database']} is on a remote host."
+        puts "This task only modifies local databases. #{config[:database]} is on a remote host."
       end
     end
 
@@ -185,7 +186,7 @@ if defined?(ActiveRecord)
     desc "Retrieves the charset for the current environment's database"
     task :charset => :environment do
       config = ActiveRecord::Base.configurations[Padrino.env || 'development']
-      case config['adapter']
+      case config[:adapter]
       when 'mysql'
         ActiveRecord::Base.establish_connection(config)
         puts ActiveRecord::Base.connection.charset
@@ -200,7 +201,7 @@ if defined?(ActiveRecord)
     desc "Retrieves the collation for the current environment's database"
     task :collation => :environment do
       config = ActiveRecord::Base.configurations[Padrino.env || 'development']
-      case config['adapter']
+      case config[:adapter]
       when 'mysql'
         ActiveRecord::Base.establish_connection(config)
         puts ActiveRecord::Base.connection.collation
@@ -294,19 +295,19 @@ if defined?(ActiveRecord)
   end
 
   def drop_database(config)
-    case config['adapter']
+    case config[:adapter]
     when 'mysql'
       ActiveRecord::Base.establish_connection(config)
-      ActiveRecord::Base.connection.drop_database config['database']
+      ActiveRecord::Base.connection.drop_database config[:database]
     when /^sqlite/
       require 'pathname'
-      path = Pathname.new(config['database'])
+      path = Pathname.new(config[:database])
       file = path.absolute? ? path.to_s : Padrino.root(path)
 
       FileUtils.rm(file)
     when 'postgresql'
-      ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-      ActiveRecord::Base.connection.drop_database config['database']
+      ActiveRecord::Base.establish_connection(config.merge(:database => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.drop_database config[:database]
     end
   end
 
@@ -315,8 +316,8 @@ if defined?(ActiveRecord)
   end
 
   def set_firebird_env(config)
-    ENV["ISC_USER"]     = config["username"].to_s if config["username"]
-    ENV["ISC_PASSWORD"] = config["password"].to_s if config["password"]
+    ENV["ISC_USER"]     = config[:username].to_s if config[:username]
+    ENV["ISC_PASSWORD"] = config[:password].to_s if config[:password]
   end
 
   def firebird_db_string(config)

data/lib/padrino-gen.rb

@@ -1,5 +1,8 @@
 require 'padrino-core/support_lite'
 require 'padrino-gen/generators'
+
+##
 # Add our rakes when padrino core require this file.
+# 
 require 'padrino-core/tasks'
 Padrino::Tasks.files << Dir[File.dirname(__FILE__) + "/padrino-gen/padrino-tasks/**/*.rb"]

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.6.3"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-26}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{nesquena@gmail.com}
@@ -98,7 +98,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.3"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.7"])
       s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
       s.add_runtime_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
+      s.add_dependency(%q<padrino-core>, ["= 0.6.7"])
       s.add_dependency(%q<thor>, [">= 0.11.8"])
       s.add_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
@@ -121,7 +121,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
+    s.add_dependency(%q<padrino-core>, ["= 0.6.7"])
     s.add_dependency(%q<thor>, [">= 0.11.8"])
     s.add_dependency(%q<bundler>, [">= 0.5.0"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])

data/test/helper.rb

@@ -9,7 +9,7 @@ require 'thor'
 # We try to load the vendored padrino-core if exist
 %w(core).each do |gem|
   if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
-    $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
+    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
   end
 end