padrino-gen 0.9.18 → 0.9.19

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

@@ -197,10 +197,13 @@ module Padrino
           template "templates/helper.rb.tt", destination_root(app, "helpers.rb")
           @short_name = 'notifier'
           template "templates/mailer.rb.tt", destination_root(app, "mailers.rb")
+          empty_directory destination_root(app, "views", "layouts")
           empty_directory destination_root(app, "views", "mailers")
         else # generate standard folders
-          empty_directory destination_root("#{app}/controllers/")
-          empty_directory destination_root("#{app}/helpers/")
+          empty_directory destination_root(app, 'controllers')
+          empty_directory destination_root(app, 'helpers')
+          empty_directory destination_root(app, 'views')
+          empty_directory destination_root(app, 'views', 'layouts')
         end
       end
 

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

@@ -8,7 +8,7 @@ module Padrino
         #             :down => "..text...", column_format => "t.column :#{field}, :#{kind}" }
         def output_model_migration(filename, name, columns, options={})
           if behavior == :revoke
-            remove_migration(name)
+            remove_migration(filename)
           else
             return if migration_exist?(filename)
             model_name = name.to_s.pluralize

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

@@ -2,6 +2,8 @@ def setup_mock
   require_dependencies 'mocha', :group => 'test'
   case options[:test].to_s
     when 'rspec'
+      inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :mocha\n", :after => "RSpec.configure do |conf|\n"
+    when 'rspec1'
       inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :mocha\n", :after => "Spec::Runner.configure do |conf|\n"
     else
       insert_mocking_include "Mocha::API"

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

@@ -2,6 +2,8 @@ def setup_mock
   require_dependencies 'rr', :group => 'test'
   case options[:test].to_s
     when 'rspec'
+      inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :rr\n", :after => "RSpec.configure do |conf|\n"
+    when 'rspec1'
       inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :rr\n", :after => "Spec::Runner.configure do |conf|\n"
     when 'riot'
       inject_into_file "test/test_config.rb","require 'riot/rr'\n", :after => "\"/../config/boot\")\n"

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

@@ -92,12 +92,12 @@ def setup_orm
   when 'mysql'
     ar.gsub! /!DB_DEVELOPMENT!/, MYSQL.gsub(/!DB_NAME!/,"\"#{db}_development\"")
     ar.gsub! /!DB_PRODUCTION!/, MYSQL.gsub(/!DB_NAME!/,"\"#{db}_production\"")
-    ar.gsub! /!DB_TEST/, MYSQL.gsub(/!DB_NAME!/,"\"#{db}_test\"")
+    ar.gsub! /!DB_TEST!/, MYSQL.gsub(/!DB_NAME!/,"\"#{db}_test\"")
     require_dependencies 'mysql'
   when 'mysql2'
     ar.gsub! /!DB_DEVELOPMENT!/, MYSQL2.gsub(/!DB_NAME!/,"\"#{db}_development\"")
     ar.gsub! /!DB_PRODUCTION!/, MYSQL2.gsub(/!DB_NAME!/,"\"#{db}_production\"")
-    ar.gsub! /!DB_TEST/, MYSQL2.gsub(/!DB_NAME!/,"\"#{db}_test\"")
+    ar.gsub! /!DB_TEST!/, MYSQL2.gsub(/!DB_NAME!/,"\"#{db}_test\"")
     require_dependencies 'mysql2'
   when 'postgres'
     ar.gsub! /!DB_DEVELOPMENT!/, POSTGRES.gsub(/!DB_NAME!/,"\"#{db}_development\"")

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

@@ -9,6 +9,7 @@ COUCHREST
 
 def setup_orm
   require_dependencies 'couchrest'
+  require_dependencies 'couchrest_extended_document'
   require_dependencies 'json_pure'
   create_file("config/database.rb", COUCHREST.gsub(/!NAME!/, @app_name.underscore))
   empty_directory('app/models')

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

@@ -79,7 +79,7 @@ def setup_test
   create_file destination_root("features/add.feature"), CUCUMBER_FEATURE
   create_file destination_root("features/step_definitions/add_steps.rb"), CUCUMBER_STEP
   create_file destination_root("cucumber.yml"), CUCUMBER_YML
-  require_dependencies 'rspec', :require => 'spec', :group => 'test'
+  require_dependencies 'rspec', :group => 'test'
   insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
   create_file destination_root("spec/spec.rake"), RSPEC_RAKE
-end
+end

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

@@ -2,7 +2,7 @@ RSPEC_SETUP = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_SETUP)
 PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
-Spec::Runner.configure do |conf|
+RSpec.configure do |conf|
   conf.include Rack::Test::Methods
 end
 
@@ -29,11 +29,11 @@ end
 TEST
 
 RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = Dir['spec/**/*_spec.rb']
-  t.spec_opts  = %w(-fs --color)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "./spec/**/*_spec.rb"
+  # Put spec opts in a file named .rspec in root
 end
 TEST
 
@@ -50,7 +50,7 @@ TEST
 
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
-  require_dependencies 'rspec', :require => 'spec', :group => 'test'
+  require_dependencies 'rspec', :group => 'test'
   insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
   create_file destination_root("spec/spec.rake"), RSPEC_RAKE
 end

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

@@ -0,0 +1,67 @@
+RSPEC_SETUP = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_SETUP)
+PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+
+Spec::Runner.configure do |conf|
+  conf.include Rack::Test::Methods
+end
+
+def app
+  ##
+  # You can handle all padrino applications using instead:
+  #   Padrino.application
+  CLASS_NAME.tap { |app|  }
+end
+TEST
+
+RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_CONTROLLER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+
+describe "!NAME!Controller" do
+  before do
+    get "/"
+  end
+
+  it "returns hello world" do
+    last_response.body.should == "Hello World"
+  end
+end
+TEST
+
+RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
+require 'spec/rake/spectask'
+
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_files = Dir['spec/**/*_spec.rb']
+  t.spec_opts  = %w(-fs --color)
+end
+TEST
+
+RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+
+describe "!NAME! Model" do
+  let(:!DNAME!) { !NAME!.new }
+  it 'can be created' do
+    !DNAME!.should_not be_nil
+  end
+end
+TEST
+
+def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
+  require_dependencies 'rspec', :version => "~> 1.2.3", :require => 'spec', :group => 'test'
+  insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
+  create_file destination_root("spec/spec.rake"), RSPEC_RAKE
+end
+
+# Generates a controller test given the controllers name
+def generate_controller_test(name)
+  rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+  create_file destination_root("spec/controllers/#{name.to_s.underscore}_controller_spec.rb"), rspec_contents, :skip => true
+end
+
+def generate_model_test(name)
+  rspec_contents = RSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  create_file destination_root("spec/models/#{name.to_s.underscore}_spec.rb"), rspec_contents, :skip => true
+end

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

@@ -42,7 +42,7 @@ TEST
 SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_MODEL_TEST)
 require File.expand_path(File.dirname(__FILE__) + '/../test_config.rb')
 
-class !NAME!ControllerTest < Test::Unit::TestCase
+class !NAME!Test < Test::Unit::TestCase
   context "!NAME! Model" do
     should 'construct new instance' do
       @!DNAME! = !NAME!.new
@@ -56,6 +56,9 @@ def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'shoulda', :group => 'test'
   insert_test_suite_setup SHOULDA_SETUP
+  if options[:orm] == "activerecord"
+    inject_into_file destination_root("test/test_config.rb"), "require 'shoulda/active_record'\n\n", :before => /class.*?\n/
+  end
   create_file destination_root("test/test.rake"), SHOULDA_RAKE
 end
 

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

@@ -1,9 +1,10 @@
 require 'padrino-core/cli/base' unless defined?(Padrino::Cli::Base)
+require 'net/https'
 
 module Padrino
   module Generators
     class Plugin < Thor::Group
-      PLUGIN_URL = 'http://github.com/padrino/padrino-recipes/tree/master/plugins'
+      PLUGIN_URL = 'https://github.com/padrino/padrino-recipes/tree/master/plugins'
       # Add this generator to our padrino-gen
       Padrino::Generators.add_generator(:plugin, self)
 
@@ -29,7 +30,16 @@ module Padrino
       # Create the Padrino Plugin
       def setup_plugin
         if options[:list] # list method ran here
-          plugins = open(PLUGIN_URL).read.scan(%r{/plugins/(\w+)_plugin.rb}).uniq
+          plugins = {}
+          uri = URI.parse(PLUGIN_URL)
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true if uri.scheme == "https"
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http.start do
+            http.request_get(uri.path) do |res|
+              plugins = res.body.scan(%r{/plugins/(\w+)_plugin.rb}).uniq
+            end
+          end
           say "Available plugins:", :green
           say plugins.map { |plugin| "  - #{plugin}" }.join("\n")
         else # executing the plugin instructions
@@ -44,4 +54,4 @@ module Padrino
       end
     end # Plugins
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/project/public/index.html

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<title>
+			Welcome to Padrino
+		</title>
+		<style type="text/css">
+		body{
+		font-family:Helvetica,Arial,sans-serif;
+		line-height:150%;
+		}
+		ul,li{
+		list-style-type:none;
+		margin:0px;
+		padding:5px 0px 5px 0px;
+		margin-left:5px;
+		}
+		a{
+		color:#333;
+		}
+		</style>
+	</head>
+	<body>
+		<h1>
+			Welcome to Padrino.rb
+		</h1>
+		<p>
+			Thanks for choosing Padrino for your Development.<br />
+			To get you started you we collected some Tutorials and Links:<br />
+		</p>
+		<ul>
+			<li>
+				<a href="http://www.padrinorb.com/guides/blog-tutorial">Blog Tutorial</a>
+			</li>
+			<li>
+				<a href="http://www.padrinorb.com/guides/generators">Generators</a>
+			</li>
+			<li>
+				<a href="http://www.padrinorb.com/guides/development-commands">Development Commands</a>
+			</li>
+		</ul>
+		<p>
+			To define a new default site for your project please delete this <em>index.html</em> file from the <em>public</em> directory.
+		</p>
+	</body>
+</html>

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

@@ -21,17 +21,17 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino project"
 
-      class_option :app ,         :desc => "The application name",                          :aliases => '-n', :default => nil,      :type => :string
-      class_option :bundle,       :desc => "Run bundle install",                            :aliases => '-b', :default => false,    :type => :boolean
-      class_option :root,         :desc => "The root destination",                          :aliases => '-r', :default => ".",      :type => :string
-      class_option :dev,          :desc => "Use padrino from a git checkout",                                 :default => false,    :type => :boolean
-      class_option :tiny,         :desc => "Generate tiny app skeleton",                    :aliases => '-i', :default => false,    :type => :boolean
-      class_option :adapter,      :desc => "SQL adapter for ORM (sqlite, mysql, postgres)", :aliases => '-a', :default => "sqlite", :type => :string
-      class_option :template,     :desc => "Generate project from template",                :aliases => '-p', :default => nil,      :type => :string
+      class_option :app ,         :desc => "The application name",                                  :aliases => '-n', :default => nil,      :type => :string
+      class_option :bundle,       :desc => "Run bundle install",                                    :aliases => '-b', :default => false,    :type => :boolean
+      class_option :root,         :desc => "The root destination",                                  :aliases => '-r', :default => ".",      :type => :string
+      class_option :dev,          :desc => "Use padrino from a git checkout",                                         :default => false,    :type => :boolean
+      class_option :tiny,         :desc => "Generate tiny app skeleton",                            :aliases => '-i', :default => false,    :type => :boolean
+      class_option :adapter,      :desc => "SQL adapter for ORM (sqlite, mysql, mysql2, postgres)", :aliases => '-a', :default => "sqlite", :type => :string
+      class_option :template,     :desc => "Generate project from template",                        :aliases => '-p', :default => nil,      :type => :string
 
       # Definitions for the available customizable components
       component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic], :default => :none
-      component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot], :default => :none
+      component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec1, :rspec, :shoulda, :cucumber, :bacon, :testspec, :riot], :default => :none
       component_option :mock,       "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
       component_option :script,     "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools, :extcore, :dojo], :default => :none
       component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb, :erubis, :liquid], :default => :haml
@@ -80,7 +80,7 @@ module Padrino
           =================================================================
           #{name} is ready for development! Next, follow these steps:
           =================================================================
-          1) cd #{name}
+          1) cd #{options[:root]}/#{name}
           =================================================================
 
           TEXT
@@ -90,7 +90,7 @@ module Padrino
           =================================================================
           #{name} is ready for development! Next, follow these steps:
           =================================================================
-          1) cd #{name}
+          1) cd #{options[:root]}/#{name}
           2) bundle install
           =================================================================
 

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

@@ -9,7 +9,7 @@ module Padrino
       def project(options={})
         components = options.map { |component, value| "--#{component}=#{value}" }
         params = [name, *components].push("-r=#{destination_root("../")}")
-        say "=> Executing: padrino-gen #{name} #{params.join(" ")}", :magenta
+        say "=> Executing: padrino-gen project #{params.join(" ")}", :magenta
         Padrino.bin_gen(*params.unshift("project"))
       end
 
@@ -77,9 +77,9 @@ module Padrino
               template_file
             when template_file =~ /gist/ && template_file !~ /raw/
               raw_link, _ = *open(template_file).read.scan(/<a\s+href\s?\=\"(.*?)\"\>raw/)
-              raw_link ? "http://gist.github.com#{raw_link[0]}" : template_file
+              raw_link ? "https://gist.github.com#{raw_link[0]}" : template_file
             when File.extname(template_file).blank? # referencing official plugin (i.e hoptoad)
-              "http://github.com/padrino/padrino-recipes/raw/master/#{kind.to_s.pluralize}/#{template_file}_#{kind}.rb"
+              "https://github.com/padrino/padrino-recipes/raw/master/#{kind.to_s.pluralize}/#{template_file}_#{kind}.rb"
             else # local file on system
               File.expand_path(template_file)
             end

data/test/test_model_generator.rb

@@ -314,7 +314,7 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate test file for shoulda" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda', '-d=activerecord') }
       silence_logger { generate(:model, 'SomePerson', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class SomePersonControllerTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/models/some_person_test.rb")
+      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")
@@ -348,12 +348,13 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_no_file_exists("#{@apptmp}/sample_project/spec/models/user_spec.rb")
     end
 
-    should "destroy the model migration" do
+    should "destroy the right model migration" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
-      silence_logger { generate(:model, 'Person', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:model, 'User', "-r=#{@apptmp}/sample_project") }
-      silence_logger { generate(:model, 'User', "-r=#{@apptmp}/sample_project", '-d') }
-      assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_create_users.rb")
+      silence_logger { generate(:model, 'bar_foo', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'foo', "-r=#{@apptmp}/sample_project") }
+      silence_logger { generate(:model, 'foo', "-r=#{@apptmp}/sample_project", '-d') }
+      assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_create_foos.rb")
+      assert_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_bar_foos.rb")
     end
   end
 end

data/test/test_plugin_generator.rb

@@ -51,9 +51,9 @@ class TestPluginGenerator < Test::Unit::TestCase
     end
 
     should "resolve gist url properly" do
-      FakeWeb.register_uri(:get, "http://gist.github.com/357045", :body => '<a href="/raw/357045/4356/blog_template.rb">raw</a>')
-      template_file = 'http://gist.github.com/357045'
-      resolved_path = 'http://gist.github.com/raw/357045/4356/blog_template.rb'
+      FakeWeb.register_uri(:get, "https://gist.github.com/357045", :body => '<a href="/raw/357045/4356/blog_template.rb">raw</a>')
+      template_file = 'https://gist.github.com/357045'
+      resolved_path = 'https://gist.github.com/raw/357045/4356/blog_template.rb'
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
       project_gen.expects(:apply).with(resolved_path).returns(true).once
       silence_logger { project_gen.invoke_all }
@@ -61,7 +61,7 @@ class TestPluginGenerator < Test::Unit::TestCase
 
     should "resolve official template" do
       template_file = 'sampleblog'
-      resolved_path = "http://github.com/padrino/padrino-recipes/raw/master/templates/sampleblog_template.rb"
+      resolved_path = "https://github.com/padrino/padrino-recipes/raw/master/templates/sampleblog_template.rb"
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
       project_gen.expects(:apply).with(resolved_path).returns(true).once
       silence_logger { project_gen.invoke_all }
@@ -76,7 +76,7 @@ class TestPluginGenerator < Test::Unit::TestCase
 
     should "resolve official plugin" do
       template_file = 'hoptoad'
-      resolved_path = "http://github.com/padrino/padrino-recipes/raw/master/plugins/hoptoad_plugin.rb"
+      resolved_path = "https://github.com/padrino/padrino-recipes/raw/master/plugins/hoptoad_plugin.rb"
       plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{})
       plugin_gen.expects(:in_app_root?).returns(true).once
       plugin_gen.expects(:apply).with(resolved_path).returns(true).once

data/test/test_project_generator.rb

@@ -8,6 +8,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
   def teardown
     `rm -rf #{@apptmp}`
+    `rm -rf /tmp/project`
   end
 
   context 'the project generator' do
@@ -18,6 +19,8 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/Padrino.mount\("SampleProject"\).to\('\/'\)/,"#{@apptmp}/sample_project/config/apps.rb")
       assert_file_exists("#{@apptmp}/sample_project/config/boot.rb")
       assert_file_exists("#{@apptmp}/sample_project/public/favicon.ico")
+      assert_dir_exists("#{@apptmp}/sample_project/app/views")
+      assert_dir_exists("#{@apptmp}/sample_project/app/views/layouts")
     end
 
     should "generate a valid name" do
@@ -26,6 +29,13 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/class ProjectCom < Padrino::Application/,"#{@apptmp}/project.com/app/app.rb")
       assert_match_in_file(/Padrino.mount\("ProjectCom"\).to\('\/'\)/,"#{@apptmp}/project.com/config/apps.rb")
     end
+    
+    should "display the right path" do
+      buffer = silence_logger { generate(:project, 'project', "--root=/tmp") }
+      assert_file_exists("/tmp/project")
+      assert_match(/cd \/tmp\/project/, buffer)
+    end
+    
 
     should "allow specifying alternate application name" do
       assert_nothing_raised { silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--app=base_app') } }
@@ -44,6 +54,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/app/helpers.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/mailers.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers")
+      assert_dir_exists("#{@apptmp}/sample_project/app/views/layouts")
       assert_match_in_file(/:notifier/,"#{@apptmp}/sample_project/app/mailers.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/helpers")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/controllers")
@@ -128,6 +139,13 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/conf.mock_with :mocha/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
     end
 
+    should "properly generate for mocha and rspec1" do
+      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}",'--test=rspec1', '--mock=mocha', '--script=none') }
+      assert_match(/Applying.*?mocha.*?mock/, buffer)
+      assert_match_in_file(/gem 'mocha'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/conf.mock_with :mocha/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+    end
+
     should "properly generate for rr and rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec', '--mock=rr', '--script=none') }
       assert_match(/Applying.*?rr.*?mock/, buffer)
@@ -135,6 +153,13 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/conf.mock_with :rr/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
     end
 
+    should "properly generate for rr and rspec1" do
+      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec1', '--mock=rr', '--script=none') }
+      assert_match(/Applying.*?rr.*?mock/, buffer)
+      assert_match_in_file(/gem 'rr'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/conf.mock_with :rr/m, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+    end
+
   end
 
   context "the generator for orm components" do
@@ -278,7 +303,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "properly generate for ohm" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=ohm', '--script=none') }
-      assert_match /Applying.*?ohm.*?orm/, buffer
+      assert_match(/Applying.*?ohm.*?orm/, buffer)
       assert_match_in_file(/gem 'json'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'ohm'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'ohm-contrib', :require => "ohm\/contrib"/, "#{@apptmp}/sample_project/Gemfile")
@@ -288,7 +313,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "properly generate for mongomatic" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=mongomatic', '--script=none') }
-      assert_match /Applying.*?mongomatic.*?orm/, buffer
+      assert_match(/Applying.*?mongomatic.*?orm/, buffer)
       assert_match_in_file(/gem 'bson_ext'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'mongomatic'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/Mongomatic.db = Mongo::Connection.new.db/, "#{@apptmp}/sample_project/config/database.rb")
@@ -396,15 +421,27 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
     end
 
+    should "properly generate for rspec1" do
+      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec1', '--script=none') }
+      assert_match(/Applying.*?rspec.*?test/, buffer)
+      assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/:require => "rack\/test"/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/:group => "test"/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'rspec'.*?"~>\s*1.2.3".*?:require => "spec"/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/Spec::Runner/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_file_exists("#{@apptmp}/sample_project/spec/spec.rake")
+    end
+    
     should "properly generate for rspec" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec', '--script=none') }
       assert_match(/Applying.*?rspec.*?test/, buffer)
       assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/:require => "rack\/test"/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/:group => "test"/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/gem 'rspec'.*?:require => "spec"/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'rspec'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
-      assert_match_in_file(/Spec::Runner/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/RSpec.configure/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/spec/spec.rake")
     end
 
@@ -438,12 +475,12 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/:require => "rack\/test"/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/:group => "test"/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/gem 'rspec'.*?:require => "spec"/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'rspec'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'cucumber'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'capybara'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/features/support/env.rb")
-      assert_match_in_file(/Spec::Runner/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/RSpec.configure/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
       assert_match_in_file(/World\(Cucumber::Web::URLs\)/, "#{@apptmp}/sample_project/features/support/url.rb")
       assert_file_exists("#{@apptmp}/sample_project/spec/spec.rake")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 9
-  - 18
-  version: 0.9.18
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 9
-        - 18
-        version: 0.9.18
+        - 19
+        version: 0.9.19
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - lib/padrino-gen/generators/components/tests/cucumber.rb
 - lib/padrino-gen/generators/components/tests/riot.rb
 - lib/padrino-gen/generators/components/tests/rspec.rb
+- lib/padrino-gen/generators/components/tests/rspec1.rb
 - lib/padrino-gen/generators/components/tests/shoulda.rb
 - lib/padrino-gen/generators/components/tests/testspec.rb
 - lib/padrino-gen/generators/controller.rb
@@ -130,6 +131,7 @@ files:
 - lib/padrino-gen/generators/project/config/boot.rb
 - lib/padrino-gen/generators/project/config.ru
 - lib/padrino-gen/generators/project/public/favicon.ico
+- lib/padrino-gen/generators/project/public/index.html
 - lib/padrino-gen/generators/project.rb
 - lib/padrino-gen/generators/runner.rb
 - lib/padrino-gen/generators/templates/controller.rb.tt