padrino-gen 0.10.7 → 0.11.0

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

@@ -1,9 +1,67 @@
-if defined?(Mongoid)
+if PadrinoTasks.load?(:mongoid, defined?(Mongoid))
+  require 'mongoid' # eagerly load mongoid for version check
+
   namespace :mi do
 
+    if Mongoid::VERSION =~ /^[012]\./
+      # Mongoid 2 API
+      def mongoid_collections
+        Mongoid.master.collections
+      end
+
+      def mongoid_collection(name)
+        Mongoid.master.collection(name)
+      end
+
+      def mongoid_new_collection(collection, name)
+        collection.db.collection(name)
+      end
+
+      def enum_mongoid_documents(collection)
+        collection.find({}, :timeout => false, :sort => "_id") do |cursor|
+          cursor.each do |doc|
+            yield doc
+          end
+        end
+      end
+
+      def rename_mongoid_collection(collection, new_name)
+        collection.rename(new_name)
+      end
+    else
+      # Mongoid 3+ API
+      def mongoid_collections
+        Mongoid.default_session.collections
+      end
+
+      def mongoid_collection(name)
+        Mongoid.default_session[name]
+      end
+
+      def mongoid_new_collection(collection, name)
+        Mongoid.default_session[name]
+      end
+
+      def enum_mongoid_documents(collection)
+        collection.find.sort(:_id => 1).each do |doc|
+          yield doc
+        end
+      end
+
+      def rename_mongoid_collection(collection, new_name)
+        db_name = collection.database.name
+        collection.database.session.with(:database => :admin) do |admin|
+          admin.command(
+            :renameCollection => "#{db_name}.#{collection.name}",
+            :to               => "#{db_name}.#{new_name}",
+            :dropTarget       => true)
+        end
+      end
+    end
+
     desc 'Drops all the collections for the database for the current Padrino.env'
     task :drop => :environment do
-      Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+      mongoid_collections.select {|c| c.name !~ /system/ }.each(&:drop)
     end
 
     # Helper to retrieve a list of models.
@@ -33,7 +91,7 @@ if defined?(Mongoid)
 
     def convert_ids(obj)
       if obj.is_a?(String) && obj =~ /^[a-f0-9]{24}$/
-        BSON::ObjectId(obj)
+        defined?(Moped) ? Moped::BSON::ObjectId.from_string(obj) : BSON::ObjectId(obj)
       elsif obj.is_a?(Array)
         obj.map do |v|
           convert_ids(v)
@@ -57,18 +115,16 @@ if defined?(Mongoid)
         puts "Converting #{collection_name} to use ObjectIDs"
 
         # get old collection
-        collection = Mongoid.master.collection(collection_name)
+        collection = mongoid_collection(collection_name)
 
         # get new collection (a clean one)
-        collection.db["#{collection_name}_new"].drop
-        new_collection = collection.db["#{collection_name}_new"]
+        mongoid_collection("#{collection_name}_new").drop
+        new_collection = mongoid_new_collection(collection, "#{collection_name}_new")
 
         # convert collection documents
-        collection.find({}, :timeout => false, :sort => "_id") do |cursor|
-           cursor.each do |doc|
-            new_doc = convert_ids(doc)
-            new_collection.insert(new_doc, :safe => true)
-          end
+        enum_mongoid_documents(collection) do |doc|
+          new_doc = convert_ids(doc)
+          new_collection.insert(new_doc, :safe => true)
         end
 
         puts "Done! Converted collection is in #{new_collection.name}\n\n"
@@ -76,15 +132,15 @@ if defined?(Mongoid)
 
       # no errors. great! now rename _new to collection_name
       collection_names.each do |collection_name|
-        collection = Mongoid.master.collection(collection_name)
-        new_collection = collection.db["#{collection_name}_new"]
+        collection = mongoid_collection(collection_name)
+        new_collection = mongoid_new_collection(collection, "#{collection_name}_new")
 
         # swap collection to _old
         puts "Moving #{collection.name} to #{collection_name}_old"
-        collection.db["#{collection_name}_old"].drop
+        mongoid_new_collection(collection, "#{collection_name}_old").drop
 
         begin
-          collection.rename("#{collection_name}_old")
+          rename_mongoid_collection(collection, "#{collection_name}_old")
         rescue StandardError => e
           puts "Unable to rename database #{collection_name} to #{collection_name}_old"
           puts "reason: #{e.message}\n\n"
@@ -94,7 +150,7 @@ if defined?(Mongoid)
         puts "Moving #{new_collection.name} to #{collection_name}\n\n"
 
         begin
-          new_collection.rename(collection_name)
+          rename_mongoid_collection(new_collection, collection_name)
         rescue StandardError => e
           puts "Unable to rename database #{new_collection.name} to #{collection_name}"
           puts "reason: #{e.message}\n\n"
@@ -107,9 +163,11 @@ if defined?(Mongoid)
     desc "Clean up old collections backed up by objectid_convert"
     task :cleanup_old_collections => :environment do
       collection_names.each do |collection_name|
-        collection = Mongoid.master.collection(collection_name)
-        collection.db["#{collection.name}_old"].drop
+        collection = mongoid_collection(collection_name)
+        mongoid_new_collection(collection, "#{collection.name}_old").drop
       end
     end
   end
+
+  task 'db:drop' => 'mi:drop'
 end

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

@@ -1,6 +1,12 @@
 if defined?(MongoMapper)
+  begin
+    require 'i18n'
+  rescue LoadError
+    # only do this for I18n check later
+  end
+
   namespace :mm do
-    desc 'Drops all the collections for the database for the current Rails.env'
+    desc 'Drops all the collections for the database for the current Padrino.env'
     task :drop => :environment do
       MongoMapper.database.collections.select {|c| c.name !~ /system/ }.each(&:drop)
     end
@@ -47,4 +53,6 @@ if defined?(MongoMapper)
       end
     end
   end
+
+  task 'db:drop' => 'mm:drop'
 end

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

@@ -1,4 +1,4 @@
-if defined?(Sequel)
+if PadrinoTasks.load?(:sequel, defined?(Sequel))
   namespace :sq do
     namespace :migrate do
 
@@ -33,5 +33,10 @@ if defined?(Sequel)
         puts "<= sq:migrate:down executed"
       end
     end
+
+    desc "Perform migration up to latest migration available"
+    task :migrate => 'sq:migrate:up'
   end
+
+  task 'db:migrate' => 'sq:migrate'
 end

data/lib/padrino-gen.rb

@@ -40,7 +40,7 @@ module Padrino
       end
 
       ##
-      # Gloabl add a new generator class to +padrino-gen+
+      # Global add a new generator class to +padrino-gen+
       #
       # @param [Symbol] name
       #   key name for generator mapping
@@ -72,7 +72,7 @@ module Padrino
 end # Padrino
 
 ##
-# We add our generators to Padrino::Genererator
+# We add our generators to Padrino::Generators
 #
 Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{project,app,mailer,controller,model,migration,plugin}.rb']
 

data/test/helper.rb

@@ -100,7 +100,7 @@ class MiniTest::Spec
     path = File.join(options[:root],'lib',"#{name}_init.rb")
     instance = mock
     instance.expects(:invoke!).at_least_once
-    include_text = "  register #{name.to_s.camelize}Initializer\n"
+    include_text = "    register #{name.to_s.camelize}Initializer\n"
     Thor::Actions::InjectIntoFile.expects(:new).with(anything,anything, include_text, anything).returns(instance)
     Thor::Actions::CreateFile.expects(:new).with(anything, path, kind_of(Proc), anything).returns(instance)
   end

data/test/test_app_generator.rb

@@ -28,12 +28,31 @@ describe "AppGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/demo/views")
       assert_file_exists("#{@apptmp}/sample_project/demo/views/layouts")
       assert_dir_exists("#{@apptmp}/sample_project/public/demo")
-      assert_match_in_file('Padrino.mount("Demo").to("/demo")', "#{@apptmp}/sample_project/config/apps.rb")
+      assert_match_in_file("Padrino.mount('SampleProject::Demo', :app_file => Padrino.root('demo/app.rb')).to('/demo')", "#{@apptmp}/sample_project/config/apps.rb")
+      assert_match_in_file('module SampleProject', "#{@apptmp}/sample_project/demo/app.rb")
       assert_match_in_file('class Demo < Padrino::Application', "#{@apptmp}/sample_project/demo/app.rb")
       assert_match_in_file(/Padrino.configure_apps do/, "#{@apptmp}/sample_project/config/apps.rb")
       assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
+    should "create correctly a new padrino application with an underscore name" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") }
+      assert_file_exists("#{@apptmp}/sample_project")
+      assert_file_exists("#{@apptmp}/sample_project/demo_app")
+      assert_file_exists("#{@apptmp}/sample_project/demo_app/app.rb")
+      assert_file_exists("#{@apptmp}/sample_project/demo_app/controllers")
+      assert_file_exists("#{@apptmp}/sample_project/demo_app/helpers")
+      assert_file_exists("#{@apptmp}/sample_project/demo_app/views")
+      assert_file_exists("#{@apptmp}/sample_project/demo_app/views/layouts")
+      assert_dir_exists("#{@apptmp}/sample_project/public/demo_app")
+      assert_match_in_file("Padrino.mount('SampleProject::DemoApp', :app_file => Padrino.root('demo_app/app.rb')).to('/demo_app')", "#{@apptmp}/sample_project/config/apps.rb")
+      assert_match_in_file('module SampleProject', "#{@apptmp}/sample_project/demo_app/app.rb")
+      assert_match_in_file('class DemoApp < Padrino::Application', "#{@apptmp}/sample_project/demo_app/app.rb")
+      assert_match_in_file(/Padrino.configure_apps do/, "#{@apptmp}/sample_project/config/apps.rb")
+      assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
+    end
+
     should "generate tiny app skeleton" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo','--tiny',"--root=#{@apptmp}/sample_project") }
@@ -52,15 +71,15 @@ describe "AppGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
       capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
       capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-a=demo') }
-      assert_match_in_file(/Demo.controllers :demo_items do/m, "#{@apptmp}/sample_project/demo/controllers/demo_items.rb")
-      assert_match_in_file(/Demo.helpers do/m, "#{@apptmp}/sample_project/demo/helpers/demo_items_helper.rb")
+      assert_match_in_file(/SampleProject::Demo.controllers :demo_items do/m, "#{@apptmp}/sample_project/demo/controllers/demo_items.rb")
+      assert_match_in_file(/SampleProject::Demo.helpers do/m, "#{@apptmp}/sample_project/demo/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/demo/views/demo_items")
     end
 
     should "correctly create a new mailer inside a padrino application" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") }
-      capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project", '-a=demoapp') }
+      capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project", '-a=demo_app') }
     end
 
     # only destroys what it generated.

data/test/test_controller_generator.rb

@@ -22,8 +22,8 @@ describe "ControllerGenerator" do
     should "generate controller within existing project" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
-      assert_match_in_file(/SampleProject.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
+      assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
+      assert_match_in_file(/SampleProject::App.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_file_exists(@controller_test_path)
     end
@@ -31,8 +31,8 @@ describe "ControllerGenerator" do
     should "generate controller within existing project with weird name" do
       capture_io { generate(:project, 'warepedia', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/warepedia") }
-      assert_match_in_file(/Warepedia.controllers :demo_items do/m, "#{@apptmp}/warepedia/app/controllers/demo_items.rb")
-      assert_match_in_file(/Warepedia.helpers do/m, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb")
+      assert_match_in_file(/Warepedia::App.controllers :demo_items do/m, "#{@apptmp}/warepedia/app/controllers/demo_items.rb")
+      assert_match_in_file(/Warepedia::App.helpers do/m, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/warepedia/app/views/demo_items")
     end
 
@@ -40,8 +40,8 @@ describe "ControllerGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/Subby.controllers :demo_items do/m, @controller_path.gsub('app','subby'))
-      assert_match_in_file(/Subby.helpers do/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
+      assert_match_in_file(/SampleProject::Subby.controllers :demo_items do/m, @controller_path.gsub('app','subby'))
+      assert_match_in_file(/SampleProject::Subby.helpers do/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/subby/views/demo_items")
       assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby'))
     end
@@ -49,8 +49,8 @@ describe "ControllerGenerator" do
     should 'not fail if we don\'t have test component' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/SampleProject.controllers :demo_items do/m, @controller_path)
-      assert_match_in_file(/SampleProject.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
+      assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path)
+      assert_match_in_file(/SampleProject::App.helpers do/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
       assert_no_file_exists("#{@apptmp}/sample_project/test")
     end

data/test/test_mailer_generator.rb

@@ -21,7 +21,7 @@ describe "MailerGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:mailer, 'demo', '-a=/subby', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/Subby.mailer :demo/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
+      assert_match_in_file(/SampleProject::Subby.mailer :demo/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/subby/views/mailers/demo")
     end
 
@@ -29,7 +29,7 @@ describe "MailerGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:mailer, 'demo', 'action1', 'action2', '-a=/subby', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/Subby.mailer :demo/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
+      assert_match_in_file(/SampleProject::Subby.mailer :demo/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
       assert_match_in_file(/email :action1 do.*?end/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
       assert_match_in_file(/email :action2 do.*?end/m, "#{@apptmp}/sample_project/subby/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/subby/views/mailers/demo")
@@ -38,21 +38,21 @@ describe "MailerGenerator" do
     should "support generating a new mailer extended from base" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/SampleProject.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
+      assert_match_in_file(/SampleProject::App.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/demo")
     end
 
     should "support generating a new mailer extended from base with long name" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:mailer, 'UserNotice', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/SampleProject.mailer :user_notice/m, "#{@apptmp}/sample_project/app/mailers/user_notice.rb")
+      assert_match_in_file(/SampleProject::App.mailer :user_notice/m, "#{@apptmp}/sample_project/app/mailers/user_notice.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/user_notice")
     end
 
     should "support generating a new mailer extended from base with capitalized name" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       capture_io { generate(:mailer, 'DEMO', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/SampleProject.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
+      assert_match_in_file(/SampleProject::App.mailer :demo/m, "#{@apptmp}/sample_project/app/mailers/demo.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers/demo")
     end
   end

data/test/test_model_generator.rb

@@ -54,7 +54,6 @@ describe "ModelGenerator" do
       assert_match_in_file(/class Post\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/subby/models/post.rb")
       assert_match_in_file(/property :body, String/m, "#{@apptmp}/sample_project/subby/models/post.rb")
       assert_match_in_file(/migration 1, :create_posts do/m, "#{@apptmp}/sample_project/db/migrate/001_create_posts.rb")
-      assert_match_in_file(/gem 'dm-core'/m,"#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/DataMapper.finalize/m,"#{@apptmp}/sample_project/config/boot.rb")
     end
 
@@ -76,6 +75,19 @@ describe "ModelGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/002_create_accounts.rb")
       assert_file_exists("#{@apptmp}/sample_project/db/migrate/003_create_banks.rb")
     end
+
+    should "generate a default type value for fields" do
+      current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+      capture_io { generate(:model, 'person', "name", "age:integer", "email", "-r=#{@apptmp}/sample_project") }
+      migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
+      assert_match_in_file(/class CreatePeople < ActiveRecord::Migration/m, migration_file_path)
+      assert_match_in_file(/create_table :people/m, migration_file_path)
+      assert_match_in_file(/t.string :name/m,   migration_file_path)
+      assert_match_in_file(/t.integer :age/m,   migration_file_path)
+      assert_match_in_file(/t.string :email/m,  migration_file_path)
+      assert_match_in_file(/drop_table :people/m, migration_file_path)
+    end
   end
 
   # ACTIVERECORD
@@ -123,9 +135,9 @@ describe "ModelGenerator" do
   end
 
   # MINIRECORD
-  context "model generator using mini_record" do
+  context "model generator using minirecord" do
     should "generate hooks for auto upgrade" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=mini_record') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=minirecord') }
       assert_match_in_file(
         "Padrino.after_load do\n  ActiveRecord::Base.auto_upgrade!",
         "#{@apptmp}/sample_project/config/boot.rb"
@@ -138,7 +150,7 @@ describe "ModelGenerator" do
     end
 
     should "generate model file" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=mini_record') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=minirecord') }
       capture_io { generate(:model, 'user', 'name:string', 'surname:string', 'age:integer', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
       assert_match_in_file(/field :name, :as => :string/m, "#{@apptmp}/sample_project/models/user.rb")
@@ -147,7 +159,7 @@ describe "ModelGenerator" do
     end
 
     should "generate model file with camelized name" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=mini_record') }
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=minirecord') }
       capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class ChunkyBacon < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
       assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
@@ -175,13 +187,6 @@ describe "ModelGenerator" do
 
   # DATAMAPPER
   context "model generator using datamapper" do
-
-    should "generate gemfile gem" do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
-      capture_io { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/gem 'dm-core'/m,"#{@apptmp}/sample_project/Gemfile")
-    end
-
     should "generate model file with camelized name" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
@@ -301,8 +306,6 @@ describe "ModelGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ohm') }
       capture_io { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class Person < Ohm::Model/, "#{@apptmp}/sample_project/models/person.rb")
-      assert_match_in_file(/include Ohm::Timestamping/, "#{@apptmp}/sample_project/models/person.rb")
-      assert_match_in_file(/include Ohm::Typecast/, "#{@apptmp}/sample_project/models/person.rb")
       assert_match_in_file(/# attribute :name/m, "#{@apptmp}/sample_project/models/person.rb")
       assert_match_in_file(/# reference :venue, Venue/m, "#{@apptmp}/sample_project/models/person.rb")
     end
@@ -311,9 +314,9 @@ describe "ModelGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ohm') }
       capture_io { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
       assert_match_in_file(/class User < Ohm::Model/, "#{@apptmp}/sample_project/models/user.rb")
-      assert_match_in_file(/attribute :name, String/m, "#{@apptmp}/sample_project/models/user.rb")
-      assert_match_in_file(/attribute :age, Integer/m, "#{@apptmp}/sample_project/models/user.rb")
-      assert_match_in_file(/attribute :email, String/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/attribute :name/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/attribute :age/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/attribute :email/m, "#{@apptmp}/sample_project/models/user.rb")
     end
   end
 
@@ -424,18 +427,18 @@ describe "ModelGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/describe "SomeUser Model"/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
-      assert_match_in_file(/let\(:some_user\) \{ SomeUser.new \}/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
-      assert_match_in_file(/some_user\.should_not be_nil/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
+      assert_match_in_file(/describe SomeUser do/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
+      # assert_match_in_file(/let\(:some_user\) \{ SomeUser.new \}/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
+      # assert_match_in_file(/some_user\.should_not be_nil/m, "#{@apptmp}/sample_project/spec/models/some_user_spec.rb")
     end
 
     should "generate test file for rspec in specified app" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
       capture_io { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/describe "SomeUser Model"/m, "#{@apptmp}/sample_project/spec/subby/models/some_user_spec.rb")
-      assert_match_in_file(/let\(:some_user\) \{ SomeUser.new \}/m, "#{@apptmp}/sample_project/spec/subby/models/some_user_spec.rb")
-      assert_match_in_file(/some_user\.should_not be_nil/m, "#{@apptmp}/sample_project/spec/subby/models/some_user_spec.rb")
+      assert_match_in_file(/describe SomeUser do/m, "#{@apptmp}/sample_project/spec/subby/models/some_user_spec.rb")
+      # assert_match_in_file(/let\(:some_user\) \{ SomeUser.new \}/m, "#{@apptmp}/sample_project/spec/subby/models/some_user_spec.rb")
+      # assert_match_in_file(/some_user\.should_not be_nil/m, "#{@apptmp}/sample_project/spec/subby/models/some_user_spec.rb")
     end
 
     # SHOULDA

data/test/test_plugin_generator.rb

@@ -80,6 +80,29 @@ describe "PluginGenerator" do
       plugin_gen.expects(:apply).with(resolved_path).returns(true).once
       capture_io { plugin_gen.invoke_all }
     end
+
+    should "print a warning if template cannot be found" do
+      template_file  = 'hwat'
+      resolved_path = "https://github.com/padrino/padrino-recipes/raw/master/plugins/hwat_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(:say).with("The template at #{resolved_path} could not be found!", :red).returns(true).once
+      capture_io { plugin_gen.invoke_all }
+    end
+  end
+
+  context "with list option" do
+    should "return a list of available plugins with no parameter" do
+      plugin_gen = Padrino::Generators::Plugin.new([], [],{})
+      plugin_gen.expects(:list_plugins).returns(true).once
+      capture_io { plugin_gen.invoke_all }
+    end
+
+    should "return a list of available plugins with list option" do
+      plugin_gen = Padrino::Generators::Plugin.new(['some_plugin'], ["-l", "-r=#{@apptmp}/sample_project"],{})
+      plugin_gen.expects(:list_plugins).returns(true).once
+      capture_io { plugin_gen.invoke_all }
+    end
   end
 
   context "with git commands" do