padrino-gen 0.14.1.1 → 0.14.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjI5ZjIxMmQwYzJhMGIyMmQ4N2I2NTBmZmY4OGQwYTQ3MzYxZDE5NQ==
-  data.tar.gz: !binary |-
-    ZGU1Yzg5NjI2NDBkNjQzNjJlODc0ODY4MjQ5ZDZjZmNlZTBlNmQ5Yw==
+SHA1:
+  metadata.gz: 54060d405658309147c991cd2eff9a365cf2fa8f
+  data.tar.gz: 94d6b1400fcd1e232991adcc770d4ee06e55b3cf
 SHA512:
-  metadata.gz: !binary |-
-    YjEwMmQ3OWVhOTA1ODBiYWU2ZWUyNWFhMzZiNjkxNzQ3MjExZGE1MDY3ZWQ4
-    ZTE0MTYzYjdlMzlkZTZjYmVmZjYyYTRlY2JlM2MxZGI1YTEyNTQ0Mjc3OTQy
-    M2ZjOTJlNzZkNWJiNTJiNjc3MTRjNzNlMDJhOGYyMjk4OTNkOGM=
-  data.tar.gz: !binary |-
-    YWM1OGU1NmIzZTc1NzlhNjIxNTdjNmRiMDFhOTZkMzRlOWEzNTRhZDM5YzJk
-    MzgyMjZmOGYyNDRlYTNjYmI4MzIyNTg1Y2ZmNDU4YzMwNWM1ODE5N2FmZGZh
-    ZDFiNGQ0MDFhMmY0ZWI2YWY3NjNlYWQyMTQ1ODE5Zjg2NGRmNDk=
+  metadata.gz: f007cda5e22efca492e334c2877868e9306e1c3f50a5a70cd4f67f0862eb38bbe0479b7f7e408060424fa96079ccf91741e34f688a346798b70fa470dd4e6e59
+  data.tar.gz: 38a60006fc6610bcc01f71577a357f69e5971ffbc2ade927525913a432106c60b3752ce44c1839a17da16b2446a4dfbd7c4dd8bfe02db2645cb941a5129693aa

data/lib/padrino-gen/command.rb

@@ -13,6 +13,6 @@ module Padrino
   #
   def self.bin_gen(*args)
     @_padrino_gen_bin ||= [Padrino.ruby_command, File.expand_path("../../../bin/padrino-gen", __FILE__)]
-    system args.unshift(@_padrino_gen_bin).join(" ")
+    system *@_padrino_gen_bin, *args
   end
 end

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

@@ -145,11 +145,11 @@ module Padrino
       #   resolve_valid_choice(:mock)
       #
       def resolve_valid_choice(component)
-        available_string = self.class.available_choices_for(component).join(", ")
+        choices = self.class.available_choices_for(component).map(&:to_s)
         choice = options[component]
         until valid_choice?(component, choice)
           say("Option for --#{component} '#{choice}' is not available.", :red)
-          choice = ask("Please enter a valid option for #{component} (#{available_string}):")
+          choice = ask("Please enter a valid option for #{component}:", :limited_to => choices)
         end
         choice
       end
@@ -181,9 +181,9 @@ module Padrino
       # @example
       #   store_component_config('/foo/bar')
       #
-      def store_component_config(destination)
+      def store_component_config(destination, opts = {})
         components = @_components || options
-        create_file(destination) do
+        create_file(destination, opts) do
           self.class.component_types.inject({}) { |result, comp|
             result[comp] = components[comp].to_s; result
           }.to_yaml
@@ -435,29 +435,6 @@ WARNING
         in_root { run 'bundle install --binstubs' }
       end
 
-      ##
-      # Ask something to the user and receives a response.
-      #
-      # @param [String] statement
-      #   String of statement to display for input.
-      # @param [String] default
-      #   Default value for input.
-      # @param [String] color
-      #   Name of color to display input.
-      #auto_locale
-      # @return [String] Input value
-      #
-      # @example
-      #   ask("What is your name?")
-      #   ask("Path for ruby", "/usr/local/bin/ruby") => "Path for ruby (leave blank for /usr/local/bin/ruby):"
-      #
-      def ask(statement, default=nil, color=nil)
-        default_text = default ? " (leave blank for #{default}):" : nil
-        say("#{statement}#{default_text} ", color)
-        result = $stdin.gets.strip
-        result.empty? ? default : result
-      end
-
       ##
       # Raise SystemExit if the app does not exist.
       #

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

@@ -111,29 +111,38 @@ MIDDLEWARE
 def setup_orm
   ar = AR
   db = @project_name.underscore
-  # We're now defaulting to mysql2 since mysql is deprecated
-  case options[:adapter]
-  when 'mysql-gem'
-    ar.sub! /!DB_DEVELOPMENT!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_development'")
-    ar.sub! /!DB_PRODUCTION!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_production'")
-    ar.sub! /!DB_TEST!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_test'")
-    require_dependencies 'mysql', :version => "~> 2.8.1"
-  when 'mysql', 'mysql2'
-    ar.sub! /!DB_DEVELOPMENT!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_development'")
-    ar.sub! /!DB_PRODUCTION!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_production'")
-    ar.sub! /!DB_TEST!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_test'")
-    require_dependencies 'mysql2'
-  when 'postgres'
-    ar.sub! /!DB_DEVELOPMENT!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_development'")
-    ar.sub! /!DB_PRODUCTION!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_production'")
-    ar.sub! /!DB_TEST!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_test'")
-    require_dependencies 'pg'
-  else
-    ar.sub! /!DB_DEVELOPMENT!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
-    ar.sub! /!DB_PRODUCTION!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
-    ar.sub! /!DB_TEST!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
-    require_dependencies 'sqlite3'
+
+  begin
+    case adapter ||= options[:adapter]
+    when 'mysql-gem'
+      ar.sub! /!DB_DEVELOPMENT!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_development'")
+      ar.sub! /!DB_PRODUCTION!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_production'")
+      ar.sub! /!DB_TEST!/, MYSQL.sub(/!DB_NAME!/,"'#{db}_test'")
+      require_dependencies 'mysql', :version => "~> 2.8.1"
+    when 'mysql', 'mysql2'
+      ar.sub! /!DB_DEVELOPMENT!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_development'")
+      ar.sub! /!DB_PRODUCTION!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_production'")
+      ar.sub! /!DB_TEST!/, MYSQL2.sub(/!DB_NAME!/,"'#{db}_test'")
+      require_dependencies 'mysql2'
+    when 'postgres'
+      ar.sub! /!DB_DEVELOPMENT!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_development'")
+      ar.sub! /!DB_PRODUCTION!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_production'")
+      ar.sub! /!DB_TEST!/, POSTGRES.sub(/!DB_NAME!/,"'#{db}_test'")
+      require_dependencies 'pg'
+    when 'sqlite'
+      ar.sub! /!DB_DEVELOPMENT!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
+      ar.sub! /!DB_PRODUCTION!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
+      ar.sub! /!DB_TEST!/, SQLITE.sub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
+      require_dependencies 'sqlite3'
+    else
+      say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
+      fail ArgumentError
+    end
+  rescue ArgumentError
+    adapter = ask("Please, choose a proper adapter:", :limited_to => %w[mysql mysql2 mysql-gem postgres sqlite])
+    retry
   end
+
   require_dependencies 'activerecord', :require => 'active_record', :version => ">= 3.1"
   create_file("config/database.rb", ar)
   middleware :connection_pool_management, CONNECTION_POOL_MIDDLEWARE
@@ -152,7 +161,19 @@ def create_model_file(name, options={})
   create_file(model_path, model_contents,:skip => true)
 end
 
+if defined?(ActiveRecord::Migration) && ActiveRecord::Migration.respond_to?(:[])
+AR_MIGRATION = (<<-MIGRATION) unless defined?(AR_MIGRATION)
+class !FILECLASS! < ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]
+  def self.up
+    !UP!
+  end
 
+  def self.down
+    !DOWN!
+  end
+end
+MIGRATION
+else
 AR_MIGRATION = (<<-MIGRATION) unless defined?(AR_MIGRATION)
 class !FILECLASS! < ActiveRecord::Migration
   def self.up
@@ -164,6 +185,7 @@ class !FILECLASS! < ActiveRecord::Migration
   end
 end
 MIGRATION
+end
 
 AR_MODEL_UP_MG = (<<-MIGRATION).gsub(/^/,'    ') unless defined?(AR_MODEL_UP_MG)
 create_table :!TABLE! do |t|

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

@@ -68,22 +68,31 @@ def setup_orm
     dm-timestamps
     dm-validations
   ).each { |dep| require_dependencies dep }
-  require_dependencies case options[:adapter]
+
+  begin
+    case adapter ||= options[:adapter]
     when 'mysql', 'mysql2'
       dm.gsub!(/!DB_DEVELOPMENT!/,"\"mysql://root@localhost/#{db}_development\"")
       dm.gsub!(/!DB_PRODUCTION!/,"\"mysql://root@localhost/#{db}_production\"")
       dm.gsub!(/!DB_TEST!/,"\"mysql://root@localhost/#{db}_test\"")
-      'dm-mysql-adapter'
+      require_dependencies 'dm-mysql-adapter'
     when 'postgres'
       dm.gsub!(/!DB_DEVELOPMENT!/,"\"postgres://root@localhost/#{db}_development\"")
       dm.gsub!(/!DB_PRODUCTION!/,"\"postgres://root@localhost/#{db}_production\"")
       dm.gsub!(/!DB_TEST!/,"\"postgres://root@localhost/#{db}_test\"")
-      'dm-postgres-adapter'
-    else
+      require_dependencies 'dm-postgres-adapter'
+    when 'sqlite'
       dm.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite3://\" + Padrino.root('db', \"#{db}_development.db\")")
       dm.gsub!(/!DB_PRODUCTION!/,"\"sqlite3://\" + Padrino.root('db', \"#{db}_production.db\")")
       dm.gsub!(/!DB_TEST!/,"\"sqlite3://\" + Padrino.root('db', \"#{db}_test.db\")")
-      'dm-sqlite-adapter'
+      require_dependencies 'dm-sqlite-adapter'
+    else
+      say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
+      fail ArgumentError
+    end
+  rescue ArgumentError
+    adapter = ask("Please, choose a proper adapter:", :limited_to => %w[mysql mysql2 postgres sqlite])
+    retry
   end
 
   create_file("config/database.rb", dm)

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

@@ -111,28 +111,38 @@ MIDDLEWARE
 def setup_orm
   ar = MR
   db = @project_name.underscore
-  case options[:adapter]
-  when 'mysql-gem'
-    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_development'")
-    ar.gsub! /!DB_PRODUCTION!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_production'")
-    ar.gsub! /!DB_TEST!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_test'")
-    require_dependencies 'mysql', :version => "~> 2.8.1"
-  when 'mysql', 'mysql2'
-    ar.gsub! /!DB_DEVELOPMENT!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_development'")
-    ar.gsub! /!DB_PRODUCTION!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_production'")
-    ar.gsub! /!DB_TEST!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_test'")
-    require_dependencies 'mysql2'
-  when 'postgres'
-    ar.gsub! /!DB_DEVELOPMENT!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_development'")
-    ar.gsub! /!DB_PRODUCTION!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_production'")
-    ar.gsub! /!DB_TEST!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_test'")
-    require_dependencies 'pg'
-  else
-    ar.gsub! /!DB_DEVELOPMENT!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
-    ar.gsub! /!DB_PRODUCTION!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
-    ar.gsub! /!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
-    require_dependencies 'sqlite3'
+
+  begin
+    case adapter ||= options[:adapter]
+    when 'mysql-gem'
+      ar.gsub! /!DB_DEVELOPMENT!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_development'")
+      ar.gsub! /!DB_PRODUCTION!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_production'")
+      ar.gsub! /!DB_TEST!/, MYSQL.gsub(/!DB_NAME!/,"'#{db}_test'")
+      require_dependencies 'mysql', :version => "~> 2.8.1"
+    when 'mysql', 'mysql2'
+      ar.gsub! /!DB_DEVELOPMENT!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_development'")
+      ar.gsub! /!DB_PRODUCTION!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_production'")
+      ar.gsub! /!DB_TEST!/, MYSQL2.gsub(/!DB_NAME!/,"'#{db}_test'")
+      require_dependencies 'mysql2'
+    when 'postgres'
+      ar.gsub! /!DB_DEVELOPMENT!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_development'")
+      ar.gsub! /!DB_PRODUCTION!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_production'")
+      ar.gsub! /!DB_TEST!/, POSTGRES.gsub(/!DB_NAME!/,"'#{db}_test'")
+      require_dependencies 'pg'
+    when 'sqlite'
+      ar.gsub! /!DB_DEVELOPMENT!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_development.db')")
+      ar.gsub! /!DB_PRODUCTION!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_production.db')")
+      ar.gsub! /!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/,"Padrino.root('db', '#{db}_test.db')")
+      require_dependencies 'sqlite3'
+    else
+      say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
+      fail ArgumentError
+    end
+  rescue ArgumentError
+    adapter = ask("Please, choose a proper adapter:", :limited_to => %w[mysql mysql2 mysql-gem postgres sqlite])
+    retry
   end
+
   require_dependencies 'mini_record'
   create_file('config/database.rb', ar)
   insert_hook('ActiveRecord::Base.auto_upgrade!', :after_load)

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

@@ -1,5 +1,4 @@
 SEQUEL = (<<-SEQUEL) unless defined?(SEQUEL)
-Sequel::Model.plugin(:schema)
 Sequel::Model.raise_on_save_failure = false # Do not throw exceptions on failure
 Sequel::Model.db = case Padrino.env
   when :development then Sequel.connect(!DB_DEVELOPMENT!, :loggers => [logger])
@@ -12,32 +11,38 @@ def setup_orm
   sequel = SEQUEL
   db = @project_name.underscore
   require_dependencies 'sequel'
-  case options[:adapter]
-  when 'mysql-gem'
-    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://localhost/#{db}_development\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql://localhost/#{db}_production\"")
-    sequel.gsub!(/!DB_TEST!/,"\"mysql://localhost/#{db}_test\"")
-    require_dependencies 'mysql', :version => "~> 2.8.1"
-    'mysql'
-  when 'mysql', 'mysql2'
-    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql2://localhost/#{db}_development\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql2://localhost/#{db}_production\"")
-    sequel.gsub!(/!DB_TEST!/,"\"mysql2://localhost/#{db}_test\"")
-    require_dependencies 'mysql2'
-    'mysql2'
-  when 'postgres'
-    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://localhost/#{db}_development\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"postgres://localhost/#{db}_production\"")
-    sequel.gsub!(/!DB_TEST!/,"\"postgres://localhost/#{db}_test\"")
-    require_dependencies 'pg'
-    'pg'
-  else
-    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://db/#{db}_development.db\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"sqlite://db/#{db}_production.db\"")
-    sequel.gsub!(/!DB_TEST!/,       "\"sqlite://db/#{db}_test.db\"")
-    require_dependencies 'sqlite3'
-    'sqlite3'
+
+  begin
+    case adapter ||= options[:adapter]
+    when 'mysql-gem'
+      sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://localhost/#{db}_development\"")
+      sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql://localhost/#{db}_production\"")
+      sequel.gsub!(/!DB_TEST!/,"\"mysql://localhost/#{db}_test\"")
+      require_dependencies 'mysql', :version => "~> 2.8.1"
+    when 'mysql', 'mysql2'
+      sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql2://localhost/#{db}_development\"")
+      sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql2://localhost/#{db}_production\"")
+      sequel.gsub!(/!DB_TEST!/,"\"mysql2://localhost/#{db}_test\"")
+      require_dependencies 'mysql2'
+    when 'postgres'
+      sequel.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://localhost/#{db}_development\"")
+      sequel.gsub!(/!DB_PRODUCTION!/, "\"postgres://localhost/#{db}_production\"")
+      sequel.gsub!(/!DB_TEST!/,"\"postgres://localhost/#{db}_test\"")
+      require_dependencies 'pg'
+    when 'sqlite'
+      sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://db/#{db}_development.db\"")
+      sequel.gsub!(/!DB_PRODUCTION!/, "\"sqlite://db/#{db}_production.db\"")
+      sequel.gsub!(/!DB_TEST!/,       "\"sqlite://db/#{db}_test.db\"")
+      require_dependencies 'sqlite3'
+    else
+      say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
+      fail ArgumentError
+    end
+  rescue ArgumentError
+    adapter = ask("Please, choose a proper adapter:", :limited_to => %w[mysql mysql2 mysql-gem postgres sqlite])
+    retry
   end
+
   create_file("config/database.rb", sequel)
   empty_directory('db/migrate')
 end

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

@@ -91,7 +91,7 @@ module Padrino
           choice = @_components[comp] = resolve_valid_choice(comp)
           execute_component_setup(comp, choice)
         end
-        store_component_config('.components')
+        store_component_config('.components', :force => true)
         store_component_choice(:namespace, @project_name)
         store_component_choice(:migration_format, options[:migration_format])
       end

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

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'open-uri'
 
 module Padrino
   module Generators
@@ -125,14 +126,18 @@ module Padrino
           when template_file =~ %r{^https?://} && template_file !~ /gist/
             template_file
           when template_file =~ /gist/ && template_file !~ /raw/
-            raw_link, _ = *open(template_file).read.scan(/<a\s+href\s?\=\"(.*?)\"\>raw/)
+            raw_link, _ = *open(template_file) { |io| io.read.scan(/<a\s+href\s?\=\"(.*?)\"\>raw/) }
             raw_link ? "https://gist.github.com#{raw_link[0]}" : template_file
           when File.extname(template_file).empty? # referencing official plugin (i.e hoptoad)
             "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
-        self.apply(template_path) rescue say("The template at #{template_path} could not be found!", :red)
+        begin
+          self.apply(template_path)
+        rescue => error
+          say("The template at #{template_path} could not be loaded: #{error.message}", :red)
+        end
       end
     end
   end

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

@@ -6,5 +6,3 @@ PadrinoTasks.use(:database)
 PadrinoTasks.use(<%= options[:orm].to_sym.inspect %>)
 <%- end -%>
 PadrinoTasks.init
-
-task :default => :test

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

@@ -50,7 +50,7 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
 
     desc "Create the database"
     task :create => :environment do
-      config = Utils.symbolize_keys(DataMapper.repository.adapter.options)
+      config = Padrino::Utils.symbolize_keys(DataMapper.repository.adapter.options)
       adapter = config[:adapter]
       user, password, host = config[:user], config[:password], config[:host]
 
@@ -67,7 +67,7 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
 
     desc "Drop the database (postgres and mysql only)"
     task :drop => :environment do
-      config = Utils.symbolize_keys(DataMapper.repository.adapter.options)
+      config = Padrino::Utils.symbolize_keys(DataMapper.repository.adapter.options)
       adapter = config[:adapter]
       user, password, host = config[:user], config[:password], config[:host]
 

data/test/test_plugin_generator.rb

@@ -101,7 +101,8 @@ describe "PluginGenerator" do
       FakeWeb.register_uri :get, resolved_path, :status => 404
       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
+      # Use regex to ignore trailing whitespace in message
+      plugin_gen.expects(:say).with{ |message, color| (message =~ /The template at #{resolved_path} could not be loaded:.*404.*/) && (color == :red) }.returns(true).once
       capture_io { plugin_gen.invoke_all }
     end
   end

data/test/test_project_generator.rb

@@ -328,7 +328,7 @@ describe "ProjectGenerator" do
       end
 
       it 'should properly generate sqlite3' do
-        out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=activerecord', '--adapter=sqlite3') }
+        out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=activerecord', '--adapter=sqlite') }
         assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/sample_project/Gemfile")
         assert_match_in_file(/sample_project_development.db/, "#{@apptmp}/sample_project/config/database.rb")
         assert_match_in_file(%r{:adapter => 'sqlite3'}, "#{@apptmp}/sample_project/config/database.rb")

data/test/test_task_generator.rb

@@ -54,5 +54,12 @@ describe "TaskGenerator" do
       assert_match_in_file(/desc "This is a sample"/, file_path)
       assert_match_in_file(/task :demo_task => :environment do/, file_path)
     end
+
+    it 'should preserve spaces' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      Padrino.bin_gen('task', 'DemoTask', "--namespace=Sample", "--description=This is a sample", "-r=#{@apptmp}/sample_project", :out => File::NULL)
+      file_path = "#{@apptmp}/sample_project/tasks/sample_demo_task.rake"
+      assert_match_in_file(/desc "This is a sample"/, file_path)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.14.1.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,58 +19,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4w
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4w
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.14.2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -80,9 +78,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -204,22 +202,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-gen
-rubygems_version: 2.4.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Generators for easily creating and building padrino applications