padrino-gen 0.8.1 → 0.8.2

data/README.rdoc

@@ -49,11 +49,11 @@ You can also instruct the generator to skip a certain component to avoid using o
   
 The available components and their default options are listed below:
 
-* test:     <tt>bacon</tt>      (default), <tt>shoulda</tt>, <tt>rspec</tt>, <tt>testspec</tt>, <tt>riot</tt>
-* renderer: <tt>haml</tt>       (default), <tt>erb</tt>
-* mock:     <tt>mocha</tt>      (default), <tt>rr</tt>
-* script:   <tt>jquery</tt>     (default), <tt>prototype</tt>, <tt>rightjs</tt>
-* orm:      <tt>datamapper</tt> (default), <tt>mongomapper</tt>, <tt>activerecord</tt>, <tt>sequel</tt>, <tt>couchrest</tt>
+test::      rspec (default), bacon, shoulda, testspec, riot
+renderer::  haml  (default), erb
+mock::      none  (default), rr
+script::    none  (default), prototype, rightjs
+orm::       none  (default), mongomapper, activerecord, sequel, couchrest
 
 The generator uses the <tt>bundler</tt> gem to resolve any application dependencies when the application is newly created.
 The necessary bundler command can be executed automatically through the generator with

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/bin/padrino-gen

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-%w[rubygems thor/group].each { |gem| require gem }
+require 'rubygems'
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 # We try to load the vendored padrino-core if exist
@@ -8,6 +8,7 @@ if File.exist?(File.dirname(__FILE__) + "/../../padrino-core/lib")
 end
 
 require 'padrino-gen'
+require 'padrino-gen/generators/cli'
 
 # We need our config boot because we need to load registered generators so:
 Padrino::Generators::Cli.start(ARGV)

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

@@ -28,7 +28,7 @@ module Padrino
       # include_component_module_for(:mock, 'rr')
       def include_component_module_for(component, choice=nil)
         choice = fetch_component_choice(component) unless choice
-        return if choice.to_s == 'none'
+        return false if choice.to_s == 'none'
         self.class.send(:include, generator_module_for(choice, component))
       end
 
@@ -130,7 +130,6 @@ module Padrino
       end
 
       module ClassMethods
-
         # Defines a class option to allow a component to be chosen and add to component type list
         # Also builds the available_choices hash of which component choices are supported
         # component_option :test, "Testing framework", :aliases => '-t', :choices => [:bacon, :shoulda]
@@ -141,6 +140,16 @@ module Padrino
           class_option name, :default => options[:default] || options[:choices].first, :aliases => options[:aliases], :desc => description
         end
 
+        # Tell to padrino that for this Thor::Group is necessary a task to run
+        def require_arguments!
+          @_require_arguments = true
+        end
+
+        # Return true if we need an arguments for our Thor::Group
+        def require_arguments?
+          @_require_arguments
+        end
+
         # Returns the compiled list of component types which can be specified
         def component_types
           @component_types
@@ -153,4 +162,4 @@ module Padrino
       end
     end
   end
-end
+end

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

@@ -22,10 +22,7 @@ module Padrino
       class_option :destroy, :aliases => '-d', :default => false,   :type    => :boolean
 
       # Show help if no argv given
-      def self.start(given_args=ARGV, config={})
-        given_args = ["-h"] if given_args.empty?
-        super
-      end
+      require_arguments!
 
       # Copies over the Padrino base admin application
       def create_app

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

@@ -1,31 +1,12 @@
+require 'thor/group'
+require 'padrino-core/support_lite'
+
 module Padrino
   module Generators
-
-    DEV_PATH = File.expand_path("../../../", File.dirname(__FILE__))
-
-    class << self
-      def load_paths
-        @load_paths ||= Dir[File.dirname(__FILE__) + '/generators/{project,app,mailer,controller,model,migration}.rb']
-      end
-
-      def mappings
-        @mappings ||= SupportLite::OrderedHash.new
-      end
-
-      def add_generator(name, klass)
-        mappings[name] = klass
-      end
-
-      def setup!
-        require 'padrino-gen/generators/actions'
-        Dir[File.dirname(__FILE__) + '/generators/{components}/**/*.rb'].each { |lib| require lib }
-      end
-
-      def lockup!
-        load_paths.each { |lib| require lib  }
-      end
-    end
-
+    ##
+    # This class bootstrap +config/boot+ and perform +Padrino::Generators.lockup!+ for handle
+    # 3rd party generators
+    # 
     class Cli < Thor::Group
 
       # Include related modules
@@ -36,8 +17,6 @@ module Padrino
       # We need to TRY to load boot because some of our app dependencies maybe have 
       # custom generators, so is necessary know who are.
       def load_boot
-        Padrino::Generators.setup!
-
         begin
           ENV['PADRINO_LOG_LEVEL'] ||= "test"
           if options[:root]
@@ -47,6 +26,7 @@ module Padrino
           end
         rescue Exception => e
           puts "=> Problem loading config/boot.rb"
+          puts ["=> #{e.message}", *e.backtrace].join("\n  ")
         end
       end
 
@@ -57,13 +37,12 @@ module Padrino
         generator_class = Padrino::Generators.mappings[generator_kind]
 
         if generator_class
-          generator_class.start(ARGV)
+          args = ARGV.empty? && generator_class.require_arguments? ? ["-h"] : ARGV
+          generator_class.start(args)
         else
           puts "Please specify generator to use (#{Padrino::Generators.mappings.keys.join(", ")})"
         end
       end
-
-    end
-
-  end
-end
+    end # Cli
+  end # Generators
+end # Padrino

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

@@ -33,8 +33,8 @@ module Padrino
         # For orm database components
         # Generates a standalone migration file based on the given options and columns
         # options => { :base "...text...", :change_format => "...text...",
-        #              :add => lambda { |field, kind| "add_column :#{table_name}, :#{field}, :#{kind}" },
-        #              :remove => lambda { |field, kind| "remove_column :#{table_name}, :#{field}" }
+        #              :add => proc { |field, kind| "add_column :#{table_name}, :#{field}, :#{kind}" },
+        #              :remove => proc { |field, kind| "remove_column :#{table_name}, :#{field}" }
         def output_migration_file(filename, name, columns, options={})
           if behavior == :revoke
             remove_migration(name)

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

@@ -6,11 +6,15 @@ module Padrino
         module MochaGen
           def setup_mock
             require_dependencies 'mocha', :group => 'test'
-            insert_mocking_include "Mocha::API", :path => "test/test_config.rb"
+            case options[:test].to_s
+              when 'rspec'
+                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"
+            end
           end
-        end
-        
-      end
-    end
-  end
-end
+        end # MochaGen
+      end # Mocks
+    end # Components
+  end # Generators
+end # Padrino

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

@@ -6,15 +6,17 @@ module Padrino
         module RrGen
           def setup_mock
             require_dependencies 'rr', :group => 'test'
-            if options[:test] == 'riot'
-              inject_into_file "test/test_config.rb","  Riot.rr\n", :after => "class Riot::Situation\n"
-            else
-              insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
+            case options[:test].to_s
+              when 'rspec'
+                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","  Riot.rr\n", :after => "class Riot::Situation\n"
+              else
+                insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
             end
           end
-        end
-
-      end
-    end
-  end
-end
+        end # RrGen
+      end # Mocks
+    end # Components
+  end # Generators
+end # Padrino

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

@@ -100,7 +100,7 @@ module Padrino
           def create_model_migration(migration_name, name, columns)
             output_model_migration(migration_name, name, columns,
                  :base => AR_MIGRATION,
-                 :column_format => lambda { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
+                 :column_format => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
                  :up => AR_MODEL_UP_MG, :down => AR_MODEL_DOWN_MG)
           end
 
@@ -113,8 +113,8 @@ module Padrino
           def create_migration_file(migration_name, name, columns)
             output_migration_file(migration_name, name, columns,
                 :base => AR_MIGRATION, :change_format => AR_CHANGE_MG,
-                :add => lambda { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
-                :remove => lambda { |field, kind| "t.remove :#{field}" })
+                :add => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
+                :remove => Proc.new { |field, kind| "t.remove :#{field}" })
           end
 
         end

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

@@ -73,7 +73,7 @@ module Padrino
 
           def create_model_migration(migration_name, name, columns)
             output_model_migration(migration_name, name, columns,
-                 :column_format => lambda { |field, kind| "column :#{field}, #{kind.camelize}" },
+                 :column_format => Proc.new { |field, kind| "column :#{field}, #{kind.camelize}" },
                  :base => DM_MIGRATION, :up => DM_MODEL_UP_MG, :down => DM_MODEL_DOWN_MG)
           end
 
@@ -86,8 +86,8 @@ module Padrino
           def create_migration_file(migration_name, name, columns)
             output_migration_file(migration_name, name, columns,
                 :base => DM_MIGRATION, :change_format => DM_CHANGE_MG,
-                :add => lambda { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
-                :remove => lambda { |field, kind| "drop_column :#{field}" }
+                :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
+                :remove => Proc.new { |field, kind| "drop_column :#{field}" }
                 )
           end
         end

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

@@ -59,7 +59,7 @@ module Padrino
 
           def create_model_migration(migration_name, name, columns)
             output_model_migration(migration_name, name, columns,
-                   :column_format => lambda { |field, kind| "#{kind.camelize} :#{field}" },
+                   :column_format => Proc.new { |field, kind| "#{kind.camelize} :#{field}" },
                    :base => SQ_MIGRATION, :up => SQ_MODEL_UP_MG, :down => SQ_MODEL_DOWN_MG)
           end
 
@@ -72,8 +72,8 @@ module Padrino
           def create_migration_file(migration_name, name, columns)
             output_migration_file(migration_name, name, columns,
                   :base => SQ_MIGRATION, :change_format => SQ_CHANGE_MG,
-                  :add => lambda { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
-                  :remove => lambda { |field, kind| "drop_column :#{field}" }
+                  :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
+                  :remove => Proc.new { |field, kind| "drop_column :#{field}" }
                   )
           end
         end

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

@@ -10,32 +10,34 @@ module Padrino
           end
 
           def app
-            CLASS_NAME.tap { |app| app.set :environment, :test }
+            # Sinatra < 1.0 always disable sessions for test env
+            # so if you need them it's necessary force the use 
+            # of Rack::Session::Cookie
+            CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+            # You can hanlde all padrino applications using instead:
+            #   Padrino.application
           end
           TEST
 
-          # Setup the testing configuration helper and dependencies
-          def setup_test
-            require_dependencies 'bacon', :group => 'test'
-            insert_test_suite_setup BACON_SETUP
-          end
-
           BACON_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
 
           describe "!NAME!Controller" do
             it 'returns text at root' do
-              get '/'
+              get "/"
               last_response.body.should == "some text"
             end
           end
           TEST
 
-          # Generates a controller test given the controllers name
-          def generate_controller_test(name)
-            bacon_contents = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file destination_root("test/controllers/","#{name}_controller_test.rb"), bacon_contents, :skip => true
+          BACON_RAKE = (<<-TEST).gsub(/^ {10}/, '')
+          require 'rake/testtask'
+
+          Rake::TestTask.new(:test) do |test|
+            test.pattern = '**/*_test.rb'
+            test.verbose = true
           end
+          TEST
 
           BACON_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
@@ -48,6 +50,19 @@ module Padrino
           end
           TEST
 
+          # Setup the testing configuration helper and dependencies
+          def setup_test
+            require_dependencies 'bacon', :group => 'test'
+            insert_test_suite_setup BACON_SETUP, :path => 'test/test_config.rb'
+            create_file destination_root("test/test.rake"), BACON_RAKE
+          end
+
+          # Generates a controller test given the controllers name
+          def generate_controller_test(name)
+            bacon_contents = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+            create_file destination_root("test/controllers/","#{name}_controller_test.rb"), bacon_contents, :skip => true
+          end
+
           def generate_model_test(name)
             bacon_contents = BACON_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
             create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), bacon_contents, :skip => true

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

@@ -9,44 +9,65 @@ module Padrino
             include Rack::Test::Methods
 
             def app
-              CLASS_NAME.tap { |app| app.set :environment, :test }
+              # Sinatra < 1.0 always disable sessions for test env
+              # so if you need them it's necessary force the use 
+              # of Rack::Session::Cookie
+              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              # You can hanlde all padrino applications using instead:
+              #   Padrino.application
             end
           end
           TEST
 
-          def setup_test
-            require_dependencies 'riot', :group => 'test'
-            insert_test_suite_setup RIOT_SETUP
-          end
-
           RIOT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
 
           context "!NAME!Controller" do
             context "description here" do
-              setup { get '/' }
+              setup do
+                get "/"
+              end
+
               asserts("the response body") { last_response.body }.equals "Hello World"
             end
           end
           TEST
 
-          # Generates a controller test given the controllers name
-          def generate_controller_test(name)
-            riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file destination_root("test/controllers/#{name}_controller_test.rb"), riot_contents, :skip => true
+          RIOT_RAKE = (<<-TEST).gsub(/^ {10}/, '')
+          require 'rake/testtask'
+
+          Rake::TestTask.new(:test) do |test|
+            test.pattern = '**/*_test.rb'
+            test.verbose = true
           end
+          TEST
 
           RIOT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
 
           context "!NAME! Model" do
             context 'can be created' do
-              setup { @!DNAME! = !NAME!.new }
+              setup do 
+                @!DNAME! = !NAME!.new
+              end
+
               asserts("that record is not nil") { !@!DNAME!.nil? }
             end
           end
           TEST
 
+          def setup_test
+            require_dependencies 'riot', :group => 'test'
+            insert_test_suite_setup RIOT_SETUP
+            create_file destination_root("test/test.rake"), RIOT_RAKE
+          end
+
+          # Generates a controller test given the controllers name
+          def generate_controller_test(name)
+            riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+            create_file destination_root("test/controllers/#{name}_controller_test.rb"), riot_contents, :skip => true
+          end
+
           def generate_model_test(name)
             riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
             create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), riot_contents, :skip => true

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

@@ -10,36 +10,40 @@ module Padrino
           end
 
           def app
-            CLASS_NAME.tap { |app| app.set :environment, :test }
+            # Sinatra < 1.0 always disable sessions for test env
+            # so if you need them it's necessary force the use 
+            # of Rack::Session::Cookie
+            CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+            # You can hanlde all padrino applications using instead:
+            #   Padrino.application
           end
           TEST
 
-          # TODO move to spec directory to follow convention
-          def setup_test
-            require_dependencies 'rspec', :group => 'test', :require => 'spec'
-            insert_test_suite_setup RSPEC_SETUP
-          end
-
           RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.dirname(__FILE__) + '/../spec_helper.rb'
 
           describe "!NAME!Controller" do
-            setup { get('/') }
+            before do 
+              get "/"
+            end
+
             it "returns hello world" do
               last_response.body.should == "Hello World"
             end
           end
           TEST
 
-          # TODO move to spec directory to follow convention
-          # 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("test/controllers/#{name}_controller_spec.rb"), rspec_contents, :skip => true
+          RSPEC_RAKE = (<<-TEST).gsub(/^ {10}/, '')
+          require 'spec/rake/spectask'
+
+          Spec::Rake::SpecTask.new(:spec) do |t|
+            t.spec_opts = ['--options', "spec/spec.opts"]
+            t.spec_files = Dir['**/*_spec.rb']
           end
+          TEST
 
           RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
-          require File.dirname(__FILE__) + '/../test_config.rb'
+          require File.dirname(__FILE__) + '/../spec_helper.rb'
 
           describe "!NAME! Model" do
             it 'can be created' do
@@ -49,9 +53,22 @@ module Padrino
           end
           TEST
 
+          def setup_test
+            require_dependencies 'rspec', :require => 'spec', :group => 'test'
+            insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
+            create_file destination_root("spec/spec.rake"), RSPEC_RAKE
+            create_file destination_root("spec/spec.opts"), "--color"
+          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}_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.downcase.underscore)
-            create_file destination_root("test/models/#{name.to_s.downcase}_spec.rb"), rspec_contents, :skip => true
+            create_file destination_root("spec/models/#{name.to_s.downcase}_spec.rb"), rspec_contents, :skip => true
           end
 
         end

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

@@ -9,16 +9,16 @@ module Padrino
             include Rack::Test::Methods
 
             def app
-              CLASS_NAME.tap { |app| app.set :environment, :test }
+              # Sinatra < 1.0 always disable sessions for test env
+              # so if you need them it's necessary force the use 
+              # of Rack::Session::Cookie
+              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              # You can hanlde all padrino applications using instead:
+              #   Padrino.application
             end
           end
           TEST
 
-          def setup_test
-            require_dependencies 'shoulda', :group => 'test'
-            insert_test_suite_setup SHOULDA_SETUP
-          end
-
           SHOULDA_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
 
@@ -35,11 +35,14 @@ module Padrino
           end
           TEST
 
-          # Generates a controller test given the controllers name
-          def generate_controller_test(name)
-            shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file destination_root("test/controllers/#{name}_controller_test.rb"), shoulda_contents, :skip => true
+          SHOULDA_RAKE = (<<-TEST).gsub(/^ {10}/, '')
+          require 'rake/testtask'
+
+          Rake::TestTask.new(:test) do |test|
+            test.pattern = '**/*_test.rb'
+            test.verbose = true
           end
+          TEST
 
           SHOULDA_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
@@ -54,6 +57,18 @@ module Padrino
           end
           TEST
 
+          def setup_test
+            require_dependencies 'shoulda', :group => 'test'
+            insert_test_suite_setup SHOULDA_SETUP
+            create_file destination_root("test/test.rake"), SHOULDA_RAKE
+          end
+
+          # Generates a controller test given the controllers name
+          def generate_controller_test(name)
+            shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+            create_file destination_root("test/controllers/#{name}_controller_test.rb"), shoulda_contents, :skip => true
+          end
+
           def generate_model_test(name)
             shoulda_contents = SHOULDA_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
             create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), shoulda_contents, :skip => true

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

@@ -9,16 +9,16 @@ module Padrino
             include Rack::Test::Methods
 
             def app
-              CLASS_NAME.tap { |app| app.set :environment, :test }
+              # Sinatra < 1.0 always disable sessions for test env
+              # so if you need them it's necessary force the use 
+              # of Rack::Session::Cookie
+              CLASS_NAME.tap { |app| app.use Rack::Session::Cookie }
+              # You can hanlde all padrino applications using instead:
+              #   Padrino.application
             end
           end
           TEST
 
-          def setup_test
-            require_dependencies 'test/spec', :group => 'test'
-            insert_test_suite_setup TESTSPEC_SETUP
-          end
-
           TESTSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
 
@@ -30,11 +30,14 @@ module Padrino
           end
           TEST
 
-          # Generates a controller test given the controllers name
-          def generate_controller_test(name)
-            testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
-            create_file destination_root("test/controllers/#{name}_controller_test.rb"), testspec_contents, :skip => true
+          TESTSPEC_RAKE = (<<-TEST).gsub(/^ {10}/, '')
+          require 'rake/testtask'
+
+          Rake::TestTask.new(:test) do |test|
+            test.pattern = '**/*_test.rb'
+            test.verbose = true
           end
+          TEST
 
           TESTSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '')
           require File.dirname(__FILE__) + '/../test_config.rb'
@@ -47,6 +50,18 @@ module Padrino
           end
           TEST
 
+          def setup_test
+            require_dependencies 'test-spec', :require => 'test/spec', :group => 'test'
+            insert_test_suite_setup TESTSPEC_SETUP
+            create_file destination_root("test/test.rake"), TESTSPEC_RAKE
+          end
+
+          # Generates a controller test given the controllers name
+          def generate_controller_test(name)
+            testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.camelize)
+            create_file destination_root("test/controllers/#{name}_controller_test.rb"), testspec_contents, :skip => true
+          end
+
           def generate_model_test(name)
             tests_contents = TESTSPEC_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize).gsub(/!DNAME!/, name.downcase.underscore)
             create_file destination_root("test/models/#{name.to_s.downcase}_test.rb"), tests_contents, :skip => true

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

@@ -24,10 +24,7 @@ module Padrino
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
-      def self.start(given_args=ARGV, config={})
-        given_args = ["-h"] if given_args.empty?
-        super
-      end
+      require_arguments!
 
       def create_controller
         self.destination_root = options[:root]

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

@@ -23,10 +23,7 @@ module Padrino
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
-      def self.start(given_args=ARGV, config={})
-        given_args = ["-h"] if given_args.empty?
-        super
-      end
+      require_arguments!
 
       def create_mailer
         self.destination_root = options[:root]

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

@@ -23,17 +23,18 @@ module Padrino
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
-      def self.start(given_args=ARGV, config={})
-        given_args = ["-h"] if given_args.empty?
-        super
-      end
+      require_arguments!
 
       def create_migration
         self.destination_root = options[:root]
         if in_app_root?
           self.behavior = :revoke if options[:destroy]
-          include_component_module_for(:orm)
-          create_migration_file(name, name, columns)
+          if include_component_module_for(:orm)
+            create_migration_file(name, name, columns)
+          else
+            say "<= You need an ORM adapter for run this generator. Sorry!"
+            raise SystemExit
+          end
         else
           say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
         end

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

@@ -24,16 +24,16 @@ module Padrino
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
 
       # Show help if no argv given
-      def self.start(given_args=ARGV, config={})
-        given_args = ["-h"] if given_args.empty?
-        super
-      end
+      require_arguments!
 
       def create_model
         self.destination_root = options[:root]
         if in_app_root?
           self.behavior = :revoke if options[:destroy]
-          include_component_module_for(:orm)
+          unless include_component_module_for(:orm)
+            say "<= You need an ORM adapter for run this generator. Sorry!"
+            raise SystemExit
+          end
           include_component_module_for(:test)
           migration_name = "create_#{name.pluralize.underscore}"
           create_model_file(name, fields)

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

@@ -1,3 +1,5 @@
+require 'padrino-core/version'
+
 module Padrino
   module Generators
     class Project < Thor::Group
@@ -18,22 +20,19 @@ module Padrino
 
       argument :name, :desc => "The name of your padrino project"
 
-      class_option :run_bundler,  :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 :run_bundler,  :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
 
       # Definitions for the available customizable components
       component_option :orm,      "database engine",    :aliases => '-d', :choices => [:datamapper, :mongomapper, :activerecord, :sequel, :couchrest], :default => :none
-      component_option :test,     "testing framework",  :aliases => '-t', :choices => [:bacon, :shoulda, :rspec, :testspec, :riot]
-      component_option :mock,     "mocking library",    :aliases => '-m', :choices => [:mocha, :rr]
+      component_option :test,     "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :bacon, :testspec, :riot]
+      component_option :mock,     "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
       component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs], :default => :none
       component_option :renderer, "template engine",    :aliases => '-e', :choices => [:haml, :erb]
 
       # Show help if no argv given
-      def self.start(given_args=ARGV, config={})
-        given_args = ["-h"] if given_args.empty?
-        super
-      end
+      require_arguments!
 
       # Copies over the Padrino base application App
       def setup_project
@@ -59,6 +58,20 @@ module Padrino
           in_root { run 'bundle install' }
         end
       end
+
+      # Finish message
+      def finish
+        say (<<-TEXT).gsub(/ {8}/,'')
+
+        =================================================================
+        #{name} has been successfully created, now follow this steps:
+        =================================================================
+          1) cd #{name}
+          2) bundle install
+        =================================================================
+
+        TEXT
+      end
     end
   end
 end

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

@@ -0,0 +1,7 @@
+if defined?(ActiveRecord) || defined?(DataMapper)
+  desc 'Load the seed data from db/seeds.rb'
+  task :seed => :environment do
+    seed_file = Padrino.root('db', 'seeds.rb')
+    load(seed_file) if File.exist?(seed_file)
+  end
+end

data/lib/padrino-gen.rb

@@ -1,6 +1,66 @@
-require 'thor/group'
 require 'padrino-core/support_lite'
-require 'padrino-core/version'
-require 'padrino-gen/generators'
 require 'padrino-core/tasks'
+
+module Padrino
+  ##
+  # This module it's used for register generators
+  # 
+  # Can be useful for 3rd party generators:
+  # 
+  #   # custom_generator.rb
+  #   class CustomGenerator < Thor::Group
+  #     Padrino::Generators.add_generator(:custom_generator, self)
+  #   end
+  # 
+  # Now for handle generators in padrino you need to add it to into +load_paths+
+  # 
+  # Padrino::Generators.load_paths << "custom_generator.rb"
+  # 
+  module Generators
+
+    DEV_PATH = File.expand_path("../../", File.dirname(__FILE__))
+
+    class << self
+
+      ##
+      # Here we store our generators paths
+      # 
+      def load_paths
+        @_files ||= []
+      end
+
+      ##
+      # Return a ordered list of task with their class
+      # 
+      def mappings
+        @_mappings ||= SupportLite::OrderedHash.new
+      end
+
+      ##
+      # Gloabl add a new generator class to +padrino-gen+
+      # 
+      def add_generator(name, klass)
+        mappings[name] = klass
+      end
+
+      ##
+      # Load Global Actions and Component Actions then all files in +load_path+.
+      # 
+      def lockup!
+        require 'padrino-gen/generators/actions'
+        Dir[File.dirname(__FILE__) + '/padrino-gen/generators/components/**/*.rb'].each { |lib| require lib }
+        load_paths.flatten.each { |file| require file  }
+      end
+    end
+  end # Generators
+end # Padrino
+
+##
+# We add our generators to Padrino::Genererator 
+# 
+Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{project,app,mailer,controller,model,migration}.rb']
+
+##
+# We add our tasks to padrino-core
+# 
 Padrino::Tasks.files << Dir[File.dirname(__FILE__) + "/padrino-gen/padrino-tasks/**/*.rb"]

data/padrino-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   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-14}
+  s.date = %q{2010-02-17}
   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}
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/padrino-gen",
      "lib/padrino-gen.rb",
-     "lib/padrino-gen/generators.rb",
      "lib/padrino-gen/generators/actions.rb",
      "lib/padrino-gen/generators/app.rb",
      "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/cli.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",
@@ -83,6 +83,7 @@ Gem::Specification.new do |s|
      "lib/padrino-gen/padrino-tasks/activerecord.rb",
      "lib/padrino-gen/padrino-tasks/datamapper.rb",
      "lib/padrino-gen/padrino-tasks/locale.rb",
+     "lib/padrino-gen/padrino-tasks/seed.rb",
      "padrino-gen.gemspec",
      "test/helper.rb",
      "test/test_app_generator.rb",
@@ -107,7 +108,7 @@ 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.8.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.2"])
       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"])
@@ -118,7 +119,7 @@ Gem::Specification.new do |s|
       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.8.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.8.2"])
       s.add_dependency(%q<thor>, [">= 0.13.0"])
       s.add_dependency(%q<bundler>, [">= 0.9.3"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
@@ -130,7 +131,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.8.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.8.2"])
     s.add_dependency(%q<thor>, [">= 0.13.0"])
     s.add_dependency(%q<bundler>, [">= 0.9.3"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])

data/test/helper.rb

@@ -15,7 +15,6 @@ end
 
 require 'padrino-gen'
 
-Padrino::Generators.setup!
 Padrino::Generators.lockup!
 
 class Test::Unit::TestCase

data/test/test_cli.rb

@@ -1,10 +1,8 @@
 require File.dirname(__FILE__) + '/helper'
-require 'thor/group'
-require 'fakeweb'
+require 'padrino-gen/generators/cli'
 
 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

data/test/test_controller_generator.rb

@@ -55,7 +55,7 @@ class TestControllerGenerator < Test::Unit::TestCase
     should "generate controller test for rspec" do
       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')
+      assert_match_in_file(/describe "DemoItemsController" do/m, '/tmp/sample_project/spec/controllers/demo_items_controller_spec.rb')
     end
 
     should "generate controller test for shoulda" do
@@ -93,18 +93,8 @@ class TestControllerGenerator < Test::Unit::TestCase
       silence_logger { @cont_gen.start(['demo_items','-r=/tmp/sample_project','-d'])}
       assert_no_file_exists(@controller_path)
       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 { @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)
+      assert_no_file_exists('/tmp/sample_project/spec/controllers/demo_items_controller_spec.rb')
     end
 
   end
-
-
 end

data/test/test_migration_generator.rb

@@ -15,6 +15,11 @@ class TestMigrationGenerator < Test::Unit::TestCase
       assert_no_file_exists('/tmp/db/migration')
     end
 
+    should "fail if we don't use an adapter" do
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
+      assert_raise(SystemExit) { silence_logger { @mig_gen.start(['AddEmailToUsers', '-r=/tmp/sample_project']) } }
+    end
+
     should "generate migration inside app root" do
       silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon', '-d=activerecord']) }
       response_success = silence_logger { @mig_gen.start(['AddEmailToUsers', '-r=/tmp/sample_project']) }

data/test/test_model_generator.rb

@@ -15,6 +15,11 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_no_file_exists('/tmp/app/models/user.rb')
     end
 
+    should "fail if we don't use an adapter" do
+      silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=bacon']) }
+      assert_raise(SystemExit) { silence_logger { @model_gen.start(['user', '-r=/tmp/sample_project']) } }
+    end
+
     should 'not fail if we don\'t have test component' do
       silence_logger { @project.start(['sample_project', '--root=/tmp', '--test=none', '-d=activerecord']) }
       response_success = silence_logger { @model_gen.start(['user', '-r=/tmp/sample_project']) }
@@ -199,9 +204,9 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate test file for rspec" do
       silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=rspec', '-d=activerecord']) }
       silence_logger { @model_gen.start(['User', '-r=/tmp/sample_project']) }
-      assert_match_in_file(/describe "User Model"/m, '/tmp/sample_project/test/models/user_spec.rb')
-      assert_match_in_file(/@user = User.new/m, '/tmp/sample_project/test/models/user_spec.rb')
-      assert_match_in_file(/@user\.should\.not\.be\snil/m, '/tmp/sample_project/test/models/user_spec.rb')
+      assert_match_in_file(/describe "User Model"/m, '/tmp/sample_project/spec/models/user_spec.rb')
+      assert_match_in_file(/@user = User.new/m, '/tmp/sample_project/spec/models/user_spec.rb')
+      assert_match_in_file(/@user\.should\.not\.be\snil/m, '/tmp/sample_project/spec/models/user_spec.rb')
     end
 
     # SHOULDA
@@ -239,7 +244,7 @@ class TestModelGenerator < Test::Unit::TestCase
       silence_logger { @project.start(['sample_project', '--root=/tmp', '--script=none', '-t=rspec', '-d=activerecord']) }
       silence_logger { @model_gen.start(['User', '-r=/tmp/sample_project']) }
       silence_logger { @model_gen.start(['User', '-r=/tmp/sample_project', '-d']) }
-      assert_no_file_exists('/tmp/sample_project/test/models/user_spec.rb')
+      assert_no_file_exists('/tmp/sample_project/spec/models/user_spec.rb')
     end
     
     should "destroy the model migration" do

data/test/test_project_generator.rb

@@ -15,7 +15,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists('/tmp/sample_project')
       assert_file_exists('/tmp/sample_project/app')
       assert_file_exists('/tmp/sample_project/config/boot.rb')
-      assert_file_exists('/tmp/sample_project/test/test_config.rb')
+      assert_file_exists('/tmp/sample_project/spec/spec_helper.rb')
     end
 
     should "not create models folder if no orm is chosen" do
@@ -38,8 +38,8 @@ class TestProjectGenerator < Test::Unit::TestCase
       silence_logger { @project.start(['sample_project', '--root=/tmp']) }
       components_chosen = YAML.load_file('/tmp/sample_project/.components')
       assert_equal 'none', components_chosen[:orm]
-      assert_equal 'bacon', components_chosen[:test]
-      assert_equal 'mocha', components_chosen[:mock]
+      assert_equal 'rspec', components_chosen[:test]
+      assert_equal 'none', components_chosen[:mock]
       assert_equal 'none', components_chosen[:script]
       assert_equal 'haml', components_chosen[:renderer]
     end
@@ -88,12 +88,20 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/RR::Adapters::RRMethods/m, '/tmp/sample_project/test/test_config.rb')
     end
 
-    should "properly generate default for mocha" do
+    should "properly generate for mocha and rspec" do
       buffer = silence_logger { @project.start(['sample_project', '--root=/tmp', '--mock=mocha', '--script=none']) }
       assert_match /Applying.*?mocha.*?mock/, buffer
       assert_match_in_file(/gem 'mocha'/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/include Mocha::API/m, '/tmp/sample_project/test/test_config.rb')
+      assert_match_in_file(/conf.mock_with :mocha/m, '/tmp/sample_project/spec/spec_helper.rb')
     end
+
+    should "properly generate for rr and rspec" do
+      buffer = silence_logger { @project.start(['sample_project', '--root=/tmp', '--mock=rr', '--script=none']) }
+      assert_match /Applying.*?rr.*?mock/, buffer
+      assert_match_in_file(/gem 'rr'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/conf.mock_with :rr/m, '/tmp/sample_project/spec/spec_helper.rb')
+    end
+
   end
 
   context "the generator for orm components" do
@@ -185,6 +193,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'bacon'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Bacon::Context/, '/tmp/sample_project/test/test_config.rb')
+      assert_file_exists('/tmp/sample_project/test/test.rake')
     end
 
     should "properly generate for riot" do
@@ -193,14 +202,16 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'riot'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Riot::Situation/, '/tmp/sample_project/test/test_config.rb')
+      assert_file_exists('/tmp/sample_project/test/test.rake')
     end
 
     should "properly generate for rspec" do
       buffer = silence_logger { @project.start(['sample_project', '--root=/tmp', '--test=rspec', '--script=none']) }
       assert_match /Applying.*?rspec.*?test/, buffer
       assert_match_in_file(/gem 'rspec'.*?:require => "spec"/, '/tmp/sample_project/Gemfile')
-      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
-      assert_match_in_file(/Spec::Runner/, '/tmp/sample_project/test/test_config.rb')
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/spec/spec_helper.rb')
+      assert_match_in_file(/Spec::Runner/, '/tmp/sample_project/spec/spec_helper.rb')
+      assert_file_exists('/tmp/sample_project/spec/spec.rake')
     end
 
     should "properly generate for shoulda" do
@@ -209,14 +220,16 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'shoulda'/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_project/test/test_config.rb')
+      assert_file_exists('/tmp/sample_project/test/test.rake')
     end
 
     should "properly generate for testspec" do
       buffer = silence_logger { @project.start(['sample_project', '--root=/tmp', '--test=testspec', '--script=none']) }
       assert_match /Applying.*?testspec.*?test/, buffer
-      assert_match_in_file(/gem 'test\/spec'/, '/tmp/sample_project/Gemfile')
+      assert_match_in_file(/gem 'test-spec'.*?:require => "test\/spec"/, '/tmp/sample_project/Gemfile')
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, '/tmp/sample_project/test/test_config.rb')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_project/test/test_config.rb')
+      assert_file_exists('/tmp/sample_project/test/test.rake')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -132,13 +132,13 @@ files:
 - VERSION
 - bin/padrino-gen
 - lib/padrino-gen.rb
-- lib/padrino-gen/generators.rb
 - lib/padrino-gen/generators/actions.rb
 - lib/padrino-gen/generators/app.rb
 - 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/cli.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
@@ -189,6 +189,7 @@ files:
 - lib/padrino-gen/padrino-tasks/activerecord.rb
 - lib/padrino-gen/padrino-tasks/datamapper.rb
 - lib/padrino-gen/padrino-tasks/locale.rb
+- lib/padrino-gen/padrino-tasks/seed.rb
 - padrino-gen.gemspec
 - test/helper.rb
 - test/test_app_generator.rb