padrino-gen 0.10.1 → 0.10.2

data/README.rdoc

@@ -160,4 +160,4 @@ To learn more about the mailer generator, check out the guide to
 
 == Copyright
 
-Copyright (c) 2011 Padrino. See LICENSE for details.
+Copyright (c) 2011 Padrino. See LICENSE for details.

data/lib/padrino-gen.rb

@@ -74,4 +74,4 @@ Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-gen/gen
 ##
 # We add our tasks to padrino-core
 #
-Padrino::Tasks.files << Dir[File.dirname(__FILE__) + "/padrino-gen/padrino-tasks/**/*.rb"]
+Padrino::Tasks.files << Dir[File.dirname(__FILE__) + "/padrino-gen/padrino-tasks/**/*.rb"]

data/lib/padrino-gen/command.rb

@@ -9,4 +9,4 @@ module Padrino
     @_padrino_gen_bin ||= [Padrino.ruby_command, File.expand_path("../../../bin/padrino-gen", __FILE__)]
     args.empty? ? @_padrino_gen_bin : system(args.unshift(@_padrino_gen_bin).join(" "))
   end
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/app.rb

@@ -51,4 +51,4 @@ module Padrino
       end
     end # App
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/app/app.rb.tt

@@ -56,4 +56,4 @@ class <%= @app_name %> < Padrino::Application
   #     render 'errors/505'
   #   end
   #
-end
+end

data/lib/padrino-gen/generators/cli.rb

@@ -50,4 +50,4 @@ module Padrino
       end
     end # Cli
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/components/actions.rb

@@ -117,4 +117,4 @@ module Padrino
       end # Actions
     end # Components
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/components/mocks/mocha.rb

@@ -6,4 +6,4 @@ def setup_mock
     else
       insert_mocking_include "Mocha::API"
   end
-end
+end

data/lib/padrino-gen/generators/components/mocks/rr.rb

@@ -8,4 +8,4 @@ def setup_mock
     else
       insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
   end
-end
+end

data/lib/padrino-gen/generators/components/orms/sequel.rb

@@ -13,11 +13,11 @@ def setup_orm
   db = @app_name.underscore
   require_dependencies 'sequel'
   require_dependencies case options[:adapter]
-  when 'mysql'
-    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://localhost/#{db}_development\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql://localhost/#{db}_production\"")
-    sequel.gsub!(/!DB_TEST!/,"\"mysql://localhost/#{db}_test\"")
-    'mysql'
+  when 'mysql', 'mysql2'
+    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"#{options[:adapter]}://localhost/#{db}_development\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"#{options[:adapter]}://localhost/#{db}_production\"")
+    sequel.gsub!(/!DB_TEST!/,"\"#{options[:adapter]}://localhost/#{db}_test\"")
+    options[:adapter]
   when 'postgres'
     sequel.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://localhost/#{db}_development\"")
     sequel.gsub!(/!DB_PRODUCTION!/, "\"postgres://localhost/#{db}_production\"")

data/lib/padrino-gen/generators/components/renderers/erb.rb

@@ -1,3 +1,3 @@
 def setup_renderer
   require_dependencies 'erubis', :version => "~> 2.7.0"
-end
+end

data/lib/padrino-gen/generators/components/renderers/haml.rb

@@ -1,3 +1,3 @@
 def setup_renderer
   require_dependencies 'haml'
-end
+end

data/lib/padrino-gen/generators/components/renderers/liquid.rb

@@ -1,4 +1,4 @@
 def setup_renderer
   require_dependencies 'liquid', :version => "= 2.1.2"
   require_dependencies 'liquify'
-end
+end

data/lib/padrino-gen/generators/components/renderers/slim.rb

@@ -1,3 +1,3 @@
 def setup_renderer
   require_dependencies 'slim'
-end
+end

data/lib/padrino-gen/generators/components/scripts/dojo.rb

@@ -7,4 +7,4 @@ def setup_script
     copy_file('templates/static/ujs/dojo.js', destination_root("/public/javascripts/dojo-ujs.js"))
   end
   create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
-end
+end

data/lib/padrino-gen/generators/components/scripts/extcore.rb

@@ -7,4 +7,4 @@ def setup_script
     copy_file('templates/static/ujs/ext.js', destination_root("/public/javascripts/ext-ujs.js"))
   end
   create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
-end
+end

data/lib/padrino-gen/generators/components/scripts/jquery.rb

@@ -7,4 +7,4 @@ def setup_script
     copy_file('templates/static/ujs/jquery.js', destination_root("/public/javascripts/jquery-ujs.js"))
   end
   create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
-end
+end

data/lib/padrino-gen/generators/components/scripts/mootools.rb

@@ -7,4 +7,4 @@ def setup_script
     copy_file('templates/static/ujs/mootools.js', destination_root("/public/javascripts/mootools-ujs.js"))
   end
   create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
-end
+end

data/lib/padrino-gen/generators/components/scripts/prototype.rb

@@ -9,4 +9,4 @@ def setup_script
     copy_file('templates/static/ujs/prototype.js', destination_root("/public/javascripts/prototype-ujs.js"))
   end
   create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
-end
+end

data/lib/padrino-gen/generators/components/scripts/rightjs.rb

@@ -7,4 +7,4 @@ def setup_script
     copy_file('templates/static/ujs/right.js', destination_root("/public/javascripts/right-ujs.js"))
   end
   create_file(destination_root('/public/javascripts/application.js'), "// Put your application scripts here")
-end
+end

data/lib/padrino-gen/generators/components/stylesheets/compass.rb

@@ -36,4 +36,4 @@ def setup_stylesheet
   inject_into_file destination_root('/app/app.rb'), COMPASS_REGISTER, :after => "register Padrino::Helpers\n"
 
   directory "components/stylesheets/compass/", destination_root('/app/stylesheets')
-end
+end

data/lib/padrino-gen/generators/components/stylesheets/compass/application.scss

@@ -40,4 +40,4 @@ form.bp {
   #sidebar {
     @include column(3); }
   #content {
-    @include column(21, true); } }
+    @include column(21, true); } }

data/lib/padrino-gen/generators/components/stylesheets/compass/partials/_base.scss

@@ -7,4 +7,4 @@ $blueprint-grid-margin: 10px;
 
 // Use this to calculate the width based on the total width.
 // Or you can set !blueprint_grid_width to a fixed value and unset !blueprint_container_size -- it will be calculated for you.
-$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin;
+$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin;

data/lib/padrino-gen/generators/components/stylesheets/less.rb

@@ -19,4 +19,4 @@ def setup_stylesheet
   require_dependencies 'less', 'rack-less'
   initializer :less, LESS_INIT
   empty_directory destination_root('/app/stylesheets')
-end
+end

data/lib/padrino-gen/generators/components/stylesheets/sass.rb

@@ -12,4 +12,4 @@ def setup_stylesheet
   require_dependencies 'sass'
   initializer :sass, SASS_INIT.chomp
   empty_directory destination_root('/app/stylesheets')
-end
+end

data/lib/padrino-gen/generators/components/tests/bacon.rb

@@ -42,7 +42,7 @@ task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 BACON_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(BACON_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
 
 describe "!NAME! Model" do
   it 'can be created' do
@@ -69,6 +69,8 @@ end
 
 def generate_model_test(name)
   bacon_contents  = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  path = options[:app] == '.' ? '/..' : '/../..'
+  bacon_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), bacon_contents, :skip => true
 end

data/lib/padrino-gen/generators/components/tests/riot.rb

@@ -66,7 +66,7 @@ task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 RIOT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
 
 context "!NAME! Model" do
   context 'can be created' do
@@ -95,6 +95,8 @@ end
 
 def generate_model_test(name)
   riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  path = options[:app] == '.' ? '/..' : '/../..'
+  riot_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), riot_contents, :skip => true
 end

data/lib/padrino-gen/generators/components/tests/shoulda.rb

@@ -47,7 +47,7 @@ task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
 
 class !NAME!Test < Test::Unit::TestCase
   context "!NAME! Model" do
@@ -78,6 +78,8 @@ end
 
 def generate_model_test(name)
   shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  path = options[:app] == '.' ? '/..' : '/../..'
+  shoulda_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), shoulda_contents, :skip => true
 end

data/lib/padrino-gen/generators/components/tests/testspec.rb

@@ -42,7 +42,7 @@ task 'test' => test_tasks.map { |f| "test:\#{f}" }
 TEST
 
 TESTSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTSPEC_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
 
 context "!NAME! Model" do
   specify 'can be created' do
@@ -68,6 +68,8 @@ end
 
 def generate_model_test(name)
   tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  path = options[:app] == '.' ? '/..' : '/../..'
+  tests_contents.gsub!(/!PATH!/,path)
   model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
   create_file destination_root(model_test_path), tests_contents, :skip => true
 end

data/lib/padrino-gen/generators/controller.rb

@@ -46,4 +46,4 @@ module Padrino
       end
     end # Controller
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/mailer.rb

@@ -44,4 +44,4 @@ module Padrino
       end
     end # Mailer
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/migration.rb

@@ -41,4 +41,4 @@ module Padrino
       end
     end # Migration
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/plugin.rb

@@ -54,4 +54,4 @@ module Padrino
       end
     end # Plugins
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/project/config/boot.rb

@@ -26,4 +26,4 @@ end
 Padrino.after_load do
 end
 
-Padrino.load!
+Padrino.load!

data/lib/padrino-gen/generators/templates/controller.rb.tt

@@ -19,4 +19,4 @@
   # end
 
   <%= @actions %>
-end
+end

data/lib/padrino-gen/generators/templates/helper.rb.tt

@@ -4,4 +4,4 @@
   # def simple_helper_method
   #  ...
   # end
-end
+end

data/lib/padrino-gen/generators/templates/initializer.rb.tt

@@ -2,4 +2,4 @@ module <%= "#{@_init_name.to_s.camelize}Initializer" %>
   def self.registered(app)
 <%= @_init_data %>
   end
-end
+end

data/lib/padrino-gen/generators/templates/mailer.rb.tt

@@ -45,4 +45,4 @@
 
     <%- end -%>
   <%- end -%>
-end
+end

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

@@ -2,4 +2,4 @@ desc 'Load the seed data from db/seeds.rb'
 task :seed => :environment do
   seed_file = Padrino.root('db', 'seeds.rb')
   load(seed_file) if File.exist?(seed_file)
-end
+end

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

@@ -34,4 +34,4 @@ if defined?(Sequel)
       end
     end
   end
-end
+end

data/test/fixtures/admin_template.rb

@@ -4,4 +4,4 @@ generate :model, "post title:string body:text"
 rake "ar:create"
 generate :admin
 rake "ar:migrate"
-generate :admin_page, "post"
+generate :admin_page, "post"

data/test/fixtures/git_template.rb

@@ -1,4 +1,4 @@
 project :test => :rspec, :orm => :activerecord
 git :init
 git :add, "."
-git :commit, "hello"
+git :commit, "hello"

data/test/fixtures/plugin_template.rb

@@ -10,4 +10,4 @@ HOPTOAD = <<-HOPTOAD
 HOPTOAD
 require_dependencies 'rack_hoptoad', :require => 'rack/hoptoad'
 initializer :hoptoad,HOPTOAD
-inject_into_file destination_root('/app/app.rb'),"    enable :raise_errors\n", :after => "configure do\n"
+inject_into_file destination_root('/app/app.rb'),"    enable :raise_errors\n", :after => "configure do\n"

data/test/fixtures/rake_template.rb

@@ -6,4 +6,4 @@ project :test => :shoulda, :orm => :activerecord
 #   }
 # end
 # RAKE
-rake "custom"
+rake "custom"

data/test/helper.rb

@@ -147,8 +147,8 @@ end
 
 module Webrat
   module Logging
-    def logger # :nodoc:
+    def logger # # @private
       @logger = nil
     end
   end
-end
+end

data/test/test_cli.rb

@@ -23,4 +23,4 @@ class TestCli < Test::Unit::TestCase
       assert_nothing_raised { silence_logger { generate(:cli, "--root=#{@apptmp}/sample_project") } }
     end
   end
-end
+end

data/test/test_controller_generator.rb

@@ -59,6 +59,7 @@ class TestControllerGenerator < Test::Unit::TestCase
       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") }
+      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
 
@@ -66,6 +67,7 @@ class TestControllerGenerator < Test::Unit::TestCase
       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") }
+      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
 
@@ -73,6 +75,7 @@ class TestControllerGenerator < Test::Unit::TestCase
       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") }
+      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
 
@@ -89,6 +92,7 @@ class TestControllerGenerator < Test::Unit::TestCase
       silence_logger { 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'))
       assert_file_exists("#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
     end
 

data/test/test_generator.rb

@@ -11,4 +11,4 @@ class TestGenerator < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/test_mailer_generator.rb

@@ -66,4 +66,4 @@ class TestMailerGenerator < Test::Unit::TestCase
       assert_no_file_exists("#{@apptmp}/sample_project/app/mailers/demo.rb")
     end
   end
-end
+end

data/test/test_migration_generator.rb

@@ -191,4 +191,4 @@ class TestMigrationGenerator < Test::Unit::TestCase
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_remove_email_from_users.rb")
     end
   end
-end
+end

data/test/test_model_generator.rb

@@ -325,26 +325,57 @@ class TestModelGenerator < Test::Unit::TestCase
   context "model generator testing files" do
     # BACON
     should "generate test file for bacon" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "SomeUser Model"/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/@some_user = SomeUser.new/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/@some_user\.should\.not\.be\.nil/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+    end
+
+    should "generate test file for bacon in specified app" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/describe "SomeUser Model"/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
       assert_match_in_file(/@some_user = SomeUser.new/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
       assert_match_in_file(/@some_user\.should\.not\.be\.nil/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
+      assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
     end
 
     # RIOT
     should "generate test file for riot" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot', '-d=activerecord') }
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/context "SomeUser Model" do/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/SomeUser.new/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/asserts\("that record is not nil"\) \{ \!topic.nil\? \}/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+    end
+
+    should "generate test file for riot in specified app" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot', '-d=activerecord') }
       silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/context "SomeUser Model" do/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
       assert_match_in_file(/SomeUser.new/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
       assert_match_in_file(/asserts\("that record is not nil"\) \{ \!topic.nil\? \}/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
+      assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
     end
 
     # RSPEC
     should "generate test file for rspec" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "SomeUser Model"/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
+      assert_match_in_file(/let\(:some_user\) \{ SomeUser.new \}/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
+      assert_match_in_file(/some_user\.should_not be_nil/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
+    end
+
+    should "generate test file for rspec in specified app" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
@@ -355,6 +386,17 @@ class TestModelGenerator < Test::Unit::TestCase
 
     # SHOULDA
     should "generate test file for shoulda" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda', '-d=activerecord') }
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'SomePerson', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class SomePersonTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/models/some_person_test.rb")
+      assert_match_in_file(/context "SomePerson Model"/m, "#{@apptmp}/sample_project/test/models/some_person_test.rb")
+      assert_match_in_file(/@some_person = SomePerson.new/m, "#{@apptmp}/sample_project/test/models/some_person_test.rb")
+      assert_match_in_file(/assert_not_nil @some_person/m, "#{@apptmp}/sample_project/test/models/some_person_test.rb")
+      assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_person_test.rb")
+    end
+
+    should "generate test file for shoulda in specified app" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda', '-d=activerecord') }
       silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'SomePerson', "-a=/subby", "-r=#{@apptmp}/sample_project") }
@@ -362,16 +404,28 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/context "SomePerson Model"/m, "#{@apptmp}/sample_project/test/subby/models/some_person_test.rb")
       assert_match_in_file(/@some_person = SomePerson.new/m, "#{@apptmp}/sample_project/test/subby/models/some_person_test.rb")
       assert_match_in_file(/assert_not_nil @some_person/m, "#{@apptmp}/sample_project/test/subby/models/some_person_test.rb")
+      assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_person_test.rb")
     end
 
     # TESTSPEC
     should "generate test file for testspec" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec', '-d=activerecord') }
+      silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/context "SomeUser Model"/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/@some_user = SomeUser.new/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/@some_user\.should\.not\.be\.nil/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+      assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb")
+    end
+
+    should "generate test file for testspec in specified app" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testspec', '-d=activerecord') }
       silence_logger { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/context "SomeUser Model"/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
       assert_match_in_file(/@some_user = SomeUser.new/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
       assert_match_in_file(/@some_user\.should\.not\.be\.nil/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
+      assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb")
     end
   end
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: 
-  version: 0.10.1
+  segments: 
+  - 0
+  - 10
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 -07:00
+date: 2011-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,6 +45,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id002
@@ -46,6 +60,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 4
+        - 1
         version: 2.4.1
   type: :runtime
   version_requirements: *id003
@@ -171,12 +190,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []