padrino-gen 0.14.0.1 → 0.14.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a461006204ef4ddc1ff41af26f1b00a096c042cf
-  data.tar.gz: 73d0ffd6d95ea6483ddbec99094937ff04516ef2
+  metadata.gz: a86e25c6f9ce2bd438f782020867cc1a807716a7
+  data.tar.gz: 7518be6e979a87db7354f89c782f470442e432b4
 SHA512:
-  metadata.gz: f1480225ada484bb9fa790773cd12db0e76dc8f9babd336baace08b22aa2f153b7b6912d873a2a57f02064552989309bd83ece56e109f29fc7ef037628ccd2ea
-  data.tar.gz: 65eeff0dfcc195f2c8d9dc021ac8a42017e0cf4ca982e5b5d6453704853443124e8432ebf8f5c890f547364910e816cc8c4144827de7801f69b683ad4c467067
+  metadata.gz: 035d9fde49b0ce00726eb5a64c1a7d0631f53c237e68d6f1682faf808a38d18545ad7cb0efd6a196b7fe74487f01015e07231905c16d77b04ccb8d3a0c748afd
+  data.tar.gz: c5ac2f3af444a1b54ca4c432573dc2ae919495b3e692adafe272d2b3a22bb45f1232dc6cfc06097aee24e3fcde004f98efa33ef50d8c4dd6e98ebed1d6ef55cb

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

@@ -507,7 +507,7 @@ WARNING
       end
 
       ##
-      # Ensure that project name is valid, else raise an NameError.
+      # Ensures that project name is valid, else raise an NameError.
       #
       # @param [String] name
       #   Name of project.
@@ -529,6 +529,9 @@ WARNING
       ##
       # Validates namespace name (controller name, etc.) or fails with an error.
       #
+      # @param [String] name
+      #   Name of namespace
+      #
       # @example
       #   validate_namespace 'Project_One1' #=> pass
       #   validate_namespace 'Erroneous/name' #=> fail
@@ -601,14 +604,14 @@ WARNING
         end
 
         ##
-        # Tell Padrino that for this Thor::Group it is a necessary task to run.
+        # Tells Padrino that for this Thor::Group it is a necessary task to run.
         #
         def require_arguments!
           @require_arguments = true
         end
 
         ##
-        # Return true if we need an arguments for our Thor::Group.
+        # Returns true if we need an arguments for our Thor::Group.
         #
         def require_arguments?
           @require_arguments

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

@@ -10,7 +10,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
 
   namespace :ar do
     namespace :create do
-      desc 'Create all the local databases defined in config/database.yml'
+      desc "Create all the local databases defined in config/database.yml"
       task :all => :skeleton do
         ActiveRecord::Base.configurations.each_value do |config|
           # Skip entries that don't have a database key, such as the first entry here:
@@ -31,7 +31,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    desc 'Create the database defined in config/database.yml for the current Padrino.env'
+    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])
     end
@@ -40,7 +40,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       begin
         if config[:adapter] =~ /sqlite/
           if File.exist?(config[:database])
-            $stderr.puts "#{config[:database]} already exists"
+            $stderr.puts "#{config[:database]} already exists."
           else
             begin
               # Create the SQLite database
@@ -88,7 +88,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     end
 
     namespace :drop do
-      desc 'Drops all the local databases defined in config/database.yml'
+      desc "Drops all the local databases defined in config/database.yml"
       task :all => :skeleton do
         ActiveRecord::Base.configurations.each_value do |config|
           # Skip entries that don't have a database key
@@ -103,7 +103,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    desc 'Drops the database for the current Padrino.env'
+    desc "Drops the database for the current Padrino.env"
     task :drop => :skeleton do
       config = ActiveRecord::Base.configurations.with_indifferent_access[Padrino.env || :development]
       begin
@@ -129,7 +129,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     end
 
     namespace :migrate do
-      desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with MIGRATION_VERSION=x.'
+      desc "Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with MIGRATION_VERSION=x."
       task :redo => :skeleton do
         if env_migration_version
           Rake::Task["ar:migrate:down"].invoke
@@ -140,23 +140,23 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
         end
       end
 
-      desc 'Resets your database using your migrations for the current environment'
+      desc "Resets your database using your migrations for the current environment."
       task :reset => ["ar:drop", "ar:create", "ar:migrate"]
 
-      desc 'Runs the "up" for a given MIGRATION_VERSION.'
+      desc "Runs the "up" for a given MIGRATION_VERSION."
       task(:up => :skeleton){ migrate_as(:up) }
 
-      desc 'Runs the "down" for a given MIGRATION_VERSION.'
+      desc "Runs the "down" for a given MIGRATION_VERSION."
       task(:down => :skeleton){ migrate_as(:down) }
     end
 
-    desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
+    desc "Rolls the schema back to the previous version. Specify the number of steps with STEP=n"
     task(:rollback => :skeleton){ move_as(:rollback) }
 
-    desc 'Pushes the schema to the next version. Specify the number of steps with STEP=n'
+    desc "Pushes the schema to the next version. Specify the number of steps with STEP=n"
     task(:forward => :skeleton){ move_as(:forward) }
 
-    desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
+    desc "Drops and recreates the database from db/schema.rb for the current environment and loads the seeds."
     task :reset => [ 'ar:drop', 'ar:setup' ]
 
     desc "Retrieves the charset for the current environment's database"
@@ -170,11 +170,11 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
         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'
+        puts 'Sorry, your database adapter is not supported yet, feel free to submit a patch.'
       end
     end
 
-    desc "Retrieves the collation for the current environment's database"
+    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]
@@ -186,12 +186,12 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    desc "Retrieves the current schema version number"
+    desc "Retrieves the current schema version number."
     task :version => :skeleton do
       puts "Current version: #{ActiveRecord::Migrator.current_version}"
     end
 
-    desc "Raises an error if there are pending migrations"
+    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
@@ -206,11 +206,11 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    desc 'Create the database, load the schema, and initialize with the seed data'
+    desc "Create the database, load the schema, and initialize with the seed data."
     task :setup => [ 'ar:create', 'ar:schema:load', 'seed' ]
 
     namespace :schema do
-      desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
+      desc "Create a db/schema.rb file that can be portably used against any DB supported by AR."
       task :dump => :skeleton do
         require 'active_record/schema_dumper'
         File.open(ENV['SCHEMA'] || Padrino.root("db", "schema.rb"), "w") do |file|
@@ -219,7 +219,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
         Rake::Task["ar:schema:dump"].reenable
       end
 
-      desc "Load a schema.rb file into the database"
+      desc "Load a schema.rb file into the database."
       task :load => :skeleton do
         file = ENV['SCHEMA'] || Padrino.root("db", "schema.rb")
         if File.exist?(file)
@@ -231,7 +231,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
     end
 
     namespace :structure do
-      desc "Dump the database structure to a SQL file"
+      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]
@@ -259,7 +259,7 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
           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]}'"
+          raise "Task not supported by '#{config[:adapter]}'."
         end
 
         if ActiveRecord::Base.connection.supports_migrations?
@@ -268,23 +268,23 @@ if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
       end
     end
 
-    desc "Generates .yml files for I18n translations"
+    desc "Generates .yml files for I18n translations."
     task :translate => :environment do
       models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
 
       models.each do |m|
-        # Get the model class.
+        # get the model class
         klass = m.camelize.constantize
 
-        # Avoid non ActiveRecord models.
+        # avoid non ActiveRecord models
         next unless klass.ancestors.include?(ActiveRecord::Base)
 
-        # Init the processing.
+        # init the processing
         print "Processing #{m.humanize}: "
         FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
         langs = Array(I18n.locale)
 
-        # Create models for it and en locales.
+        # create models for it and en locales
         langs.each do |lang|
           filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
           columns    = klass.columns.map(&:name)

data/test/test_migration_generator.rb

@@ -52,7 +52,7 @@ describe "MigrationGenerator" do
 
     describe "the default migration numbering" do
       it 'should properly calculate version number' do
-        capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+        capture_io { generate(:project, 'sample_project', '--migration_format=number', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
         capture_io { generate(:migration, 'add_email_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
         capture_io { generate(:migration, 'add_name_to_person', "email:string", "-r=#{@apptmp}/sample_project") }
         capture_io { generate(:migration, 'add_age_to_user', "email:string", "-r=#{@apptmp}/sample_project") }
@@ -64,7 +64,7 @@ describe "MigrationGenerator" do
 
     describe "the timestamped migration numbering" do
       it 'should properly calculate version number' do
-        capture_io { generate(:project, 'sample_project', "--migration_format=timestamp", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+        capture_io { generate(:project, 'sample_project', '--migration_format=timestamp', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
 
         time = stop_time_for_test.utc.strftime("%Y%m%d%H%M%S")
 
@@ -90,8 +90,11 @@ describe "MigrationGenerator" do
   end
 
   describe 'the migration generator for activerecord' do
-    it 'should generate migration for generic needs' do
+    before do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
+    end
+
+    it 'should generate migration for generic needs' do
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/class ModifyUserFields/m, migration_file_path)
@@ -100,8 +103,7 @@ describe "MigrationGenerator" do
     end
 
     it 'should generate migration for adding columns' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
+      migration_params = ['AddEmailToUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/class AddEmailToUsers/m, migration_file_path)
@@ -112,8 +114,7 @@ describe "MigrationGenerator" do
     end
 
     it 'should generate migration for removing columns' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
+      migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb"
       assert_match_in_file(/class RemoveEmailFromUsers/m, migration_file_path)
@@ -125,8 +126,11 @@ describe "MigrationGenerator" do
   end
 
   describe 'the migration generator for datamapper' do
-    it 'should generate migration for generic needs' do
+    before do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
+    end
+
+    it 'should generate migration for generic needs' do
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/migration\s1.*?:modify_user_fields/m, migration_file_path)
@@ -135,8 +139,7 @@ describe "MigrationGenerator" do
     end
 
     it 'should generate migration for adding columns' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
-      migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
+      migration_params = ['AddEmailToUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/migration\s1.*?:add_email_to_users/m, migration_file_path)
@@ -147,8 +150,7 @@ describe "MigrationGenerator" do
     end
 
     it 'should generate migration for removing columns' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
-      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
+      migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb"
       assert_match_in_file(/migration\s1.*?:remove_email_from_users/m, migration_file_path)
@@ -159,7 +161,6 @@ describe "MigrationGenerator" do
     end
 
     it 'should properly version migration files' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       response_success = capture_io { generate(:migration, 'ModifyUserFields2', "-r=#{@apptmp}/sample_project") }
       response_success = capture_io { generate(:migration, 'ModifyUserFields3', "-r=#{@apptmp}/sample_project") }
@@ -170,8 +171,11 @@ describe "MigrationGenerator" do
   end
 
   describe 'the migration generator for sequel' do
-    it 'should generate migration for generic needs' do
+    before do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+    end
+
+    it 'should generate migration for generic needs' do
       response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb"
       assert_match_in_file(/Sequel\.migration/m, migration_file_path)
@@ -180,8 +184,7 @@ describe "MigrationGenerator" do
     end
 
     it 'should generate migration for adding columns' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
-      migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
+      migration_params = ['AddEmailToUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb"
       assert_match_in_file(/Sequel\.migration/m, migration_file_path)
@@ -192,8 +195,7 @@ describe "MigrationGenerator" do
     end
 
     it 'should generate migration for removing columns' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
-      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
+      migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
       response_success = capture_io { generate(:migration, *migration_params) }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb"
       assert_match_in_file(/Sequel\.migration/m, migration_file_path)
@@ -205,21 +207,21 @@ describe "MigrationGenerator" do
   end
 
   describe "the migration destroy option" do
+    before do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
+      @migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
+    end
 
     it 'should destroy the migration files' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
-      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      capture_io { generate(:migration, *migration_params) }
+      capture_io { generate(:migration, *@migration_params) }
       capture_io { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb")
     end
 
     it 'should destroy the migration file regardless of number' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
-      migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
-      migration_param2 = ['AddEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"]
+      migration_param2 = ['AddEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"]
       capture_io { generate(:migration, *migration_param2) }
-      capture_io { generate(:migration, *migration_params) }
+      capture_io { generate(:migration, *@migration_params) }
       capture_io { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') }
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_remove_email_from_users.rb")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.14.0.1
+  version: 0.14.0.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-05-08 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.14.0.1
+        version: 0.14.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.1
+        version: 0.14.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.1
+        version: 0.14.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.1
+        version: 0.14.0.2
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.1
+        version: 0.14.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.1
+        version: 0.14.0.2
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-gen
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Generators for easily creating and building padrino applications