padrino-gen 0.9.14 → 0.9.15

data/test/test_plugin_generator.rb

@@ -0,0 +1,123 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestPluginGenerator < Test::Unit::TestCase
+  def setup
+    %w(sample_project sample_git sample_rake sample_admin).each { |proj| system("rm -rf /tmp/#{proj}") }
+  end
+
+  context "the plugin destroy option" do
+    should "remove the plugin instance" do
+      path = File.expand_path('../fixtures/plugin_template.rb', __FILE__)
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp') }
+      silence_logger { generate(:plugin, path, '--root=/tmp/sample_project') }
+      silence_logger { generate(:plugin, path, '--root=/tmp/sample_project', '-d') }
+      assert_no_file_exists('/tmp/sample_project/lib/hoptoad_init.rb')
+      assert_no_match_in_file(/enable \:raise_errors/,'/tmp/sample_project/app/app.rb')
+      assert_no_match_in_file(/rack\_hoptoad/, '/tmp/sample_project/Gemfile')
+    end
+  end
+
+  context 'the project generator with template' do
+    setup do
+      example_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'example_template.rb')
+      silence_logger { generate(:project, 'sample_project', "-p=#{example_template_path}", '-r=/tmp', '> /dev/null') }
+    end
+
+    before_should "invoke Padrino.bin_gen" do
+      expects_generated_project :test => :shoulda, :orm => :activerecord, :dev => true
+      expects_generated :model, "post title:string body:text -r=/tmp/sample_project"
+      expects_generated :controller, "posts get:index get:new post:new -r=/tmp/sample_project"
+      expects_generated :migration, "AddEmailToUser email:string -r=/tmp/sample_project"
+      expects_generated :fake, "foo bar -r=/tmp/sample_project"
+      expects_dependencies 'nokogiri'
+      expects_initializer :test, "# Example"
+      expects_generated :app, "testapp -r=/tmp/sample_project"
+      expects_generated :controller, "users get:index -r=/tmp/sample_project --app=testapp"
+    end
+  end
+
+  context "with resolving urls" do
+
+    should "resolve generic url properly" do
+      template_file = 'http://www.example.com/test.rb'
+      project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", '-r=/tmp'], {})
+      project_gen.expects(:apply).with(template_file).returns(true).once
+      silence_logger { project_gen.invoke_all }
+    end
+
+    should "resolve gist url properly" do
+      FakeWeb.register_uri(:get, "http://gist.github.com/357045", :body => '<a href="/raw/357045/4356/blog_template.rb">raw</a>')
+      template_file = 'http://gist.github.com/357045'
+      resolved_path = 'http://gist.github.com/raw/357045/4356/blog_template.rb'
+      project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", '-r=/tmp'], {})
+      project_gen.expects(:apply).with(resolved_path).returns(true).once
+      silence_logger { project_gen.invoke_all }
+    end
+
+    should "resolve official template" do
+      template_file = 'sampleblog'
+      resolved_path = "http://github.com/padrino/padrino-recipes/raw/master/templates/sampleblog_template.rb"
+      project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", '-r=/tmp'], {})
+      project_gen.expects(:apply).with(resolved_path).returns(true).once
+      silence_logger { project_gen.invoke_all }
+    end
+
+    should "resolve local file" do
+      template_file = 'path/to/local/file.rb'
+      project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", '-r=/tmp'], {})
+      project_gen.expects(:apply).with(File.expand_path(template_file)).returns(true).once
+      silence_logger { project_gen.invoke_all }
+    end
+
+    should "resolve official plugin" do
+      template_file = 'hoptoad'
+      resolved_path = "http://github.com/padrino/padrino-recipes/raw/master/plugins/hoptoad_plugin.rb"
+      plugin_gen = Padrino::Generators::Plugin.new([ template_file], ['-r=/tmp/sample_project'],{})
+      plugin_gen.expects(:in_app_root?).returns(true).once
+      plugin_gen.expects(:apply).with(resolved_path).returns(true).once
+      silence_logger { plugin_gen.invoke_all }
+    end
+  end
+
+  context "with git commands" do
+    setup do
+      git_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'git_template.rb')
+      silence_logger { generate(:project, 'sample_git', "-p=#{git_template_path}", '-r=/tmp', '> /dev/null') }
+    end
+
+    before_should "generate a repository correctly" do
+      expects_generated_project :test => :rspec, :orm => :activerecord, :name => 'sample_git'
+      expects_git :init, :root => '/tmp/sample_git'
+      expects_git :add, :arguments => '.', :root => '/tmp/sample_git'
+      expects_git :commit, :arguments => 'hello', :root => '/tmp/sample_git'
+    end
+  end
+
+  context "with rake invocations" do
+    setup do
+      rake_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'rake_template.rb')
+      silence_logger { generate(:project, 'sample_rake', "-p=#{rake_template_path}", '-r=/tmp', '> /dev/null') }
+    end
+
+    before_should "Run rake task and list tasks" do
+      expects_generated_project :test => :shoulda, :orm => :activerecord, :name => 'sample_rake'
+      expects_rake "custom", :root => '/tmp/sample_rake'
+    end
+  end
+
+  context "with admin commands" do
+    setup do
+      admin_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'admin_template.rb')
+      silence_logger { generate(:project, 'sample_admin', "-p=#{admin_template_path}", '-r=/tmp', '> /dev/null') }
+    end
+
+    before_should "generate correctly an admin" do
+      expects_generated_project :test => :shoulda, :orm => :activerecord, :name => 'sample_admin'
+      expects_generated :model, "post title:string body:text -r=/tmp/sample_admin"
+      expects_rake "ar:create", :root => '/tmp/sample_admin'
+      expects_generated :admin, "-r=/tmp/sample_admin"
+      expects_rake "ar:migrate", :root => '/tmp/sample_admin'
+      expects_generated :admin_page, "post -r=/tmp/sample_admin"
+    end
+  end
+end

data/test/test_project_generator.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 class TestProjectGenerator < Test::Unit::TestCase
   def setup
     `rm -rf /tmp/sample_project`
+    `rm -rf /tmp/project.com`
     `rm -rf /tmp/warepedia`
   end
 
@@ -15,7 +16,14 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/config/boot.rb')
       assert_file_exists('/tmp/sample_project/public/favicon.ico')
     end
-    
+
+    should "generate a valid name" do
+      silence_logger { generate(:project, 'project.com', '--root=/tmp') }
+      assert_file_exists('/tmp/project.com')
+      assert_match_in_file(/class ProjectCom < Padrino::Application/,'/tmp/project.com/app/app.rb')
+      assert_match_in_file(/Padrino.mount\("ProjectCom"\).to\('\/'\)/,'/tmp/project.com/config/apps.rb')
+    end
+
     should "allow specifying alternate application name" do
       assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--app=base_app') } }
       assert_file_exists('/tmp/sample_project')
@@ -79,12 +87,12 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "output to log components being applied" do
       component_options = ['--orm=datamapper', '--test=riot', '--mock=mocha', '--script=prototype', '--renderer=erb','--stylesheet=less']
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', *component_options) }
-      assert_match /Applying.*?datamapper.*?orm/, buffer
-      assert_match /Applying.*?riot.*?test/, buffer
-      assert_match /Applying.*?mocha.*?mock/, buffer
-      assert_match /Applying.*?prototype.*?script/, buffer
-      assert_match /Applying.*?erb.*?renderer/, buffer
-      assert_match /Applying.*?less.*?stylesheet/, buffer
+      assert_match(/Applying.*?datamapper.*?orm/, buffer)
+      assert_match(/Applying.*?riot.*?test/, buffer)
+      assert_match(/Applying.*?mocha.*?mock/, buffer)
+      assert_match(/Applying.*?prototype.*?script/, buffer)
+      assert_match(/Applying.*?erb.*?renderer/, buffer)
+      assert_match(/Applying.*?less.*?stylesheet/, buffer)
     end
 
     should "output gem files for base app" do
@@ -98,28 +106,28 @@ class TestProjectGenerator < Test::Unit::TestCase
   context "a generator for mock component" do
     should "properly generate for rr and riot" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--mock=rr', '--test=riot', '--script=none') }
-      assert_match /Applying.*?rr.*?mock/, buffer
+      assert_match(/Applying.*?rr.*?mock/, buffer)
       assert_match_in_file(/gem 'rr'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/require 'riot\/rr'/, '/tmp/sample_project/test/test_config.rb')
     end
 
     should "properly generater for rr and bacon" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--mock=rr', '--test=bacon', '--script=none') }
-      assert_match /Applying.*?rr.*?mock/, buffer
+      assert_match(/Applying.*?rr.*?mock/, buffer)
       assert_match_in_file(/gem 'rr'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/RR::Adapters::RRMethods/m, '/tmp/sample_project/test/test_config.rb')
     end
 
     should "properly generate for mocha and rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp','--test=rspec', '--mock=mocha', '--script=none') }
-      assert_match /Applying.*?mocha.*?mock/, buffer
+      assert_match(/Applying.*?mocha.*?mock/, buffer)
       assert_match_in_file(/gem 'mocha'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/conf.mock_with :mocha/m, '/tmp/sample_project/spec/spec_helper.rb')
     end
 
     should "properly generate for rr and rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=rspec', '--mock=rr', '--script=none') }
-      assert_match /Applying.*?rr.*?mock/, buffer
+      assert_match(/Applying.*?rr.*?mock/, buffer)
       assert_match_in_file(/gem 'rr'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/conf.mock_with :rr/m, '/tmp/sample_project/spec/spec_helper.rb')
     end
@@ -127,33 +135,34 @@ class TestProjectGenerator < Test::Unit::TestCase
   end
 
   context "the generator for orm components" do
-    
+
     context "for sequel" do
       should "properly generate default" do
         @app.instance_eval("undef setup_orm if respond_to?('setup_orm')")
-        buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=sequel', '--script=none') }
-        assert_match /Applying.*?sequel.*?orm/, buffer
-        assert_match_in_file(/gem 'sequel'/, '/tmp/sample_project/Gemfile')
-        assert_match_in_file(/gem 'sqlite3-ruby'/, '/tmp/sample_project/Gemfile')
-        assert_match_in_file(/Sequel.connect/, '/tmp/sample_project/config/database.rb')
-        assert_match_in_file(%r{sqlite://}, '/tmp/sample_project/config/database.rb')
-        assert_dir_exists('/tmp/sample_project/app/models')
+        buffer = silence_logger { generate(:project, 'project.com', '--root=/tmp', '--orm=sequel', '--script=none') }
+        assert_match(/Applying.*?sequel.*?orm/, buffer)
+        assert_match_in_file(/gem 'sequel'/, '/tmp/project.com/Gemfile')
+        assert_match_in_file(/gem 'sqlite3-ruby'/, '/tmp/project.com/Gemfile')
+        assert_match_in_file(/Sequel.connect/, '/tmp/project.com/config/database.rb')
+        assert_match_in_file(%r{sqlite://}, '/tmp/project.com/config/database.rb')
+        assert_match_in_file(%r{project_com}, '/tmp/project.com/config/database.rb')
+        assert_dir_exists('/tmp/project.com/app/models')
       end
-      
+
       should "properly generate mysql" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=sequel', '--adapter=mysql') }
         assert_match_in_file(/gem 'mysql'/, '/tmp/sample_project/Gemfile')
         assert_match_in_file(%r{"mysql://}, '/tmp/sample_project/config/database.rb')
         assert_match_in_file(/sample_project_development/, '/tmp/sample_project/config/database.rb')
       end
-      
+
       should "properly generate sqlite3" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=sequel', '--adapter=sqlite') }
         assert_match_in_file(/gem 'sqlite3-ruby'/, '/tmp/sample_project/Gemfile')
         assert_match_in_file(%r{sqlite://}, '/tmp/sample_project/config/database.rb')
         assert_match_in_file(/sample_project_development/, '/tmp/sample_project/config/database.rb')
       end
-      
+
       should "properly generate postgres" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=sequel', '--adapter=postgres') }
         assert_match_in_file(/gem 'pg'/, '/tmp/sample_project/Gemfile')
@@ -164,28 +173,29 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     context "for activerecord" do
       should "properly generate default" do
-        buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=activerecord', '--script=none') }
-        assert_match /Applying.*?activerecord.*?orm/, buffer
-        assert_match_in_file(/gem 'activerecord', :require => "active_record"/, '/tmp/sample_project/Gemfile')
-        assert_match_in_file(/gem 'sqlite3-ruby', :require => "sqlite3"/, '/tmp/sample_project/Gemfile')
-        assert_match_in_file(/ActiveRecord::Base.establish_connection/, '/tmp/sample_project/config/database.rb')
-        assert_dir_exists('/tmp/sample_project/app/models')
+        buffer = silence_logger { generate(:project, 'project.com', '--root=/tmp', '--orm=activerecord', '--script=none') }
+        assert_match(/Applying.*?activerecord.*?orm/, buffer)
+        assert_match_in_file(/gem 'activerecord', :require => "active_record"/, '/tmp/project.com/Gemfile')
+        assert_match_in_file(/gem 'sqlite3-ruby', :require => "sqlite3"/, '/tmp/project.com/Gemfile')
+        assert_match_in_file(/ActiveRecord::Base.establish_connection/, '/tmp/project.com/config/database.rb')
+        assert_match_in_file(/project_com/, '/tmp/project.com/config/database.rb')
+        assert_dir_exists('/tmp/project.com/app/models')
       end
-      
+
       should "properly generate mysql" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=activerecord','--adapter=mysql') }
         assert_match_in_file(/gem 'mysql'/, '/tmp/sample_project/Gemfile')
         assert_match_in_file(/sample_project_development/, '/tmp/sample_project/config/database.rb')
         assert_match_in_file(%r{:adapter   => 'mysql'}, '/tmp/sample_project/config/database.rb')
       end
-      
+
       should "properly generate sqlite3" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=activerecord', '--adapter=sqlite3') }
         assert_match_in_file(/gem 'sqlite3-ruby', :require => "sqlite3"/, '/tmp/sample_project/Gemfile')
         assert_match_in_file(/sample_project_development.db/, '/tmp/sample_project/config/database.rb')
         assert_match_in_file(%r{:adapter => 'sqlite3'}, '/tmp/sample_project/config/database.rb')
       end
-      
+
       should "properly generate postgres" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=activerecord', '--adapter=postgres') }
         assert_match_in_file(/gem 'pg', :require => "postgres"/, '/tmp/sample_project/Gemfile')
@@ -196,27 +206,28 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     context "for datamapper" do
       should "properly generate default" do
-        buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=datamapper', '--script=none') }
-        assert_match /Applying.*?datamapper.*?orm/, buffer
-        assert_match_in_file(/gem 'data_mapper'/, '/tmp/sample_project/Gemfile')
-        assert_match_in_file(/gem 'dm-sqlite-adapter'/, '/tmp/sample_project/Gemfile')
-        assert_match_in_file(/DataMapper.setup/, '/tmp/sample_project/config/database.rb')
-        assert_dir_exists('/tmp/sample_project/app/models')
+        buffer = silence_logger { generate(:project, 'project.com', '--root=/tmp', '--orm=datamapper', '--script=none') }
+        assert_match(/Applying.*?datamapper.*?orm/, buffer)
+        assert_match_in_file(/gem 'data_mapper'/, '/tmp/project.com/Gemfile')
+        assert_match_in_file(/gem 'dm-sqlite-adapter'/, '/tmp/project.com/Gemfile')
+        assert_match_in_file(/DataMapper.setup/, '/tmp/project.com/config/database.rb')
+        assert_match_in_file(/project_com/, '/tmp/project.com/config/database.rb')
+        assert_dir_exists('/tmp/project.com/app/models')
       end
-      
+
       should "properly generate for mysql" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=datamapper', '--adapter=mysql') }
         assert_match_in_file(/gem 'dm-mysql-adapter'/, '/tmp/sample_project/Gemfile')
         assert_match_in_file(%r{"mysql://}, '/tmp/sample_project/config/database.rb')
         assert_match_in_file(/sample_project_development/, '/tmp/sample_project/config/database.rb')
       end
-      
+
       should "properly generate for sqlite" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=datamapper', '--adapter=sqlite') }
         assert_match_in_file(/gem 'dm-sqlite-adapter'/, '/tmp/sample_project/Gemfile')
         assert_match_in_file(/sample_project_development/, '/tmp/sample_project/config/database.rb')
       end
-      
+
       should "properly generate for postgres" do
         buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=datamapper', '--adapter=postgres') }
         assert_match_in_file(/gem 'dm-postgres-adapter'/, '/tmp/sample_project/Gemfile')
@@ -225,66 +236,101 @@ class TestProjectGenerator < Test::Unit::TestCase
       end
     end
 
-
     should "properly generate for mongomapper" do
-      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=mongomapper', '--script=none') }
-      assert_match /Applying.*?mongomapper.*?orm/, buffer
-      assert_match_in_file(/gem 'mongo_mapper'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/gem 'bson_ext'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/MongoMapper.database/, '/tmp/sample_project/config/database.rb')
-      assert_dir_exists('/tmp/sample_project/app/models')
+      buffer = silence_logger { generate(:project, 'project.com', '--root=/tmp', '--orm=mongomapper', '--script=none') }
+      assert_match(/Applying.*?mongomapper.*?orm/, buffer)
+      assert_match_in_file(/gem 'mongo_mapper'/, '/tmp/project.com/Gemfile')
+      assert_match_in_file(/gem 'bson_ext'/, '/tmp/project.com/Gemfile')
+      assert_match_in_file(/MongoMapper.database/, '/tmp/project.com/config/database.rb')
+      assert_match_in_file(/project_com/, '/tmp/project.com/config/database.rb')
+      assert_dir_exists('/tmp/project.com/app/models')
     end
 
     should "properly generate for mongoid" do
-      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=mongoid', '--script=none') }
-      assert_match /Applying.*?mongoid.*?orm/, buffer
-      assert_match_in_file(/gem 'mongoid'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/gem 'bson_ext'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/Mongoid.database/, '/tmp/sample_project/config/database.rb')
-      assert_dir_exists('/tmp/sample_project/app/models')
+      buffer = silence_logger { generate(:project, 'project.com', '--root=/tmp', '--orm=mongoid', '--script=none') }
+      assert_match(/Applying.*?mongoid.*?orm/, buffer)
+      assert_match_in_file(/gem 'mongoid'/, '/tmp/project.com/Gemfile')
+      assert_match_in_file(/gem 'bson_ext'/, '/tmp/project.com/Gemfile')
+      assert_match_in_file(/Mongoid.database/, '/tmp/project.com/config/database.rb')
+      assert_match_in_file(/project_com/, '/tmp/project.com/config/database.rb')
+      assert_dir_exists('/tmp/project.com/app/models')
     end
 
 
     should "properly generate for couchrest" do
-      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=couchrest', '--script=none') }
-      assert_match /Applying.*?couchrest.*?orm/, buffer
-      assert_match_in_file(/gem 'couchrest'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/CouchRest.database!/, '/tmp/sample_project/config/database.rb')
+      buffer = silence_logger { generate(:project, 'project.com', '--root=/tmp', '--orm=couchrest', '--script=none') }
+      assert_match(/Applying.*?couchrest.*?orm/, buffer)
+      assert_match_in_file(/gem 'couchrest'/, '/tmp/project.com/Gemfile')
+      assert_match_in_file(/CouchRest.database!/, '/tmp/project.com/config/database.rb')
+      assert_match_in_file(/project_com/, '/tmp/project.com/config/database.rb')
+      assert_dir_exists('/tmp/project.com/app/models')
+    end
+
+    should "properly generate for ohm" do
+      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=ohm', '--script=none') }
+      assert_match /Applying.*?ohm.*?orm/, buffer
+      assert_match_in_file(/gem 'json'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'ohm'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'ohm-contrib', :require => "ohm\/contrib"/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/Ohm.connect/, '/tmp/sample_project/config/database.rb')
+      assert_dir_exists('/tmp/sample_project/app/models')
+    end
+
+    should "properly generate for mongomatic" do
+      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--orm=mongomatic', '--script=none') }
+      assert_match /Applying.*?mongomatic.*?orm/, buffer
+      assert_match_in_file(/gem 'bson_ext'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'mongomatic'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/Mongomatic.db = Mongo::Connection.new.db/, '/tmp/sample_project/config/database.rb')
       assert_dir_exists('/tmp/sample_project/app/models')
     end
   end
 
+
   context "the generator for renderer component" do
-    should "properly generate default for erb" do
+    should "properly generate for erb" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=erb', '--script=none') }
-      assert_match /Applying.*?erb.*?renderer/, buffer
+      assert_match(/Applying.*?erb.*?renderer/, buffer)
     end
 
     should "properly generate for haml" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=haml','--script=none') }
-      assert_match /Applying.*?haml.*?renderer/, buffer
+      assert_match(/Applying.*?haml.*?renderer/, buffer)
       assert_match_in_file(/gem 'haml'/, '/tmp/sample_project/Gemfile')
     end
+    
+    should "properly generate for erubis" do 
+      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=erubis','--script=none') }
+      assert_match(/Applying.*?erubis.*?renderer/,buffer)
+      assert_match_in_file(/gem 'erubis'/, '/tmp/sample_project/Gemfile')
+    end
+
+    should "properly generate for liquid" do 
+      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=liquid','--script=none') }
+      assert_match(/Applying.*?liquid.*?renderer/,buffer)
+      assert_match_in_file(/gem 'liquid'/, '/tmp/sample_project/Gemfile')
+    end
+
   end
 
   context "the generator for script component" do
     should "properly generate for jquery" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=jquery') }
-      assert_match /Applying.*?jquery.*?script/, buffer
+      assert_match(/Applying.*?jquery.*?script/, buffer)
       assert_file_exists('/tmp/sample_project/public/javascripts/jquery.js')
       assert_file_exists('/tmp/sample_project/public/javascripts/application.js')
     end
 
     should "properly generate for mootools" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=mootools') }
-      assert_match /Applying.*?mootools.*?script/, buffer
+      assert_match(/Applying.*?mootools.*?script/, buffer)
       assert_file_exists('/tmp/sample_project/public/javascripts/mootools-core.js')
       assert_file_exists('/tmp/sample_project/public/javascripts/application.js')
     end
 
     should "properly generate for prototype" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=prototype') }
-      assert_match /Applying.*?prototype.*?script/, buffer
+      assert_match(/Applying.*?prototype.*?script/, buffer)
       assert_file_exists('/tmp/sample_project/public/javascripts/protopak.js')
       assert_file_exists('/tmp/sample_project/public/javascripts/lowpro.js')
       assert_file_exists('/tmp/sample_project/public/javascripts/application.js')
@@ -292,30 +338,30 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "properly generate for rightjs" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=rightjs') }
-      assert_match /Applying.*?rightjs.*?script/, buffer
+      assert_match(/Applying.*?rightjs.*?script/, buffer)
       assert_file_exists('/tmp/sample_project/public/javascripts/right.js')
       assert_file_exists('/tmp/sample_project/public/javascripts/application.js')
     end
 
     should "properly generate for ext-core" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=extcore') }
-      assert_match /Applying.*?extcore.*?script/, buffer
+      assert_match(/Applying.*?extcore.*?script/, buffer)
       assert_file_exists('/tmp/sample_project/public/javascripts/ext-core.js')
       assert_file_exists('/tmp/sample_project/public/javascripts/application.js')
     end
-    
+
     should "properly generate for dojo" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=dojo') }
-      assert_match /Applying.*?dojo.*?script/, buffer
+      assert_match(/Applying.*?dojo.*?script/, buffer)
       assert_file_exists('/tmp/sample_project/public/javascripts/dojo.js')
       assert_file_exists('/tmp/sample_project/public/javascripts/application.js')
     end
   end
 
   context "the generator for test component" do
-    should "properly default generate for bacon" do
+    should "properly generate for bacon" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=bacon', '--script=none') }
-      assert_match /Applying.*?bacon.*?test/, buffer
+      assert_match(/Applying.*?bacon.*?test/, buffer)
       assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
@@ -327,7 +373,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "properly generate for riot" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=riot', '--script=none') }
-      assert_match /Applying.*?riot.*?test/, buffer
+      assert_match(/Applying.*?riot.*?test/, buffer)
       assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
@@ -336,12 +382,13 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Riot::Situation/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Riot::Context/, '/tmp/sample_project/test/test_config.rb')
+      assert_match_in_file(/SampleProject\.tap/, '/tmp/sample_project/test/test_config.rb')
       assert_file_exists('/tmp/sample_project/test/test.rake')
     end
 
     should "properly generate for rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=rspec', '--script=none') }
-      assert_match /Applying.*?rspec.*?test/, buffer
+      assert_match(/Applying.*?rspec.*?test/, buffer)
       assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
@@ -353,7 +400,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "properly generate for shoulda" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=shoulda', '--script=none') }
-      assert_match /Applying.*?shoulda.*?test/, buffer
+      assert_match(/Applying.*?shoulda.*?test/, buffer)
       assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
@@ -365,7 +412,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "properly generate for testspec" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=testspec', '--script=none') }
-      assert_match /Applying.*?testspec.*?test/, buffer
+      assert_match(/Applying.*?testspec.*?test/, buffer)
       assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
@@ -377,7 +424,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "properly generate for cucumber" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=cucumber', '--script=none') }
-      assert_match /Applying.*?cucumber.*?test/, buffer
+      assert_match(/Applying.*?cucumber.*?test/, buffer)
       assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:require => "rack\/test"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/:group => "test"/, '/tmp/sample_project/Gemfile')
@@ -400,7 +447,7 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate for sass" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=haml','--script=none','--stylesheet=sass') }
       assert_match_in_file(/gem 'haml'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, '/tmp/sample_project/lib/sass_plugin.rb')
+      assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, '/tmp/sample_project/lib/sass_init.rb')
       assert_match_in_file(/register SassInitializer/m, '/tmp/sample_project/app/app.rb')
       assert_dir_exists('/tmp/sample_project/app/stylesheets')
     end
@@ -409,11 +456,11 @@ class TestProjectGenerator < Test::Unit::TestCase
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=haml','--script=none','--stylesheet=less') }
       assert_match_in_file(/gem 'less'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/gem 'rack-less'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/module LessInitializer.*Rack::Less/m, '/tmp/sample_project/lib/less_plugin.rb')
+      assert_match_in_file(/module LessInitializer.*Rack::Less/m, '/tmp/sample_project/lib/less_init.rb')
       assert_match_in_file(/register LessInitializer/m, '/tmp/sample_project/app/app.rb')
       assert_dir_exists('/tmp/sample_project/app/stylesheets')
     end
-    
+
     should "properly generate for compass" do
       buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=haml','--script=none','--stylesheet=compass') }
       assert_match_in_file(/gem 'compass'/, '/tmp/sample_project/Gemfile')
@@ -424,5 +471,15 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project/app/stylesheets/application.scss')
       assert_file_exists('/tmp/sample_project/app/stylesheets/partials/_base.scss')
     end
+
+    should "properly generate for scss" do
+      buffer = silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--renderer=haml','--script=none','--stylesheet=scss') }
+      assert_match_in_file(/gem 'haml'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/module ScssInitializer.*Sass::Plugin::Rack/m, '/tmp/sample_project/lib/scss_init.rb')
+      assert_match_in_file(/Sass::Plugin.options\[:syntax\] = :scss/m, '/tmp/sample_project/lib/scss_init.rb')
+      assert_match_in_file(/register ScssInitializer/m, '/tmp/sample_project/app/app.rb')
+      assert_dir_exists('/tmp/sample_project/app/stylesheets')
+    end
+    
   end
 end