padrino-gen 0.10.7 → 0.11.0

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

@@ -52,7 +52,6 @@ describe "!NAME! Model" do
 end
 TEST
 
-# Setup the testing configuration helper and dependencies
 def setup_test
   require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
   require_dependencies 'bacon', :group => 'test'
@@ -60,7 +59,6 @@ def setup_test
   create_file destination_root("test/test.rake"), BACON_RAKE
 end
 
-# Generates a controller test given the controllers name
 def generate_controller_test(name)
   bacon_contents       = BACON_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")

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

@@ -62,7 +62,6 @@ def setup_test
   create_file destination_root("test/test.rake"), MINITEST_RAKE
 end
 
-# Generates a controller test given the controllers name
 def generate_controller_test(name)
   minitest_contents = MINITEST_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")

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

@@ -86,7 +86,6 @@ def setup_test
   create_file destination_root("test/test.rake"), RIOT_RAKE
 end
 
-# Generates a controller test given the controllers name
 def generate_controller_test(name)
   riot_contents = RIOT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")

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

@@ -29,29 +29,29 @@ end
 TEST
 
 RSPEC_RAKE = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_RAKE)
-require 'rspec/core/rake_task'
+begin
+  require 'rspec/core/rake_task'
 
-spec_tasks = Dir['spec/*/'].map { |d| File.basename(d) }
+  spec_tasks = Dir['spec/*/'].map { |d| File.basename(d) }
 
-spec_tasks.each do |folder|
-  RSpec::Core::RakeTask.new("spec:\#{folder}") do |t|
-    t.pattern = "./spec/\#{folder}/**/*_spec.rb"
-    t.rspec_opts = %w(-fs --color)
+  spec_tasks.each do |folder|
+    RSpec::Core::RakeTask.new("spec:\#{folder}") do |t|
+      t.pattern = "./spec/\#{folder}/**/*_spec.rb"
+      t.rspec_opts = %w(-fs --color)
+    end
   end
-end
 
-desc "Run complete application spec suite"
-task 'spec' => spec_tasks.map { |f| "spec:\#{f}" }
+  desc "Run complete application spec suite"
+  task 'spec' => spec_tasks.map { |f| "spec:\#{f}" }
+rescue LoadError
+  puts "RSpec is not part of this bundle, skip specs."
+end
 TEST
 
 RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
 require 'spec_helper'
 
-describe "!NAME! Model" do
-  let(:!DNAME!) { !NAME!.new }
-  it 'can be created' do
-    !DNAME!.should_not be_nil
-  end
+describe !NAME! do
 end
 TEST
 
@@ -62,7 +62,6 @@ def setup_test
   create_file destination_root("spec/spec.rake"), RSPEC_RAKE
 end
 
-# Generates a controller test given the controllers name
 def generate_controller_test(name)
   rspec_contents = RSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_spec_path = File.join('spec',options[:app],'controllers',"#{name.to_s.underscore}_controller_spec.rb")

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

@@ -69,7 +69,6 @@ def setup_test
   create_file destination_root("test/test.rake"), SHOULDA_RAKE
 end
 
-# Generates a controller test given the controllers name
 def generate_controller_test(name)
   shoulda_contents = SHOULDA_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")

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

@@ -59,7 +59,6 @@ def setup_test
   create_file destination_root("test/test.rake"), TESTSPEC_RAKE
 end
 
-# Generates a controller test given the controllers name
 def generate_controller_test(name)
   testspec_contents = TESTSPEC_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
   controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")

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

@@ -20,11 +20,12 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen controller generates a new Padrino controller"
 
-      argument :name, :desc => "The name of your padrino controller"
-      argument :fields, :desc => "The fields for the controller", :type => :array, :default => []
-      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
-      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => "/app", :type => :string
-      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
+      argument     :name,      :desc => 'The name of your padrino controller'
+      argument     :fields,    :desc => 'The fields for the controller',                            :default => [],     :type => :array
+      class_option :root,      :desc => 'The root destination',                   :aliases => '-r', :default => '.',    :type => :string
+      class_option :app,       :desc => 'The application destination path',       :aliases => '-a', :default => '/app', :type => :string
+      class_option :destroy,                                                      :aliases => '-d', :default => false,  :type => :boolean
+      class_option :namespace, :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',     :type => :string
 
       # Show help if no argv given
       require_arguments!
@@ -37,17 +38,19 @@ module Padrino
         if in_app_root?
           app = options[:app]
           check_app_existence(app)
-          @app_name = fetch_app_name(app)
-          @actions  = controller_actions(fields)
-          @controller = name.to_s.underscore
+          @project_name = options[:namespace].underscore.camelize
+          @project_name = fetch_project_name(app) if @project_name.empty?
+          @app_name     = fetch_app_name(app)
+          @actions      = controller_actions(fields)
+          @controller   = name.to_s.underscore
           self.behavior = :revoke if options[:destroy]
-          template "templates/controller.rb.tt", destination_root(app, "controllers", "#{name.to_s.underscore}.rb")
-          template "templates/helper.rb.tt",     destination_root(app, "helpers", "#{name.to_s.underscore}_helper.rb")
+          template 'templates/controller.rb.tt', destination_root(app, 'controllers', "#{name.to_s.underscore}.rb")
+          template 'templates/helper.rb.tt',     destination_root(app, 'helpers', "#{name.to_s.underscore}_helper.rb")
           empty_directory destination_root(app, "/views/#{name.to_s.underscore}")
           include_component_module_for(:test)
           generate_controller_test(name) if test?
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end
       end
     end # Controller

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

@@ -11,7 +11,7 @@ module Padrino
       # Define the source template root
       def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       # Defines the banner for this CLI generator
-      def self.banner; "padrino-gen mailer [name]"; end
+      def self.banner; 'padrino-gen mailer [name]'; end
 
       # Include related modules
       include Thor::Actions
@@ -20,11 +20,12 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen mailer generates a new Padrino mailer"
 
-      argument :name, :desc => "The name of your padrino mailer"
-      argument :actions, :desc => "The delivery actions to add to your mailer", :type => :array, :default => []
-      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
-      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => "/app", :type => :string
-      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
+      argument     :name,      :desc => 'The name of your padrino mailer'
+      argument     :actions,   :desc => 'The delivery actions to add to your mailer',                                   :type =>  :array, :default =>  []
+      class_option :root,      :desc => 'The root destination',                   :aliases => '-r', :default => '.',    :type => :string
+      class_option :app,       :desc => 'The application destination path',       :aliases => '-a', :default => '/app', :type => :string
+      class_option :destroy,                                                      :aliases => '-d', :default => false,  :type => :boolean
+      class_option :namespace, :desc => 'The name space of your padrino project', :aliases => '-n', :default => '',     :type => :string
 
       # Show help if no argv given
       require_arguments!
@@ -37,15 +38,17 @@ module Padrino
         if in_app_root?
           app = options[:app]
           check_app_existence(app)
-          self.behavior = :revoke if options[:destroy]
-          @app_name = fetch_app_name(app)
-          @actions = actions.map{|a| a.to_sym}
-          @short_name = name.to_s.gsub(/_mailer/i, '').underscore.downcase
+          self.behavior    = :revoke if options[:destroy]
+          @project_name    = options[:namespace].underscore.camelize
+          @project_name    = fetch_project_name(app) if @project_name.empty?
+          @app_name        = fetch_app_name(app)
+          @actions         = actions.map{|a| a.to_sym}
+          @short_name      = name.to_s.gsub(/_mailer/i, '').underscore.downcase
           @mailer_basename = @short_name.underscore
           template "templates/mailer.rb.tt", destination_root(app, 'mailers', "#{@mailer_basename}.rb")
           empty_directory destination_root(app, 'views', 'mailers', @mailer_basename)
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end
       end
     end # Mailer

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

@@ -20,9 +20,9 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen migration generates a new migration file"
 
-      argument :name, :desc => "The name of your padrino migration"
-      argument :columns, :desc => "The columns for the migration", :type => :array, :default => []
-      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
+      argument :name, :desc => 'The name of your padrino migration'
+      argument :columns, :desc => 'The columns for the migration', :type => :array, :default => []
+      class_option :root, :desc => 'The root destination', :aliases => '-r', :default => '.', :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
 
       # Show help if no argv given
@@ -36,11 +36,11 @@ module Padrino
           if include_component_module_for(:orm)
             create_migration_file(name, name, columns)
           else
-            say "<= You need an ORM adapter for run this generator. Sorry!"
+            say '<= You need an ORM adapter for run this generator. Sorry!'
             raise SystemExit
           end
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end
       end
     end # Migration

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

@@ -20,12 +20,12 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen model generates a new model and migration files"
 
-      argument :name, :desc => "The name of your padrino model"
-      argument :fields, :desc => "The fields for the model", :type => :array, :default => []
-      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
-      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => ".", :type => :string
+      argument :name, :desc => 'The name of your padrino model'
+      argument :fields, :desc => 'The fields for the model', :type => :array, :default => []
+      class_option :root, :desc => 'The root destination', :aliases => '-r', :default => '.', :type => :string
+      class_option :app, :desc => 'The application destination path', :aliases => '-a', :default => '.', :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
-      class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
+      class_option :skip_migration, :aliases => '-s', :default => false, :type => :boolean
 
       # Show help if no argv given
       require_arguments!
@@ -40,7 +40,7 @@ module Padrino
           check_app_existence(app)
           self.behavior = :revoke if options[:destroy]
           if invalids = invalid_fields(fields)
-            say "Invalid field name:", :red
+            say 'Invalid field name:', :red
             say " #{invalids.join(", ")}"
             return
           end
@@ -50,11 +50,12 @@ module Padrino
           end
           include_component_module_for(:test)
           migration_name = "create_#{name.pluralize.underscore}"
+          apply_default_fields fields
           create_model_file(name, :fields => fields, :app => app)
           generate_model_test(name) if test?
           create_model_migration(migration_name, name, fields) unless options[:skip_migration]
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end
       end
     end # Model

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

@@ -36,7 +36,21 @@ module Padrino
       #
       # @api private
       def setup_plugin
-        if options[:list] # list method ran here
+        if options[:list] || plugin_file.nil? # list method ran here
+          list_plugins
+        else # executing the plugin instructions
+          if in_app_root?
+            self.behavior = :revoke if options[:destroy]
+            self.destination_root = options[:root]
+            execute_runner(:plugin, plugin_file)
+          else
+            say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          end
+        end
+      end
+
+      no_tasks do
+        def list_plugins
           plugins = {}
           uri = URI.parse(PLUGIN_URL)
           http = Net::HTTP.new(uri.host, uri.port)
@@ -49,14 +63,6 @@ module Padrino
           end
           say "Available plugins:", :green
           say plugins.map { |plugin| "  - #{plugin}" }.join("\n")
-        else # executing the plugin instructions
-          if in_app_root?
-            self.behavior = :revoke if options[:destroy]
-            self.destination_root = options[:root]
-            execute_runner(:plugin, plugin_file)
-          else
-            say "You are not at the root of a Padrino application! (config/boot.rb not found)"
-          end
         end
       end
     end # Plugins

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

@@ -4,4 +4,5 @@ tmp/**/*
 bin/*
 vendor/gems/*
 !vendor/gems/cache/
-.sass-cache/*
+.sass-cache/*
+db/*.db

data/lib/padrino-gen/generators/project/config/apps.rb.tt

@@ -2,15 +2,15 @@
 # This file mounts each app in the Padrino project to a specified sub-uri.
 # You can mount additional applications using any of these commands below:
 #
-#   Padrino.mount("blog").to('/blog')
-#   Padrino.mount("blog", :app_class => "BlogApp").to('/blog')
-#   Padrino.mount("blog", :app_file =>  "path/to/blog/app.rb").to('/blog')
+#   Padrino.mount('blog').to('/blog')
+#   Padrino.mount('blog', :app_class => 'BlogApp').to('/blog')
+#   Padrino.mount('blog', :app_file =>  'path/to/blog/app.rb').to('/blog')
 #
 # You can also map apps to a specified host:
 #
-#   Padrino.mount("Admin").host("admin.example.org")
-#   Padrino.mount("WebSite").host(/.*\.?example.org/)
-#   Padrino.mount("Foo").to("/foo").host("bar.example.org")
+#   Padrino.mount('Admin').host('admin.example.org')
+#   Padrino.mount('WebSite').host(/.*\.?example.org/)
+#   Padrino.mount('Foo').to('/foo').host('bar.example.org')
 #
 # Note 1: Mounted apps (by default) should be placed into the project root at '/app_name'.
 # Note 2: If you use the host matching remember to respect the order of the rules.
@@ -18,7 +18,7 @@
 # By default, this file mounts the primary app which was generated with this project.
 # However, the mounted app can be modified as needed:
 #
-#   Padrino.mount("AppName", :app_file => "path/to/file", :app_class => "BlogApp").to('/')
+#   Padrino.mount('AppName', :app_file => 'path/to/file', :app_class => 'BlogApp').to('/')
 #
 
 ##
@@ -28,7 +28,9 @@
 Padrino.configure_apps do
   # enable :sessions
   set :session_secret, '<%= SecureRandom.hex(32) %>'
+  set :protection, true
+  set :protect_from_csrf, true
 end
 
 # Mounts the core application for this project
-Padrino.mount(<%= @app_name.inspect %>).to('/')
+Padrino.mount('<%= @project_name.to_s %>::<%= @app_name.to_s %>', :app_file => Padrino.root('app/app.rb')).to('/')

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

@@ -24,23 +24,24 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen project generates a new Padrino project"
 
-      argument :name, :desc => "The name of your padrino project"
+      argument :name, :desc => 'The name of your padrino project'
 
-      class_option :app ,         :desc => "The application name",                                  :aliases => '-n', :default => nil,      :type => :string
-      class_option :bundle,       :desc => "Run bundle install",                                    :aliases => '-b', :default => false,    :type => :boolean
-      class_option :root,         :desc => "The root destination",                                  :aliases => '-r', :default => ".",      :type => :string
-      class_option :dev,          :desc => "Use padrino from a git checkout",                                         :default => false,    :type => :boolean
-      class_option :tiny,         :desc => "Generate tiny app skeleton",                            :aliases => '-i', :default => false,    :type => :boolean
-      class_option :adapter,      :desc => "SQL adapter for ORM (sqlite, mysql, mysql2, postgres)", :aliases => '-a', :default => "sqlite", :type => :string
-      class_option :template,     :desc => "Generate project from template",                        :aliases => '-p', :default => nil,      :type => :string
+      class_option :app ,         :desc => 'The application name',                                  :aliases => '-n', :default => nil,      :type => :string
+      class_option :bundle,       :desc => 'Run bundle install',                                    :aliases => '-b', :default => false,    :type => :boolean
+      class_option :root,         :desc => 'The root destination',                                  :aliases => '-r', :default => '.',      :type => :string
+      class_option :dev,          :desc => 'Use padrino from a git checkout',                                         :default => false,    :type => :boolean
+      class_option :tiny,         :desc => 'Generate tiny app skeleton',                            :aliases => '-i', :default => false,    :type => :boolean
+      class_option :adapter,      :desc => 'SQL adapter for ORM (sqlite, mysql, mysql2, mysql-gem, postgres)', :aliases => '-a', :default => 'sqlite', :type => :string
+      class_option :template,     :desc => 'Generate project from template',                        :aliases => '-p', :default => nil,      :type => :string
+      class_option :gem,          :desc => 'Generate project as a gem',                             :aliases => '-g', :default => false,    :type => :boolean
 
       # Definitions for the available customizable components
-      component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :mini_record, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic, :ripple], :default => :none
-      component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot, :minitest], :default => :none
-      component_option :mock,       "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
-      component_option :script,     "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools, :extcore, :dojo], :default => :none
-      component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb, :liquid, :slim], :default => :haml
-      component_option :stylesheet, "stylesheet engine",  :aliases => '-c', :choices => [:less, :sass, :compass, :scss], :default => :none
+      component_option :orm,        'database engine',    :aliases => '-d', :choices => [:activerecord, :minirecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic, :ripple], :default => :none
+      component_option :test,       'testing framework',  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot, :minitest], :default => :none
+      component_option :mock,       'mocking library',    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
+      component_option :script,     'javascript library', :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools, :extcore, :dojo], :default => :none
+      component_option :renderer,   'template engine',    :aliases => '-e', :choices => [:haml, :erb, :liquid, :slim], :default => :slim
+      component_option :stylesheet, 'stylesheet engine',  :aliases => '-c', :choices => [:less, :sass, :compass, :scss], :default => :none
 
       # Show help if no argv given
       require_arguments!
@@ -49,20 +50,30 @@ module Padrino
       #
       # @api private
       def setup_project
-        valid_constant?(options[:app] || name)
-        @app_name = (options[:app] || name).gsub(/\W/, "_").underscore.camelize
+        valid_constant? name
+        app = (options[:app] || "App")
+
+        @project_name = name.gsub(/\W/, '_').underscore.camelize
+        @app_name = app.gsub(/\W/, '_').underscore.camelize
         self.destination_root = File.join(options[:root], name)
         if options[:template] # Run the template to create project
           execute_runner(:template, options[:template])
         else # generate project without template
-          directory("project/", destination_root)
-          empty_directory destination_root("public/images")
-          empty_directory destination_root("public/javascripts")
-          empty_directory destination_root("public/stylesheets")
-          empty_directory destination_root("tmp")
+          directory('project/', destination_root)
+          empty_directory destination_root('public/images')
+          empty_directory destination_root('public/javascripts')
+          empty_directory destination_root('public/stylesheets')
+          empty_directory destination_root('tmp')
           store_component_config('.components')
           app_skeleton('app', options[:tiny])
-          template "templates/Gemfile.tt", destination_root("Gemfile")
+          template 'templates/Gemfile.tt', destination_root('Gemfile')
+          template 'templates/Rakefile.tt', destination_root('Rakefile')
+          if options.gem?
+            template 'templates/gem/gemspec.tt', destination_root(name + '.gemspec')
+            template 'templates/gem/README.md.tt', destination_root('README.md')
+            template 'templates/gem/lib/libname.tt', destination_root("lib/#{name}.rb")
+            template 'templates/gem/lib/libname/version.tt', destination_root("lib/#{name}/version.rb")
+          end
         end
       end
 
@@ -77,6 +88,7 @@ module Padrino
           execute_component_setup(comp, choice)
         end
         store_component_config('.components')
+        store_component_choice(:namespace, @project_name)
       end
 
       # Bundle all required components using bundler and Gemfile
@@ -93,14 +105,30 @@ module Padrino
       # @api private
       def finish_message
         say
-        say "="*65, :green
+        say '=' * 65, :green
         say "#{name} is ready for development!", :green
-        say "="*65, :green
+        say '=' * 65, :green
         say "$ cd #{options[:root]}/#{name}"
-        say "$ bundle install" unless options[:bundle]
+        say "$ bundle" unless options[:bundle]
         say "="*65, :green
         say
       end
+
+      # Returns the git author name config or a fill-in value
+      #
+      # @api private
+      def git_author_name
+        git_author_name = `git config user.name`.chomp
+        git_author_name.empty? ? "TODO: Write your name" : git_author_name
+      end
+
+      # Returns the git author email config or a fill-in value
+      #
+      # @api private
+      def git_author_email
+        git_author_email = `git config user.email`.chomp
+        git_author_email.empty? ? "TODO: Write your email address" : git_author_email
+      end
     end # Project
   end # Generators
 end # Padrino

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

@@ -132,7 +132,7 @@ module Padrino
           else # local file on system
             File.expand_path(template_file)
           end
-        self.apply(template_path)
+        self.apply(template_path) rescue say("The template at #{template_path} could not be found!", :red)
       end
     end # Runner
   end # Generators

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

@@ -1,12 +1,17 @@
-source :rubygems
+source 'https://rubygems.org'
+
+# Distribute your app as a gem
+<% unless options.gem? %># <% end %>gemspec
 
 # Server requirements
 # gem 'thin' # or mongrel
 # gem 'trinidad', :platform => 'jruby'
 
+# Optional JSON codec (faster performance)
+# gem 'oj'
+
 # Project requirements
 gem 'rake'
-gem 'sinatra-flash', :require => 'sinatra/flash'
 
 # Component requirements
 
@@ -16,7 +21,7 @@ gem 'sinatra-flash', :require => 'sinatra/flash'
 <% if options.dev? %># <% end %>gem 'padrino', '<%= Padrino.version %>'
 
 # Or Padrino Edge
-# gem 'padrino', :git => 'git://github.com/padrino/padrino-framework.git'
+# gem 'padrino', :github => 'padrino/padrino-framework'
 
 # Or Individual Gems
 <% unless options.dev? %># <% end %>%w(core gen helpers cache mailer admin).each do |g|

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

@@ -0,0 +1,8 @@
+require 'bundler/setup'
+require 'padrino-core/cli/rake'
+
+<%- if options[:orm] -%>
+PadrinoTasks.use(:database)
+PadrinoTasks.use(<%= options[:orm].to_sym.inspect %>)
+<%- end -%>
+PadrinoTasks.init

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

@@ -1,22 +1,21 @@
-<%= @app_name %>.controllers <%= ":#{@controller}" if @controller %> do
-  # get :index, :map => "/foo/bar" do
-  #   session[:foo] = "bar"
+<%= @project_name %>::<%= @app_name %>.controllers <%= ":#{@controller}" if @controller %> 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
-  #   "Maps to url '/foo/#{params[:id]}'"
+  #   'Maps to url '/foo/#{params[:id]}''
   # end
 
-  # get "/example" do
-  #   "Hello world!"
+  # get '/example' do
+  #   'Hello world!'
   # end
-
-  <%= @actions %>
+  <%= "\n#{@actions}" %>
 end

data/lib/padrino-gen/generators/templates/gem/README.md.tt

@@ -0,0 +1,29 @@
+# <%=name.camelcase%>
+
+A padrino gem
+
+## Usage
+
+Add the following to your `Gemfile`:
+
+```ruby
+gem '<%=name%>'
+```
+
+and mount the app in your `apps.rb`:
+
+```ruby
+Padrino.mount("<%=name.camelcase%>::App").to("/<%=name%>")
+```
+
+## Development
+
+For development, this gem can be run as a standalone Padrino application
+as you would expect from a normal one:
+
+```ruby
+$ bundle exec padrino start
+```
+
+The Rakefile also works like the normal Padrino one and supports all standard
+components.

data/lib/padrino-gen/generators/templates/gem/gemspec.tt

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/<%=name%>/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = [<%=git_author_name.inspect%>]
+  gem.email         = [<%=git_author_email.inspect%>]
+  gem.description   = %q{TODO: Write a gem description}
+  gem.summary       = %q{TODO: Write a gem summary}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = <%=name.underscore.inspect%>
+  gem.require_paths = ["lib", "app"]
+  gem.version       = <%=name.camelcase%>::VERSION
+
+  gem.add_dependency "padrino-core"
+end

data/lib/padrino-gen/generators/templates/gem/lib/libname/version.tt

@@ -0,0 +1,3 @@
+module <%=name.camelcase%>
+  VERSION = '0.0.1'
+end

data/lib/padrino-gen/generators/templates/gem/lib/libname.tt

@@ -0,0 +1,6 @@
+require 'padrino-core'
+
+module <%=name.camelcase%>
+  extend Padrino::Module
+  gem! <%=name.inspect%>
+end