padrino-gen 0.11.4 → 0.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ab4eea6e67ab8f8b201278704e124704844cade
-  data.tar.gz: ed5c452b5c97cd8c00475e6d30956df6962b7de4
+  metadata.gz: 34257b397db80982537c1b0e65fdb8bec6380419
+  data.tar.gz: bfbb59c39f77c8305b62b95e5fb86399d4d9f289
 SHA512:
-  metadata.gz: 01b7c42188cd0c6c3b79e2ef15d530d1b81159fa1098764a19199062a46a4a42044deb8534d9890cedd60ad1f7718cf7ea6bdfc95f6ab3581bd0db674ea4d964
-  data.tar.gz: 44b6c205f8ff6e69bdd0a1088567e15cece7be98b1c1bf9c5433330d310dcb58bc94cfe0b65df94070adb8da8e821b6b99211c9e0f645946845530215770ddda
+  metadata.gz: 7a33c18c27dcab467595384094a24afa5d073162148a8dc7999a4286c567f6598e0d04d0ae36bef692bebe87c670e92e4ed056431593a91e4086d83d8aec8bf7
+  data.tar.gz: 3afec25a54e43dfc53f09b3bf048a698c3a13f0988881711364a61e3983bfef1ee6e67e96f5690ef99ff8503af321dddd45e9574aab866dba5e6f290ffe71293

data/README.rdoc

@@ -38,12 +38,12 @@ 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::       rspec (default), bacon, shoulda, cucumber, testspec, riot, minitest
-renderer::   haml  (default), erb, erubis, liquid, slim
-stylesheet:: sass  (default), less, compass
+test::       none  (default), bacon, shoulda, cucumber, testspec, riot, rspec, minitest, steak
+renderer::   slim  (default), erb, erubis, liquid, haml
+stylesheet:: none  (default), less, compass, sass, scss
 mock::       none  (default), mocha, rr
 script::     none  (default), jquery, prototype, mootools, rightjs, extcore, dojo
-orm::        none  (default), datamapper, mongomapper, mongoid, activerecord, sequel, couchrest, ohm, mongomatic, ripple
+orm::        none  (default), datamapper, mongomapper, mongoid, activerecord, minirecord, sequel, couchrest, ohm, mongomatic, ripple
 
 In addition, you can generate projects based on existing templates:
 

data/lib/padrino-gen.rb

@@ -1,7 +1,7 @@
-require 'active_support/ordered_hash'
 require 'padrino-core/support_lite'
 require 'padrino-core/tasks'
 require 'padrino-gen/command'
+require 'active_support/ordered_hash'
 
 module Padrino
   ##
@@ -68,7 +68,7 @@ module Padrino
 end
 
 # Add our generators to Padrino::Generators.
-Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{project,app,mailer,controller,model,migration,plugin,component}.rb']
+Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/padrino-gen/generators/{project,app,mailer,controller,model,migration,plugin,component,task}.rb']
 
 # Add our tasks to padrino-core.
 Padrino::Tasks.files << Dir[File.dirname(__FILE__) + "/padrino-gen/padrino-tasks/**/*.rb"]

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

@@ -198,6 +198,14 @@ module Padrino
         File.exist?(destination_root('config/boot.rb'))
       end
 
+      ##
+      # Returns true if constant name already exists.
+      #
+      def already_exists?(name, project_name = nil)
+        project_name = project_name ? (Object.const_get(project_name) rescue nil) : nil
+        Object.const_defined?(name) || (project_name && project_name.const_defined?(name))
+      end
+
       ##
       # Returns the field with an unacceptable name(for symbol) else returns nil.
       #

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

@@ -35,19 +35,25 @@ module Padrino
         if in_app_root?
           @project_name = options[:namespace].underscore.camelize
           @project_name = fetch_project_name(@app_folder) if @project_name.empty?
-          lowercase_app_folder = @app_folder.downcase
-          self.behavior = :revoke if options[:destroy]
-          app_skeleton(lowercase_app_folder, options[:tiny])
-          empty_directory destination_root("public/#{lowercase_app_folder}")
-          append_file destination_root('config/apps.rb'), "\nPadrino.mount('#{@project_name}::#{@app_name}', :app_file => Padrino.root('#{lowercase_app_folder}/app.rb')).to('/#{lowercase_app_folder}')"
-
-          return if self.behavior == :revoke
-          say
-          say '=' * 65, :green
-          say "Your #{@app_name} application has been installed."
-          say '=' * 65, :green
-          say "This application has been mounted to /#{@app_name.downcase}"
-          say "You can configure a different path by editing 'config/apps.rb'"
+          if already_exists?(@app_name, @project_name)
+            say "#{@app_name} already exists."
+            say "Please, change the name."
+            return
+          else
+            lowercase_app_folder = @app_folder.downcase
+            self.behavior = :revoke if options[:destroy]
+            app_skeleton(lowercase_app_folder, options[:tiny])
+            empty_directory destination_root("public/#{lowercase_app_folder}")
+            inject_into_file destination_root('config/apps.rb'), "\nPadrino.mount('#{@project_name}::#{@app_name}', :app_file => Padrino.root('#{lowercase_app_folder}/app.rb')).to('/#{lowercase_app_folder}')\n", :before => /^Padrino.mount.*\.to\('\/'\)$/
+  
+            return if self.behavior == :revoke
+            say
+            say '=' * 65, :green
+            say "Your #{@app_name} application has been installed."
+            say '=' * 65, :green
+            say "This application has been mounted to /#{@app_name.downcase}"
+            say "You can configure a different path by editing 'config/apps.rb'"
+          end
         else
           say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end

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

@@ -14,11 +14,16 @@ module <%= @project_name %>
     #
     # You can customize caching store engines:
     #
-    # set :cache, Padrino::Cache::Store::Memcache.new(::Memcached.new('127.0.0.1:11211', :exception_retry_limit => 1))
-    # set :cache, Padrino::Cache::Store::Memcache.new(::Dalli::Client.new('127.0.0.1:11211', :exception_retry_limit => 1))
-    # set :cache, Padrino::Cache::Store::Redis.new(::Redis.new(:host => '127.0.0.1', :port => 6379, :db => 0))
-    # set :cache, Padrino::Cache::Store::Memory.new(50)
-    # set :cache, Padrino::Cache::Store::File.new(Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
+    # set :cache, Padrino::Cache.new(:LRUHash) # Keeps cached values in memory
+    # set :cache, Padrino::Cache.new(:Memcached) # Uses default server at localhost
+    # set :cache, Padrino::Cache.new(:Memcached, '127.0.0.1:11211', :exception_retry_limit => 1)
+    # set :cache, Padrino::Cache.new(:Memcached, :backend => memcached_or_dalli_instance)
+    # set :cache, Padrino::Cache.new(:Redis) # Uses default server at localhost
+    # set :cache, Padrino::Cache.new(:Redis, :host => '127.0.0.1', :port => 6379, :db => 0)
+    # set :cache, Padrino::Cache.new(:Redis, :backend => redis_instance)
+    # set :cache, Padrino::Cache.new(:Mongo) # Uses default server at localhost
+    # set :cache, Padrino::Cache.new(:Mongo, :backend => mongo_client_instance)
+    # set :cache, Padrino::Cache.new(:File, :dir => Padrino.root('tmp', app_name.to_s, 'cache')) # default choice
     #
 
     ##

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

@@ -52,6 +52,10 @@ module Padrino
             @project_name = fetch_component_choice(:namespace)
             execute_component_setup(comp, choice)
             store_component_choice(comp, choice)
+            if comp.to_s == 'orm' && choice.to_s != 'none'
+              inject_into_file destination_root('Rakefile'), "PadrinoTasks.use(:database)\n", :before => "PadrinoTasks.init"
+              inject_into_file destination_root('Rakefile'), "PadrinoTasks.use(#{choice.to_sym.inspect})\n", :before => "PadrinoTasks.init"
+            end
           end
         else
           say 'You are not at the root of a Padrino application! (config/boot.rb not found)'

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

@@ -29,12 +29,14 @@ ActiveRecord::Base.configurations[:test] = {
 # Setup our logger
 ActiveRecord::Base.logger = logger
 
-# Raise exception on mass assignment protection for Active Record models.
-ActiveRecord::Base.mass_assignment_sanitizer = :strict
+if ActiveRecord::VERSION::MAJOR.to_i < 4
+  # Raise exception on mass assignment protection for Active Record models.
+  ActiveRecord::Base.mass_assignment_sanitizer = :strict
 
-# Log the query plan for queries taking more than this (works
-# with SQLite, MySQL, and PostgreSQL).
-ActiveRecord::Base.auto_explain_threshold_in_seconds = 0.5
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL).
+  ActiveRecord::Base.auto_explain_threshold_in_seconds = 0.5
+end
 
 # Include Active Record class name as root for JSON serialized output.
 ActiveRecord::Base.include_root_in_json = false

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

@@ -14,12 +14,14 @@ ActiveRecord::Base.configurations[:test] = {
 # Setup our logger.
 ActiveRecord::Base.logger = logger
 
-# Raise exception on mass assignment protection for Active Record models.
-ActiveRecord::Base.mass_assignment_sanitizer = :strict
+if ActiveRecord::VERSION::MAJOR.to_i < 4
+  # Raise exception on mass assignment protection for Active Record models.
+  ActiveRecord::Base.mass_assignment_sanitizer = :strict
 
-# Log the query plan for queries taking more than this (works
-# with SQLite, MySQL, and PostgreSQL).
-ActiveRecord::Base.auto_explain_threshold_in_seconds = 0.5
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL).
+  ActiveRecord::Base.auto_explain_threshold_in_seconds = 0.5
+end
 
 # Doesn't include Active Record class name as root for JSON serialized output.
 ActiveRecord::Base.include_root_in_json = false

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

@@ -74,17 +74,8 @@ Mongoid::Config.sessions =
 MONGO
 
 def setup_orm
-  require_dependencies 'mongoid', :version => (RUBY_VERSION >= '1.9' ? '~>3.0.0' : '~>2.0')
-
-  if RUBY_VERSION =~ /1\.8/ && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')
-    require_dependencies('SystemTimer', :require => 'system_timer')
-  end
-
-  if RUBY_VERSION >= '1.9'
-     create_file('config/database.rb', MONGOID3.gsub(/!NAME!/, @project_name.underscore))
-  else
-    create_file('config/database.rb', MONGOID.gsub(/!NAME!/, @project_name.underscore))
-  end
+  require_dependencies 'mongoid', :version => '~>3.0.0'
+  create_file('config/database.rb', MONGOID3.gsub(/!NAME!/, @project_name.underscore))
 end
 
 MONGOID_MODEL = (<<-MODEL) unless defined?(MONGOID_MODEL)

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

@@ -11,7 +11,6 @@ MONGO
 def setup_orm
   require_dependencies 'mongo_mapper'
   require_dependencies 'bson_ext', :require => 'mongo'
-  require_dependencies('SystemTimer', :require => 'system_timer') if RUBY_VERSION =~ /1\.8/ && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')
   create_file("config/database.rb", MONGO.gsub(/!NAME!/, @project_name.underscore))
 end
 

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

@@ -39,7 +39,10 @@ RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
 begin
   require 'rspec/core/rake_task'
 
-  spec_tasks = Dir['spec/*/'].map { |d| File.basename(d) }
+	spec_tasks = Dir['spec/*/'].inject([]) do |result, d|
+	  result << File.basename(d) unless Dir["\#{d}*"].empty?
+	  result
+	end
 
   spec_tasks.each do |folder|
     RSpec::Core::RakeTask.new("spec:\#{folder}") do |t|

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

@@ -0,0 +1,93 @@
+STEAK_SETUP = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_SETUP)
+PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+
+RSpec.configure do |conf|
+  conf.include Rack::Test::Methods
+  conf.include Capybara
+end
+
+def app
+  ##
+  # You can handle all padrino applications using instead:
+  #   Padrino.application
+  CLASS_NAME.tap { |app|  }
+end
+
+Capybara.app = app
+TEST
+
+STEAK_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_CONTROLLER_TEST)
+require 'spec_helper'
+
+describe "!NAME!Controller" do
+  before do
+    get "/"
+  end
+
+  it "returns hello world" do
+    last_response.body.should == "Hello World"
+  end
+end
+TEST
+
+STEAK_CONTROLLER_ACCEPTANCE_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_CONTROLLER_ACCEPTANCE_TEST)
+require 'spec_helper'
+
+feature "!NAME!Controller" do
+  background do
+    visit "/"
+  end
+
+  scenario "returns hello world" do
+    page.should.have_content == "Hello World"
+  end
+end
+TEST
+
+STEAK_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_RAKE)
+require 'rspec/core/rake_task'
+
+spec_tasks = Dir['spec/*/'].map { |d| File.basename(d) }
+
+spec_tasks.each do |folder|
+  RSpec::Core::RakeTask.new("spec:\#{folder}") do |t|
+    t.pattern = "./spec/\#{folder}/**/*_spec.rb"
+    t.rspec_opts = %w(-fs --color)
+  end
+end
+
+desc "Run complete application spec suite"
+task 'spec' => spec_tasks.map { |f| "spec:\#{f}" }
+TEST
+
+STEAK_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_MODEL_TEST)
+require 'spec_helper'
+
+describe !NAME! do
+end
+TEST
+
+def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
+  require_dependencies 'steak', :group => 'test'
+  insert_test_suite_setup STEAK_SETUP, :path => "spec/spec_helper.rb"
+  create_file destination_root("spec/spec.rake"), STEAK_RAKE
+end
+
+# Generates a controller test given the controllers name
+def generate_controller_test(name)
+  spec_contents = STEAK_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
+  controller_spec_path = File.join('spec',options[:app],'controllers',"#{name.to_s.underscore}_controller_spec.rb")
+  create_file destination_root(controller_spec_path), spec_contents, :skip => true
+
+  acceptance_contents = STEAK_CONTROLLER_ACCEPTANCE_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
+  controller_acceptance_path = File.join('spec',options[:app],'acceptance','controllers',"#{name.to_s.underscore}_controller_spec.rb")
+  create_file destination_root(controller_acceptance_path), acceptance_contents, :skip => true
+end
+
+def generate_model_test(name)
+  rspec_contents = STEAK_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  model_spec_path = File.join('spec',options[:app],'models',"#{name.to_s.underscore}_spec.rb")
+  create_file destination_root(model_spec_path), rspec_contents, :skip => true
+end

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

@@ -32,22 +32,31 @@ module Padrino
         if in_app_root?
           app = options[:app]
           check_app_existence(app)
-          self.behavior = :revoke if options[:destroy]
-          if invalids = invalid_fields(fields)
-            say 'Invalid field name:', :red
-            say " #{invalids.join(", ")}"
+          camel_name = name.to_s.underscore.camelize
+          @project_name = ""
+          @project_name = fetch_project_name
+          if already_exists?(camel_name, @project_name)
+            say "#{camel_name} already exists."
+            say "Please, change the name."
             return
+          else
+            self.behavior = :revoke if options[:destroy]
+            if invalids = invalid_fields(fields)
+              say 'Invalid field name:', :red
+              say " #{invalids.join(", ")}"
+              return
+            end
+            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}"
+            apply_default_fields fields
+            create_model_file(name, :fields => fields, :app => app)
+            generate_model_test(name) if test?
+            create_model_migration(migration_name, name, fields) unless options[:skip_migration]
           end
-          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}"
-          apply_default_fields fields
-          create_model_file(name, :fields => fields, :app => app)
-          generate_model_test(name) if test?
-          create_model_migration(migration_name, name, fields) unless options[:skip_migration]
         else
           say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end

data/lib/padrino-gen/generators/project/config/apps.rb.tt

@@ -28,7 +28,7 @@
 Padrino.configure_apps do
   # enable :sessions
   set :session_secret, '<%= SecureRandom.hex(32) %>'
-  set :protection, true
+  set :protection, :except => :path_traversal
   set :protect_from_csrf, true
 end
 

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

@@ -16,6 +16,7 @@ Bundler.require(:default, PADRINO_ENV)
 # ## Configure your I18n
 #
 # I18n.default_locale = :en
+# I18n.enforce_available_locales = false
 #
 # ## Configure your HTML5 data helpers
 #

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

@@ -128,7 +128,7 @@ module Padrino
             raw_link, _ = *open(template_file).read.scan(/<a\s+href\s?\=\"(.*?)\"\>raw/)
             raw_link ? "https://gist.github.com#{raw_link[0]}" : template_file
           when File.extname(template_file).blank? # referencing official plugin (i.e hoptoad)
-            "https://github.com/padrino/padrino-recipes/raw/master/#{kind.to_s.pluralize}/#{template_file}_#{kind}.rb"
+            "https://raw.github.com/padrino/padrino-recipes/master/#{kind.to_s.pluralize}/#{template_file}_#{kind}.rb"
           else # local file on system
             File.expand_path(template_file)
           end

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

@@ -0,0 +1,45 @@
+module Padrino
+  module Generators
+    ##
+    # Responsible for generating new task file for Padrino application.
+    #
+    class Task < Thor::Group
+      include Thor::Actions
+      include Padrino::Generators::Actions
+      include Padrino::Generators::Components::Actions
+
+      Padrino::Generators.add_generator(:task, self)
+
+      class << self
+        def source_root; File.expand_path(File.dirname(__FILE__)); end
+        def banner; "padrino-gen task [name]"; end
+      end
+
+      desc "Description:\n\n\tpadrino-gen task generates a new task file."
+
+      argument     :name,        :desc => 'The name of your application task'
+      class_option :root,        :desc => 'The root destination',                     :aliases => '-r', :default => '.', :type => :string
+      class_option :description, :desc => 'The description of your application task', :aliases => '-d', :default => nil, :type => :string
+      class_option :namespace,   :desc => 'The namespace of your application task',   :aliases => '-n', :default => nil, :type => :string
+
+      # Show help if no ARGV given
+      require_arguments!
+
+      def create_task
+        self.destination_root = options[:root]
+        if in_app_root?
+          app        = options[:app]
+          @task_name = name.to_s.underscore
+          @namespace = options[:namespace].underscore if options[:namespace]
+          @desc      = options[:description]
+          filename   = @task_name + ".rake"
+          filename   = "#{@namespace}_#{filename}" if @namespace
+
+          template 'templates/task.rb.tt', destination_root('tasks', filename)
+        else
+          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
+        end
+      end
+    end
+  end
+end

data/lib/padrino-gen/generators/templates/task.rb.tt

@@ -0,0 +1,7 @@
+<%= "namespace :#{@namespace} do" if @namespace %>
+  <%= "desc \"#{@desc}\"" if @desc %>
+  task :<%= @task_name %> => :environment do
+    # This is a custom task.
+  end
+<%= "end" if @namespace %>
+

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

@@ -48,9 +48,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
               ActiveRecord::Base.establish_connection(config)
               ActiveRecord::Base.connection
             rescue StandardError => e
-              $stderr.puts *(e.backtrace)
-              $stderr.puts e.inspect
-              $stderr.puts "Couldn't create database for #{config.inspect}"
+              catch_error(:create, e, config)
             end
           end
           return # Skip the else clause of begin/rescue
@@ -81,9 +79,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
             ActiveRecord::Base.connection.create_database(config[:database], config.merge(:encoding => @encoding))
             ActiveRecord::Base.establish_connection(config)
           rescue StandardError => e
-            $stderr.puts *(e.backtrace)
-            $stderr.puts e.inspect
-            $stderr.puts "Couldn't create database for #{config.inspect}"
+            catch_error(:create, e, config)
           end
         end
       else
@@ -101,9 +97,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
             # Only connect to local databases
             local_database?(config) { drop_database(config) }
           rescue StandardError => e
-            $stderr.puts *(e.backtrace)
-            $stderr.puts e.inspect
-            $stderr.puts "Couldn't drop #{config[:database]}"
+            catch_error(:drop, e, config)
           end
         end
       end
@@ -115,9 +109,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       begin
         drop_database(config)
       rescue StandardError => e
-        $stderr.puts *(e.backtrace)
-        $stderr.puts e.inspect
-        $stderr.puts "Couldn't drop #{config[:database]}"
+        catch_error(:drop, e, config)
       end
     end
 
@@ -220,7 +212,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     desc "Raises an error if there are pending migrations"
     task :abort_if_pending_migrations => :environment do
       if defined? ActiveRecord
-        pending_migrations = ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations
+        pending_migrations = ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
 
         if pending_migrations.any?
           puts "You have #{pending_migrations.size} pending migrations:"
@@ -363,6 +355,17 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     FireRuby::Database.db_string_for(config.symbolize_keys)
   end
 
+  def catch_error(type, error, config)
+    $stderr.puts *(error.backtrace)
+    $stderr.puts error.inspect
+    case type
+    when :create
+      $stderr.puts "Couldn't create database for #{config.inspect}"
+    when :drop
+      $stderr.puts "Couldn't drop #{config[:database]}"
+    end
+  end
+
   task 'db:migrate' => 'ar:migrate'
   task 'db:create'  => 'ar:create'
   task 'db:drop'    => 'ar:drop'

data/padrino-gen.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+  s.license = "MIT"
 
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files         = `git ls-files`.split("\n") | Dir.glob("{lib}/**/*")

data/test/helper.rb

@@ -7,7 +7,9 @@ require 'webrat'
 require 'fakeweb'
 require 'thor/group'
 require 'padrino-gen'
-require 'padrino-core/support_lite' unless defined?(SupportLite)
+require 'padrino-core'
+require 'padrino-mailer'
+require 'padrino-helpers'
 
 Padrino::Generators.load_components!
 
@@ -31,6 +33,23 @@ class MiniTest::Spec
     "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)
   end
 
+  # generate_with_parts(:app, "demo", "--root=/tmp/sample_project", :apps => "subapp")
+  # This method is intended to reproduce the real environment.
+  def generate_with_parts(name, *params)
+    features, constants = [$", Object.constants].map{|x| Marshal.load(Marshal.dump(x)) }
+
+    if root = params.find{|x| x.index(/\-r=|\-\-root=/) }
+      root = root.split(/=/)[1]
+      options, model_path = {}, File.expand_path(File.join(root, "/models/**/*.rb"))
+      options = params.pop if params.last.is_a?(Hash)
+      Dir[model_path].each{|path| require path }
+      Array(options[:apps]).each{|app_name| require File.expand_path(File.join(root, "/#{app_name}/app.rb")) } if options[:apps]
+    end
+    "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)
+    ($" - features).each{|x| $".delete(x) }
+    (Object.constants - constants).each{|constant| Object.instance_eval{ remove_const(constant) }}
+  end
+
   # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
   # In this case, block is the html to evaluate
   def assert_has_tag(name, attributes = {}, &block)

data/test/test_app_generator.rb

@@ -96,5 +96,26 @@ describe "AppGenerator" do
       assert_no_dir_exists("#{@apptmp}/sample_project/demo/views")
       assert_no_match_in_file(/Padrino\.mount\("Demo"\).to\("\/demo"\)/,"#{@apptmp}/sample_project/config/apps.rb")
     end
+
+    should "abort if app name already exists" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      out, err = capture_io { generate(:app, 'kernel', "--root=#{@apptmp}/sample_project") }
+      assert_match(/Kernel already exists/, out)
+      assert_no_dir_exists("#{@apptmp}/sample_project/public/kernel")
+      assert_no_dir_exists("#{@apptmp}/sample_project/kernel/controllers")
+      assert_no_dir_exists("#{@apptmp}/sample_project/kernel/helpers")
+      assert_no_file_exists("#{@apptmp}/sample_project/kernel/app.rb")
+    end
+
+    should "abort if app name already exists in root" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:app, 'subapp', "--root=#{@apptmp}/sample_project") }
+      out, err = capture_io { generate_with_parts(:app, 'subapp', "--root=#{@apptmp}/sample_project", :apps => "subapp") }
+      assert_dir_exists("#{@apptmp}/sample_project/public/subapp")
+      assert_dir_exists("#{@apptmp}/sample_project/subapp/controllers")
+      assert_dir_exists("#{@apptmp}/sample_project/subapp/helpers")
+      assert_file_exists("#{@apptmp}/sample_project/subapp/app.rb")
+      assert_match(/Subapp already exists/, out)
+    end
   end
 end

data/test/test_controller_generator.rb

@@ -140,6 +140,14 @@ describe "ControllerGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
     end
 
+    should "generate controller test for steak" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=steak') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb")
+      assert_match_in_file(/feature "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/acceptance/controllers/demo_items_controller_spec.rb")
+    end
+
     should "generate controller test for cucumber" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=cucumber') }
       capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }

data/test/test_generator.rb

@@ -4,7 +4,7 @@ describe "Generator" do
 
   context "the generator" do
     should "have default generators" do
-      %w{controller mailer migration model app plugin component}.each do |gen|
+      %w{controller mailer migration model app plugin component task}.each do |gen|
         assert Padrino::Generators.mappings.has_key?(gen.to_sym)
         assert_equal "Padrino::Generators::#{gen.camelize}", Padrino::Generators.mappings[gen.to_sym].name
         assert Padrino::Generators.mappings[gen.to_sym].respond_to?(:start)

data/test/test_model_generator.rb

@@ -97,6 +97,23 @@ describe "ModelGenerator" do
       assert_match_in_file(/      t.string :email/m,  migration_file_path)
       assert_match_in_file(/    drop_table :people/m, migration_file_path)
     end
+
+    should "abort if model name already exists" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "-d=activerecord") }
+      out, err = capture_io { generate(:model, 'kernel', "--root=#{@apptmp}/sample_project") }
+      assert_match(/Kernel already exists/, out)
+      assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_kernel.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/models/kernel.rb")
+    end
+
+    should "abort if model name already exists in root" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "-d=activerecord") }
+      capture_io { generate(:app, 'user', "--root=#{@apptmp}/sample_project") }
+      out, err = capture_io { generate_with_parts(:model, 'user', "--root=#{@apptmp}/sample_project", :apps => "user") }
+      assert_file_exists("#{@apptmp}/sample_project/user/app.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/models/user.rb")
+      assert_match(/User already exists/, out)
+    end
   end
 
   # ACTIVERECORD

data/test/test_plugin_generator.rb

@@ -68,7 +68,7 @@ describe "PluginGenerator" do
 
     should "resolve official template" do
       template_file = 'sampleblog'
-      resolved_path = "https://github.com/padrino/padrino-recipes/raw/master/templates/sampleblog_template.rb"
+      resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/templates/sampleblog_template.rb"
       project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {})
       project_gen.expects(:apply).with(resolved_path).returns(true).once
       capture_io { project_gen.invoke_all }
@@ -83,7 +83,7 @@ describe "PluginGenerator" do
 
     should "resolve official plugin" do
       template_file = 'hoptoad'
-      resolved_path = "https://github.com/padrino/padrino-recipes/raw/master/plugins/hoptoad_plugin.rb"
+      resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/plugins/hoptoad_plugin.rb"
       plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{})
       plugin_gen.expects(:in_app_root?).returns(true).once
       plugin_gen.expects(:apply).with(resolved_path).returns(true).once
@@ -92,7 +92,7 @@ describe "PluginGenerator" do
 
     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"
+      resolved_path = "https://raw.github.com/padrino/padrino-recipes/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

data/test/test_project_generator.rb

@@ -377,13 +377,8 @@ describe "ProjectGenerator" do
     should "properly generate for mongoid" do
       out, err = capture_io { generate(:project, 'project.com', "--root=#{@apptmp}", '--orm=mongoid', '--script=none') }
       assert_match(/applying.*?mongoid.*?orm/, out)
-      if RUBY_VERSION >= '1.9'
-        assert_match_in_file(/gem 'mongoid', '~>3.0.0'/, "#{@apptmp}/project.com/Gemfile")
-        assert_match_in_file(/Mongoid::Config.sessions =/, "#{@apptmp}/project.com/config/database.rb")
-      else
-        assert_match_in_file(/gem 'mongoid', '~>2.0'/, "#{@apptmp}/project.com/Gemfile")
-        assert_match_in_file(/Mongoid.database/, "#{@apptmp}/project.com/config/database.rb")
-      end
+      assert_match_in_file(/gem 'mongoid', '~>3.0.0'/, "#{@apptmp}/project.com/Gemfile")
+      assert_match_in_file(/Mongoid::Config.sessions =/, "#{@apptmp}/project.com/config/database.rb")
     end
 
 
@@ -557,6 +552,20 @@ describe "ProjectGenerator" do
       assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake")
     end
 
+    should "properly generate for steak" do
+      out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=steak', '--script=none') }
+      assert_match(/applying.*?steak.*?test/, out)
+      assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/:require => 'rack\/test'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/:group => 'test'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'steak'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/RSpec.configure/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_file_exists("#{@apptmp}/sample_project/spec/spec.rake")
+      assert_match_in_file(/RSpec::Core::RakeTask\.new\("spec:\#/,"#{@apptmp}/sample_project/spec/spec.rake")
+      assert_match_in_file(/task 'spec' => spec_tasks/,"#{@apptmp}/sample_project/spec/spec.rake")
+    end
+
     should "properly generate for minitest" do
       out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=minitest', '--script=none') }
       assert_match(/applying.*?minitest.*?test/, out)

data/test/test_task_generator.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "TaskGenerator" do
+  def setup
+    @apptmp = "#{Dir.tmpdir}/padrino-tests/#{UUID.new.generate}"
+    `mkdir -p #{@apptmp}`
+  end
+
+  def teardown
+    `rm -rf #{@apptmp}`
+  end
+
+  context 'the task generator' do
+    should "fail outside app root" do
+      out, err = capture_io { generate(:task, 'foo', "-r=#{@apptmp}") }
+      assert_match(/not at the root/, out)
+      assert_no_file_exists('/tmp/tasks/foo.rake')
+    end
+
+    should "generate filename properly" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:task, 'DemoTask', "--namespace=Sample", "--description='This is a sample'", "-r=#{@apptmp}/sample_project") }
+      assert_file_exists("#{@apptmp}/sample_project/tasks/sample_demo_task.rake")
+    end
+
+    should "generate task file with description" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:task, 'foo', "--description=This is a sample", "-r=#{@apptmp}/sample_project") }
+      file_path = "#{@apptmp}/sample_project/tasks/foo.rake"
+      assert_no_match_in_file(/namespace/, file_path)
+      assert_match_in_file(/desc "This is a sample"/, file_path)
+      assert_match_in_file(/task :foo => :environment do/, file_path)
+    end
+
+    should "generate task file with namespace" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:task, 'foo', "--namespace=Sample", "-r=#{@apptmp}/sample_project") }
+      file_path = "#{@apptmp}/sample_project/tasks/sample_foo.rake"
+      assert_match_in_file(/namespace :sample do/, file_path)
+      assert_match_in_file(/task :foo => :environment do/, file_path)
+      assert_no_match_in_file(/desc/, file_path)
+    end
+
+    should "generate task file with snake case name when using camelized name" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:task, 'DemoTask', "--namespace=Sample", "--description=This is a sample", "-r=#{@apptmp}/sample_project") }
+      file_path = "#{@apptmp}/sample_project/tasks/sample_demo_task.rake"
+      assert_match_in_file(/namespace :sample do/, file_path)
+      assert_match_in_file(/desc "This is a sample"/, file_path)
+      assert_match_in_file(/task :demo_task => :environment do/, file_path)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.12.0.rc1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,7 @@ files:
 - lib/padrino-gen/generators/components/tests/riot.rb
 - lib/padrino-gen/generators/components/tests/rspec.rb
 - lib/padrino-gen/generators/components/tests/shoulda.rb
+- lib/padrino-gen/generators/components/tests/steak.rb
 - lib/padrino-gen/generators/components/tests/testspec.rb
 - lib/padrino-gen/generators/controller.rb
 - lib/padrino-gen/generators/mailer.rb
@@ -112,6 +113,7 @@ files:
 - lib/padrino-gen/generators/project/config/boot.rb
 - lib/padrino-gen/generators/project/public/favicon.ico
 - lib/padrino-gen/generators/runner.rb
+- lib/padrino-gen/generators/task.rb
 - lib/padrino-gen/generators/templates/Gemfile.tt
 - lib/padrino-gen/generators/templates/Rakefile.tt
 - lib/padrino-gen/generators/templates/controller.rb.tt
@@ -122,6 +124,7 @@ files:
 - lib/padrino-gen/generators/templates/helper.rb.tt
 - lib/padrino-gen/generators/templates/initializer.rb.tt
 - lib/padrino-gen/generators/templates/mailer.rb.tt
+- lib/padrino-gen/generators/templates/task.rb.tt
 - lib/padrino-gen/padrino-tasks/activerecord.rb
 - lib/padrino-gen/padrino-tasks/database.rb
 - lib/padrino-gen/padrino-tasks/datamapper.rb
@@ -147,6 +150,7 @@ files:
 - test/test_model_generator.rb
 - test/test_plugin_generator.rb
 - test/test_project_generator.rb
+- test/test_task_generator.rb
 - lib/padrino-gen/generators/templates/static/js/dojo.js
 - lib/padrino-gen/generators/templates/static/js/ext.js
 - lib/padrino-gen/generators/templates/static/js/jquery.js
@@ -162,7 +166,8 @@ files:
 - lib/padrino-gen/generators/templates/static/ujs/prototype.js
 - lib/padrino-gen/generators/templates/static/ujs/right.js
 homepage: http://www.padrinorb.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -176,9 +181,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-gen
 rubygems_version: 2.0.6
@@ -202,4 +207,5 @@ test_files:
 - test/test_model_generator.rb
 - test/test_plugin_generator.rb
 - test/test_project_generator.rb
+- test/test_task_generator.rb
 has_rdoc: