padrino-gen 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: effdab76dcbf3f1dec71da8a9272954f2ab5bd3f
-  data.tar.gz: 1aaab8565a82db9b0ccb97da317318b54c12415e
+  metadata.gz: 9723f186fd87abe0b38622f0fa4fc17ad84686a2
+  data.tar.gz: abaefe256065c0c96e0765a3b9d28d8dfa80eb7c
 SHA512:
-  metadata.gz: ab6563038789f50343e38c33e648404239470ef2ebbec10b70ea6225ee24b2cd6f9a7794bdf51a705a16ee8cf8f74f5499e74746219ad14f33251b47f89c189f
-  data.tar.gz: ca0642e0a51ab6f870be8e36bf271d2bae826f8885cad03ec2d88f4190a1869954c0b42e9b6004daad239a1eefa5c9b52e02e15a831196d9e3b1ec6326cbe658
+  metadata.gz: 33a337375ecd93d5bd1fefd82c349f4c17dd31aad25fe0ca827374a7370e49024e7a377cae09bec6b10147fd2bdfbc8bfa85739102ea8ed85fa6175f11d8e720
+  data.tar.gz: 2ce9dcf92dc0aa13ab49d339af8590ad5add089e01ae3a61e77fee905f55fbaba3cd0642743b68380dc4cb5a8cde5b66ca95c29327da145f5e13f6e3aea974e0

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

@@ -3,12 +3,24 @@ module Padrino
     # Raised when an application does not have a resolved root path.
     class  AppRootNotFound < RuntimeError; end
     ##
+    # Default helper name for use in tiny app skeleton generator.
+    #
+    DEFAULT_HELPER_NAME = "Helper".freeze
+    ##
     # Common actions needed to support project and component generation.
     #
     module Actions
       def self.included(base)
         base.extend(ClassMethods)
       end
+      ##
+      # Avoids editing destination file if it does not exist.
+      #
+      def inject_into_file(destination, *args, &block)
+        destination_path = destination.start_with?("/") ? destination : destination_root(destination)
+        return unless File.exist?(destination_path)
+        super
+      end
 
       ##
       # Performs the necessary generator for a given component choice.
@@ -37,7 +49,7 @@ module Padrino
       #   The type of the component module.
       #
       # @example
-      #   generator_module_for('rr', :mock)
+      #   apply_component_for('rr', :mock)
       #
       def apply_component_for(choice, component)
         # I need to override Thor#apply because for unknow reason :verbose => false break tasks.
@@ -335,7 +347,7 @@ WARNING
         inject_into_file('config/boot.rb', "  #{include_text}\n", :after => "Padrino.#{where} do\n")
       end
 
-        ##
+      ##
       # Inserts a middleware inside app.rb.
       #
       # @param [String] include_text
@@ -464,6 +476,7 @@ WARNING
         directory('app/', destination_root(app))
         if tiny
           template 'templates/controller.rb.tt', destination_root(app, 'controllers.rb')
+          @helper_name = DEFAULT_HELPER_NAME
           template 'templates/helper.rb.tt', destination_root(app, 'helpers.rb')
           @short_name = 'notifier'
           template 'templates/mailer.rb.tt', destination_root(app, 'mailers.rb')
@@ -502,6 +515,21 @@ WARNING
         options[:app] == '.' ? '/..' : '/../..'
       end
 
+      ##
+      # Creates an empty directory with .keep file
+      #
+      def empty_directory_with_keep_file(destination, config = {})
+        empty_directory(destination, config)
+        keep_file(destination)
+      end
+
+      ##
+      # Creates an empty .keep file
+      #
+      def keep_file(destination)
+        create_file("#{destination}/.keep")
+      end
+
       # Class methods for Thor generators to support the generators and component choices.
       module ClassMethods
         ##

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

@@ -17,10 +17,11 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen app generates a new Padrino application"
       argument     :name,      :desc => 'The name of your padrino application'
-      class_option :root,      :desc => 'The root destination',                   :aliases => '-r', :default => '.',   :type => :string
-      class_option :destroy,                                                      :aliases => '-d', :default => false, :type => :boolean
-      class_option :tiny,      :desc => 'Generate tiny app skeleton',             :aliases => '-i', :default => false, :type => :boolean
-      class_option :namespace, :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',    :type => :string
+      class_option :root,      :desc => 'The root destination',                     :aliases => '-r', :default => '.',   :type => :string
+      class_option :destroy,                                                        :aliases => '-d', :default => false, :type => :boolean
+      class_option :tiny,      :desc => 'Generate tiny app skeleton',               :aliases => '-i', :default => false, :type => :boolean
+      class_option :namespace, :desc => 'The name space of your padrino project',   :aliases => '-n', :default => '',    :type => :string
+      class_option :force,     :desc => 'Generate app files if app already exists', :aliases => '-f', :default => false, :type => :boolean
 
       # Show help if no ARGV given
       require_arguments!
@@ -39,9 +40,11 @@ module Padrino
           if options[:destroy]
             self.behavior = :revoke
           else
-            say "#{@app_name} already exists."
-            say "Please, change the name."
-            return
+            unless options[:force]
+              say "#{@app_name} already exists."
+              say "Please, change the name."
+              return
+            end
           end if already_exists?(@app_name, @project_name)
 
           lowercase_app_folder = @app_folder.downcase

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

@@ -57,8 +57,8 @@ module <%= @project_name %>
     #     render 'errors/404'
     #   end
     #
-    #   error 505 do
-    #     render 'errors/505'
+    #   error 500 do
+    #     render 'errors/500'
     #   end
     #
   end

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

@@ -1,6 +1,7 @@
 BACON_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(BACON_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
 class Bacon::Context
   include Rack::Test::Methods

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

@@ -3,6 +3,7 @@ apply_component_for(:rspec, :test)
 CUCUMBER_SETUP = (<<-TEST) unless defined?(CUCUMBER_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
 require 'capybara/cucumber'
 require 'rspec/expectations'

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

@@ -1,6 +1,7 @@
 MINITEST_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(MINITEST_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
-require File.expand_path('../../config/boot', __FILE__)
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
 class MiniTest::Spec
   include Rack::Test::Methods

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

@@ -1,6 +1,7 @@
 RIOT_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(RIOT_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
 # Specify your app using the #app helper inside a context.
 # Takes either an app class or a block argument.

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

@@ -1,6 +1,7 @@
 RSPEC_SETUP = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods
@@ -24,13 +25,15 @@ TEST
 RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_CONTROLLER_TEST)
 require 'spec_helper'
 
-describe "!NAME!Controller" do
-  before do
-    get "/"
-  end
+RSpec.describe "!NAME!Controller" do
+  pending "add some examples to \#{__FILE__}" do
+    before do
+      get "/"
+    end
 
-  it "returns hello world" do
-    last_response.body.should == "Hello World"
+    it "returns hello world" do
+      expect(last_response.body).to eq "Hello World"
+    end
   end
 end
 TEST
@@ -39,15 +42,15 @@ RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
 begin
   require 'rspec/core/rake_task'
 
-  spec_tasks = Dir['spec/*/'].inject([]) do |result, d|
+  spec_tasks = Dir['spec/*/'].each_with_object([]) do |d, result|
     result << File.basename(d) unless Dir["\#{d}*"].empty?
-    result
   end
 
   spec_tasks.each do |folder|
+    desc "Run the spec suite in \#{folder}"
     RSpec::Core::RakeTask.new("spec:\#{folder}") do |t|
       t.pattern = "./spec/\#{folder}/**/*_spec.rb"
-      t.rspec_opts = %w(-fs --color)
+      t.rspec_opts = "--color"
     end
   end
 
@@ -61,20 +64,23 @@ TEST
 RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
 require 'spec_helper'
 
-describe !NAME! do
+RSpec.describe !NAME! do
+  pending "add some examples to (or delete) \#{__FILE__}"
 end
 TEST
 
 RSPEC_HELPER_TEST = (<<-TEST) unless defined?(RSPEC_HELPER_TEST)
 require 'spec_helper'
 
-describe "!NAME!" do
-  let(:helpers){ Class.new }
-  before { helpers.extend !NAME! }
-  subject { helpers }
+RSpec.describe "!NAME!" do
+  pending "add some examples to (or delete) \#{__FILE__}" do
+    let(:helpers){ Class.new }
+    before { helpers.extend !NAME! }
+    subject { helpers }
 
-  it "should return nil" do
-    expect(subject.foo).to be_nil
+    it "should return nil" do
+      expect(subject.foo).to be_nil
+    end
   end
 end
 TEST

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

@@ -1,6 +1,7 @@
 SHOULDA_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(SHOULDA_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
 require "test/unit"
 
@@ -78,12 +79,8 @@ class !NAME!Test < Test::Unit::TestCase
       @helpers.extend !NAME!
     end
 
-    def helpers
-      @helpers
-    end
-
     should "return nil" do
-      assert_equal nil, helpers.foo
+      assert_equal nil, @helpers.foo
     end
   end
 end

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

@@ -1,6 +1,7 @@
 STEAK_SETUP = (<<-TEST).gsub(/^ {12}/, '') unless defined?(STEAK_SETUP)
 RACK_ENV = 'test' unless defined?(RACK_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
 
 RSpec.configure do |conf|
   conf.include Rack::Test::Methods

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

@@ -16,15 +16,16 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen controller generates a new Padrino controller"
 
-      argument     :name,      :desc => 'The name of your padrino controller'
-      argument     :fields,    :desc => 'The fields for the controller',                            :default => [],     :type => :array
-      class_option :root,      :desc => 'The root destination',                   :aliases => '-r', :default => '.',    :type => :string
-      class_option :app,       :desc => 'The application destination path',       :aliases => '-a', :default => '/app', :type => :string
-      class_option :destroy,                                                      :aliases => '-d', :default => false,  :type => :boolean
-      class_option :namespace, :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',     :type => :string
-      class_option :layout,    :desc => 'The layout for the controller',          :aliases => '-l', :default => '',     :type => :string
-      class_option :parent,    :desc => 'The parent of the controller',           :aliases => '-p', :default => '',     :type => :string
-      class_option :provides,  :desc => 'the formats provided by the controller', :aliases => '-f', :default => '',     :type => :string
+      argument     :name,       :desc => 'The name of your padrino controller'
+      argument     :fields,     :desc => 'The fields for the controller',                            :default => [],     :type => :array
+      class_option :root,       :desc => 'The root destination',                   :aliases => '-r', :default => '.',    :type => :string
+      class_option :app,        :desc => 'The application destination path',       :aliases => '-a', :default => '/app', :type => :string
+      class_option :destroy,                                                       :aliases => '-d', :default => false,  :type => :boolean
+      class_option :namespace,  :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',     :type => :string
+      class_option :layout,     :desc => 'The layout for the controller',          :aliases => '-l', :default => '',     :type => :string
+      class_option :parent,     :desc => 'The parent of the controller',           :aliases => '-p', :default => '',     :type => :string
+      class_option :provides,   :desc => 'The formats provided by the controller', :aliases => '-f', :default => '',     :type => :string
+      class_option :'no-helper',:desc => 'Not generate helper',                                      :default => false,  :type => :boolean
 
       # Show help if no ARGV given
       require_arguments!
@@ -52,12 +53,12 @@ module Padrino
 
           self.behavior = :revoke if options[:destroy]
           template 'templates/controller.rb.tt', destination_root(app, 'controllers', "#{name.to_s.underscore}.rb")
-          template 'templates/helper.rb.tt',     destination_root(app, 'helpers', "#{name.to_s.underscore}_helper.rb")
+          template 'templates/helper.rb.tt',     destination_root(app, 'helpers', "#{name.to_s.underscore}_helper.rb") unless options[:'no-helper']
           empty_directory destination_root(app, "/views/#{name.to_s.underscore}")
           include_component_module_for(:test)
           if test?
             generate_controller_test(name)
-            generate_helper_test(@helper_name, @project_name, @app_name)
+            generate_helper_test(@helper_name, @project_name, @app_name) unless options[:'no-helper']
           end
         else
           say 'You are not at the root of a Padrino application! (config/boot.rb not found)'

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

@@ -15,12 +15,13 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen model generates a new model and migration files"
 
-      argument :name, :desc => 'The name of your padrino model'
-      argument :fields, :desc => 'The fields for the model', :type => :array, :default => []
-      class_option :root, :desc => 'The root destination', :aliases => '-r', :default => '.', :type => :string
-      class_option :app, :desc => 'The application destination path', :aliases => '-a', :default => '.', :type => :string
-      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
-      class_option :skip_migration, :aliases => '-s', :default => false, :type => :boolean
+      argument :name,               :desc => 'The name of your padrino model'
+      argument :fields,             :desc => 'The fields for the model',                                     :default => [],    :type => :array
+      class_option :root,           :desc => 'The root destination',                       :aliases => '-r', :default => '.',   :type => :string
+      class_option :app,            :desc => 'The application destination path',           :aliases => '-a', :default => '.',   :type => :string
+      class_option :destroy,                                                               :aliases => '-d', :default => false, :type => :boolean
+      class_option :skip_migration,                                                        :aliases => '-s', :default => false, :type => :boolean
+      class_option :force,          :desc => 'Generate model files if app already exists', :aliases => '-f', :default => false, :type => :boolean
 
       # Show help if no ARGV given.
       require_arguments!
@@ -54,9 +55,11 @@ module Padrino
         if options[:destroy]
           self.behavior = :revoke
         else
-          say "#{@camel_name} already exists."
-          say "Please, change the name."
-          return false
+          unless options[:force]
+            say "#{@camel_name} already exists."
+            say "Please, change the name."
+            return false
+          end
         end if model_name_already_exists?
 
         return false if has_invalid_fields?

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

@@ -55,7 +55,6 @@ module Padrino
           empty_directory destination_root('public/images')
           empty_directory destination_root('public/javascripts')
           empty_directory destination_root('public/stylesheets')
-          empty_directory destination_root('tmp')
           store_component_config('.components')
           unless options[:lean]
             app_skeleton('app', options[:tiny])
@@ -63,11 +62,16 @@ module Padrino
           end
           template 'templates/Gemfile.tt', destination_root('Gemfile')
           template 'templates/Rakefile.tt', destination_root('Rakefile')
+          template 'templates/project_bin.tt', destination_root("bin/#{name}")
+          File.chmod(0755, destination_root("bin/#{name}"))
           if options.gem?
             template 'templates/gem/gemspec.tt', destination_root(name + '.gemspec')
             template 'templates/gem/README.md.tt', destination_root('README.md')
             template 'templates/gem/lib/libname.tt', destination_root("lib/#{name}.rb")
             template 'templates/gem/lib/libname/version.tt', destination_root("lib/#{name}/version.rb")
+          else
+            empty_directory_with_keep_file destination_root('tmp')
+            empty_directory_with_keep_file destination_root('log')
           end
         end
       end
@@ -87,6 +91,32 @@ module Padrino
         store_component_choice(:migration_format, options[:migration_format])
       end
 
+      ##
+      # Generates test files for tiny app skeleton.
+      #
+      def setup_test_files
+        if options[:tiny] && @_components[:test] != :none
+          test_component = @_components[:test]
+          test_component = "rspec" if test_component == "cucumber"
+          uppercase_test_component = test_component.upcase
+          controller_template_name = "#{uppercase_test_component}_CONTROLLER_TEST"
+          helper_template_name     = "#{uppercase_test_component}_HELPER_TEST"
+          return unless defined?(controller_template_name)
+
+          controller_content = instance_eval(controller_template_name).gsub(/!NAME!/, "")
+          helper_content     = instance_eval(helper_template_name).gsub(/!NAME!/, "#{@project_name}::#{@app_name}::#{DEFAULT_HELPER_NAME}")
+
+          proc{|*args| args.map{|str| str.gsub!(/!PATH!/, recognize_path)} }.call(controller_content, helper_content)
+
+          directory_name = [:rspec, :steak].include?(test_component.to_sym) ? "spec" : "test"
+          base_path      = File.join(directory_name, "app")
+          create_file destination_root("#{base_path}/controllers/controllers_#{directory_name}.rb"), controller_content, :skip => true
+          create_file destination_root("#{base_path}/helpers/helpers_#{directory_name}.rb"),         helper_content,     :skip => true
+          helper_path = destination_root(File.join(directory_name, "#{directory_name == "spec" ? "spec_helper" : "test_config"}.rb"))
+          gsub_file helper_path, %r{helpers/\*\*/\*\.rb}, "helpers.rb"
+        end
+      end
+
       ##
       # Bundle all required components using bundler and Gemfile.
       #
@@ -106,7 +136,7 @@ module Padrino
         say '=' * 65, :green
         say "$ cd #{options[:root]}/#{name}"
         say "$ bundle" unless options[:bundle]
-        say "="*65, :green
+        say "=" * 65, :green
         say
       end
 

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

@@ -1,7 +1,6 @@
 .DS_Store
 log/**/*
 tmp/**/*
-bin/*
 vendor/gems/*
 !vendor/gems/cache/
 .sass-cache/*

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

@@ -13,7 +13,7 @@ Bundler.require(:default, RACK_ENV)
 # Padrino::Logger::Config[:development][:log_level]  = :devel
 # Padrino::Logger::Config[:development][:log_static] = true
 #
-# ## Configure your I18n
+# ## Configure your I18n
 #
 # I18n.default_locale = :en
 # I18n.enforce_available_locales = false

data/lib/padrino-gen/generators/templates/project_bin.tt

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)+'/..')
+
+# Start the app with Padrino::Server
+require 'rubygems'
+require 'bundler/setup'
+require 'padrino-core/cli/launcher'
+
+ARGV.unshift('start') if ARGV.first.nil? || ARGV.first.start_with?('-')
+Padrino::Cli::Launcher.start ARGV
+
+# Start the app with Rack::Server
+#require "rack"
+#Rack::Server.start

data/lib/padrino-gen/generators/templates/static/ujs/jquery.js

@@ -26,7 +26,7 @@ $(function(){
      * link_to 'sign out', '/logout', :confirm => 'Log out?'
     **/
 
-    $('a[data-confirm]').on('click', function(e) {
+    $(document).on('click', 'a[data-confirm]', function(e) {
       var message = $(this).data('confirm');
       if (!confirm(message)) { e.preventDefault(); e.stopped = true; }
     });
@@ -36,7 +36,7 @@ $(function(){
      * link_to 'add item', '/create', :remote => true
     **/
 
-    $('a[data-remote=true]').on('click', function(e) {
+    $(document).on('click', 'a[data-remote=true]', function(e) {
       var element = $(this);
       if (e.stopped) return;
       e.preventDefault(); e.stopped = true;
@@ -51,7 +51,7 @@ $(function(){
      * link_to 'delete item', '/destroy', :method => :delete
     **/
 
-    $('a[data-method]:not([data-remote])').on('click', function(e) {
+    $(document).on('click', 'a[data-method]:not([data-remote])', function(e) {
       if (e.stopped) return;
       JSAdapter.sendMethod($(this));
       e.preventDefault(); e.stopped = true;

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

@@ -51,33 +51,31 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
     desc "Create the database"
     task :create => :environment do
       config = DataMapper.repository.adapter.options.symbolize_keys
+      adapter = config[:adapter]
       user, password, host = config[:user], config[:password], config[:host]
-      database       = config[:database]  || config[:path].sub(/\//, "")
+
+      database       = config[:database]  || config[:path]
+      database.sub!(/^\//,'') unless adapter.start_with?('sqlite')
+
       charset        = config[:charset]   || ENV['CHARSET']   || 'utf8'
       collation      = config[:collation] || ENV['COLLATION'] || 'utf8_unicode_ci'
 
       puts "=> Creating database '#{database}'"
-      if config[:adapter] == 'sqlite3'
-        DataMapper.setup(DataMapper.repository.name, config)
-      else
-        # require 'padrino-gen/padrino-tasks/sql-helpers'
-        Padrino::Generators::SqlHelpers.create_db(config[:adapter], user, password, host, database, charset, collation)
-      end
+      Padrino::Generators::SqlHelpers.create_db(adapter, user, password, host, database, charset, collation)
       puts "<= dm:create executed"
     end
 
     desc "Drop the database (postgres and mysql only)"
     task :drop => :environment do
       config = DataMapper.repository.adapter.options.symbolize_keys
+      adapter = config[:adapter]
       user, password, host = config[:user], config[:password], config[:host]
-      database       = config[:database] || config[:path].sub(/\//, "")
+
+      database       = config[:database] || config[:path]
+      database.sub!(/^\//,'') unless adapter.start_with?('sqlite')
 
       puts "=> Dropping database '#{database}'"
-      if config[:adapter] == 'sqlite3'
-        File.delete(config[:path]) if File.exist?(config[:path])
-      else
-        Padrino::Generators::SqlHelpers.drop_db(config[:adapter], user, password, host, database)
-      end
+      Padrino::Generators::SqlHelpers.drop_db(adapter, user, password, host, database)
       puts "<= dm:drop executed"
     end
 

data/lib/padrino-gen/padrino-tasks/sql-helpers.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Padrino
   module Generators
     module SqlHelpers
@@ -26,8 +28,9 @@ module Padrino
             arguments << "CREATE DATABASE #{database} DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}"
 
             Process.wait Process.spawn(environment, 'mysql', *arguments)
-          when 'sqlite'
+          when 'sqlite', 'sqlite3'
             fail "Database #{database} already exists" if File.file?(database)
+            FileUtils.mkdir_p(File.dirname(database))
             File.open(database, 'a') {}
           else
             raise "Adapter #{adapter} not supported for creating databases yet."
@@ -58,7 +61,7 @@ module Padrino
             arguments << "DROP DATABASE IF EXISTS #{database}"
 
             Process.wait Process.spawn(environment, 'mysql', *arguments)
-          when 'sqlite'
+          when 'sqlite', 'sqlite3'
             File.delete(database) if File.file?(database)
           else
             raise "Adapter #{adapter} not supported for dropping databases yet."

data/test/test_app_generator.rb

@@ -63,6 +63,8 @@ describe "AppGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/demo/mailers.rb")
       assert_dir_exists("#{@apptmp}/sample_project/public/demo")
       assert_match_in_file(/:notifier/,"#{@apptmp}/sample_project/demo/mailers.rb")
+      assert_match_in_file(/module Helper/, "#{@apptmp}/sample_project/demo/helpers.rb")
+      assert_match_in_file(/helpers Helper/, "#{@apptmp}/sample_project/demo/helpers.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/helpers")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/controllers")
     end
@@ -117,5 +119,14 @@ describe "AppGenerator" do
       assert_file_exists("#{@apptmp}/sample_project/subapp/app.rb")
       assert_match(/Subapp already exists/, out)
     end
+
+    it 'should generate app files if :force option is specified' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      out, err = capture_io { generate(:app, 'kernel', "--root=#{@apptmp}/sample_project", "--force") }
+      assert_dir_exists("#{@apptmp}/sample_project/public/kernel")
+      assert_dir_exists("#{@apptmp}/sample_project/kernel/controllers")
+      assert_dir_exists("#{@apptmp}/sample_project/kernel/helpers")
+      assert_file_exists("#{@apptmp}/sample_project/kernel/app.rb")
+    end
   end
 end

data/test/test_component_generator.rb

@@ -79,25 +79,21 @@ describe "ComponentGenerator" do
       capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") }
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'slim', components_chosen[:renderer]
-      $stdin.stub(:gets, 'yes') do
-        out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
-        assert_match(/applying.*?haml.*?renderer/, out)
-        assert_match(/Switch renderer to/, out)
-        components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
-        assert_equal 'haml', components_chosen[:renderer]
-      end
+      Readline.stubs(:readline).returns('yes').once
+      out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
+      assert_match(/applying.*?haml.*?renderer/, out)
+      components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
+      assert_equal 'haml', components_chosen[:renderer]
     end
     it 'should when deny changes, will not be applied' do
       capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") }
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'slim', components_chosen[:renderer]
-      $stdin.stub(:gets, 'no') do
-        out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
-        refute_match(/applying.*?haml.*?renderer/, out)
-        assert_match(/Switch renderer to/, out)
-        components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
-        assert_equal 'slim', components_chosen[:renderer]
-      end
+      Readline.stubs(:readline).returns('no').once
+      out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
+      refute_match(/applying.*?haml.*?renderer/, out)
+      components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
+      assert_equal 'slim', components_chosen[:renderer]
     end
   end
 

data/test/test_controller_generator.rb

@@ -185,6 +185,18 @@ describe "ControllerGenerator" do
       assert_match_in_file(/get :test do\n\n  end\n/m, @controller_path)
       assert_match_in_file(/post :yada do\n\n  end\n/m, @controller_path)
     end
+
+    describe "with 'no-helper' option" do
+      it 'should not generate helper within existing project' do
+        capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
+        capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '--no-helper') }
+        assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items")
+        assert_file_exists("#{@apptmp}/sample_project/app/controllers/demo_items.rb")
+        assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb")
+        assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb")
+        assert_no_file_exists("#{@apptmp}/sample_project/spec/app/helpers/demo_items_helper_spec.rb")
+      end
+    end
   end
 
   describe "the controller destroy option" do

data/test/test_model_generator.rb

@@ -57,15 +57,6 @@ describe "ModelGenerator" do
       assert_match_in_file(/DataMapper.finalize/m,"#{@apptmp}/sample_project/config/boot.rb")
     end
 
-    it 'should generate only generate model once' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      response_success = capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      out, err = capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
-      assert_match(/identical\e\[0m  models\/user\.rb/, out)
-      assert_match(/identical\e\[0m  test\/models\/user_test\.rb/, out)
-    end
-
     it 'should generate migration file versions properly' do
       capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
@@ -114,6 +105,14 @@ describe "ModelGenerator" do
       assert_no_file_exists("#{@apptmp}/sample_project/models/user.rb")
       assert_match(/User already exists/, out)
     end
+
+    it 'should generate model files if :force option is specified' 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", "--force", :apps => "user") }
+      assert_file_exists("#{@apptmp}/sample_project/user/app.rb")
+      assert_file_exists("#{@apptmp}/sample_project/models/user.rb")
+    end
   end
 
   # ACTIVERECORD

data/test/test_plugin_generator.rb

@@ -39,12 +39,14 @@ describe "PluginGenerator" do
       expects_generated :migration, "AddEmailToUser email:string -r=#{@apptmp}/sample_project"
       expects_generated :fake, "foo bar -r=#{@apptmp}/sample_project"
       expects_generated :plugin, "carrierwave -r=#{@apptmp}/sample_project"
+      File.stubs(:exist?).returns(true)
       expects_dependencies 'nokogiri'
       expects_initializer :test, "# Example", :root => "#{@apptmp}/sample_project"
       expects_generated :app, "testapp -r=#{@apptmp}/sample_project"
       expects_generated :controller, "users get:index -r=#{@apptmp}/sample_project --app=testapp"
       example_template_path = File.join(File.dirname(__FILE__), 'fixtures', 'example_template.rb')
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "-p=#{example_template_path}", '> /dev/null') }
+      File.unstub(:exist?)
     end
   end
 

data/test/test_project_generator.rb

@@ -20,6 +20,7 @@ describe "ProjectGenerator" do
       assert_match_in_file("Padrino.mount('SampleProject::App', :app_file => Padrino.root('app/app.rb')).to('/')", "#{@apptmp}/sample_project/config/apps.rb")
       assert_file_exists("#{@apptmp}/sample_project/config/boot.rb")
       assert_file_exists("#{@apptmp}/sample_project/Rakefile")
+      assert_file_exists("#{@apptmp}/sample_project/bin/sample_project")
       assert_file_exists("#{@apptmp}/sample_project/public/favicon.ico")
       assert_dir_exists("#{@apptmp}/sample_project/public/images")
       assert_dir_exists("#{@apptmp}/sample_project/public/javascripts")
@@ -93,6 +94,11 @@ describe "ProjectGenerator" do
       assert_no_match_in_file(/Padrino.mount\('SampleProject::App'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
+    it 'should generate lean project correctly even if the component is specified' do
+      out, err = capture_io { generate(:project,'sample_project', '--lean', "--root=#{@apptmp}", "--orm=activerecord", "--stylesheet=compass") }
+      assert_match("", err)
+    end
+
     it 'should generate tiny skeleton' do
       capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}") }
       assert_file_exists("#{@apptmp}/sample_project")
@@ -104,6 +110,8 @@ describe "ProjectGenerator" do
       assert_dir_exists("#{@apptmp}/sample_project/public/javascripts")
       assert_dir_exists("#{@apptmp}/sample_project/public/stylesheets")
       assert_match_in_file(/:notifier/,"#{@apptmp}/sample_project/app/mailers.rb")
+      assert_match_in_file(/module Helper/, "#{@apptmp}/sample_project/app/helpers.rb")
+      assert_match_in_file(/helpers Helper/, "#{@apptmp}/sample_project/app/helpers.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/helpers")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/controllers")
     end
@@ -115,6 +123,8 @@ describe "ProjectGenerator" do
       assert_match_in_file(/^module SampleGem/,"#{@apptmp}/sample_gem/app/app.rb")
       assert_match_in_file(/class App/,"#{@apptmp}/sample_gem/app/app.rb")
       assert_file_exists("#{@apptmp}/sample_gem/README.md")
+      assert_no_file_exists("#{@apptmp}/sample_gem/tmp/.keep")
+      assert_no_file_exists("#{@apptmp}/sample_gem/log/.keep")
     end
 
     it 'should generate gemspec and special files with dashes in name' do
@@ -192,6 +202,12 @@ describe "ProjectGenerator" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none') }
       assert_match_in_file(/gem 'padrino'/, "#{@apptmp}/sample_project/Gemfile")
     end
+
+    it 'should create .keep files for empty directories that are required for running application' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "--stylesheet=sass", "--orm=sequel") }
+      assert_file_exists("#{@apptmp}/sample_project/tmp/.keep")
+      assert_file_exists("#{@apptmp}/sample_project/log/.keep")
+    end
   end
 
   describe "a generator for mock component" do
@@ -659,4 +675,77 @@ describe "ProjectGenerator" do
       assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets")
     end
   end
+
+  describe "tiny app skeleton generator for test component" do
+    it "should properly generate for rspec" do
+      capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=rspec") }
+      assert_dir_exists("#{@apptmp}/sample_project/spec/")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/RSpec\.describe "Controller" do/, "#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb")
+      assert_match_in_file(/RSpec.describe "SampleProject::App::Helper" do/, "#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb")
+    end
+
+    it "should properly generate for steak" do
+      capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=steak") }
+      assert_dir_exists("#{@apptmp}/sample_project/spec/")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/describe "Controller" do/, "#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb")
+      assert_match_in_file(/describe "SampleProject::App::Helper" do/, "#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb")
+    end
+
+    it "should properly generate for cucumber" do
+      capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=cucumber") }
+      assert_dir_exists("#{@apptmp}/sample_project/spec/")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb")
+      assert_file_exists("#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
+      assert_match_in_file(/describe "Controller" do/, "#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb")
+      assert_match_in_file(/describe "SampleProject::App::Helper" do/, "#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb")
+    end
+
+    it "should properly generate for bacon" do
+      capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=bacon") }
+      assert_dir_exists("#{@apptmp}/sample_project/test/")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/describe "Controller" do/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_match_in_file(/describe "SampleProject::App::Helper"/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+    end
+
+    it "should properly generate for minitest" do
+      capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=minitest") }
+      assert_dir_exists("#{@apptmp}/sample_project/test/")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/describe "Controller" do/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_match_in_file(/describe "SampleProject::App::Helper"/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+    end
+
+    it "should properly generate for riot" do
+      capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=riot") }
+      assert_dir_exists("#{@apptmp}/sample_project/test/")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/context "Controller" do/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_match_in_file(/describe "SampleProject::App::Helper"/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+    end
+
+    it "should properly generate for shoulda" do
+      capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=shoulda") }
+      assert_dir_exists("#{@apptmp}/sample_project/test/")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_file_exists("#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/class ControllerTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_match_in_file(/class SampleProject::App::HelperTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-08-13 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.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -152,6 +152,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/project_bin.tt
 - lib/padrino-gen/generators/templates/task.rb.tt
 - lib/padrino-gen/padrino-tasks/activerecord.rb
 - lib/padrino-gen/padrino-tasks/database.rb