padrino-gen 0.7.9 → 0.8.0

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.7.9"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-02-14}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{padrinorb@gmail.com}
@@ -29,21 +29,10 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators.rb",
      "lib/padrino-gen/generators/actions.rb",
      "lib/padrino-gen/generators/app.rb",
-     "lib/padrino-gen/generators/app/.gitignore",
-     "lib/padrino-gen/generators/app/app/.empty_directory",
-     "lib/padrino-gen/generators/app/app/app.rb.tt",
-     "lib/padrino-gen/generators/app/app/controllers/.empty_directory",
-     "lib/padrino-gen/generators/app/app/helpers/.empty_directory",
-     "lib/padrino-gen/generators/app/app/views/.empty_directory",
-     "lib/padrino-gen/generators/app/config.ru",
-     "lib/padrino-gen/generators/app/config/apps.rb.tt",
-     "lib/padrino-gen/generators/app/config/boot.rb",
-     "lib/padrino-gen/generators/app/config/initializers/.empty_directory",
-     "lib/padrino-gen/generators/app/config/initializers/example.rb",
-     "lib/padrino-gen/generators/app/public/images/.empty_directory",
-     "lib/padrino-gen/generators/app/public/javascripts/.empty_directory",
-     "lib/padrino-gen/generators/app/public/stylesheets/.empty_directory",
-     "lib/padrino-gen/generators/app/tmp/.empty_directory",
+     "lib/padrino-gen/generators/app/app.rb.tt",
+     "lib/padrino-gen/generators/app/controllers/.empty_directory",
+     "lib/padrino-gen/generators/app/helpers/.empty_directory",
+     "lib/padrino-gen/generators/app/views/.empty_directory",
      "lib/padrino-gen/generators/components/actions.rb",
      "lib/padrino-gen/generators/components/mocks/mocha_gen.rb",
      "lib/padrino-gen/generators/components/mocks/rr_gen.rb",
@@ -66,6 +55,22 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/generators/mailer.rb",
      "lib/padrino-gen/generators/migration.rb",
      "lib/padrino-gen/generators/model.rb",
+     "lib/padrino-gen/generators/project.rb",
+     "lib/padrino-gen/generators/project/.gitignore",
+     "lib/padrino-gen/generators/project/app/.empty_directory",
+     "lib/padrino-gen/generators/project/app/app.rb.tt",
+     "lib/padrino-gen/generators/project/app/controllers/.empty_directory",
+     "lib/padrino-gen/generators/project/app/helpers/.empty_directory",
+     "lib/padrino-gen/generators/project/app/views/.empty_directory",
+     "lib/padrino-gen/generators/project/config.ru",
+     "lib/padrino-gen/generators/project/config/apps.rb.tt",
+     "lib/padrino-gen/generators/project/config/boot.rb",
+     "lib/padrino-gen/generators/project/config/initializers/.empty_directory",
+     "lib/padrino-gen/generators/project/config/initializers/example.rb",
+     "lib/padrino-gen/generators/project/public/images/.empty_directory",
+     "lib/padrino-gen/generators/project/public/javascripts/.empty_directory",
+     "lib/padrino-gen/generators/project/public/stylesheets/.empty_directory",
+     "lib/padrino-gen/generators/project/tmp/.empty_directory",
      "lib/padrino-gen/generators/templates/Gemfile.tt",
      "lib/padrino-gen/generators/templates/controller.rb.tt",
      "lib/padrino-gen/generators/templates/helper.rb.tt",
@@ -81,11 +86,13 @@ Gem::Specification.new do |s|
      "padrino-gen.gemspec",
      "test/helper.rb",
      "test/test_app_generator.rb",
+     "test/test_cli.rb",
      "test/test_controller_generator.rb",
      "test/test_generator.rb",
      "test/test_mailer_generator.rb",
      "test/test_migration_generator.rb",
-     "test/test_model_generator.rb"
+     "test/test_model_generator.rb",
+     "test/test_project_generator.rb"
   ]
   s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-gen}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -100,22 +107,22 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.7.9"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.0"])
       s.add_runtime_dependency(%q<thor>, [">= 0.13.0"])
       s.add_runtime_dependency(%q<bundler>, [">= 0.9.3"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.7.9"])
+      s.add_dependency(%q<padrino-core>, ["= 0.8.0"])
       s.add_dependency(%q<thor>, [">= 0.13.0"])
       s.add_dependency(%q<bundler>, [">= 0.9.3"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
@@ -123,11 +130,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.7.9"])
+    s.add_dependency(%q<padrino-core>, ["= 0.8.0"])
     s.add_dependency(%q<thor>, [">= 0.13.0"])
     s.add_dependency(%q<bundler>, [">= 0.9.3"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])
     s.add_dependency(%q<webrat>, [">= 0.5.1"])

data/test/helper.rb

@@ -15,7 +15,8 @@ end
 
 require 'padrino-gen'
 
-Padrino::Generators::Cli.start
+Padrino::Generators.setup!
+Padrino::Generators.lockup!
 
 class Test::Unit::TestCase
   include Rack::Test::Methods
@@ -50,28 +51,27 @@ class Test::Unit::TestCase
     raise "Please specify a block!" if html.blank?
     assert matcher.matches?(html), matcher.failure_message
   end
-  
+
   # assert_file_exists('/tmp/app')
   def assert_file_exists(file_path)
     assert File.exist?(file_path), "File at path '#{file_path}' does not exist!"
   end
-  alias assert_dir_exists assert_file_exists
-  
+  alias :assert_dir_exists :assert_file_exists
+
   # assert_no_file_exists('/tmp/app')
   def assert_no_file_exists(file_path)
     assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!"
   end
-  alias assert_no_dir_exists assert_no_file_exists
+  alias :assert_no_dir_exists :assert_no_file_exists
 
   # Asserts that a file matches the pattern
   def assert_match_in_file(pattern, file)
     File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file)
   end
-  
+
   def assert_no_match_in_file(pattern, file)
     File.exists?(file) ? !assert_match(pattern, File.read(file)) : assert_file_exists(file)
   end
-  
 end
 
 class Object

data/test/test_app_generator.rb

@@ -4,215 +4,51 @@ require 'fakeweb'
 
 class TestAppGenerator < Test::Unit::TestCase
   def setup
-    Padrino::Generators.lockup!
     FakeWeb.allow_net_connect = false
-    `rm -rf /tmp/sample_app`
-    @app = Padrino::Generators::App.dup
+    `rm -rf /tmp/sample_project`
+    @project = Padrino::Generators::Project.dup
+    @app     = Padrino::Generators::App.dup
+    @cont_gen = Padrino::Generators::Controller.dup
+    @mail_gen = Padrino::Generators::Mailer.dup
   end
 
-  context 'the App generator' do
-    should "allow simple generator to run and create base_app with no options" do
-      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')
-      assert_dir_exists('/tmp/sample_app/app/models')
-      assert_file_exists('/tmp/sample_app/test/test_config.rb')
+  context 'the app generator' do
+    should "fail outside app root" do
+      output = silence_logger { @app.start(['demo', '-r=/tmp']) }
+      assert_match(/not at the root/, output)
+      assert_no_file_exists('/tmp/demo')
     end
 
-    should "not create models folder if no orm is chosen" do
-      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '--orm=none']) }
-      assert_no_dir_exists('/tmp/sample_app/app/models')
+    should "create correctly a new padrino application" do
+      assert_nothing_raised { silence_logger { @project.start(['sample_project', '--root=/tmp']) } }
+      assert_nothing_raised { silence_logger { @app.start(['demo', '--root=/tmp/sample_project']) } }
+      assert_file_exists('/tmp/sample_project')
+      assert_file_exists('/tmp/sample_project/demo')
+      assert_file_exists('/tmp/sample_project/demo/app.rb')
+      assert_file_exists('/tmp/sample_project/demo/controllers')
+      assert_file_exists('/tmp/sample_project/demo/helpers')
+      assert_file_exists('/tmp/sample_project/demo/views')
+      assert_match_in_file 'Padrino.mount("Demo").to("/demo")', '/tmp/sample_project/config/apps.rb'
+      assert_match_in_file 'class Demo < Padrino::Application', '/tmp/sample_project/demo/app.rb'
     end
 
-    should "not create tests folder if no test framework is chosen" do
-      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '--test=none']) }
-      assert_no_dir_exists('/tmp/sample_app/test')
+    should "correctly create a new controller inside a padrino application" do
+      silence_logger { @project.start(['sample_project', '--root=/tmp']) }
+      silence_logger { @app.start(['demo', '--root=/tmp/sample_project']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project', '-a=demo']) }
+      assert_match_in_file(/SampleProject.controllers :demo_items do/m, '/tmp/sample_project/demo/controllers/demo_items.rb')
+      assert_match_in_file(/SampleProject.helpers do/m, '/tmp/sample_project/demo/helpers/demo_items_helper.rb')
+      assert_file_exists('/tmp/sample_project/demo/views/demo_items')
     end
 
-    should "place app specific names into correct files" do
-      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')
+    should "correctly create a new mailer inside a padrino application" do
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['demo', '--root=/tmp/sample_project']) }
+      silence_logger { @mail_gen.start(['demo', '-r=/tmp/sample_project', '-a=demo']) }
+      assert_match_in_file(/class DemoMailer < Padrino::Mailer::Base/m, '/tmp/sample_project/demo/mailers/demo_mailer.rb')
+      assert_match_in_file(/Padrino::Mailer::Base.smtp_settings/m, '/tmp/sample_project/config/initializers/mailer.rb')
+      assert_file_exists('/tmp/sample_project/demo/views/demo_mailer')
     end
 
-    should "create components file containing options chosen with defaults" do
-      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]
-      assert_equal 'mocha', components_chosen[:mock]
-      assert_equal 'jquery', components_chosen[:script]
-      assert_equal 'erb', components_chosen[:renderer]
-    end
-
-    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', '--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]
-      assert_equal 'mocha',     components_chosen[:mock]
-      assert_equal 'prototype', components_chosen[:script]
-      assert_equal 'erb',   components_chosen[:renderer]
-    end
-
-    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', '--root=/tmp', *component_options]) }
-      assert_match /Applying.*?datamapper.*?orm/, buffer
-      assert_match /Applying.*?riot.*?test/, buffer
-      assert_match /Applying.*?mocha.*?mock/, buffer
-      assert_match /Applying.*?prototype.*?script/, buffer
-      assert_match /Applying.*?erb.*?renderer/, buffer
-    end
-
-    should "output gem files for base app" do
-      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')
-      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_app/Gemfile')
-    end
-  end
-
-  context "a generator for mock component" do
-    should "properly generate for rr" do
-      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', '--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')
-    end
-  end
-
-  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', '--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')
-      assert_dir_exists('/tmp/sample_app/app/models')
-    end
-
-    should "properly generate for activerecord" do
-      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', :require => "active_record"/, '/tmp/sample_app/Gemfile')
-      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', '--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')
-      assert_dir_exists('/tmp/sample_app/app/models')
-    end
-
-    should "properly generate for mongomapper" do
-      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')
-      assert_dir_exists('/tmp/sample_app/app/models')
-    end
-
-    should "properly generate for couchrest" do
-      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')
-      assert_dir_exists('/tmp/sample_app/app/models')
-    end
-  end
-
-  context "the generator for renderer component" do
-    should "properly generate default for erb" do
-      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', '--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')
-    end
-  end
-
-  context "the generator for script component" do
-    should "properly generate for jquery" do
-      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')
-    end
-
-    should "properly generate for prototype" do
-      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')
-    end
-
-    should "properly generate for rightjs" do
-      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')
-    end
-  end
-
-  context "the generator for test component" do
-    should "properly default generate for bacon" do
-      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(/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', '--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(/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', '--root=/tmp', '--test=rspec', '--script=none']) }
-      assert_match /Applying.*?rspec.*?test/, buffer
-      assert_match_in_file(/gem 'rspec'.*?:require => "spec"/, '/tmp/sample_app/Gemfile')
-      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', '--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(/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', '--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(/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
 end

data/test/test_cli.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/helper'
+require 'thor/group'
+require 'fakeweb'
+
+class TestCli < Test::Unit::TestCase
+  def setup
+    FakeWeb.allow_net_connect = false
+    `rm -rf /tmp/sample_project`
+    @cli     = Padrino::Generators::Cli.dup
+    @project = Padrino::Generators::Project.dup
+  end
+
+  context 'the cli' do
+
+    should "fail without arguments" do
+      output = silence_logger { @cli.start }
+      assert_match "Please specify generator to use", output
+    end
+
+    should "work correctly if we have a project" do
+      silence_logger { @project.start(['sample_project', '--root=/tmp']) }
+      assert_nothing_raised { silence_logger { @cli.start(['--root=/tmp/sample_project']) } }
+    end
+  end
+end

data/test/test_controller_generator.rb

@@ -3,57 +3,64 @@ require 'thor/group'
 
 class TestControllerGenerator < Test::Unit::TestCase
   def setup
-    Padrino::Generators.lockup!
-    @app = Padrino::Generators::App.dup
-    @contgen = Padrino::Generators::Controller.dup
-    @controller_path = '/tmp/sample_app/app/controllers/demo_items.rb'
-    @controller_test_path = '/tmp/sample_app/test/controllers/demo_items_controller_test.rb'
-    # @route_path = '/tmp/sample_app/config/urls.rb'
-    `rm -rf /tmp/sample_app`
+    @project = Padrino::Generators::Project.dup
+    @cont_gen = Padrino::Generators::Controller.dup
+    @controller_path = '/tmp/sample_project/app/controllers/demo_items.rb'
+    @controller_test_path = '/tmp/sample_project/test/controllers/demo_items_controller_test.rb'
+    `rm -rf /tmp/sample_project`
   end
 
   context 'the controller generator' do
     should "fail outside app root" do
-      output = silence_logger { @contgen.start(['demo', '-r=/tmp']) }
+      output = silence_logger { @cont_gen.start(['demo', '-r=/tmp']) }
       assert_match(/not at the root/, output)
       assert_no_file_exists('/tmp/app/controllers/demo.rb')
     end
 
+    should 'not fail if we don\'t have test component' do
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--test=none']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
+      assert_match_in_file(/SampleProject.helpers do/m, '/tmp/sample_project/app/helpers/demo_items_helper.rb')
+      assert_file_exists('/tmp/sample_project/app/views/demo_items')
+      assert_no_file_exists("/tmp/sample_project/test")
+    end
+
     should "generate controller within existing application" do
-      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')
-      assert_file_exists('/tmp/sample_app/app/views/demo_items')
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
+      assert_match_in_file(/SampleProject.helpers do/m, '/tmp/sample_project/app/helpers/demo_items_helper.rb')
+      assert_file_exists('/tmp/sample_project/app/views/demo_items')
     end
 
     should "generate controller test for bacon" do
-      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=bacon']) }
-      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for riot" do
-      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=riot']) }
-      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=riot']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for testspec" do
-      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=testspec']) }
-      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=testspec']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
       assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path)
     end
 
     should "generate controller test for rspec" do
-      silence_logger { @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')
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=rspec']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
+      assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_project/test/controllers/demo_items_controller_spec.rb')
     end
 
     should "generate controller test for shoulda" do
-      silence_logger { @app.start(['sample_app', '--root=/tmp', '--script=none', '-t=shoulda']) }
-      silence_logger { @contgen.start(['demo_items', '-r=/tmp/sample_app']) }
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=shoulda']) }
+      silence_logger { @cont_gen.start(['demo_items', '-r=/tmp/sample_project']) }
       expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m
       assert_match_in_file(expected_pattern, @controller_test_path)
     end
@@ -61,45 +68,38 @@ class TestControllerGenerator < Test::Unit::TestCase
     # Controller action generation
 
     should "generate actions for get:test post:yada" do
-      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']) }
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=shoulda'])}
+      silence_logger { @cont_gen.start(['demo_items', "get:test", "post:yada",'-r=/tmp/sample_project']) }
       assert_match_in_file(/get :test do\n  end\n/m,@controller_path)
       assert_match_in_file(/post :yada do\n  end\n/m,@controller_path)
     end
 
-    should "generate url routes for get:yoda post:yada" do
-      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)
-    end
-
   end
 
   context "the controller destroy option" do
 
     should "destroy controller files" do
-      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'])}
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon'])}
+      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project']) }
+      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project','-d'])}
       assert_no_file_exists(@controller_path)
       assert_no_file_exists(@controller_test_path)
-      assert_no_file_exists('/tmp/sample_app/app/helpers/demo_items_helper.rb')
+      assert_no_file_exists('/tmp/sample_project/app/helpers/demo_items_helper.rb')
     end
 
     should "destroy controller files with rspec" do
-      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'])}
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=rspec'])}
+      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project']) }
+      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project','-d'])}
       assert_no_file_exists(@controller_path)
-      assert_no_file_exists('/tmp/sample_app/app/helpers/demo_items_helper.rb')
-      assert_no_file_exists('/tmp/sample_app/test/controllers/demo_items_controller_spec.rb')
+      assert_no_file_exists('/tmp/sample_project/app/helpers/demo_items_helper.rb')
+      assert_no_file_exists('/tmp/sample_project/test/controllers/demo_items_controller_spec.rb')
     end
     
     should "remove url routes" do
-      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'])}
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon'])}
+      silence_logger { @cont_gen.start(['demo_items', "get:yoda","post:yada",'-r=/tmp/sample_project']) }
+      silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project','-d'])}
       # assert_no_match_in_file(/map\(\:yoda\).to\(\"\/demo_items\/yoda\"\)/m,@route_path)
       # assert_no_match_in_file(/map\(\:yada\).to\(\"\/demo_items\/yada\"\)/m,@route_path)
     end

data/test/test_generator.rb

@@ -1,9 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestGenerator < Test::Unit::TestCase
-  def setup
-    Padrino::Generators.lockup!
-  end
 
   context "the generator" do
     should "have default generators" do