padrino-gen 0.2.2 → 0.2.5

data/README.rdoc

@@ -74,7 +74,7 @@ If not executed manually, the bundling will be performed automatically the first
 Note that this command only has to be performed when the application is first generated or when the Gemfile is modified.
  
 The generator framework within padrino is extensible and additional components and tools can be added easily.
-This would be achieved through forking our project and reading through the code in <tt>lib/generators/skeleton.rb</tt> and
+This would be achieved through forking our project and reading through the code in <tt>lib/generators/App.rb</tt> and
 the setup instructions inside the relevant files within <tt>lib/generators/components/</tt>. We are happy to accept pull requests
 for additional component types not originally included (although helping us maintain them would also be appreciated).
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.5

data/bin/padrino-gen

@@ -2,19 +2,15 @@
 %w[rubygems thor].each { |gem| require gem }
 require File.dirname(__FILE__) + "/../lib/padrino-gen"
 
-generator_mappings = SupportLite::OrderedHash.new
-generator_mappings[:app]        = Padrino::Generators::Skeleton
-generator_mappings[:model]      = Padrino::Generators::Model
-generator_mappings[:migration]  = Padrino::Generators::Migration
-generator_mappings[:controller] = Padrino::Generators::Controller
-generator_mappings[:mailer]     = Padrino::Generators::Mailer
+Padrino::Generators::Base.start(ARGV)
+Padrino::Generators.lockup!
 
-generator_kind = ARGV.delete_at(0).to_s.downcase.to_sym if ARGV[0].present?
-generator_class = generator_mappings[generator_kind]
+generator_kind  = ARGV.delete_at(0).to_s.downcase.to_sym if ARGV[0].present?
+generator_class = Padrino::Generators.mappings[generator_kind]
 arguments = ARGV.any? ? ARGV : ['-h']
 
-if generator_class 
+if generator_class
   generator_class.start(arguments)
 else
-  puts "Please specify generator to use (#{generator_mappings.keys.join(", ")})"
+  puts "Please specify generator to use (#{Padrino::Generators.mappings.keys.join(", ")})"
 end

data/lib/{generators/skeleton.rb → padrino-gen/generators/app.rb}

@@ -2,7 +2,11 @@ require 'thor'
 
 module Padrino
   module Generators
-    class Skeleton < Thor::Group
+    class App < Thor::Group
+
+      # Add this generator to our padrino-gen
+      Padrino::Generators.add_generator(:app, self)
+
       # Define the source template root
       def self.source_root; File.dirname(__FILE__); end
       def self.banner; "padrino-gen project [name] [path] [options]"; end
@@ -25,11 +29,11 @@ module Padrino
       component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs]
       component_option :renderer, "template engine",    :aliases => '-r', :choices => [:erb, :haml]
 
-      # Copies over the Padrino base application skeleton
-      def setup_skeleton
+      # Copies over the Padrino base application App
+      def setup_app
         self.destination_root = File.join(path, name)
         @class_name = name.classify
-        directory("skeleton/", self.destination_root)
+        directory("app/", self.destination_root)
         store_component_config('.components')
       end
 

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

@@ -0,0 +1,25 @@
+require 'thor'
+
+module Padrino
+  module Generators
+
+    class Base < Thor::Group
+
+      # Include related modules
+      include Thor::Actions
+      include Padrino::Generators::Actions
+
+      class_option :root, :aliases => '-r', :default => nil, :type => :string
+
+      # Copies over the base sinatra starting project
+      def load_boot
+        if in_app_root?(options[:root])
+          require(options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb')
+        else
+          say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
+        end
+      end
+    end
+
+  end
+end

data/lib/{generators → padrino-gen/generators}/controller.rb

@@ -4,6 +4,10 @@ module Padrino
   module Generators
 
     class Controller < Thor::Group
+
+      # Add this generator to our padrino-gen
+      Padrino::Generators.add_generator(:controller, self)
+
       # Define the source template root
       def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       def self.banner; "padrino-gen controller [name]"; end

data/lib/{generators → padrino-gen/generators}/mailer.rb

@@ -4,6 +4,10 @@ module Padrino
   module Generators
 
     class Mailer < Thor::Group
+
+      # Add this generator to our padrino-gen
+      Padrino::Generators.add_generator(:mailer, self)
+
       # Define the source template root
       def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       def self.banner; "padrino-gen mailer [name]"; end

data/lib/{generators → padrino-gen/generators}/migration.rb

@@ -4,6 +4,10 @@ module Padrino
   module Generators
 
     class Migration < Thor::Group
+
+      # Add this generator to our padrino-gen
+      Padrino::Generators.add_generator(:migration, self)
+
       # Define the source template root
       def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       def self.banner; "padrino-gen migration [name] [fields]"; end

data/lib/{generators → padrino-gen/generators}/model.rb

@@ -4,6 +4,10 @@ module Padrino
   module Generators
 
     class Model < Thor::Group
+
+      # Add this generator to our padrino-gen
+      Padrino::Generators.add_generator(:model, self)
+
       # Define the source template root
       def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       def self.banner; "padrino-gen model [name] [fields]"; end

data/lib/padrino-gen.rb

@@ -1,4 +1,27 @@
 require 'padrino-core/support_lite'
-Dir[File.dirname(__FILE__) + "/generators/{components}/**/*.rb"].each { |lib| require lib }
-require File.dirname(__FILE__) + "/generators/actions.rb"
-Dir[File.dirname(__FILE__) + "/generators/{skeleton,mailer,controller,model,migration}.rb"].each { |lib| require lib }
+Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{components}/**/*.rb'].each { |lib| require lib }
+require File.dirname(__FILE__) + '/padrino-gen/generators/actions.rb'
+require File.dirname(__FILE__) + '/padrino-gen/generators/base.rb'
+
+module Padrino
+  module Generators
+
+    class << self
+      def load_paths
+        @load_paths ||= Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{app,mailer,controller,model,migration}.rb']
+      end
+
+      def mappings
+        @mappings ||= SupportLite::OrderedHash.new
+      end
+
+      def add_generator(name, klass)
+        mappings[name] = klass
+      end
+
+      def lockup!
+        load_paths.each { |lib| require lib  }
+      end
+    end
+  end
+end

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.2.2"
+  s.version = "0.2.5"
 
   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{2009-12-01}
+  s.date = %q{2009-12-21}
   s.default_executable = %q{padrino-gen}
   s.description = %q{Generators for easily creating and building padrino applications from the console}
   s.email = %q{nesquena@gmail.com}
@@ -25,64 +25,66 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/padrino-gen",
-     "lib/generators/actions.rb",
-     "lib/generators/components/actions.rb",
-     "lib/generators/components/mocks/mocha_gen.rb",
-     "lib/generators/components/mocks/rr_gen.rb",
-     "lib/generators/components/orms/activerecord_gen.rb",
-     "lib/generators/components/orms/couchrest_gen.rb",
-     "lib/generators/components/orms/datamapper_gen.rb",
-     "lib/generators/components/orms/mongomapper_gen.rb",
-     "lib/generators/components/orms/sequel_gen.rb",
-     "lib/generators/components/renderers/erb_gen.rb",
-     "lib/generators/components/renderers/haml_gen.rb",
-     "lib/generators/components/scripts/jquery_gen.rb",
-     "lib/generators/components/scripts/prototype_gen.rb",
-     "lib/generators/components/scripts/rightjs_gen.rb",
-     "lib/generators/components/tests/bacon_test_gen.rb",
-     "lib/generators/components/tests/riot_test_gen.rb",
-     "lib/generators/components/tests/rspec_test_gen.rb",
-     "lib/generators/components/tests/shoulda_test_gen.rb",
-     "lib/generators/components/tests/testspec_test_gen.rb",
-     "lib/generators/controller.rb",
-     "lib/generators/mailer.rb",
-     "lib/generators/migration.rb",
-     "lib/generators/model.rb",
-     "lib/generators/skeleton.rb",
-     "lib/generators/skeleton/.gitignore",
-     "lib/generators/skeleton/Gemfile",
-     "lib/generators/skeleton/app/.empty_directory",
-     "lib/generators/skeleton/app/app.rb.tt",
-     "lib/generators/skeleton/app/controllers/.empty_directory",
-     "lib/generators/skeleton/app/helpers/.empty_directory",
-     "lib/generators/skeleton/app/views/.empty_directory",
-     "lib/generators/skeleton/config.ru",
-     "lib/generators/skeleton/config/apps.rb.tt",
-     "lib/generators/skeleton/config/boot.rb",
-     "lib/generators/skeleton/config/initializers/.empty_directory",
-     "lib/generators/skeleton/config/initializers/example.rb",
-     "lib/generators/skeleton/config/urls.rb.tt",
-     "lib/generators/skeleton/lib/.empty_directory",
-     "lib/generators/skeleton/public/images/.empty_directory",
-     "lib/generators/skeleton/public/javascripts/.empty_directory",
-     "lib/generators/skeleton/public/stylesheets/.empty_directory",
-     "lib/generators/skeleton/tmp/.empty_directory",
-     "lib/generators/templates/controller.rb.tt",
-     "lib/generators/templates/helper.rb.tt",
-     "lib/generators/templates/mailer.rb.tt",
-     "lib/generators/templates/mailer_initializer.rb.tt",
-     "lib/generators/templates/scripts/jquery.js",
-     "lib/generators/templates/scripts/lowpro.js",
-     "lib/generators/templates/scripts/protopak.js",
-     "lib/generators/templates/scripts/right.js",
      "lib/padrino-gen.rb",
+     "lib/padrino-gen/generators/actions.rb",
+     "lib/padrino-gen/generators/app.rb",
+     "lib/padrino-gen/generators/app/.gitignore",
+     "lib/padrino-gen/generators/app/Gemfile",
+     "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/config/urls.rb.tt",
+     "lib/padrino-gen/generators/app/lib/.empty_directory",
+     "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/base.rb",
+     "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",
+     "lib/padrino-gen/generators/components/orms/activerecord_gen.rb",
+     "lib/padrino-gen/generators/components/orms/couchrest_gen.rb",
+     "lib/padrino-gen/generators/components/orms/datamapper_gen.rb",
+     "lib/padrino-gen/generators/components/orms/mongomapper_gen.rb",
+     "lib/padrino-gen/generators/components/orms/sequel_gen.rb",
+     "lib/padrino-gen/generators/components/renderers/erb_gen.rb",
+     "lib/padrino-gen/generators/components/renderers/haml_gen.rb",
+     "lib/padrino-gen/generators/components/scripts/jquery_gen.rb",
+     "lib/padrino-gen/generators/components/scripts/prototype_gen.rb",
+     "lib/padrino-gen/generators/components/scripts/rightjs_gen.rb",
+     "lib/padrino-gen/generators/components/tests/bacon_test_gen.rb",
+     "lib/padrino-gen/generators/components/tests/riot_test_gen.rb",
+     "lib/padrino-gen/generators/components/tests/rspec_test_gen.rb",
+     "lib/padrino-gen/generators/components/tests/shoulda_test_gen.rb",
+     "lib/padrino-gen/generators/components/tests/testspec_test_gen.rb",
+     "lib/padrino-gen/generators/controller.rb",
+     "lib/padrino-gen/generators/mailer.rb",
+     "lib/padrino-gen/generators/migration.rb",
+     "lib/padrino-gen/generators/model.rb",
+     "lib/padrino-gen/generators/templates/controller.rb.tt",
+     "lib/padrino-gen/generators/templates/helper.rb.tt",
+     "lib/padrino-gen/generators/templates/mailer.rb.tt",
+     "lib/padrino-gen/generators/templates/mailer_initializer.rb.tt",
+     "lib/padrino-gen/generators/templates/scripts/jquery.js",
+     "lib/padrino-gen/generators/templates/scripts/lowpro.js",
+     "lib/padrino-gen/generators/templates/scripts/protopak.js",
+     "lib/padrino-gen/generators/templates/scripts/right.js",
      "padrino-gen.gemspec",
      "test/helper.rb",
+     "test/test_app_generator.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_skeleton_generator.rb"
+     "test/test_model_generator.rb"
   ]
   s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-gen}
   s.rdoc_options = ["--charset=UTF-8"]

data/test/{test_skeleton_generator.rb → test_app_generator.rb}

@@ -2,38 +2,43 @@ require File.dirname(__FILE__) + '/helper'
 require 'thor'
 require 'fakeweb'
 
-class TestSkeletonGenerator < Test::Unit::TestCase
+class TestAppGenerator < Test::Unit::TestCase
   def setup
+    Padrino::Generators.lockup!
     FakeWeb.allow_net_connect = false
     `rm -rf /tmp/sample_app`
-    @skeleton = Padrino::Generators::Skeleton.dup
+    @app = Padrino::Generators::App.dup
   end
 
-  context 'the skeleton generator' do
+  context 'the App generator' do
     should "allow simple generator to run and create base_app with no options" do
-      assert_nothing_raised { silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none']) } }
+      assert_nothing_raised { silence_logger { @app.start(['sample_app', '/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')
     end
+
     should "not create models folder if no orm is chosen" do
-      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '--orm=none']) }
+      silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none', '--test=none']) }
+      silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none']) }
+      silence_logger { @app.start(['sample_app', '/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')
       assert_match_in_file(/SampleApp.urls do/m, '/tmp/sample_app/config/urls.rb')
     end
+
     should "create components file containing options chosen with defaults" do
-      silence_logger { @skeleton.start(['sample_app', '/tmp']) }
+      silence_logger { @app.start(['sample_app', '/tmp']) }
       components_chosen = YAML.load_file('/tmp/sample_app/.components')
       assert_equal 'datamapper', components_chosen[:orm]
       assert_equal 'bacon', components_chosen[:test]
@@ -41,9 +46,10 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       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 { @skeleton.start(['sample_app', '/tmp', *component_options]) }
+      silence_logger { @app.start(['sample_app', '/tmp', *component_options]) }
       components_chosen = YAML.load_file('/tmp/sample_app/.components')
       assert_equal 'datamapper', components_chosen[:orm]
       assert_equal 'riot',  components_chosen[:test]
@@ -51,17 +57,19 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       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 { @skeleton.start(['sample_app', '/tmp', *component_options]) }
+      buffer = silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none']) }
+      silence_logger { @app.start(['sample_app', '/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')
@@ -71,14 +79,14 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "a generator for mock component" do
     should "properly generate for rr" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--mock=rr', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--mock=mocha', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -87,8 +95,8 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "the generator for orm components" do
     should "properly generate for sequel" do
-      @skeleton.instance_eval("undef setup_orm if respond_to?('setup_orm')")
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=sequel', '--script=none']) }
+      @app.instance_eval("undef setup_orm if respond_to?('setup_orm')")
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -96,7 +104,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for activerecord" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=activerecord', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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(/Migrate the database/, '/tmp/sample_app/Rakefile')
@@ -105,7 +113,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate default for datamapper" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=datamapper', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -113,7 +121,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for mongomapper" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=mongomapper', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -121,7 +129,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for couchrest" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--orm=couchrest', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -131,13 +139,13 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "the generator for renderer component" do
     should "properly generate default for erb" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--renderer=erb', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--renderer=haml','--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -147,14 +155,14 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "the generator for script component" do
     should "properly generate for jquery" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=jquery']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=prototype']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -162,7 +170,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for rightjs" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=rightjs']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -171,7 +179,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
   context "the generator for test component" do
     should "properly default generate for bacon" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=bacon', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -179,7 +187,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for riot" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=riot', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -187,7 +195,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for rspec" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=rspec', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -195,7 +203,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for shoulda" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=shoulda', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')
@@ -203,7 +211,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     end
 
     should "properly generate for testspec" do
-      buffer = silence_logger { @skeleton.start(['sample_app', '/tmp', '--test=testspec', '--script=none']) }
+      buffer = silence_logger { @app.start(['sample_app', '/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')

data/test/test_controller_generator.rb

@@ -3,7 +3,8 @@ require 'thor'
 
 class TestControllerGenerator < Test::Unit::TestCase
   def setup
-    @skeleton = Padrino::Generators::Skeleton.dup
+    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'
@@ -19,7 +20,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller within existing application" do
-      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '/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')
@@ -27,31 +28,31 @@ class TestControllerGenerator < Test::Unit::TestCase
     end
 
     should "generate controller test for bacon" do
-      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=bacon']) }
+      silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=riot']) }
+      silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=testspec']) }
+      silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=rspec']) }
+      silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda']) }
+      silence_logger { @app.start(['sample_app', '/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)
@@ -60,14 +61,14 @@ class TestControllerGenerator < Test::Unit::TestCase
     # Controller action generation
         
     should "generate actions for get:test post:yada" do
-      silence_logger { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
+      silence_logger { @app.start(['sample_app', '/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 { @skeleton.start(['sample_app', '/tmp', '--script=none', '-t=shoulda'])}
+      silence_logger { @app.start(['sample_app', '/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)      

data/test/test_generator.rb

@@ -0,0 +1,17 @@
+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
+      %w{controller mailer migration model app}.each do |gen|
+        assert Padrino::Generators.mappings.has_key?(gen.to_sym)
+        assert_equal "Padrino::Generators::#{gen.classify}", Padrino::Generators.mappings[gen.to_sym].name
+        assert Padrino::Generators.mappings[gen.to_sym].respond_to?(:start)
+      end
+    end
+  end
+end