padrino-gen 0.12.0 → 0.12.1

data/lib/padrino-gen/padrino-tasks/database.rb

@@ -1,4 +1,5 @@
-if PadrinoTasks.load?(:database, true)
+has_seeds = File.file?('db/seeds.rb')
+if PadrinoTasks.load?(:database, has_seeds)
   namespace :db do
     desc 'Load the seed data from db/seeds.rb'
     task :seed => :environment do

data/lib/padrino-gen/padrino-tasks/sql-helpers.rb

@@ -1,27 +1,31 @@
 module Padrino
-  module Generators 
+  module Generators
     module SqlHelpers
       def self.create_db(adapter, user, password, host, database, charset, collation)
         case adapter
           when 'postgres'
+            environment = {}
+            environment['PGPASSWORD'] = password unless password.blank?
+
             arguments = []
             arguments << "--encoding=#{charset}" if charset
             arguments << "--host=#{host}" if host
             arguments << "--username=#{user}" if user
             arguments << database
-            system("createdb", *arguments)
+
+            Process.wait Process.spawn(environment, 'createdb', *arguments)
           when 'mysql'
-            arguments = ["--user=#{user}"]
-            arguments << "--password=#{password}" unless password.blank?
-            
-            unless %w[127.0.0.1 localhost].include?(host)
-              arguments << "--host=#{host}"
-            end
+            environment = {}
+            environment['MYSQL_PWD'] = password unless password.blank?
+
+            arguments = []
+            arguments << "--user=#{user}" if user
+            arguments << "--host=#{host}" unless %w[127.0.0.1 localhost].include?(host)
 
             arguments << '-e'
             arguments << "CREATE DATABASE #{database} DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}"
 
-            system('mysql',*arguments)
+            Process.wait Process.spawn(environment, 'mysql', *arguments)
           else
             raise "Adapter #{adapter} not supported for creating databases yet."
         end
@@ -30,23 +34,27 @@ module Padrino
       def self.drop_db(adapter, user, password, host, database)
         case adapter
           when 'postgres'
+            environment = {}
+            environment['PGPASSWORD'] = password unless password.blank?
+
             arguments = []
             arguments << "--host=#{host}" if host
             arguments << "--username=#{user}" if user
             arguments << database
-            system("dropdb", *arguments)
+
+            Process.wait Process.spawn(environment, 'dropdb', *arguments)
           when 'mysql'
-            arguments = ["--user=#{user}"]
-            arguments << "--password=#{password}" unless password.blank?
+            environment = {}
+            environment['MYSQL_PWD'] = password unless password.blank?
 
-            unless %w[127.0.0.1 localhost].include?(host)
-              arguments << "--host=#{host}"
-            end
+            arguments = []
+            arguments << "--user=#{user}" if user
+            arguments << "--host=#{host}" unless %w[127.0.0.1 localhost].include?(host)
 
             arguments << '-e'
             arguments << "DROP DATABASE IF EXISTS #{database}"
 
-            system('mysql',*arguments)
+            Process.wait Process.spawn(environment, 'mysql', *arguments)
           else
             raise "Adapter #{adapter} not supported for dropping databases yet."
         end

data/test/helper.rb

@@ -1,8 +1,9 @@
 require File.expand_path('../../../load_paths', __FILE__)
-require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda')
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'mocha/setup'
 require 'rack/test'
 require 'rack'
-require 'uuid'
 require 'webrat'
 require 'fakeweb'
 require 'thor/group'
@@ -90,7 +91,7 @@ class MiniTest::Spec
   end
 
   def assert_no_match_in_file(pattern, file)
-    File.exist?(file) ? assert_no_match(pattern, File.read(file)) : assert_file_exists(file)
+    File.exist?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file)
   end
 
   # expects_generated :model, "post title:string body:text"

data/test/test_app_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "AppGenerator" do
   def setup
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 
@@ -10,14 +10,14 @@ describe "AppGenerator" do
     `rm -rf #{@apptmp}`
   end
 
-  context 'the app generator' do
-    should "fail outside app root" do
+  describe 'the app generator' do
+    it 'should fail outside app root' do
       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
+    it 'should create correctly a new padrino application' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
       assert_file_exists("#{@apptmp}/sample_project")
@@ -35,7 +35,7 @@ describe "AppGenerator" do
       assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
-    should "create correctly a new padrino application with an underscore name" do
+    it 'should create correctly a new padrino application with an underscore name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") }
       assert_file_exists("#{@apptmp}/sample_project")
@@ -53,7 +53,7 @@ describe "AppGenerator" do
       assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
-    should "generate tiny app skeleton" do
+    it 'should generate tiny app skeleton' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo','--tiny',"--root=#{@apptmp}/sample_project") }
       assert_file_exists("#{@apptmp}/sample_project")
@@ -67,7 +67,7 @@ describe "AppGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/demo/controllers")
     end
 
-    should "correctly create a new controller inside a padrino application" do
+    it 'should correctly create a new controller inside a padrino application' do
       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') }
@@ -76,7 +76,7 @@ describe "AppGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/demo/views/demo_items")
     end
 
-    should "correctly create a new mailer inside a padrino application" do
+    it 'should correctly create a new mailer inside a padrino application' do
       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=demo_app') }
@@ -84,11 +84,11 @@ describe "AppGenerator" do
 
     # only destroys what it generated.
     # hence, the folder will still exists if other changes were made to it.
-    should "destroys itself" do
+    it 'should destroys itself' do
       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)
+      out, err = capture_io { generate_with_parts(:app, 'demo', "--root=#{@apptmp}/sample_project", '-d', :apps => "demo") }
+      refute_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")
@@ -97,7 +97,7 @@ describe "AppGenerator" do
       assert_no_match_in_file(/Padrino\.mount\("Demo"\).to\("\/demo"\)/,"#{@apptmp}/sample_project/config/apps.rb")
     end
 
-    should "abort if app name already exists" do
+    it 'should abort if app name already exists' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       out, err = capture_io { generate(:app, 'kernel', "--root=#{@apptmp}/sample_project") }
       assert_match(/Kernel already exists/, out)
@@ -107,7 +107,7 @@ describe "AppGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/kernel/app.rb")
     end
 
-    should "abort if app name already exists in root" do
+    it 'should abort if app name already exists in root' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'subapp', "--root=#{@apptmp}/sample_project") }
       out, err = capture_io { generate_with_parts(:app, 'subapp', "--root=#{@apptmp}/sample_project", :apps => "subapp") }

data/test/test_cli.rb

@@ -3,7 +3,7 @@ require 'padrino-gen/generators/cli'
 
 describe "Cli" do
   def setup
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 
@@ -11,14 +11,14 @@ describe "Cli" do
     `rm -rf #{@apptmp}`
   end
 
-  context 'the cli' do
+  describe 'the cli' do
 
-    should "fail without arguments" do
+    it 'should fail without arguments' do
       out, err = capture_io { generate(:cli) }
       assert_match(/Please specify generator to use/, out)
     end
 
-    should "work correctly if we have a project" do
+    it 'should work correctly if we have a project' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:cli, "--root=#{@apptmp}/sample_project") }
       skip "Make a great asserition"

data/test/test_component_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "ComponentGenerator" do
   def setup
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
   end
 
@@ -10,49 +10,49 @@ describe "ComponentGenerator" do
     `rm -rf #{@apptmp}`
   end
 
-  context 'the controller generator' do
-    should "fail outside app root" do
+  describe 'the controller generator' do
+    it 'should fail outside app root' do
       out, err = capture_io { generate(:component, 'demo', "-r=#{@apptmp}") }
       assert_match(/not at the root/, out)
     end
   end
 
 
-  context "add components" do
-    should "properly generate default" do
+  describe "add components" do
+    it 'should properly generate default' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       out, err = capture_io { generate(:component, '--orm=activerecord', "-r=#{@apptmp}/sample_project") }
       assert_match(/applying.*?activerecord.*?orm/, out)
       assert_match_in_file(/gem 'activerecord', '>= 3.1', :require => 'active_record'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_no_match(/Switch renderer to/, out)
+      refute_match(/Switch renderer to/, out)
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'activerecord', components_chosen[:orm]
     end
 
-    should "properly generate with adapter" do
+    it 'should properly generate with adapter' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       out, err = capture_io { generate(:component, '--orm=sequel', '--adapter=postgres', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/gem 'pg'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_no_match(/Switch renderer to/, out)
+      refute_match(/Switch renderer to/, out)
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'sequel', components_chosen[:orm]
     end
 
-    should "enable @app_name value" do
+    it 'should enable @app_name value' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       out, err = capture_io { generate_with_parts(:component, '--test=cucumber', "-r=#{@apptmp}/sample_project", :apps => "app") }
       assert_match_in_file(/SampleProject::App\.tap \{ \|app\|  \}/, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
-    should "generate component in specified app" do
+    it 'should generate component in specified app' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'compo', "-r=#{@apptmp}/sample_project") }
       out, err = capture_io { generate_with_parts(:component, '--test=cucumber', "--app=compo", "-r=#{@apptmp}/sample_project", :apps => "compo") }
       assert_match_in_file(/SampleProject::Compo\.tap \{ \|app\|  \}/, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
-    should "not generate component in specified app if the app does not exist" do
+    it 'should not generate component in specified app if the app does not exist' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       out, err = capture_io { generate_with_parts(:component, '--test=cucumber', "--app=compo", "-r=#{@apptmp}/sample_project", :apps => "compo") }
       assert_match(/SampleProject::Compo does not exist./, out)
@@ -60,22 +60,22 @@ describe "ComponentGenerator" do
     end
   end
 
-  context "specified of same the component" do
-    should "does not change" do
+  describe "specified of same the component" do
+    it 'should does not change' do
       capture_io { generate(:project, 'sample_project', '--script=jquery', "--root=#{@apptmp}") }
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'jquery', components_chosen[:script]
       out, err = capture_io { generate(:component, '--script=jquery', "-r=#{@apptmp}/sample_project") }
       assert_match(/applying.*?jquery.*?script/, out)
-      assert_no_match(/Switch renderer to/, out)
+      refute_match(/Switch renderer to/, out)
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'jquery', components_chosen[:script]
     end
   end
 
 
-  context "component changes" do
-    should "when allow changes, will be applied" do
+  describe "component changes" do
+    it 'should when allow changes, will be applied' do
       capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") }
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'slim', components_chosen[:renderer]
@@ -87,13 +87,13 @@ describe "ComponentGenerator" do
         assert_equal 'haml', components_chosen[:renderer]
       end
     end
-    should "when deny changes, will not be applied" do
+    it 'should when deny changes, will not be applied' do
       capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") }
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'slim', components_chosen[:renderer]
       $stdin.stub(:gets, 'no') do
         out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
-        assert_no_match(/applying.*?haml.*?renderer/, out)
+        refute_match(/applying.*?haml.*?renderer/, out)
         assert_match(/Switch renderer to/, out)
         components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
         assert_equal 'slim', components_chosen[:renderer]

data/test/test_controller_generator.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "ControllerGenerator" do
   def setup
-    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}"
     `mkdir -p #{@apptmp}`
     @controller_path = "#{@apptmp}/sample_project/app/controllers/demo_items.rb"
     @controller_test_path = "#{@apptmp}/sample_project/test/app/controllers/demo_items_controller_test.rb"
@@ -12,14 +12,14 @@ describe "ControllerGenerator" do
     `rm -rf #{@apptmp}`
   end
 
-  context 'the controller generator' do
-    should "fail outside app root" do
+  describe 'the controller generator' do
+    it 'should fail outside app root' do
       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
+    it 'should generate controller within existing project' do
       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::App.controllers :demo_items do/m, @controller_path)
@@ -28,7 +28,7 @@ describe "ControllerGenerator" do
       assert_file_exists(@controller_test_path)
     end
 
-    should "generate controller within existing project with weird name" do
+    it 'should generate controller within existing project with weird name' do
       capture_io { generate(:project, 'warepedia', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/warepedia") }
       assert_match_in_file(/Warepedia::App.controllers :demo_items do/m, "#{@apptmp}/warepedia/app/controllers/demo_items.rb")
@@ -36,7 +36,7 @@ describe "ControllerGenerator" do
       assert_file_exists("#{@apptmp}/warepedia/app/views/demo_items")
     end
 
-    should "generate controller in specified app" do
+    it 'should generate controller in specified app' do
       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") }
@@ -46,43 +46,43 @@ describe "ControllerGenerator" do
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
-    should "generate controller with specified layout" do
+    it 'should generate controller with specified layout' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-l=xyzlayout') }
       assert_match_in_file(/layout :xyzlayout/m, @controller_path)
     end
 
-    should "generate controller without specified layout if empty" do
+    it 'should generate controller without specified layout if empty' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-l=') }
       assert_no_match_in_file(/layout/m, @controller_path)
     end
 
-    should "generate controller with specified parent" do
+    it 'should generate controller with specified parent' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-p=user') }
       assert_match_in_file(/SampleProject::App.controllers :demo_items, :parent => :user do/m, @controller_path)
     end
 
-    should "generate controller without specified parent" do
+    it 'should generate controller without specified parent' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-p=') }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
     end
 
-    should "generate controller with specified providers" do
+    it 'should generate controller with specified providers' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-f=:html, :js') }
       assert_match_in_file(/SampleProject::App.controllers :demo_items, :provides => \[:html, :js\] do/m, @controller_path)
     end
 
-    should "generate controller without specified providers" do
+    it 'should generate controller without specified providers' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-f=') }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
     end
 
-    should "not fail if we don't have test component" do
+    it 'should not fail if we do not have test component' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
@@ -91,7 +91,7 @@ describe "ControllerGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/test")
     end
 
-    should "generate controller test for bacon" do
+    it 'should generate controller test for bacon' do
       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") }
@@ -99,7 +99,7 @@ describe "ControllerGenerator" do
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
-    should "generate controller test for riot" do
+    it 'should generate controller test for riot' do
       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") }
@@ -107,7 +107,7 @@ describe "ControllerGenerator" do
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
 
-    should "generate controller test for minitest" do
+    it '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") }
@@ -115,14 +115,14 @@ describe "ControllerGenerator" do
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app', 'subby'))
     end
 
-    should "generate controller test for rspec" do
+    it 'should generate controller test for rspec' do
       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
+    it 'should generate controller test for shoulda' do
       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") }
@@ -132,7 +132,7 @@ describe "ControllerGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
     end
 
-    should "generate controller test for steak" do
+    it 'should generate controller test for steak' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=steak') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
@@ -140,7 +140,7 @@ describe "ControllerGenerator" do
       assert_match_in_file(/feature "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/acceptance/controllers/demo_items_controller_spec.rb")
     end
 
-    should "generate controller test for cucumber" do
+    it 'should generate controller test for cucumber' do
       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") }
@@ -148,7 +148,7 @@ describe "ControllerGenerator" do
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
-    should "correctly generate file names" do
+    it 'should correctly generate file names' do
       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")
@@ -158,7 +158,7 @@ describe "ControllerGenerator" do
     end
 
     # Controller action generation
-    should "generate actions for get:test post:yada" do
+    it 'should generate actions for get:test post:yada' do
       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\n  end\n/m, @controller_path)
@@ -166,8 +166,8 @@ describe "ControllerGenerator" do
     end
   end
 
-  context "the controller destroy option" do
-    should "destroy controller files" do
+  describe "the controller destroy option" do
+    it 'should destroy controller files' do
       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') }
@@ -176,7 +176,7 @@ describe "ControllerGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
     end
 
-    should "destroy controller files with rspec" do
+    it 'should destroy controller files with rspec' do
       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') }
@@ -185,7 +185,7 @@ describe "ControllerGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
     end
 
-    should "destroy controller files in sub apps" do
+    it 'should destroy controller files in sub apps' do
       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") }