padrino-gen 0.14.1.1 → 0.15.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjI5ZjIxMmQwYzJhMGIyMmQ4N2I2NTBmZmY4OGQwYTQ3MzYxZDE5NQ==
-  data.tar.gz: !binary |-
-    ZGU1Yzg5NjI2NDBkNjQzNjJlODc0ODY4MjQ5ZDZjZmNlZTBlNmQ5Yw==
+SHA256:
+  metadata.gz: 9897984eee6550c278a48190ada56e7d88d38cec9b6a912ce8136b911a8578f7
+  data.tar.gz: cc0de388292f104d491401feffbf673000b439728696ac4cd012a1fbba668bfd
 SHA512:
-  metadata.gz: !binary |-
-    YjEwMmQ3OWVhOTA1ODBiYWU2ZWUyNWFhMzZiNjkxNzQ3MjExZGE1MDY3ZWQ4
-    ZTE0MTYzYjdlMzlkZTZjYmVmZjYyYTRlY2JlM2MxZGI1YTEyNTQ0Mjc3OTQy
-    M2ZjOTJlNzZkNWJiNTJiNjc3MTRjNzNlMDJhOGYyMjk4OTNkOGM=
-  data.tar.gz: !binary |-
-    YWM1OGU1NmIzZTc1NzlhNjIxNTdjNmRiMDFhOTZkMzRlOWEzNTRhZDM5YzJk
-    MzgyMjZmOGYyNDRlYTNjYmI4MzIyNTg1Y2ZmNDU4YzMwNWM1ODE5N2FmZGZh
-    ZDFiNGQ0MDFhMmY0ZWI2YWY3NjNlYWQyMTQ1ODE5Zjg2NGRmNDk=
+  metadata.gz: 1c5f835446e50a8009cf55c37439fb0134faa3b1f2ea5fd14e342fbfe6688b4300a45f49a7efd7281a7af4aebfa471ba5eeac0061c8c2ac3c7d3aba861b664ba
+  data.tar.gz: e3cc0d72979f835fdaf9b04672eb7b0775cff146a65816b8b336bb340763d7f97dd292e46160ac403dc8a07ac294a91b5e5d4fe80a7cd675d2c9bdd0205725b6

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/actions.rb

@@ -71,8 +71,8 @@ module Padrino
             direction, table_name = migration_scan[0].downcase, migration_scan[1].downcase.pluralize if migration_scan.any?
             tuples = direction ? columns.map { |value| value.split(":") } : []
             tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] }
-            add_columns    = tuples.map(&options[:add]).join("\n    ")
-            remove_columns = tuples.map(&options[:remove]).join("\n    ")
+            add_columns    = tuples.map(&options[:add]).join("\n      ")
+            remove_columns = tuples.map(&options[:remove]).join("\n      ")
             forward_text = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, add_columns) if tuples.any?
             back_text    = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, remove_columns) if tuples.any?
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m,   (direction == 'add' ? forward_text.to_s : back_text.to_s))

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/Gemfile.tt

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-# Padrino supports Ruby version 1.9 and later
+# Padrino supports Ruby version 2.2.2 and later
 # ruby '<%= RUBY_VERSION.to_s %>'
 
 # Distribute your app as a gem

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/generators/templates/static/ujs/jquery.js

@@ -8,7 +8,7 @@
 **/
 
 $(function(){
-    $('form').on('submit', function(e) {
+    $(document).on('submit', 'form', function(e) {
       var element = $(this), message = element.data('confirm');
       if (message && !confirm(message)) { return false; }
       if (element.data('remote') == true) {

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

@@ -12,7 +12,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     namespace :create do
       desc "Create all the local databases defined in config/database.yml"
       task :all => :skeleton do
-        ActiveRecord::Base.configurations.each_value do |config|
+        with_all_databases do |config|
           # Skip entries that don't have a database key, such as the first entry here:
           #
           #  defaults: &defaults
@@ -33,7 +33,9 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     desc "Creates the database defined in config/database.yml for the current Padrino.env"
     task :create => :skeleton do
-      create_database(ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env])
+      with_database(Padrino.env) do |config|
+        create_database(config)
+      end
     end
 
     def create_database(config)
@@ -90,7 +92,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     namespace :drop do
       desc "Drops all the local databases defined in config/database.yml"
       task :all => :skeleton do
-        ActiveRecord::Base.configurations.each_value do |config|
+        with_all_databases do |config|
           # Skip entries that don't have a database key
           next unless config[:database]
           begin
@@ -105,11 +107,12 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     desc "Drops the database for the current Padrino.env"
     task :drop => :skeleton do
-      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
-      begin
-        drop_database(config)
-      rescue StandardError => e
-        catch_error(:drop, e, config)
+      with_database(Padrino.env || :development) do |config|
+        begin
+          drop_database(config)
+        rescue StandardError => e
+          catch_error(:drop, e, config)
+        end
       end
     end
 
@@ -124,7 +127,15 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking ar:schema:dump. Target specific version with MIGRATION_VERSION=x. Turn off output with VERBOSE=false."
     task :migrate => :skeleton do
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate("db/migrate/", env_migration_version)
+
+      if less_than_active_record_5_2?
+        ActiveRecord::Migrator.migrate("db/migrate/", env_migration_version)
+      elsif less_than_active_record_6_0?
+        ActiveRecord::MigrationContext.new("db/migrate/").migrate(env_migration_version)
+      else
+        ActiveRecord::MigrationContext.new("db/migrate/", ActiveRecord::SchemaMigration).migrate(env_migration_version)
+      end
+
       Rake::Task["ar:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
 
@@ -161,28 +172,30 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
     desc "Retrieves the charset for the current environment's database"
     task :charset => :skeleton do
-      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
-      case config[:adapter]
-      when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
-        ActiveRecord::Base.establish_connection(config)
-        puts ActiveRecord::Base.connection.charset
-      when 'postgresql'
-        ActiveRecord::Base.establish_connection(config)
-        puts ActiveRecord::Base.connection.encoding
-      else
-        puts 'Sorry, your database adapter is not supported yet, feel free to submit a patch.'
+      with_database(Padrino.env || :development) do |config|
+        case config[:adapter]
+        when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
+          ActiveRecord::Base.establish_connection(config)
+          puts ActiveRecord::Base.connection.charset
+        when 'postgresql'
+          ActiveRecord::Base.establish_connection(config)
+          puts ActiveRecord::Base.connection.encoding
+        else
+          puts 'Sorry, your database adapter is not supported yet, feel free to submit a patch.'
+        end
       end
     end
 
     desc "Retrieves the collation for the current environment's database."
     task :collation => :skeleton do
-      config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
-      case config[:adapter]
-      when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
-        ActiveRecord::Base.establish_connection(config)
-        puts ActiveRecord::Base.connection.collation
-      else
-        puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      with_database(Padrino.env || :development) do |config|
+        case config[:adapter]
+        when 'mysql', 'mysql2', 'em_mysql2', 'jdbcmysql'
+          ActiveRecord::Base.establish_connection(config)
+          puts ActiveRecord::Base.connection.collation
+        else
+          puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+        end
       end
     end
 
@@ -194,7 +207,14 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     desc "Raises an error if there are pending migrations."
     task :abort_if_pending_migrations => :skeleton do
       if defined? ActiveRecord
-        pending_migrations = ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
+        pending_migrations =
+          if less_than_active_record_5_2?
+            ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
+          elsif less_than_active_record_6_0?
+            ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).open.pending_migrations
+          else
+            ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).open.pending_migrations
+          end
 
         if pending_migrations.any?
           puts "You have #{pending_migrations.size} pending migrations:"
@@ -233,36 +253,37 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     namespace :structure do
       desc "Dump the database structure to a SQL file."
       task :dump => :skeleton do
-        config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env]
-        case config[:adapter]
-        when "mysql", "mysql2", 'em_mysql2', "oci", "oracle", 'jdbcmysql'
-          config = config.inject({}){|result, (key, value)| result[key.to_s] = value; result }
-          ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, resolve_structure_sql)
-        when "postgresql"
-          ENV['PGHOST']     = config[:host] if config[:host]
-          ENV['PGPORT']     = config[:port].to_s if config[:port]
-          ENV['PGPASSWORD'] = config[:password].to_s if config[:password]
-          search_path = config[:schema_search_path]
-          if search_path
-            search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
+        with_database(Padrino.env) do |config|
+          case config[:adapter]
+          when "mysql", "mysql2", 'em_mysql2', "oci", "oracle", 'jdbcmysql'
+            config = config.inject({}){|result, (key, value)| result[key.to_s] = value; result }
+            ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, resolve_structure_sql)
+          when "postgresql"
+            ENV['PGHOST']     = config[:host] if config[:host]
+            ENV['PGPORT']     = config[:port].to_s if config[:port]
+            ENV['PGPASSWORD'] = config[:password].to_s if config[:password]
+            search_path = config[:schema_search_path]
+            if search_path
+              search_path = search_path.split(",").map{|search_path| "--schema=#{search_path.strip}" }.join(" ")
+            end
+            `pg_dump -U "#{config[:username]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{config[:database]}`
+            raise "Error dumping database" if $?.exitstatus == 1
+          when "sqlite", "sqlite3"
+            dbfile = config[:database] || config[:dbfile]
+            `#{config[:adapter]} #{dbfile} .schema > db/#{Padrino.env}_structure.sql`
+          when "sqlserver"
+            `scptxfr /s #{config[:host]} /d #{config[:database]} /I /f db\\#{Padrino.env}_structure.sql /q /A /r`
+            `scptxfr /s #{config[:host]} /d #{config[:database]} /I /F db\ /q /A /r`
+          when "firebird"
+            set_firebird_env(config)
+            db_string = firebird_db_string(config)
+            sh "isql -a #{db_string} > #{Padrino.root}/db/#{Padrino.env}_structure.sql"
+          else
+            raise "Task not supported by '#{config[:adapter]}'."
           end
-          `pg_dump -U "#{config[:username]}" -s -x -O -f db/#{Padrino.env}_structure.sql #{search_path} #{config[:database]}`
-          raise "Error dumping database" if $?.exitstatus == 1
-        when "sqlite", "sqlite3"
-          dbfile = config[:database] || config[:dbfile]
-          `#{config[:adapter]} #{dbfile} .schema > db/#{Padrino.env}_structure.sql`
-        when "sqlserver"
-          `scptxfr /s #{config[:host]} /d #{config[:database]} /I /f db\\#{Padrino.env}_structure.sql /q /A /r`
-          `scptxfr /s #{config[:host]} /d #{config[:database]} /I /F db\ /q /A /r`
-        when "firebird"
-          set_firebird_env(config)
-          db_string = firebird_db_string(config)
-          sh "isql -a #{db_string} > #{Padrino.root}/db/#{Padrino.env}_structure.sql"
-        else
-          raise "Task not supported by '#{config[:adapter]}'."
         end
 
-        if ActiveRecord::Base.connection.supports_migrations?
+        if !ActiveRecord::Base.connection.respond_to?(:supports_migrations?) || ActiveRecord::Base.connection.supports_migrations?
           File.open(resolve_structure_sql, "a"){|f| f << ActiveRecord::Base.connection.dump_schema_information }
         end
       end
@@ -357,13 +378,29 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
   def migrate_as(type)
     version = env_migration_version
     fail "MIGRATION_VERSION is required" unless version
-    ActiveRecord::Migrator.run(type, "db/migrate/", version)
+
+    if less_than_active_record_5_2?
+      ActiveRecord::Migrator.run(type, "db/migrate/", version)
+    elsif less_than_active_record_6_0?
+      ActiveRecord::MigrationContext.new('db/migrate/').run(type, version)
+    else
+      ActiveRecord::MigrationContext.new('db/migrate/', ActiveRecord::SchemaMigration).run(type, version)
+    end
+
     dump_schema
   end
 
   def move_as(type)
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    ActiveRecord::Migrator.send(type, 'db/migrate/', step)
+
+    if less_than_active_record_5_2?
+      ActiveRecord::Migrator.send(type, 'db/migrate/', step)
+    elsif less_than_active_record_6_0?
+      ActiveRecord::MigrationContext.new('db/migrate/').send(type, step)
+    else
+      ActiveRecord::MigrationContext.new('db/migrate/', ActiveRecord::SchemaMigration).send(type, step)
+    end
+
     dump_schema
   end
 
@@ -375,6 +412,40 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     "#{Padrino.root}/db/#{Padrino.env}_structure.sql"
   end
 
+  def less_than_active_record_5_2?
+    ActiveRecord.version < Gem::Version.create("5.2.0")
+  end
+
+  def less_than_active_record_6_0?
+    ActiveRecord.version < Gem::Version.create("6.0.0")
+  end
+
+  def with_database(env_name)
+    if less_than_active_record_6_0?
+      config = ActiveRecord::Base.configurations.with_indifferent_access[env_name]
+
+      yield config
+    else
+      db_configs = ActiveRecord::Base.configurations.configs_for(env_name: env_name.to_s)
+
+      db_configs.each do |db_config|
+        yield db_config.config.with_indifferent_access
+      end
+    end
+  end
+
+  def with_all_databases
+    if less_than_active_record_6_0?
+      ActiveRecord::Base.configurations.each_value do |config|
+        yield config
+      end
+    else
+      ActiveRecord::Base.configurations.configs_for.each do |db_config|
+        yield db_config.config.with_indifferent_access
+      end
+    end
+  end
+
   task 'db:migrate' => 'ar:migrate'
   task 'db:create'  => 'ar:create'
   task 'db:drop'    => 'ar:drop'

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/padrino-gen.gemspec

@@ -5,7 +5,6 @@ require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FIL
 
 Gem::Specification.new do |s|
   s.name = "padrino-gen"
-  s.rubyforge_project = "padrino-gen"
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
   s.email = "padrinorb@gmail.com"
   s.summary = "Generators for easily creating and building padrino applications"
@@ -24,7 +23,7 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-core", Padrino.version)
-  s.add_dependency("bundler", "~> 1.0")
+  s.add_dependency("bundler", ">= 1.0", "< 3")
   s.add_development_dependency("padrino-helpers", Padrino.version)
   s.add_development_dependency("padrino-mailer", Padrino.version)
 end

data/test/test_component_generator.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
+require "rb-readline"
 
 describe "ComponentGenerator" do
   def setup

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,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.14.1.1
+  version: 0.15.1
 platform: ruby
 authors:
 - Padrino Team
 - Nathan Esquenazi
 - Davide D'Agostino
 - Arthur Chiu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,58 +19,62 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4w
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4w
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1.1
+        version: 0.15.1
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -80,9 +84,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -202,25 +206,43 @@ homepage: http://www.padrinorb.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+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
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Generators for easily creating and building padrino applications
-test_files: []
+test_files:
+- test/fixtures/admin_template.rb
+- test/fixtures/example_template.rb
+- test/fixtures/git_template.rb
+- test/fixtures/plugin_template.rb
+- test/fixtures/rake_template.rb
+- test/helper.rb
+- test/test_app_generator.rb
+- test/test_cli.rb
+- test/test_component_generator.rb
+- test/test_controller_generator.rb
+- test/test_generator.rb
+- test/test_helper_generator.rb
+- test/test_mailer_generator.rb
+- test/test_migration_generator.rb
+- test/test_model_generator.rb
+- test/test_plugin_generator.rb
+- test/test_project_generator.rb
+- test/test_sql_helpers.rb
+- test/test_task_generator.rb