padrino-gen 0.9.1 → 0.9.2

data/README.rdoc

@@ -7,7 +7,8 @@ Padrino comes preloaded with flexible code generators powered in part by the exc
 both in creating new applications and building on existing ones. The generators have been built to be as library agnostic
 as possible, supporting a myriad of test frameworks, js libraries, mocking libraries, etc.
 
-See the wiki article for additional information: <...WIKI...>
+See the guide for {Padrino Generators}[http://wiki.github.com/padrino/padrino-framework/generators] for a
+more in-depth look at the system.
 
 === Application Generator
 
@@ -19,14 +20,6 @@ to using Padrino.
 One important feature of the generators is that they were built from the ground up to support a wide variety
 of tools, libraries and gems for use within your padrino application. 
 
-This means that Padrino generators do *not* lock you into using any particular database, ORM, testing framework, 
-templating engine or javascript library. In fact, when generating an application you can actually tell 
-Padrino which components you would like to use!
-
-The usage for the project generator is quite simple:
-
-  $ padrino-gen project <the_app_name> </path/to/create/app> --<component-name> <value>
-
 The simplest possible command to generate a base application would be:
 
   $ padrino-gen project demo_project
@@ -35,11 +28,7 @@ This would construct a Padrino application DemoApp (which extends from Padrino::
 inside the folder 'demo_project' at our current path. Inside the application there would be configuration and 
 setup performed for the default components.
 
-You can also define specific components to be used:
-
-  $ padrino-gen project demo_project --test rspec --renderer haml --mock rr --script jquery --orm datamapper
-  
-There is also support for aliases for each component within the command:
+You can define specific components to be used:
 
   $ padrino-gen project demo_project -t rspec -r haml -m rr -s jquery -d datamapper
   
@@ -49,25 +38,14 @@ You can also instruct the generator to skip a certain component to avoid using o
   
 The available components and their default options are listed below:
 
-test::      rspec (default), bacon, shoulda, testspec, riot
+test::      rspec (default), bacon, shoulda, cucumber, testspec, riot
 renderer::  haml  (default), erb
-mock::      none  (default), rr
-script::    none  (default), prototype, rightjs
-orm::       none  (default), mongomapper, activerecord, sequel, couchrest
-
-The generator uses the <tt>bundler</tt> gem to resolve any application dependencies when the application is newly created.
-The necessary bundler command can be executed automatically through the generator with
+mock::      none  (default), mocha, rr
+script::    none  (default), jquery, prototype, mootools, rightjs
+orm::       none  (default), mongomapper, mongoid, activerecord, sequel, couchrest
 
-  $ padrino-gen project demo_project --run_bundler # alias -b
-
-or this can be done manually through executing command <tt>gem bundle</tt> in the terminal at the root of the generated application.
-If not executed manually, the bundling will be performed automatically the first time the application attempts to boot.
-Note that this command only has to be performed when the application is first generated or when the Gemfile is modified.
- 
-The generator framework within padrino is extensible and additional components and tools can be added easily.
-This would be achieved through forking our project and reading through the code in <tt>lib/generators/App.rb</tt> and
-the setup instructions inside the relevant files within <tt>lib/generators/components/</tt>. We are happy to accept pull requests
-for additional component types not originally included (although helping us maintain them would also be appreciated).
+To learn more about the project generator, check out the guide to
+{Padrino Generators}[http://wiki.github.com/padrino/padrino-framework/generators].
 
 === Sub App Generator
 
@@ -90,6 +68,9 @@ By default these apps are mounted under:
   
 but you can edit config/apps.rb and change it.
 
+To learn more about the subapp generator, check out the guide to
+{Padrino Generators}[http://wiki.github.com/padrino/padrino-framework/generators].
+
 === Model Generator
 
 Padrino provides generator support for quickly creating new models within your Padrino application. Note that
@@ -108,20 +89,8 @@ You can also specify desired fields to be contained within your User model:
 
   $ padrino-gen model User name:string age:integer email:string
   
-The model generator will create multiple files within your application and based on your ORM component. 
-Usually the model file will generate files similar to the following:
-
-  * model definition file [app/models/user.rb]
-  * migration declaration [db/migrate/xxx_create_users.rb]
-  * model unit test file  [test/models/user_test.rb]
-  
-You can define as many models as you would like in a Padrino application using this generator.
-
-You can destroy models that you created via the destroy option and setting it to true. default is false.
-  
-  $ padrino-gen model User -d
-  
-This remove all created model files.
+To learn more about the model generator, check out the guide to
+{Padrino Generators}[http://wiki.github.com/padrino/padrino-framework/generators].
 
 === Migration Generator
 
@@ -137,19 +106,8 @@ Using the migration generator is as simple as:
   $ padrino-gen migration AddFieldsToUsers
   $ padrino-gen migration RemoveFieldsFromUsers
   
-You can also specify desired columns to be added to the migration file:
-
-  $ padrino-gen migration AddFieldsToUsers last_login:datetime crypted_password:string
-  $ padrino-gen migration RemoveFieldsFromUsers password:string ip_address:string
-  
-The migration generator will then construct the migration file according to your ORM component chosen
-within <tt>db/migrate/xxx_add_fields_to_users.rb</tt> including the columns specified in the command.
-
-You can destroy migrations that you created via the destroy option and setting it to true. default is false.
-  
-  $ padrino-gen migration AddFieldsToUsers -d
-  
-This removes the migration file.
+To learn more about the migration generator, check out the guide to
+{Padrino Generators}[http://wiki.github.com/padrino/padrino-framework/generators].
 
 === Controller Generator
 
@@ -163,28 +121,13 @@ created through the Padrino application generator and that follow Padrino conven
 Using the controller generator is as simple as:
 
   $ padrino-gen controller Admin
-
-If you want create a controller for a specified sub app you can:
-
-  $ padrino-gen controller Admin -a my_sub_app
   
 You can also specify desired actions to be added to your controller:
 
   $ padrino-gen controller Admin get:index get:new post:create
   
-The controller generator will then construct the controller file within <tt>app/controllers/admin.rb</tt>
-and also a controller test file at <tt>test/controllers/admin_controller_test.rb</tt> according to the 
-test framework chosen during app generation. A default route will also be generated mapping to name of the controller and the route name. For example:
-
-  $ padrino-gen controller User get:index
-  
-  will create a url route for :index mapping to "/user/index"
-  
-You can destroy controllers that you created via the destroy option and setting it to true. default is false.
-
-    $ padrino-gen controller User -d
-
-This removes all created controller files.
+To learn more about the controller generator, check out the guide to
+{Padrino Generators}[http://wiki.github.com/padrino/padrino-framework/generators].
 
 === Mailer Generator
 
@@ -196,21 +139,8 @@ Using the mailer generator is as simple as:
 
   $ padrino-gen mailer UserNotifier
 
-If you want create a mailer for a specified sub app you can:
-
-  $ padrino-gen mailer UserNotifier -a my_sub_app
-
-You can also specify desired delivery actions to be added to the mailer:
-
-  $ padrino-gen mailer UserNotifier confirm_account welcome inactive_account
-  
-The mailer generator will then construct the mailer file within <tt>app/mailers/user_notifier.rb</tt>
-
-You can destroy mailer that you created via the destroy option and setting it to true. default is false.
-  
-  $ padrino-gen mailer UserNotifer -d
-  
-This remove all created mailer files.
+To learn more about the mailer generator, check out the guide to
+{Padrino Generators}[http://wiki.github.com/padrino/padrino-framework/generators].
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

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

@@ -4,7 +4,7 @@ require 'padrino-core/support_lite'
 module Padrino
   module Generators
     ##
-    # This class bootstrap +config/boot+ and perform +Padrino::Generators.lockup!+ for handle
+    # This class bootstrap +config/boot+ and perform +Padrino::Generators.load_components!+ for handle
     # 3rd party generators
     # 
     class Cli < Thor::Group
@@ -31,7 +31,7 @@ module Padrino
       end
 
       def setup
-        Padrino::Generators.lockup!
+        Padrino::Generators.load_components!
 
         generator_kind  = ARGV.delete_at(0).to_s.downcase.to_sym if ARGV[0].present?
         generator_class = Padrino::Generators.mappings[generator_kind]

data/lib/padrino-gen/generators/components/actions.rb

@@ -2,11 +2,6 @@ module Padrino
   module Generators
     module Components
       module Actions
-        BASE_TEST_HELPER = (<<-TEST).gsub(/^ {8}/, '')
-        PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
-        require File.dirname(__FILE__) + "/../config/boot"
-        TEST
-
         # For orm database components
         # Generates the model migration file created when generating a new model
         # options => { :base => "....text...", :up => "..text...",
@@ -89,9 +84,8 @@ module Padrino
         # insert_test_suite_setup('...CLASS_NAME...')
         # => inject_into_file("test/test_config.rb", TEST.gsub(/CLASS_NAME/, @class_name), :after => "set :environment, :test")
         def insert_test_suite_setup(suite_text, options={})
-          test_helper_text = [BASE_TEST_HELPER, suite_text.gsub(/CLASS_NAME/, @class_name)].join("\n")
           options.reverse_merge!(:path => "test/test_config.rb")
-          create_file(options[:path], test_helper_text)
+          create_file(options[:path], suite_text.gsub(/CLASS_NAME/, @class_name))
         end
 
         # For mocking components

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

@@ -7,16 +7,16 @@ module Padrino
 
           COUCHREST = (<<-COUCHREST).gsub(/^ {10}/, '')
           case Padrino.env
-            when :development then COUCHDB = "your_db_name_development"
-            when :production  then COUCHDB = "your_db_name_production"
-            when :test        then COUCHDB = "your_db_name_test"
+            when :development then COUCHDB = '!NAME!_name_development'
+            when :production  then COUCHDB = '!NAME!_name_production'
+            when :test        then COUCHDB = '!NAME!_name_test'
           end
           CouchRest.database!(COUCHDB)
           COUCHREST
 
           def setup_orm
             require_dependencies 'couchrest'
-            create_file("config/database.rb", COUCHREST)
+            create_file("config/database.rb", COUCHREST.gsub(/!NAME!/, name.underscore))
             empty_directory('app/models')
           end
 

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

@@ -0,0 +1,81 @@
+module Padrino
+  module Generators
+    module Components
+      module Orms
+
+        module MongoidGen
+
+          MONGOID = (<<-MONGO).gsub(/^ {10}/, '')
+
+          # Connection.new takes host, port
+          host = 'localhost'
+          port = Mongo::Connection::DEFAULT_PORT
+
+          database_name = case Padrino.env
+            when :development then '!NAME!_development'
+            when :production  then '!NAME!_production'
+            when :test        then '!NAME!_test'
+          end
+
+          Mongoid.database = Mongo::Connection.new(host, port).db(database_name)
+
+          # You can also configure Mongoid this way
+          # Mongoid.configure do |config|
+          #   name = @settings["database"]
+          #   host = @settings["host"]
+          #   config.master = Mongo::Connection.new.db(name)
+          #   config.slaves = [
+          #     Mongo::Connection.new(host, @settings["slave_one"]["port"], :slave_ok => true).db(name),
+          #     Mongo::Connection.new(host, @settings["slave_two"]["port"], :slave_ok => true).db(name)
+          #   ]
+          # end
+          #
+          # More installation and setup notes are on http://mongoid.org/docs/
+          MONGO
+
+          def setup_orm
+            require_dependencies 'mongo_ext', :require => 'mongo'
+            require_dependencies 'mongoid'
+            create_file("config/database.rb", MONGOID.gsub(/!NAME!/, name.underscore))
+            empty_directory('app/models')
+          end
+
+          MONGOID_MODEL = (<<-MODEL).gsub(/^ {10}/, '')
+          class !NAME!
+            include Mongoid::Document
+            include Mongoid::Timestamps # adds created_at and updated_at fields
+
+            # field <name>, :type => <type>, :default => <value>
+            !FIELDS!
+
+            # You can define indexes on documents using the index macro: 
+            # index :field <, :unique => true>
+
+            # You can create a composite key in mongoid to replace the default id using the key macro: 
+            # key :field <, :another_field, :one_more ....>
+
+          end
+          MODEL
+
+          def create_model_file(name, fields)
+            model_path = destination_root('app/models/', "#{name.to_s.underscore}.rb")
+            field_tuples = fields.collect { |value| value.split(":") }
+            column_declarations = field_tuples.collect { |field, kind| "field :#{field}, :type => #{kind.camelize}" }.join("\n  ")
+            model_contents = MONGOID_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+            model_contents.gsub!(/!FIELDS!/, column_declarations)
+            create_file(model_path, model_contents)
+          end
+
+          def create_model_migration(filename, name, fields)
+            # NO MIGRATION NEEDED
+          end
+
+          def create_migration_file(migration_name, name, columns)
+            # NO MIGRATION NEEDED
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -9,15 +9,16 @@ module Padrino
           MongoMapper.connection = Mongo::Connection.new('localhost', nil, :logger => logger)
 
           case Padrino.env
-            when :development then MongoMapper.database = 'your_db_development'
-            when :production  then MongoMapper.database = 'your_db_production'
-            when :test        then MongoMapper.database = 'your_db_test'
+            when :development then MongoMapper.database = '!NAME!_development'
+            when :production  then MongoMapper.database = '!NAME!_production'
+            when :test        then MongoMapper.database = '!NAME!_test'
           end
           MONGO
 
           def setup_orm
+            require_dependencies 'mongo_ext', :require => 'mongo'
             require_dependencies 'mongo_mapper'
-            create_file("config/database.rb", MONGO)
+            create_file("config/database.rb", MONGO.gsub(/!NAME!/, name.underscore))
             empty_directory('app/models')
           end
 

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

@@ -7,19 +7,27 @@ module Padrino
 
           SASS_INIT = (<<-SASS).gsub(/^ {10}/, '')
           # Enables support for SASS template reloading for rack.
+          # Store SASS files by default within 'public/stylesheets/sass'
           # See http://nex-3.com/posts/88-sass-supports-rack for more details.
 
           module SassInitializer
             def self.registered(app)
               require 'sass/plugin/rack'
+              Sass::Plugin.options[:template_location] = File.join(Padrino.root, "app/stylesheets")
+              Sass::Plugin.options[:css_location] = File.join(Padrino.root, "public/stylesheets")
               app.use Sass::Plugin::Rack
             end
           end
           SASS
 
+          SASS_REGISTER = (<<-SASSR).gsub(/^ {10}/, '')
+              register SassInitializer # Remove if not using SASS\n
+          SASSR
+
           def setup_renderer
             require_dependencies 'haml'
             create_file destination_root('/lib/sass.rb'), SASS_INIT
+            inject_into_file destination_root('/app/app.rb'), SASS_REGISTER, :after => "configure do\n"
           end
         end
 

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

@@ -0,0 +1,16 @@
+module Padrino
+  module Generators
+    module Components
+      module Scripts
+        
+        module MootoolsGen
+          def setup_script
+            copy_file('templates/scripts/mootools-core.js', destination_root("/public/javascripts/mootools-core.js"))
+            create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
+          end
+        end
+        
+      end
+    end
+  end
+end

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

@@ -5,6 +5,9 @@ module Padrino
 
         module BaconGen
           BACON_SETUP = (<<-TEST).gsub(/^ {10}/, '')
+          PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+          require File.dirname(__FILE__) + "/../config/boot"
+
           class Bacon::Context
             include Rack::Test::Methods
           end

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

@@ -0,0 +1,77 @@
+require 'padrino-gen/generators/components/tests/rspec_test_gen'
+
+module Padrino
+  module Generators
+    module Components
+      module Tests
+        module CucumberGen
+          include Padrino::Generators::Components::Tests::RspecGen
+
+          CUCUMBER_SETUP = (<<-TEST).gsub(/^ {10}/, '')
+          PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+          require File.dirname(__FILE__) + "/../../config/boot"
+          
+          require 'capybara/cucumber'
+          require 'spec/expectations'
+
+          # Sinatra < 1.0 always disable sessions for test env
+          # so if you need them it's necessary to force the use 
+          # of Rack::Session::Cookie
+          Capybara.app = CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+          # You can handle all padrino applications instead using:
+          #   Capybara.app = Padrino.application
+          TEST
+
+          CUCUMBER_YML = (<<-TEST).gsub(/^ {10}/, '')
+          default: --tags ~@wip --strict features
+          html_report: --tags ~@wip --strict --format html --out=features_report.html features
+          TEST
+
+          CUCUMBER_FEATURE = (<<-TEST).gsub(/^ {10}/, '')
+          Feature: Addition
+            In order to avoid silly mistakes
+            As a math idiot 
+            I want to be told the sum of two numbers
+
+            Scenario: Add two numbers
+              Given I visit the calculator page
+              And I fill in '50' for 'first'
+              And I fill in '70' for 'second'
+              When I press 'Add'
+              Then I should see 'Answer: 120'
+          TEST
+
+          CUCUMBER_STEP = (<<-TEST).gsub(/^ {10}/, '')
+          Given /^I visit the calculator page$/ do
+            visit '/add'
+          end
+
+          Given /^I fill in '(.*)' for '(.*)'$/ do |value, field|
+            fill_in(field, :with => value)
+          end
+
+          When /^I press '(.*)'$/ do |name|
+            click_button(name)
+          end
+
+          Then /^I should see '(.*)'$/ do |text|
+            response_body.should contain(/#\{text}/m)
+          end
+          TEST
+
+          def setup_test_with_cucumber
+            require_dependencies 'cucumber', :group => 'test'
+            require_dependencies 'capybara', :group => 'test'
+            insert_test_suite_setup CUCUMBER_SETUP, :path => "features/support/env.rb"
+            create_file destination_root("features/add.feature"), CUCUMBER_FEATURE
+            create_file destination_root("features/step_definitions/add_steps.rb"), CUCUMBER_STEP
+            create_file destination_root("cucumber.yml"), CUCUMBER_YML
+            setup_test_without_cucumber
+          end
+
+          alias_method_chain :setup_test, :cucumber
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,9 @@ module Padrino
 
         module RiotGen
           RIOT_SETUP = (<<-TEST).gsub(/^ {10}/, '')
+          PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+          require File.dirname(__FILE__) + "/../config/boot"
+
           class Riot::Situation
             include Rack::Test::Methods
 

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

@@ -2,56 +2,67 @@ module Padrino
   module Generators
     module Components
       module Tests
-
         module RspecGen
-          RSPEC_SETUP = (<<-TEST).gsub(/^ {10}/, '')
-          Spec::Runner.configure do |conf|
-            conf.include Rack::Test::Methods
-          end
 
-          def app
-            # Sinatra < 1.0 always disable sessions for test env
-            # so if you need them it's necessary force the use 
-            # of Rack::Session::Cookie
-            CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
-            # You can hanlde all padrino applications using instead:
-            #   Padrino.application
-          end
-          TEST
+          unless defined?(RSPEC_SETUP)
+            RSPEC_SETUP = (<<-TEST).gsub(/^ {12}/, '')
+            PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+            require File.dirname(__FILE__) + "/../config/boot"
 
-          RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../spec_helper.rb'
+            Spec::Runner.configure do |conf|
+              conf.include Rack::Test::Methods
+            end
 
-          describe "!NAME!Controller" do
-            before do 
-              get "/"
+            def app
+              # Sinatra < 1.0 always disable sessions for test env
+              # so if you need them it's necessary force the use
+              # of Rack::Session::Cookie
+              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              # You can hanlde all padrino applications using instead:
+              #   Padrino.application
             end
+            TEST
+          end
+
+          unless defined?(RSPEC_CONTROLLER_TEST)
+            RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '')
+            require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-            it "returns hello world" do
-              last_response.body.should == "Hello World"
+            describe "!NAME!Controller" do
+              before do
+                get "/"
+              end
+
+              it "returns hello world" do
+                last_response.body.should == "Hello World"
+              end
             end
+            TEST
           end
-          TEST
 
-          RSPEC_RAKE = (<<-TEST).gsub(/^ {10}/, '')
-          require 'spec/rake/spectask'
+          unless defined?(RSPEC_RAKE)
+            RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '')
+            require 'spec/rake/spectask'
 
-          Spec::Rake::SpecTask.new(:spec) do |t|
-            t.spec_opts = ['--options', "spec/spec.opts"]
-            t.spec_files = Dir['**/*_spec.rb']
+            Spec::Rake::SpecTask.new(:spec) do |t|
+              t.spec_opts = ['--options', "spec/spec.opts"]
+              t.spec_files = Dir['**/*_spec.rb']
+            end
+            TEST
           end
-          TEST
 
-          RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../spec_helper.rb'
+          unless defined?(RSPEC_MODEL_TEST)
+            RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '')
+            require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-          describe "!NAME! Model" do
-            it 'can be created' do
-              @!DNAME! = !NAME!.new
-              @!DNAME!.should.not.be nil
+            describe "!NAME! Model" do
+              it 'can be created' do
+                @!DNAME! = !NAME!.new
+                @!DNAME!.should_not be_nil
+              end
             end
+            TEST
           end
-          TEST
 
           def setup_test
             require_dependencies 'rspec', :require => 'spec', :group => 'test'

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

@@ -5,6 +5,9 @@ module Padrino
 
         module ShouldaGen
           SHOULDA_SETUP = (<<-TEST).gsub(/^ {10}/, '')
+          PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+          require File.dirname(__FILE__) + "/../config/boot"
+
           class Test::Unit::TestCase
             include Rack::Test::Methods
 

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

@@ -5,6 +5,9 @@ module Padrino
 
         module TestspecGen
           TESTSPEC_SETUP = (<<-TEST).gsub(/^ {10}/, '')
+          PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+          require File.dirname(__FILE__) + "/../config/boot"
+
           class Test::Unit::TestCase
             include Rack::Test::Methods
 

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

@@ -25,10 +25,10 @@ module Padrino
       class_option :dev,          :desc => "Use padrino from a git checkout",        :default => false, :type => :boolean
 
       # Definitions for the available customizable components
-      component_option :orm,      "database engine",    :aliases => '-d', :choices => [:datamapper, :mongomapper, :activerecord, :sequel, :couchrest], :default => :none
-      component_option :test,     "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :bacon, :testspec, :riot]
+      component_option :orm,      "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest], :default => :none
+      component_option :test,     "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot]
       component_option :mock,     "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
-      component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs], :default => :none
+      component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools], :default => :none
       component_option :renderer, "template engine",    :aliases => '-e', :choices => [:haml, :erb]
 
       # Show help if no argv given