pah 0.0.12 → 0.0.13

data/lib/pah/partials/_cleanup.rb

@@ -1,12 +1,4 @@
-puts "Removing unnecessary files ... ".magenta
+git rm: "README.rdoc"
+git rm: "app/views/layouts/application.html.erb"
 
-remove_file "README.rdoc"
-remove_file "app/views/layouts/application.html.erb"
-
-inside "public" do
-  remove_file "robots.txt"
-end
-
-git :add => '--all'
-git :commit => "-aqm 'Removed unnecessary files left over from initial app generation.'"
-puts "\n"
+git_commit 'Remove unnecessary files left over from initial app generation.'

data/lib/pah/partials/_database.rb

@@ -1,13 +1,11 @@
 copy_static_file 'config/database.yml'
 gsub_file 'config/database.yml', /PROJECT/, @app_name
-git :add => 'config/database.yml'
-git :commit => "-qm 'Adding config/database.yml.'"
+git add: 'config/database.yml'
+git_commit 'Add config/database.yml.'
 
 in_root do
-  run "rake db:create db:migrate db:test:clone"
+  run "bundle exec rake db:create db:migrate db:test:clone"
 end
 
-git :add => 'db/schema.rb'
-git :commit => "-qm 'Create database, adding db/schema.rb.'"
-
-puts "\n"
+git add: 'db/schema.rb'
+git_commit 'Create database, adding db/schema.rb.'

data/lib/pah/partials/_gems.rb

@@ -1,8 +1,8 @@
-puts "Setting up bundler and installing bundled gems (may take a while) ... ".magenta
-
 copy_static_file 'Gemfile'
 
 in_root do
+  gsub_file 'Gemfile', /RAILS_VERSION/, ::Pah::RAILS_VERSION
+
   # Since the gemset is likely empty, manually install bundler so it can install the rest
   run "gem install bundler --no-ri --no-rdoc"
 
@@ -10,7 +10,5 @@ in_root do
   run "bundle install"
 end
 
-git :add => 'Gemfile'
-git :add => 'Gemfile.lock'
-git :commit => "-qm 'Add Gemfile and Gemfile.lock.'"
-puts "\n"
+git add: 'Gemfile*'
+git_commit 'Add Gemfile and Gemfile.lock.'

data/lib/pah/partials/_generators.rb

@@ -1,5 +1,3 @@
-puts "Adding generators... ".magenta
-
 generators = <<GENERATORS
 
     # Do not generate specs for views and requests. Also, do not generate assets.
@@ -21,6 +19,5 @@ in_root do
   inject_into_file 'config/application.rb', generators, {after: "Rails::Application", verbose: false}
 end
 
-git :add => 'config/application.rb'
-git :commit => "-qm 'Adding generators.'"
-
+git add: 'config/application.rb'
+git_commit 'Add generators.'

data/lib/pah/partials/_git.rb

@@ -1,9 +1,5 @@
-puts "Initializing new Git repo ...".magenta
-
 copy_static_file '.gitignore'
 
 git :init
-git :add => "--all"
-git :commit => "-aqm 'Initial commit.'"
-
-puts "\n"
+git add: '--all'
+git_commit 'Initial commit.'

data/lib/pah/partials/_heroku.rb

@@ -1,5 +1,5 @@
 class HerokuApp < Rails::Generators::AppGenerator
-  DEFAULT_ADDONS = %w(pgbackups:auto-month loggly:mole sendgrid:starter)
+  DEFAULT_ADDONS = %w(heroku-postgresql:dev pgbackups:auto-month loggly:mole sendgrid:starter rollbar)
 
   attr_reader :name, :description, :config
 
@@ -12,6 +12,7 @@ class HerokuApp < Rails::Generators::AppGenerator
     add_timezone_config
     add_addons
     add_heroku_git_remote
+    add_rollbar_initialize_file
     check_canonical_domain
     check_collaborators
   end
@@ -50,12 +51,17 @@ class HerokuApp < Rails::Generators::AppGenerator
 
   def open
     say "Pushing application to heroku...".magenta
-    
+
     system "git push heroku master"
 
     system "heroku open --app #{name}"
   end
 
+  def add_rollbar_initialize_file
+    say "Adding rollbar to initializers".magenta
+    system "bundle exec rails generate rollbar"
+  end
+
   private
     def check_canonical_domain
       domain = @config[:heroku][:domain]
@@ -71,15 +77,12 @@ class HerokuApp < Rails::Generators::AppGenerator
     end
 end
 
-say "Configuring Heroku application...".magenta
-
 copy_static_file 'Procfile'
-git :add => 'Procfile'
-git :commit => "-qm 'Add Procfile'"
+git add: 'Procfile'
+git_commit 'Add Procfile'
 
 if @config[:heroku][:create?]
-
   production_app = HerokuApp.new @config
-
   production_app.open if @config[:heroku][:deploy?]
+  apply_n :rollbar, 'Setting up rollbar...'
 end

data/lib/pah/partials/_jumpup.rb

@@ -1,12 +1,8 @@
-puts "Setting up Jumpup... ".magenta
-
 copy_static_file 'lib/tasks/jumpup.rake'
 copy_static_file 'config/initializers/jumpup_heroku.rb'
 
 gsub_file 'config/initializers/jumpup_heroku.rb', /PROJECT/, (@config[:heroku][:name] || @app_name)
 
-git :add => 'lib/tasks/jumpup.rake'
-git :add => 'config/initializers/jumpup_heroku.rb'
-git :commit => "-qm 'Adding jumpup tasks and configuration.'"
-
-puts "\n"
+git add: 'lib/tasks/jumpup.rake'
+git add: 'config/initializers/jumpup_heroku.rb'
+git_commit 'Add jumpup tasks and configuration.'

data/lib/pah/partials/_layout.rb

@@ -1,9 +1,8 @@
-puts "Adding layout files ...".magenta
-
 copy_static_file 'app/views/layouts/application.html.haml'
 copy_static_file 'app/views/application/_error_messages.html.haml'
 copy_static_file 'app/views/application/_flash_messages.html.haml'
 
-git :add => '.'
-git :commit => "-aqm 'Add layout files.'"
-puts "\n"
+gsub_file 'app/views/layouts/application.html.haml', /= page_title(app_name: 'example')/, "= page_title(app_name: '#{@app_name}')"
+
+git add: 'app/views/'
+git_commit 'Add layout files.'

data/lib/pah/partials/_letter_opener.rb

@@ -1,5 +1,3 @@
-puts "Adding letter_opener... ".magenta
-
 letter_opener_config = <<LETTER_OPENER
 
   # Letter openner config
@@ -11,6 +9,5 @@ in_root do
   inject_into_file 'config/environments/development.rb', letter_opener_config, { before: /^end/, verbose: false }
 end
 
-git :add => 'config/environments/development.rb'
-git :commit => "-qm 'Adding letter_opener config.'"
-
+git add: 'config/environments/development.rb'
+git_commit 'Add letter_opener config.'

data/lib/pah/partials/_locale.rb

@@ -1,8 +1,8 @@
-puts "Adding locale... ".magenta
-
 copy_static_file 'config/locales/pt-BR.yml'
-git :add => 'config/locales/pt-BR.yml'
-git :commit => "-qm 'Add pt-BR locale.'"
+copy_static_file 'config/locales/app.pt-BR.yml'
+
+git add: 'config/locales/*.yml'
+git_commit 'Add pt-BR locale files.'
 
 time_zone_config = <<TIME_ZONE
 
@@ -24,6 +24,5 @@ in_root do
   inject_into_file 'config/application.rb', locale_config, { after: "# config.i18n.default_locale = :de", verbose: false }
 end
 
-git :add => 'config/application.rb'
-git :commit => "-qm 'Adding locale config.'"
-
+git add: 'config/application.rb'
+git_commit 'Add locale config.'

data/lib/pah/partials/_public.rb

@@ -1,11 +1,16 @@
-puts "Adding public files ...".magenta
-
 inside "public" do
   remove_file "robots.txt"
+  remove_file "404.html"
+  remove_file "500.html"
 end
 
 copy_static_file 'public/robots.txt'
+copy_static_file 'public/404.html'
+copy_static_file 'public/500.html'
+
+git add: 'public/robots.txt'
+git add: 'public/404.html'
+git add: 'public/500.html'
 
-git :add => '--all'
-git :commit => "-aqm 'Add public files.'"
+git_commit 'Add public files.'
 puts "\n"

data/lib/pah/partials/_puma.rb

@@ -0,0 +1,4 @@
+copy_static_file 'config/initializers/database_connection.rb'
+
+git add: 'config/initializers/database_connection.rb'
+git_commit 'Configure Puma.'

data/lib/pah/partials/_rack_timeout.rb

@@ -0,0 +1,4 @@
+copy_static_file 'config/initializers/rack_timeout.rb'
+
+git add: 'config/initializers/rack_timeout.rb'
+git_commit 'Add Rack::Timeout configuration.'

data/lib/pah/partials/_readme.rb

@@ -1,9 +1,5 @@
-puts "Adding default README... ".magenta
-
 copy_static_file 'README.md'
 gsub_file 'README.md', /PROJECT/, @app_name
 
-git :add => 'README.md'
-git :commit => "-qm 'Adding README file.'"
-
-puts "\n"
+git add: 'README.md'
+git_commit 'Add README file.'

data/lib/pah/partials/_rollbar.rb

@@ -0,0 +1,5 @@
+gsub_file 'config/initializers/rollbar.rb', /Rails\.env\.test\?/, "Rails.env.production?"
+gsub_file 'config/initializers/rollbar.rb', /config\.enabled = false/, "config.enabled = true"
+
+git add: 'config/initializers/rollbar.rb'
+git_commit 'Add rollbar initialize file.'

data/lib/pah/partials/_rspec.rb

@@ -1,13 +1,17 @@
-puts "Setting up RSpec ... ".magenta
-
-remove_dir 'test'
-
 copy_static_file 'spec/spec_helper.rb'
 
-%w{vcr.rb deferred_garbage_collection.rb http_basic_auth.rb matchers.rb uploaded_file.rb suppress_log.rb}.each do |component|
+%w{
+  database_cleaner.rb
+  deferred_garbage_collection.rb
+  factory_girl.rb
+  http_basic_auth.rb
+  matchers.rb
+  suppress_log.rb
+  uploaded_file.rb
+  vcr.rb
+  }.each do |component|
   copy_static_file "spec/support/#{component}"
 end
 
-git :add => '--all'
-git :commit => "-aqm 'Configured RSpec.'"
-puts "\n"
+git add: 'spec'
+git_commit 'Add RSpec support files'

data/lib/pah/partials/_ruby_env.rb

@@ -1,6 +1,4 @@
-puts "Setting up ruby env ... ".magenta
-
-current_ruby = 'ruby-2.1.0'
+current_ruby = '2.1.1'
 current_gemset = @app_name
 
 copy_static_file '.ruby-version'
@@ -9,12 +7,10 @@ gsub_file '.ruby-version', /RUBY_VERSION/, current_ruby
 copy_static_file '.ruby-gemset'
 gsub_file '.ruby-gemset', /GEMSET/, current_gemset
 
-git :add => '.ruby-version'
-git :add => '.ruby-gemset'
-git :commit => "-qm 'Add .ruby-version and .ruby-gemset'"
+git add: '.ruby-version'
+git add: '.ruby-gemset'
+git_commit 'Add .ruby-version and .ruby-gemset'
 
 copy_static_file '.env'
-git :add => '.env'
-git :commit => "-qm 'Add .env file'"
-
-puts "\n"
+git add: '.env'
+git_commit 'Add .env file'

data/lib/pah/partials/_secret_token.rb

@@ -1,5 +1,3 @@
-puts "Replacing secret token with environment variable...".magenta
-
 in_root do
   append_to_file '.env', "SECRET_TOKEN: #{SecureRandom::hex(60)}\n"
 
@@ -7,8 +5,6 @@ in_root do
   gsub_file 'config/initializers/secret_token.rb', /config.secret_key_base = '(.*?)'/, "config.secret_key_base = ENV['SECRET_TOKEN']"
 end
 
-git :add => 'config/initializers/secret_token.rb'
-git :add => '.env'
-git :commit => "-qm 'Replace secret token with environment variable.'"
-
-puts "\n"
+git add: 'config/initializers/secret_token.rb'
+git add: '.env'
+git_commit 'Replace secret token with environment variable.'

data/lib/pah/partials/_secure_headers.rb

@@ -1,4 +1,3 @@
-puts "Adding secure headers... ".magenta
 content = <<EOF
 
   ensure_security_headers # See more: https://github.com/twitter/secureheaders
@@ -17,7 +16,6 @@ create_file "config/initializers/secure_headers.rb" do
 end
 EOF
 end
-git :add => 'app/controllers/application_controller.rb'
-git :commit => "-qm 'Adding secure headers.'"
-
-puts "\n"
+git add: 'app/controllers/application_controller.rb'
+git add: 'config/initializers/secure_headers.rb'
+git_commit 'Add secure headers.'

data/lib/pah/partials/_simple_form.rb

@@ -0,0 +1,11 @@
+in_root do
+  run "bundle exec rails generate simple_form:install"
+end
+
+git add: 'config'
+git add: 'lib/templates'
+git_commit 'Run `rails generate simple_form:install`'
+
+copy_static_file 'config/locales/simple_form.pt-BR.yml'
+git add: 'config'
+git_commit 'Add simple_form pt-BR locale.'

data/lib/pah/template.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.join('..', 'pah', 'version.rb'), File.dirname(__FILE__))
+
 %w{colored}.each do |component|
   if Gem::Specification.find_all_by_name(component).empty?
     run "gem install #{component}"
@@ -17,14 +19,16 @@ require "bundler"
 
 # Copy a static file from the template into the new application
 def copy_static_file(path)
-  # puts "Installing #{path}...".magenta
   remove_file path
   file path, File.read(File.join(@static_files, path))
-  # puts "\n"
 end
 
-def apply_n(partial)
+def apply_n(partial, message='')
+  puts message.magenta
+
   apply "#{@partials}/_#{partial}.rb"
+
+  puts "\n"
 end
 
 def will_you_like_to?(question)
@@ -43,36 +47,41 @@ def ask_unless_test(*params)
   ask(*params)
 end
 
+def git_commit(message)
+  message = "#{message}\n\nGenerated by pah version #{Pah::VERSION}"
+  git commit: "-qm '#{message}'"
+end
+
 puts "\n========================================================="
 puts " Pah".yellow.bold
 puts "=========================================================\n"
 
-# TODO: timezone, Add rspec extensions
 
 apply_n :config
-apply_n :git
-apply_n :ruby_env
-apply_n :cleanup
-apply_n :gems
-apply_n :database
-apply_n :rspec
-apply_n :layout
-apply_n :assets
-apply_n :public
-apply_n :secure_headers
-apply_n :secret_token
-apply_n :capybara
-apply_n :generators
-apply_n :letter_opener
-apply_n :locale
-apply_n :canonical_host
-apply_n :unicorn
-apply_n :jumpup
-apply_n :readme
-apply_n :heroku
+apply_n :git,             'Initializing new Git repo...'
+apply_n :ruby_env,        'Setting up ruby env...'
+apply_n :cleanup,         'Removing unnecessary files...'
+apply_n :gems,            'Setting up bundler and installing bundled gems (may take a while)...'
+apply_n :database,        'Initializing databases...'
+apply_n :rspec,           'Setting up RSpec...'
+apply_n :layout,          'Adding layout files...'
+apply_n :assets,          'Adding asset files...'
+apply_n :public,          'Adding public files...'
+apply_n :secure_headers,  'Adding secure headers...'
+apply_n :secret_token,    'Replacing secret token with environment variable...'
+apply_n :capybara,        'Adding capybara helpers...'
+apply_n :generators,      'Adding generators...'
+apply_n :simple_form,     'Configuring simple_form...'
+apply_n :letter_opener,   'Adding letter_opener...'
+apply_n :bullet,          'Setting up bullet...'
+apply_n :locale,          'Adding locale...'
+apply_n :canonical_host,  'Configuring canonical hosts...'
+apply_n :puma,            'Configuring Puma...'
+apply_n :rack_timeout,    'Setting up Rack::Timeout...'
+apply_n :jumpup,          'Setting up Jumpup...'
+apply_n :readme,          'Adding default README...'
+apply_n :heroku,          'Configuring Heroku application...'
 
-# apply_n :omniauth # TODO: add spec support files
-                    # TODO: take care of facebook when user is not logged in on facebook (when app)
 
 puts "\n========================================================="
 puts " CONGRATS! INSTALLATION COMPLETE!".yellow.bold