lib/spontaneous/cli/generate.rb in spontaneous-0.2.0.alpha6 vs lib/spontaneous/cli/generate.rb in spontaneous-0.2.0.alpha7

@@ -10,17 +10,24 @@
     namespace :generate
 
     default_task :site
 
     desc "site [DOMAIN]", "Generates a site skeleton. Usage: spot generate <site domain name>"
+
+    method_option :database, :type => :string, :default => "mysql", :aliases => "-d", :desc => "Database adapter"
+    method_option :user, :type => :string, :default => "root", :aliases => "-u", :desc => "Database admin user"
+    method_option :password, :type => :string, :default => "", :aliases => "-p", :desc => "Database admin user"
+
     def site(*args)
-      require File.expand_path('../../../spontaneous', __FILE__)
-      ::Spontaneous::Generators::Site.start(args)
+      # require "spontaneous"
+      ::Spontaneous::Generators::Site.start(ARGV.drop_while { |e| %w(generate site).include?(e) })
     end
 
     def method_missing(method, *args)
       if PublicSuffix.valid?(method.to_s)
+        puts method
         args.unshift(method.to_s)
+        ARGV.unshift("site")
         self.send(:site, *args)
       else
         super
       end
     end