padrino-gen 0.16.0.pre4 → 0.16.0

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

@@ -11,16 +11,16 @@ module Padrino
       Padrino::Generators.add_generator(:task, self)
 
       class << self
-        def source_root; File.expand_path(File.dirname(__FILE__)); end
-        def banner; "padrino-gen task [name]"; end
+        def source_root; __dir__; end
+        def banner; 'padrino-gen task [name]'; end
       end
 
       desc "Description:\n\n\tpadrino-gen task generates a new task file."
 
-      argument     :name,        :desc => 'The name of your application task'
-      class_option :root,        :desc => 'The root destination',                     :aliases => '-r', :default => '.', :type => :string
-      class_option :description, :desc => 'The description of your application task', :aliases => '-d', :default => nil, :type => :string
-      class_option :namespace,   :desc => 'The namespace of your application task',   :aliases => '-n', :default => nil, :type => :string
+      argument     :name,        desc: 'The name of your application task'
+      class_option :root,        desc: 'The root destination',                     aliases: '-r', default: '.', type: :string
+      class_option :description, desc: 'The description of your application task', aliases: '-d', default: nil, type: :string
+      class_option :namespace,   desc: 'The namespace of your application task',   aliases: '-n', default: nil, type: :string
 
       # Show help if no ARGV given
       require_arguments!
@@ -29,11 +29,10 @@ module Padrino
         validate_namespace name
         self.destination_root = options[:root]
         if in_app_root?
-          app        = options[:app]
           @task_name = name.to_s.underscore
           @namespace = options[:namespace].underscore if options[:namespace]
           @desc      = options[:description]
-          filename   = @task_name + ".rake"
+          filename   = "#{@task_name}.rake"
           filename   = "#{@namespace}_#{filename}" if @namespace
 
           template 'templates/task.rb.tt', destination_root('tasks', filename)

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

@@ -8,7 +8,7 @@ source 'https://rubygems.org'
 
 # Server requirements
 <% if options.server == 'trinidad' -%>
-gem 'trinidad', :platform => 'jruby'
+gem 'trinidad', platform: 'jruby'
 <% else -%>
 gem '<%= options.server %>'
 <% end -%>
@@ -25,8 +25,8 @@ gem 'rake'
 
 <% if options.api? -%>
 <% if options.dev? -%>
-gem 'padrino-core', :path => '<%= Padrino::Generators::DEV_PATH %>/padrino-core'
-gem 'padrino-gen', :path => '<%= Padrino::Generators::DEV_PATH %>/padrino-gen'
+gem 'padrino-core', path: '<%= Padrino::Generators::DEV_PATH %>/padrino-core'
+gem 'padrino-gen', path: '<%= Padrino::Generators::DEV_PATH %>/padrino-gen'
 <% else -%>
 gem 'padrino-core', '<%= Padrino.version %>'
 gem 'padrino-gen', '<%= Padrino.version %>'
@@ -36,10 +36,10 @@ gem 'padrino-gen', '<%= Padrino.version %>'
 <% if options.dev? %># <% end %>gem 'padrino', '<%= Padrino.version %>'
 
 # Or Padrino Edge
-# gem 'padrino', :github => 'padrino/padrino-framework'
+# gem 'padrino', github: 'padrino/padrino-framework'
 
 # Or Individual Gems
 <% unless options.dev? %># <% end %>%w(core support gen helpers cache mailer admin).each do |g|
-<% unless options.dev? %># <% end %>  gem 'padrino-' + g, <% if options.dev? %>:path => '<%= Padrino::Generators::DEV_PATH %>/padrino-' + g<% else %>'<%= Padrino.version %>'<% end %>
+<% unless options.dev? %># <% end %>  gem 'padrino-' + g, <% if options.dev? %>path: '<%= Padrino::Generators::DEV_PATH %>/padrino-' + g<% else %>'<%= Padrino.version %>'<% end %>
 <% unless options.dev? %># <% end %>end
 <% end -%>

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

@@ -1,17 +1,17 @@
 <%= @project_name %>::<%= @app_name %>.controllers <%= ":#{@controller}" if @controller %><%= ", #{@block_opts_string}" if @block_opts_string %> do
   <%= "layout :#{@layout}" if @layout %>
-  # get :index, :map => '/foo/bar' do
+  # get :index, map: '/foo/bar' do
   #   session[:foo] = 'bar'
   #   render 'index'
   # end
 
-  # get :sample, :map => '/sample/url', :provides => [:any, :js] do
+  # get :sample, map: '/sample/url', provides: [:any, :js] do
   #   case content_type
   #     when :js then ...
   #     else ...
   # end
 
-  # get :foo, :with => :id do
+  # get :foo, with: :id do
   #   "Maps to url '/foo/#{params[:id]}'"
   # end
 

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

@@ -2,24 +2,24 @@
 # Mailer methods can be defined using the simple format:
 #
 # email :registration_email do |name, user|
-#   from 'admin@site.com'
-#   to   user.email
-#   subject 'Welcome to the site!'
-#   locals  :name => name
+#   from         'admin@site.com'
+#   to           user.email
+#   subject      'Welcome to the site!'
+#   locals       name: name
 #   content_type 'text/html'       # optional, defaults to plain/text
-#   via     :sendmail              # optional, to smtp if defined, otherwise sendmail
-#   render  'registration_email'
+#   via          :sendmail         # optional, to smtp if defined, otherwise sendmail
+#   render       'registration_email'
 # end
 #
 # You can set the default delivery settings from your app through:
 #
-#   set :delivery_method, :smtp => {
-#     :address         => 'smtp.yourserver.com',
-#     :port            => '25',
-#     :user_name       => 'user',
-#     :password        => 'pass',
-#     :authentication  => :plain, # :plain, :login, :cram_md5, no auth by default
-#     :domain          => "localhost.localdomain" # the HELO domain provided by the client to the server
+#   set :delivery_method, smtp: {
+#     address:         'smtp.yourserver.com',
+#     port:            '25',
+#     user_name:       'user',
+#     password:        'pass',
+#     authentication:  :plain, # :plain, :login, :cram_md5, no auth by default
+#     domain:          'localhost.localdomain' # the HELO domain provided by the client to the server
 #   }
 #
 # or sendmail (default):
@@ -32,8 +32,8 @@
 #
 # or storing emails locally:
 #
-#   set :delivery_method, :file => {
-#     :location => "#{Padrino.root}/tmp/emails",
+#   set :delivery_method, file: {
+#     location: "#{Padrino.root}/tmp/emails",
 #   }
 #
 # and then all delivered mail will use these settings unless otherwise specified.

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-Dir.chdir(File.dirname(__FILE__)+'/..')
+Dir.chdir("#{__dir__}/..")
 
 # Start the app with Padrino::Server
 require 'bundler/setup'

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

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