padrino-gen 0.6.3 → 0.6.7

data/test/test_app_generator.rb

@@ -12,7 +12,7 @@ class TestAppGenerator < Test::Unit::TestCase
 
   context 'the App generator' do
     should "allow simple generator to run and create base_app with no options" do
-      assert_nothing_raised { silence_logger { @app.start(['sample_app', '/tmp', '--script=none']) } }
+      assert_nothing_raised { silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none']) } }
       assert_file_exists('/tmp/sample_app')
       assert_file_exists('/tmp/sample_app/app')
       assert_file_exists('/tmp/sample_app/config/boot.rb')
@@ -21,23 +21,23 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "not create models folder if no orm is chosen" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '--orm=none']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '--orm=none']) }
       assert_no_dir_exists('/tmp/sample_app/app/models')
     end
 
     should "not create tests folder if no test framework is chosen" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '--test=none']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '--test=none']) }
       assert_no_dir_exists('/tmp/sample_app/test')
     end
 
     should "place app specific names into correct files" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none']) }
       assert_match_in_file(/class SampleApp < Padrino::Application/m, '/tmp/sample_app/app/app.rb')
       assert_match_in_file(/Padrino.mount_core\("SampleApp"\)/m, '/tmp/sample_app/config/apps.rb')
     end
 
     should "create components file containing options chosen with defaults" do
-      silence_logger { @app.start(['sample_app', '/tmp']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp']) }
       components_chosen = YAML.load_file('/tmp/sample_app/.components')
       assert_equal 'datamapper', components_chosen[:orm]
       assert_equal 'bacon', components_chosen[:test]
@@ -48,7 +48,7 @@ class TestAppGenerator < Test::Unit::TestCase
 
     should "create components file containing options chosen" do
       component_options = ['--orm=datamapper', '--test=riot', '--mock=mocha', '--script=prototype', '--renderer=erb']
-      silence_logger { @app.start(['sample_app', '/tmp', *component_options]) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', *component_options]) }
       components_chosen = YAML.load_file('/tmp/sample_app/.components')
       assert_equal 'datamapper', components_chosen[:orm]
       assert_equal 'riot',  components_chosen[:test]
@@ -59,7 +59,7 @@ class TestAppGenerator < Test::Unit::TestCase
 
     should "output to log components being applied" do
       component_options = ['--orm=datamapper', '--test=riot', '--mock=mocha', '--script=prototype', '--renderer=erb']
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', *component_options]) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', *component_options]) }
       assert_match /Applying.*?datamapper.*?orm/, buffer
       assert_match /Applying.*?riot.*?test/, buffer
       assert_match /Applying.*?mocha.*?mock/, buffer
@@ -68,7 +68,7 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "output gem files for base app" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none']) }
       assert_match_in_file(/gem 'sinatra'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/gem 'padrino'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/gem 'rack-flash'/, '/tmp/sample_app/Gemfile')
@@ -78,14 +78,14 @@ class TestAppGenerator < Test::Unit::TestCase
 
   context "a generator for mock component" do
     should "properly generate for rr" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--mock=rr', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--mock=rr', '--script=none']) }
       assert_match /Applying.*?rr.*?mock/, buffer
       assert_match_in_file(/gem 'rr'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/include RR::Adapters::RRMethods/m, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate default for mocha" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--mock=mocha', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--mock=mocha', '--script=none']) }
       assert_match /Applying.*?mocha.*?mock/, buffer
       assert_match_in_file(/gem 'mocha'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/include Mocha::API/m, '/tmp/sample_app/test/test_config.rb')
@@ -95,7 +95,7 @@ class TestAppGenerator < Test::Unit::TestCase
   context "the generator for orm components" do
     should "properly generate for sequel" do
       @app.instance_eval("undef setup_orm if respond_to?('setup_orm')")
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--orm=sequel', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--orm=sequel', '--script=none']) }
       assert_match /Applying.*?sequel.*?orm/, buffer
       assert_match_in_file(/gem 'sequel'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Sequel.connect/, '/tmp/sample_app/config/database.rb')
@@ -103,16 +103,16 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for activerecord" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--orm=activerecord', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--orm=activerecord', '--script=none']) }
       assert_match /Applying.*?activerecord.*?orm/, buffer
-      assert_match_in_file(/gem 'activerecord'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'active_record'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Migrate the database/, '/tmp/sample_app/Rakefile')
       assert_match_in_file(/ActiveRecord::Base.establish_connection/, '/tmp/sample_app/config/database.rb')
       assert_dir_exists('/tmp/sample_app/app/models')
     end
 
     should "properly generate default for datamapper" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--orm=datamapper', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--orm=datamapper', '--script=none']) }
       assert_match /Applying.*?datamapper.*?orm/, buffer
       assert_match_in_file(/gem 'dm-core'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/DataMapper.setup/, '/tmp/sample_app/config/database.rb')
@@ -120,7 +120,7 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for mongomapper" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--orm=mongomapper', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--orm=mongomapper', '--script=none']) }
       assert_match /Applying.*?mongomapper.*?orm/, buffer
       assert_match_in_file(/gem 'mongo_mapper'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/MongoMapper.database/, '/tmp/sample_app/config/database.rb')
@@ -128,7 +128,7 @@ class TestAppGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for couchrest" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--orm=couchrest', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--orm=couchrest', '--script=none']) }
       assert_match /Applying.*?couchrest.*?orm/, buffer
       assert_match_in_file(/gem 'couchrest'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/CouchRest.database!/, '/tmp/sample_app/config/database.rb')
@@ -138,82 +138,81 @@ class TestAppGenerator < Test::Unit::TestCase
 
   context "the generator for renderer component" do
     should "properly generate default for erb" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--renderer=erb', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--renderer=erb', '--script=none']) }
       assert_match /Applying.*?erb.*?renderer/, buffer
       assert_match_in_file(/gem 'erubis'/, '/tmp/sample_app/Gemfile')
     end
 
     should "properly generate for haml" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--renderer=haml','--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--renderer=haml','--script=none']) }
       assert_match /Applying.*?haml.*?renderer/, buffer
       assert_match_in_file(/gem 'haml'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, '/tmp/sample_app/config/initializers/sass.rb')
-      assert_file_exists('/tmp/sample_app/public/stylesheets/sass')
     end
   end
 
   context "the generator for script component" do
     should "properly generate for jquery" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--script=jquery']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=jquery']) }
       assert_match /Applying.*?jquery.*?script/, buffer
-      assert_file_exists('/tmp/sample_app/public/javascripts/jquery.js')
-      assert_file_exists('/tmp/sample_app/public/javascripts/application.js')
+      assert_file_exists('/tmp/sample_app/app/public/javascripts/jquery.js')
+      assert_file_exists('/tmp/sample_app/app/public/javascripts/application.js')
     end
 
     should "properly generate for prototype" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--script=prototype']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=prototype']) }
       assert_match /Applying.*?prototype.*?script/, buffer
-      assert_file_exists('/tmp/sample_app/public/javascripts/protopak.js')
-      assert_file_exists('/tmp/sample_app/public/javascripts/lowpro.js')
-      assert_file_exists('/tmp/sample_app/public/javascripts/application.js')
+      assert_file_exists('/tmp/sample_app/app/public/javascripts/protopak.js')
+      assert_file_exists('/tmp/sample_app/app/public/javascripts/lowpro.js')
+      assert_file_exists('/tmp/sample_app/app/public/javascripts/application.js')
     end
 
     should "properly generate for rightjs" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--script=rightjs']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=rightjs']) }
       assert_match /Applying.*?rightjs.*?script/, buffer
-      assert_file_exists('/tmp/sample_app/public/javascripts/right.js')
-      assert_file_exists('/tmp/sample_app/public/javascripts/application.js')
+      assert_file_exists('/tmp/sample_app/app/public/javascripts/right.js')
+      assert_file_exists('/tmp/sample_app/app/public/javascripts/application.js')
     end
   end
 
   context "the generator for test component" do
     should "properly default generate for bacon" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--test=bacon', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--test=bacon', '--script=none']) }
       assert_match /Applying.*?bacon.*?test/, buffer
       assert_match_in_file(/gem 'bacon'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Bacon::Context/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for riot" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--test=riot', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--test=riot', '--script=none']) }
       assert_match /Applying.*?riot.*?test/, buffer
       assert_match_in_file(/gem 'riot'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Riot::Situation/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for rspec" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--test=rspec', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--test=rspec', '--script=none']) }
       assert_match /Applying.*?rspec.*?test/, buffer
       assert_match_in_file(/gem 'rspec'.*?:require_as => "spec"/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Spec::Runner/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for shoulda" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--test=shoulda', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--test=shoulda', '--script=none']) }
       assert_match /Applying.*?shoulda.*?test/, buffer
       assert_match_in_file(/gem 'shoulda'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for testspec" do
-      buffer = silence_logger { @app.start(['sample_app', '/tmp', '--test=testspec', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '--root=/tmp', '--test=testspec', '--script=none']) }
       assert_match /Applying.*?testspec.*?test/, buffer
       assert_match_in_file(/gem 'test\/spec'/, '/tmp/sample_app/Gemfile')
-      assert_match_in_file(/Bundler.require_env\(:testing\)/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_app/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')
     end
   end

data/test/test_controller_generator.rb

@@ -20,7 +20,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller within existing application" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       assert_match_in_file(/SampleApp.controllers do/m, @controller_path)
       assert_match_in_file(/SampleApp.helpers do/m, '/tmp/sample_app/app/helpers/demo_items_helper.rb')
@@ -28,31 +28,31 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller test for bacon" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for riot" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=riot']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=riot']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for testspec" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=testspec']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=testspec']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for rspec" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=rspec']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=rspec']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_app/test/controllers/demo_items_controller_spec.rb')
     end
 
     should "generate controller test for shoulda" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=shoulda']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=shoulda']) }
       silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
       assert_match_in_file(expected_pattern, @controller_test_path)
@@ -61,14 +61,14 @@ class TestControllerGenerator < Test::Unit::TestCase
     # Controller action generation
 
     should "generate actions for get:test post:yada" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=shoulda'])}
       silence_logger { @contgen.start(['demo_items', "get:test","post:yada",'-r=/tmp/sample_app']) }
       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
 
     should "generate url routes for get:yoda post:yada" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=shoulda'])}
       silence_logger { @contgen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_app']) }
       # assert_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
       # assert_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
@@ -79,7 +79,7 @@ class TestControllerGenerator < Test::Unit::TestCase
   context "the controller destroy option" do
 
     should "destroy controller files" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon'])}
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon'])}
       silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app']) }
       silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app','-d'])}
       assert_no_file_exists(@controller_path)
@@ -88,7 +88,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "destroy controller files with rspec" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=rspec'])}
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=rspec'])}
       silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app']) }
       silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app','-d'])}
       assert_no_file_exists(@controller_path)
@@ -97,7 +97,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
     
     should "remove url routes" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon'])}
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon'])}
       silence_logger { @contgen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_app']) }
       silence_logger { @contgen.start(['demo_items','-r=/tmp/sample_app','-d'])}
       # assert_no_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)

data/test/test_mailer_generator.rb

@@ -17,7 +17,7 @@ class TestMailerGenerator < Test::Unit::TestCase
     end
 
     should "support generating a new mailer extended from base" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @mailgen.start(['demo', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_app/app/mailers/demo_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_app/config/initializers/mailer.rb')
@@ -25,7 +25,7 @@ class TestMailerGenerator < Test::Unit::TestCase
     end
 
     should "support generating a new mailer extended from base with long name" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @mailgen.start(['user_notice', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class UserNoticeMailer/m, '/tmp/sample_app/app/mailers/user_notice_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_app/config/initializers/mailer.rb')
@@ -33,7 +33,7 @@ class TestMailerGenerator < Test::Unit::TestCase
     end
 
     should "support generating a new mailer extended from base with capitalized name" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @mailgen.start(['DEMO', '-r=/tmp/sample_app']) }
       assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_app/app/mailers/demo_mailer.rb')
       assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_app/config/initializers/mailer.rb')
@@ -44,7 +44,7 @@ class TestMailerGenerator < Test::Unit::TestCase
   context "the mailer destroy option" do
     
     should "destroy mailer file" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon']) }
       silence_logger { @mailgen.start(['demo', '-r=/tmp/sample_app']) }
       silence_logger { @mailgen.start(['demo', '-r=/tmp/sample_app','-d']) }
       assert_no_dir_exists('/tmp/sample_app/app/views/demo_mailer')

data/test/test_migration_generator.rb

@@ -17,30 +17,30 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration inside app root" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       response_success = silence_logger { @mig_gen.start(['AddEmailToUsers', '-r=/tmp/sample_app']) }
       migration_file_path = "/tmp/sample_app/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 { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       response_success = silence_logger { @mig_gen.start(['add_email_to_users', '-r=/tmp/sample_app']) }
       migration_file_path = "/tmp/sample_app/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 { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       silence_logger { @mig_gen.start(['add_email_to_user', "email:string", '-r=/tmp/sample_app']) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_user.rb"
       assert_match_in_file(/class AddEmailToUser/m, migration_file_path)
-      assert_match_in_file(/t.column :email, :string/, migration_file_path)
+      assert_match_in_file(/t.string :email/, migration_file_path)
       assert_match_in_file(/t.remove :email/, migration_file_path)
     end
 
     should "properly calculate version number" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
       silence_logger { @mig_gen.start(['add_email_to_person', "email:string", '-r=/tmp/sample_app']) }
       silence_logger { @mig_gen.start(['add_name_to_person', "email:string", '-r=/tmp/sample_app']) }
       silence_logger { @mig_gen.start(['add_age_to_user', "email:string", '-r=/tmp/sample_app']) }
@@ -52,7 +52,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   context 'the migration generator for activerecord' do
     should "generate migration for generic needs" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
@@ -61,33 +61,33 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for adding columns" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       response_success = silence_logger { @mig_gen.start(migration_params) }
       migration_file_path = "/tmp/sample_app/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\.column :email, :string/m, migration_file_path)
-      assert_match_in_file(/t\.column :age, :integer/m, migration_file_path)
+      assert_match_in_file(/change_table :users.*?t\.string :email/m, migration_file_path)
+      assert_match_in_file(/t\.integer :age/m, migration_file_path)
       assert_match_in_file(/change_table :users.*?t\.remove :email/m, migration_file_path)
       assert_match_in_file(/t\.remove :age/m, migration_file_path)
     end
 
     should "generate migration for removing columns" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       response_success = silence_logger { @mig_gen.start(migration_params) }
       migration_file_path = "/tmp/sample_app/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)
       assert_match_in_file(/t\.remove :age/m, migration_file_path)
-      assert_match_in_file(/change_table :users.*?t\.column :email, :string/m, migration_file_path)
-      assert_match_in_file(/t\.column :age, :integer/m, migration_file_path)
+      assert_match_in_file(/change_table :users.*?t\.string :email/m, migration_file_path)
+      assert_match_in_file(/t\.integer :age/m, migration_file_path)
     end
   end
 
   context 'the migration generator for datamapper' do
     should "generate migration for generic needs" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
       response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/migration\s1.*?:modify_user_fields/m, migration_file_path)
@@ -96,7 +96,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for adding columns" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       response_success = silence_logger { @mig_gen.start(migration_params) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_users.rb"
@@ -108,7 +108,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for removing columns" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       response_success = silence_logger { @mig_gen.start(migration_params) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_remove_email_from_users.rb"
@@ -120,7 +120,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "properly version migration files" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=datamapper']) }
       response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
       response_success = silence_logger { @mig_gen.start(['ModifyUserFields2', '-r=/tmp/sample_app']) }
       response_success = silence_logger { @mig_gen.start(['ModifyUserFields3', '-r=/tmp/sample_app']) }
@@ -132,7 +132,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
 
   context 'the migration generator for sequel' do
     should "generate migration for generic needs" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
       response_success = silence_logger { @mig_gen.start(['ModifyUserFields', '-r=/tmp/sample_app']) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
@@ -141,7 +141,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for adding columns" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
       migration_params = ['AddEmailToUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       response_success = silence_logger { @mig_gen.start(migration_params) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_add_email_to_users.rb"
@@ -153,7 +153,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
 
     should "generate migration for removing columns" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       response_success = silence_logger { @mig_gen.start(migration_params) }
       migration_file_path = "/tmp/sample_app/db/migrate/001_remove_email_from_users.rb"
@@ -168,7 +168,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
   context "the migration destroy option" do
     
     should "destroy the migration files" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       silence_logger { @mig_gen.start(migration_params) }
       silence_logger { @mig_gen.start(['RemoveEmailFromUsers', '-r=/tmp/sample_app','-d']) }
@@ -176,7 +176,7 @@ class TestMigrationGenerator < Test::Unit::TestCase
     end
     
     should "destroy the migration file regardless of number" do
-      silence_logger { @app.start(['sample_app', '/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
+      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon', '-d=sequel']) }
       migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       migration_param2 = ['AddEmailFromUsers', "email:string", "age:integer", '-r=/tmp/sample_app']
       silence_logger { @mig_gen.start(migration_param2) }