padrino-gen 0.10.2 → 0.10.3

data/test/helper.rb

@@ -1,10 +1,8 @@
 require File.expand_path('../../../load_paths', __FILE__)
-require 'test/unit'
+require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda')
 require 'rack/test'
 require 'rack'
 require 'uuid'
-require 'shoulda'
-require 'mocha'
 require 'webrat'
 require 'grit'
 require 'thor/group'
@@ -14,7 +12,7 @@ require 'padrino-core/support_lite' unless defined?(SupportLite)
 
 Padrino::Generators.load_components!
 
-class Test::Unit::TestCase
+class MiniTest::Spec
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
@@ -108,10 +106,6 @@ class Test::Unit::TestCase
     Thor::Actions::CreateFile.expects(:new).with(anything, path, kind_of(Proc), anything).returns(instance)
   end
 
-  def expects
-
-  end
-
   # expects_rake "custom"
   def expects_rake(command,options={})
     #options.reverse_merge!(:root => '/tmp')
@@ -133,18 +127,6 @@ class Test::Unit::TestCase
 
 end
 
-class Object
-  # Silences the output by redirecting to stringIO
-  # silence_logger { ...commands... } => "...output..."
-  def silence_logger(&block)
-    orig_stdout = $stdout
-    $stdout = log_buffer = StringIO.new
-    block.call
-    $stdout = orig_stdout
-    log_buffer.rewind && log_buffer.read
-  end
-end
-
 module Webrat
   module Logging
     def logger # # @private

data/test/test_app_generator.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestAppGenerator < Test::Unit::TestCase
+describe "AppGenerator" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
     `mkdir -p #{@apptmp}`
@@ -12,14 +12,14 @@ class TestAppGenerator < Test::Unit::TestCase
 
   context 'the app generator' do
     should "fail outside app root" do
-      output = silence_logger { generate(:app, 'demo_root', "-r=#{@apptmp}") }
-      assert_match(/not at the root/, output)
+      out, err = capture_io { generate(:app, 'demo_root', "-r=#{@apptmp}") }
+      assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/demo_root")
     end
 
     should "create correctly a new padrino application" do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") } }
-      assert_nothing_raised { silence_logger { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
       assert_file_exists("#{@apptmp}/sample_project")
       assert_file_exists("#{@apptmp}/sample_project/demo")
       assert_file_exists("#{@apptmp}/sample_project/demo/app.rb")
@@ -35,8 +35,8 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "generate tiny app skeleton" do
-      assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") } }
-      assert_nothing_raised { silence_logger { generate(:app, 'demo','--tiny',"--root=#{@apptmp}/sample_project") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:app, 'demo','--tiny',"--root=#{@apptmp}/sample_project") }
       assert_file_exists("#{@apptmp}/sample_project")
       assert_file_exists("#{@apptmp}/sample_project/demo")
       assert_file_exists("#{@apptmp}/sample_project/demo/helpers.rb")
@@ -49,27 +49,27 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "correctly create a new controller inside a padrino application" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") }
-      silence_logger { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-a=demo') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-a=demo') }
       assert_match_in_file(/Demo.controllers :demo_items do/m, "#{@apptmp}/sample_project/demo/controllers/demo_items.rb")
       assert_match_in_file(/Demo.helpers do/m, "#{@apptmp}/sample_project/demo/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/demo/views/demo_items")
     end
 
     should "correctly create a new mailer inside a padrino application" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") }
-      silence_logger { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project", '-a=demoapp') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") }
+      capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project", '-a=demoapp') }
     end
 
     # only destroys what it generated.
     # hence, the folder will still exists if other changes were made to it.
     should "destroys itself" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") }
-      silence_logger { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
-      output = silence_logger { generate(:app, 'demo', "--root=#{@apptmp}/sample_project", '-d') }
-      assert_no_match(/has been mounted/, output)
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
+      out, err = capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project", '-d') }
+      assert_no_match(/has been mounted/, out)
       assert_no_dir_exists("#{@apptmp}/sample_project/public/demo")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/app.rb")
       assert_no_dir_exists("#{@apptmp}/sample_project/demo/controllers")

data/test/test_cli.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'padrino-gen/generators/cli'
 
-class TestCli < Test::Unit::TestCase
+describe "Cli" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
     `mkdir -p #{@apptmp}`
@@ -14,13 +14,14 @@ class TestCli < Test::Unit::TestCase
   context 'the cli' do
 
     should "fail without arguments" do
-      output = silence_logger { generate(:cli) }
-      assert_match "Please specify generator to use", output
+      out, err = capture_io { generate(:cli) }
+      assert_match(/Please specify generator to use/, out)
     end
 
     should "work correctly if we have a project" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") }
-      assert_nothing_raised { silence_logger { generate(:cli, "--root=#{@apptmp}/sample_project") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:cli, "--root=#{@apptmp}/sample_project") }
+      skip "Make a great asserition"
     end
   end
 end

data/test/test_controller_generator.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestControllerGenerator < Test::Unit::TestCase
+describe "ControllerGenerator" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
     `mkdir -p #{@apptmp}`
@@ -14,14 +14,14 @@ class TestControllerGenerator < Test::Unit::TestCase
 
   context 'the controller generator' do
     should "fail outside app root" do
-      output = silence_logger { generate(:controller, 'demo', "-r=#{@apptmp}") }
-      assert_match(/not at the root/, output)
+      out, err = capture_io { generate(:controller, 'demo', "-r=#{@apptmp}") }
+      assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/app/controllers/demo.rb")
     end
 
     should "generate controller within existing project" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
       assert_match_in_file(/SampleProject.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
@@ -29,17 +29,17 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller within existing project with weird name" do
-      silence_logger { generate(:project, 'warepedia', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/warepedia") }
+      capture_io { generate(:project, 'warepedia', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/warepedia") }
       assert_match_in_file(/Warepedia.controllers :demo_items do/m, "#{@apptmp}/warepedia/app/controllers/demo_items.rb")
       assert_match_in_file(/Warepedia.helpers do/m, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/warepedia/app/views/demo_items")
     end
 
     should "generate controller in specified app" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/Subby.controllers :demo_items do/m, @controller_path.gsub('app','subby'))
       assert_match_in_file(/Subby.helpers do/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/subby/views/demo_items")
@@ -47,8 +47,8 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should 'not fail if we don\'t have test component' do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
       assert_match_in_file(/SampleProject.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
@@ -56,40 +56,48 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller test for bacon" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
     should "generate controller test for riot" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
+    should "generate controller test for minitest" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app', 'subby'))
+      assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app', 'subby'))
+    end
+
     should "generate controller test for testspec" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
     should "generate controller test for rspec" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
     end
 
     should "generate controller test for shoulda" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
       assert_match_in_file(expected_pattern, @controller_test_path.gsub('app','subby'))
       assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby'))
@@ -97,16 +105,16 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller test for cucumber" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=cucumber') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=cucumber') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
     should "correctly generate file names" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
-      silence_logger { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
+      capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_file_exists("#{@apptmp}/sample_project/app/controllers/demo_items.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
@@ -115,8 +123,8 @@ class TestControllerGenerator < Test::Unit::TestCase
 
     # Controller action generation
     should "generate actions for get:test post:yada" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
-      silence_logger { generate(:controller, 'demo_items', "get:test", "post:yada","-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') }
+      capture_io { generate(:controller, 'demo_items', "get:test", "post:yada","-r=#{@apptmp}/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
@@ -124,28 +132,28 @@ class TestControllerGenerator < Test::Unit::TestCase
 
   context "the controller destroy option" do
     should "destroy controller files" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists(@controller_test_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
     end
 
     should "destroy controller files with rspec" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
-      silence_logger { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
+      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists(@controller_path)
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
     end
 
     should "destroy controller files in sub apps" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists(@controller_path.gsub('app','subby'))
       assert_no_file_exists(@controller_test_path.gsub('app','subby'))
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")

data/test/test_generator.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestGenerator < Test::Unit::TestCase
+describe "Generator" do
 
   context "the generator" do
     should "have default generators" do

data/test/test_mailer_generator.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestMailerGenerator < Test::Unit::TestCase
+describe "MailerGenerator" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
     `mkdir -p #{@apptmp}`
@@ -12,23 +12,23 @@ class TestMailerGenerator < Test::Unit::TestCase
 
   context 'the mailer generator' do
     should "fail outside app root" do
-      output = silence_logger { generate(:mailer, 'demo', "-r=#{@apptmp}") }
-      assert_match(/not at the root/, output)
+      out, err = capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}") }
+      assert_match(/not at the root/, out)
       assert_no_file_exists('/tmp/app/mailers/demo_mailer.rb')
     end
 
     should "generate mailer in specified app" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:mailer, 'demo', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:mailer, 'demo', '-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/Subby.mailer :demo/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/subby/views/mailers/demo")
     end
 
     should "generate mailer in specified app with actions" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:mailer, 'demo', 'action1', 'action2', '-a=/subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:mailer, 'demo', 'action1', 'action2', '-a=/subby', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/Subby.mailer :demo/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
       assert_match_in_file(/email :action1 do.*?end/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
       assert_match_in_file(/email :action2 do.*?end/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
@@ -36,22 +36,22 @@ class TestMailerGenerator < Test::Unit::TestCase
     end
 
     should "support generating a new mailer extended from base" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/demo")
     end
 
     should "support generating a new mailer extended from base with long name" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:mailer, 'UserNotice', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:mailer, 'UserNotice', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject.mailer :user_notice/m, "#{@apptmp}/sample_project/app/mailers/user_notice.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/user_notice")
     end
 
     should "support generating a new mailer extended from base with capitalized name" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:mailer, 'DEMO', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:mailer, 'DEMO', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/demo")
     end
@@ -59,9 +59,9 @@ class TestMailerGenerator < Test::Unit::TestCase
 
   context "the mailer destroy option" do
     should "destroy mailer file" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      silence_logger { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project",'-d') }
       assert_no_dir_exists("#{@apptmp}/sample_project/app/views/demo")
       assert_no_file_exists("#{@apptmp}/sample_project/app/mailers/demo.rb")
     end

data/test/test_migration_generator.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestMigrationGenerator < Test::Unit::TestCase
+describe "MigrationGenerator" do
   def setup
     @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
     `mkdir -p #{@apptmp}`
@@ -12,33 +12,33 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   context 'the migration generator' do
     should "fail outside app root" do
-      output = silence_logger { generate(:migration, 'add_email_to_users', '-r=/tmp') }
-      assert_match(/not at the root/, output)
+      out, err = capture_io { generate(:migration, 'add_email_to_users', '-r=/tmp') }
+      assert_match(/not at the root/, out)
       assert_no_file_exists("#{@apptmp}/db/migrate")
     end
 
     should "fail if we don't use an adapter" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
-      assert_raise(SystemExit) { silence_logger { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") } }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
+      assert_raises(SystemExit) { capture_io { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") } }
     end
 
     should "generate migration inside app root" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      response_success = silence_logger { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      response_success = capture_io { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/class AddEmailToUser/m, migration_file_path)
     end
 
     should "generate migration inside app root with lowercase migration argument" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      response_success = silence_logger { generate(:migration, 'add_email_to_users', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      response_success = capture_io { generate(:migration, 'add_email_to_users', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
     end
 
     should "generate migration inside app root with singular table" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      silence_logger { generate(:migration, 'add_email_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      capture_io { generate(:migration, 'add_email_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_user.rb"
       assert_match_in_file(/class AddEmailToUser/m, migration_file_path)
       assert_match_in_file(/t.string :email/, migration_file_path)
@@ -46,10 +46,10 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "properly calculate version number" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
-      silence_logger { generate(:migration, 'add_email_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:migration, 'add_name_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:migration, 'add_age_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      capture_io { generate(:migration, 'add_email_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:migration, 'add_name_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:migration, 'add_age_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class AddEmailToPerson/m, "#{@apptmp}/sample_project/db/migrate/001_add_email_to_person.rb")
       assert_match_in_file(/class AddNameToPerson/m, "#{@apptmp}/sample_project/db/migrate/002_add_name_to_person.rb")
       assert_match_in_file(/class AddAgeToUser/m, "#{@apptmp}/sample_project/db/migrate/003_add_age_to_user.rb")
@@ -58,8 +58,8 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   context 'the migration generator for activerecord' do
     should "generate migration for generic needs" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      response_success = silence_logger { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
       assert_match_in_file(/def self\.up\s+end/m, migration_file_path)
@@ -67,9 +67,9 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for adding columns" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      response_success = silence_logger { generate(:migration, *migration_params) }
+      response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
       assert_match_in_file(/change_table :users.*?t\.string :email/m, migration_file_path)
@@ -79,9 +79,9 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for removing columns" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      response_success = silence_logger { generate(:migration, *migration_params) }
+      response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb"
       assert_match_in_file(/class RemoveEmailFromUsers/m, migration_file_path)
       assert_match_in_file(/change_table :users.*?t\.remove :email/m, migration_file_path)
@@ -93,8 +93,8 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   context 'the migration generator for datamapper' do
     should "generate migration for generic needs" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
-      response_success = silence_logger { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
+      response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/migration\s1.*?:modify_user_fields/m, migration_file_path)
       assert_match_in_file(/up\sdo\s+end/m, migration_file_path)
@@ -102,9 +102,9 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for adding columns" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      response_success = silence_logger { generate(:migration, *migration_params) }
+      response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/migration\s1.*?:add_email_to_users/m, migration_file_path)
       assert_match_in_file(/modify_table :users.*?add_column :email, String/m, migration_file_path)
@@ -114,9 +114,9 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for removing columns" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      response_success = silence_logger { generate(:migration, *migration_params) }
+      response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb"
       assert_match_in_file(/migration\s1.*?:remove_email_from_users/m, migration_file_path)
       assert_match_in_file(/modify_table :users.*?drop_column :email/m, migration_file_path)
@@ -126,10 +126,10 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "properly version migration files" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
-      response_success = silence_logger { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
-      response_success = silence_logger { generate(:migration, 'ModifyUserFields2', "-r=#{@apptmp}/sample_project") }
-      response_success = silence_logger { generate(:migration, 'ModifyUserFields3', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
+      response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
+      response_success = capture_io { generate(:migration, 'ModifyUserFields2', "-r=#{@apptmp}/sample_project") }
+      response_success = capture_io { generate(:migration, 'ModifyUserFields3', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/migration\s1.*?:modify_user_fields/m, "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb")
       assert_match_in_file(/migration\s2.*?:modify_user_fields2/m, "#{@apptmp}/sample_project/db/migrate/002_modify_user_fields2.rb")
       assert_match_in_file(/migration\s3.*?:modify_user_fields3/m, "#{@apptmp}/sample_project/db/migrate/003_modify_user_fields3.rb")
@@ -138,8 +138,8 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   context 'the migration generator for sequel' do
     should "generate migration for generic needs" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
-      response_success = silence_logger { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
       assert_match_in_file(/def\sup\s+end/m, migration_file_path)
@@ -147,9 +147,9 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for adding columns" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      response_success = silence_logger { generate(:migration, *migration_params) }
+      response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
       assert_match_in_file(/alter_table :users.*?add_column :email, String/m, migration_file_path)
@@ -159,9 +159,9 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for removing columns" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      response_success = silence_logger { generate(:migration, *migration_params) }
+      response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb"
       assert_match_in_file(/class RemoveEmailFromUsers/m, migration_file_path)
       assert_match_in_file(/alter_table :users.*?drop_column :email/m, migration_file_path)
@@ -174,20 +174,20 @@ class TestMigrationGenerator < Test::Unit::TestCase
   context "the migration destroy option" do
 
     should "destroy the migration files" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      silence_logger { generate(:migration, *migration_params) }
-      silence_logger { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:migration, *migration_params) }
+      capture_io { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb")
     end
 
     should "destroy the migration file regardless of number" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
       migration_param2 = ['AddEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      silence_logger { generate(:migration, *migration_param2) }
-      silence_logger { generate(:migration, *migration_params) }
-      silence_logger { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') }
+      capture_io { generate(:migration, *migration_param2) }
+      capture_io { generate(:migration, *migration_params) }
+      capture_io { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_remove_email_from_users.rb")
     end
   end