lib/spontaneous/generators/site.rb in spontaneous-0.2.0.beta5 vs lib/spontaneous/generators/site.rb in spontaneous-0.2.0.beta6

- old
+ new

@@ -4,24 +4,25 @@ module Spontaneous module Generators class Site < Thor::Group def self.available_dbs - postgres = { :gem => "sequel_pg", :adapter => "postgres", :user => nil } - { "mysql" => { :gem => "mysql2", :adapter => "mysql2", :user => "root" }, - "pg" => postgres, "postgresql" => postgres, "postgres" => postgres } + postgres = { :gem => "sequel_pg", :adapter => "postgres", :user => ENV["USER"] } + { "sqlite" => { gem: "sqlite3", adapter: "sqlite3" }, + "mysql" => { gem: "mysql2", adapter: "mysql2", user: "root" }, + "pg" => postgres, "postgresql" => postgres, "postgres" => postgres } end def self.source_root; File.expand_path(File.dirname(__FILE__) + "/site"); end def self.banner; "spot generate site [domain]"; end include Thor::Actions argument :domain, :type => :string, :desc => "The domain name of the site to generate" class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string - class_option :database, :desc => "The database to use ('postgres' (default) or 'mysql')", :aliases => %w(-d --db), :default => "postgres", :type => :string + class_option :database, :desc => "The database to use ('sqlite' (default), 'postgres' or 'mysql')", :aliases => %w(-d --db), :default => "sqlite", :type => :string class_option :user, :desc => "The database account to use", :aliases => '-u', :type => :string class_option :password, :desc => "The password for the database user", :aliases => %w(-p), :default => "", :type => :string class_option :host, :desc => "The database host", :aliases => %w(-h), :type => :string @@ -57,9 +58,10 @@ directory "assets" directory "public" template "Gemfile.tt", "Gemfile" template "Capfile.tt", "Capfile" template "Rakefile.tt", "Rakefile" + template "db/#{@database[:adapter]}.yml.tt", "config/database.yml" # template "lib/site.rb.tt", "lib/site.rb" # empty_directory "lib/tasks" empty_directory "log" empty_directory "tmp" empty_directory "cache/media"