padrino-gen 0.9.9 → 0.9.10

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   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-03-29}
+  s.date = %q{2010-04-22}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{padrinorb@gmail.com}
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
      "bin/padrino-gen",
      "lib/padrino-gen.rb",
      "lib/padrino-gen/generators/actions.rb",
@@ -35,28 +34,29 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/app/views/layouts/.emptydirectory",
      "lib/padrino-gen/generators/cli.rb",
      "lib/padrino-gen/generators/components/actions.rb",
-     "lib/padrino-gen/generators/components/mocks/mocha_gen.rb",
-     "lib/padrino-gen/generators/components/mocks/rr_gen.rb",
-     "lib/padrino-gen/generators/components/orms/activerecord_gen.rb",
-     "lib/padrino-gen/generators/components/orms/couchrest_gen.rb",
-     "lib/padrino-gen/generators/components/orms/datamapper_gen.rb",
-     "lib/padrino-gen/generators/components/orms/mongoid_gen.rb",
-     "lib/padrino-gen/generators/components/orms/mongomapper_gen.rb",
-     "lib/padrino-gen/generators/components/orms/sequel_gen.rb",
-     "lib/padrino-gen/generators/components/renderers/erb_gen.rb",
-     "lib/padrino-gen/generators/components/renderers/haml_gen.rb",
-     "lib/padrino-gen/generators/components/scripts/jquery_gen.rb",
-     "lib/padrino-gen/generators/components/scripts/mootools_gen.rb",
-     "lib/padrino-gen/generators/components/scripts/prototype_gen.rb",
-     "lib/padrino-gen/generators/components/scripts/rightjs_gen.rb",
-     "lib/padrino-gen/generators/components/stylesheets/less_gen.rb",
-     "lib/padrino-gen/generators/components/stylesheets/sass_gen.rb",
-     "lib/padrino-gen/generators/components/tests/bacon_test_gen.rb",
-     "lib/padrino-gen/generators/components/tests/cucumber_test_gen.rb",
-     "lib/padrino-gen/generators/components/tests/riot_test_gen.rb",
-     "lib/padrino-gen/generators/components/tests/rspec_test_gen.rb",
-     "lib/padrino-gen/generators/components/tests/shoulda_test_gen.rb",
-     "lib/padrino-gen/generators/components/tests/testspec_test_gen.rb",
+     "lib/padrino-gen/generators/components/mocks/mocha.rb",
+     "lib/padrino-gen/generators/components/mocks/rr.rb",
+     "lib/padrino-gen/generators/components/orms/activerecord.rb",
+     "lib/padrino-gen/generators/components/orms/couchrest.rb",
+     "lib/padrino-gen/generators/components/orms/datamapper.rb",
+     "lib/padrino-gen/generators/components/orms/mongoid.rb",
+     "lib/padrino-gen/generators/components/orms/mongomapper.rb",
+     "lib/padrino-gen/generators/components/orms/sequel.rb",
+     "lib/padrino-gen/generators/components/renderers/erb.rb",
+     "lib/padrino-gen/generators/components/renderers/haml.rb",
+     "lib/padrino-gen/generators/components/scripts/extcore.rb",
+     "lib/padrino-gen/generators/components/scripts/jquery.rb",
+     "lib/padrino-gen/generators/components/scripts/mootools.rb",
+     "lib/padrino-gen/generators/components/scripts/prototype.rb",
+     "lib/padrino-gen/generators/components/scripts/rightjs.rb",
+     "lib/padrino-gen/generators/components/stylesheets/less.rb",
+     "lib/padrino-gen/generators/components/stylesheets/sass.rb",
+     "lib/padrino-gen/generators/components/tests/bacon.rb",
+     "lib/padrino-gen/generators/components/tests/cucumber.rb",
+     "lib/padrino-gen/generators/components/tests/riot.rb",
+     "lib/padrino-gen/generators/components/tests/rspec.rb",
+     "lib/padrino-gen/generators/components/tests/shoulda.rb",
+     "lib/padrino-gen/generators/components/tests/testspec.rb",
      "lib/padrino-gen/generators/controller.rb",
      "lib/padrino-gen/generators/mailer.rb",
      "lib/padrino-gen/generators/migration.rb",
@@ -76,6 +76,7 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/templates/helper.rb.tt",
      "lib/padrino-gen/generators/templates/mailer.rb.tt",
      "lib/padrino-gen/generators/templates/mailer_initializer.rb.tt",
+     "lib/padrino-gen/generators/templates/scripts/ext-core.js",
      "lib/padrino-gen/generators/templates/scripts/jquery.js",
      "lib/padrino-gen/generators/templates/scripts/lowpro.js",
      "lib/padrino-gen/generators/templates/scripts/mootools-core.js",
@@ -85,6 +86,7 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/padrino-tasks/datamapper.rb",
      "lib/padrino-gen/padrino-tasks/mongomapper.rb",
      "lib/padrino-gen/padrino-tasks/seed.rb",
+     "lib/padrino-gen/padrino-tasks/sequel.rb",
      "padrino-gen.gemspec",
      "test/helper.rb",
      "test/test_app_generator.rb",
@@ -108,7 +110,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.9"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.10"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -116,7 +118,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.10"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -125,7 +127,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<fakeweb>, [">= 1.2.3"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.10"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/helper.rb

@@ -32,6 +32,11 @@ class Test::Unit::TestCase
     Time.stubs(:now).returns(time)
     return time
   end
+  
+  # generate(:controller, 'DemoItems', '-r=/tmp/sample_project')
+  def generate(name, *params)
+    "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)
+  end
 
   # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
   # In this case, block is the html to evaluate

data/test/test_app_generator.rb

@@ -1,27 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
-require 'thor/group'
-require 'fakeweb'
 
 class TestAppGenerator < Test::Unit::TestCase
   def setup
-    FakeWeb.allow_net_connect = false
     `rm -rf /tmp/sample_project`
-    @project = Padrino::Generators::Project.dup
-    @app     = Padrino::Generators::App.dup
-    @cont_gen = Padrino::Generators::Controller.dup
-    @mail_gen = Padrino::Generators::Mailer.dup
   end
 
   context 'the app generator' do
     should "fail outside app root" do
-      output = silence_logger { @app.start(['demo', '-r=/tmp']) }
+      output = silence_logger { generate(:app, 'demo_root', '-r=/tmp') }
       assert_match(/not at the root/, output)
-      assert_no_file_exists('/tmp/demo')
+      assert_no_file_exists('/tmp/demo_root')
     end
 
     should "create correctly a new padrino application" do
-      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp']) } }
-      assert_nothing_raised { silence_logger { @app.start(['demo', '--root=/tmp/sample_project']) } }
+      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', '--root=/tmp') } }
+      assert_nothing_raised { silence_logger { generate(:app, 'demo', '--root=/tmp/sample_project') } }
       assert_file_exists('/tmp/sample_project')
       assert_file_exists('/tmp/sample_project/demo')
       assert_file_exists('/tmp/sample_project/demo/app.rb')
@@ -34,23 +27,22 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "correctly create a new controller inside a padrino application" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp']) }
-      silence_logger { @app.start(['demo', '--root=/tmp/sample_project']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project', '-a=demo']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp') }
+      silence_logger { generate(:app, 'demo', '--root=/tmp/sample_project') }
+      silence_logger { generate(:controller, 'demo_items', '-r=/tmp/sample_project', '-a=demo') }
       assert_match_in_file(/Demo.controllers :demo_items do/m, '/tmp/sample_project/demo/controllers/demo_items.rb')
       assert_match_in_file(/Demo.helpers do/m, '/tmp/sample_project/demo/helpers/demo_items_helper.rb')
       assert_file_exists('/tmp/sample_project/demo/views/demo_items')
     end
 
     should "correctly create a new mailer inside a padrino application" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @app.start(['demo', '--root=/tmp/sample_project']) }
-      silence_logger { @mail_gen.start(['demo', '-r=/tmp/sample_project', '-a=demo']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:app, 'demo', '--root=/tmp/sample_project') }
+      silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project', '-a=demo') }
       assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_project/demo/mailers/demo_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
       assert_match_in_file(/register MailerInitializer/,'/tmp/sample_project/demo/app.rb')
       assert_file_exists('/tmp/sample_project/demo/views/demo_mailer')
     end
-
   end
-end
+end

data/test/test_cli.rb

@@ -4,20 +4,18 @@ require 'padrino-gen/generators/cli'
 class TestCli < Test::Unit::TestCase
   def setup
     `rm -rf /tmp/sample_project`
-    @cli     = Padrino::Generators::Cli.dup
-    @project = Padrino::Generators::Project.dup
   end
 
   context 'the cli' do
 
     should "fail without arguments" do
-      output = silence_logger { @cli.start }
+      output = silence_logger { generate(:cli) }
       assert_match "Please specify generator to use", output
     end
 
     should "work correctly if we have a project" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp']) }
-      assert_nothing_raised { silence_logger { @cli.start(['--root=/tmp/sample_project']) } }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp') }
+      assert_nothing_raised { silence_logger { generate(:cli, '--root=/tmp/sample_project') } }
     end
   end
-end
+end

data/test/test_controller_generator.rb

@@ -1,10 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
-require 'thor/group'
 
 class TestControllerGenerator < Test::Unit::TestCase
   def setup
-    @project = Padrino::Generators::Project.dup
-    @cont_gen = Padrino::Generators::Controller.dup
     @controller_path = '/tmp/sample_project/app/controllers/demo_items.rb'
     @controller_test_path = '/tmp/sample_project/test/controllers/demo_items_controller_test.rb'
     `rm -rf /tmp/sample_project`
@@ -12,14 +9,14 @@ class TestControllerGenerator < Test::Unit::TestCase
 
   context 'the controller generator' do
     should "fail outside app root" do
-      output = silence_logger { @cont_gen.start(['demo', '-r=/tmp']) }
+      output = silence_logger { generate(:controller, 'demo', '-r=/tmp') }
       assert_match(/not at the root/, output)
       assert_no_file_exists('/tmp/app/controllers/demo.rb')
     end
 
     should 'not fail if we don\'t have test component' do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--test=none']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--test=none') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
       assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
       assert_match_in_file(/SampleProject.helpers do/m, '/tmp/sample_project/app/helpers/demo_items_helper.rb')
       assert_file_exists('/tmp/sample_project/app/views/demo_items')
@@ -27,74 +24,87 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller within existing application" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
       assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
       assert_match_in_file(/SampleProject.helpers do/m, '/tmp/sample_project/app/helpers/demo_items_helper.rb')
       assert_file_exists('/tmp/sample_project/app/views/demo_items')
     end
 
     should "generate controller test for bacon" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for riot" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=riot']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=riot') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for testspec" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=testspec']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=testspec') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for rspec" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=rspec']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=rspec') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
       assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_project/spec/controllers/demo_items_controller_spec.rb')
     end
 
     should "generate controller test for shoulda" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=shoulda']) }
-      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=shoulda') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
       assert_match_in_file(expected_pattern, @controller_test_path)
+      assert_file_exists('/tmp/sample_project/test/controllers/demo_items_controller_test.rb')
     end
 
-    # Controller action generation
+    should "generate controller test for cucumber" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=cucumber') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
+      assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_project/spec/controllers/demo_items_controller_spec.rb')
+      assert_match_in_file(/Capybara.app = /, '/tmp/sample_project/features/support/env.rb')
+    end
 
-    should "generate actions for get:test post:yada" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=shoulda'])}
-      silence_logger { @cont_gen.start(['demo_items', "get:test", "post:yada",'-r=/tmp/sample_project']) }
-      assert_match_in_file(/get :test do\n  end\n/m,@controller_path)
-      assert_match_in_file(/post :yada do\n  end\n/m,@controller_path)
+    should "correctly generate file names" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=rspec') }
+      silence_logger { generate(:controller, 'DemoItems', '-r=/tmp/sample_project') }
+      assert_file_exists('/tmp/sample_project/app/views/demo_items')
+      assert_file_exists('/tmp/sample_project/app/controllers/demo_items.rb')
+      assert_file_exists('/tmp/sample_project/app/helpers/demo_items_helper.rb')
+      assert_file_exists('/tmp/sample_project/spec/controllers/demo_items_controller_spec.rb')
     end
 
+    # Controller action generation
+    should "generate actions for get:test post:yada" do
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=shoulda') }
+      silence_logger { generate(:controller, 'demo_items', "get:test", "post:yada",'-r=/tmp/sample_project') }
+      assert_match_in_file(/get :test do\n  end\n/m, @controller_path)
+      assert_match_in_file(/post :yada do\n  end\n/m, @controller_path)
+    end
   end
 
   context "the controller destroy option" do
-
     should "destroy controller files" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon'])}
-      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project']) }
-      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project','-d'])}
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:controller, 'demo_items','-r=/tmp/sample_project') }
+      silence_logger { generate(:controller, 'demo_items','-r=/tmp/sample_project','-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists(@controller_test_path)
       assert_no_file_exists('/tmp/sample_project/app/helpers/demo_items_helper.rb')
     end
 
     should "destroy controller files with rspec" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=rspec'])}
-      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project']) }
-      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project','-d'])}
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=rspec') }
+      silence_logger { generate(:controller, 'demo_items','-r=/tmp/sample_project') }
+      silence_logger { generate(:controller, 'demo_items','-r=/tmp/sample_project','-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists('/tmp/sample_project/app/helpers/demo_items_helper.rb')
       assert_no_file_exists('/tmp/sample_project/spec/controllers/demo_items_controller_spec.rb')
     end
-
   end
-end
+end

data/test/test_mailer_generator.rb

@@ -1,23 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
-require 'thor/group'
 
 class TestMailerGenerator < Test::Unit::TestCase
   def setup
-    @project = Padrino::Generators::Project.dup
-    @mail_gen = Padrino::Generators::Mailer.dup
     `rm -rf /tmp/sample_project`
   end
 
   context 'the mailer generator' do
     should "fail outside app root" do
-      output = silence_logger { @mail_gen.start(['demo', '-r=/tmp']) }
+      output = silence_logger { generate(:mailer, 'demo', '-r=/tmp') }
       assert_match(/not at the root/, output)
       assert_no_file_exists('/tmp/app/mailers/demo_mailer.rb')
     end
 
     should "support generating a new mailer extended from base" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @mail_gen.start(['demo', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project') }
       assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_project/app/mailers/demo_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
       assert_match_in_file(/register MailerInitializer/m, '/tmp/sample_project/app/app.rb')
@@ -25,33 +22,30 @@ class TestMailerGenerator < Test::Unit::TestCase
     end
 
     should "support generating a new mailer extended from base with long name" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @mail_gen.start(['user_notice', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:mailer, 'user_notice', '-r=/tmp/sample_project') }
       assert_match_in_file(/class UserNoticeMailer/m, '/tmp/sample_project/app/mailers/user_notice_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
       assert_file_exists('/tmp/sample_project/app/views/user_notice_mailer')
     end
 
     should "support generating a new mailer extended from base with capitalized name" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @mail_gen.start(['DEMO', '-r=/tmp/sample_project']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:mailer, 'DEMO', '-r=/tmp/sample_project') }
       assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_project/app/mailers/demo_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/lib/mailer.rb')
       assert_file_exists('/tmp/sample_project/app/views/demo_mailer')
     end
-
   end
 
   context "the mailer destroy option" do
-
     should "destroy mailer file" do
-      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @mail_gen.start(['demo', '-r=/tmp/sample_project']) }
-      silence_logger { @mail_gen.start(['demo', '-r=/tmp/sample_project','-d']) }
+      silence_logger { generate(:project, 'sample_project', '--root=/tmp', '--script=none', '-t=bacon') }
+      silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project') }
+      silence_logger { generate(:mailer, 'demo', '-r=/tmp/sample_project','-d') }
       assert_no_dir_exists('/tmp/sample_project/app/views/demo_mailer')
       assert_no_file_exists('/tmp/sample_project/app/mailers/demo_mailer.rb')
       assert_no_file_exists('/tmp/sample_project/lib/mailer.rb')
     end
   end
-
-end
+end