suspenders 1.34.0 → 1.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45dd44edca5abdb998e4f4125948865647cf12c
-  data.tar.gz: 7b3357990de3de5de40a6b9129e4c12f6dcfbbaa
+  metadata.gz: 5d6e0976e91ec4917e8119de4459892b4c11f6e8
+  data.tar.gz: f94cb991a1498ca9337f6c5b06c5445cd7ab9a47
 SHA512:
-  metadata.gz: e2e317030fcb84a99761ddbcad59747cddc75c8c543934912001c167169269b96d4a172dd1242eb5022b2efb115b95b91eea6d16eeef72a72805f627b2894c7d
-  data.tar.gz: 8d64ca336c16609af68560ab0b84289a2db6d0e6af7d48a0a9f70b58fc879de4a70966a5f8d53e6708aa885bd2faea7a80f21b3a97dab6587449b4764081c6ce
+  metadata.gz: 83fae0c577a776372fce11421f90f7e30a2f6dec55302638f54af395ae23a777a521b4717f6fafbfb561df229162a19d6373ec998db33c0c4e074feac858838d
+  data.tar.gz: dc25306dcd657edbc7d300ce384fe50a97060a8b4d0848da6e09489462c39d9a9cad3bd1f27f4d14dd7576110fba3703c6653920e9ea1d29314b5252abf54f80

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.2.3
+rvm: 2.3.0
 cache: bundler
 sudo: false
 before_install:

data/NEWS.md

@@ -1,17 +1,27 @@
-1.34.0 (unreleased)
+1.35.0 (December 30, 2015)
+
+* Introduce Heroku Pipelines support
+* Update to Ruby 2.3.0
+* Heroku commands run on staging by default
+* Git ignore `.env.local` instead of `.env`
+* Add ability to use byebug navigation commands inside of Pry using the
+  `pry-byebug` gem
+* Remove `i18n-tasks` from generated Gemfile
+* Accessibility: Add `lang` attribute to `html` element in layout
+
+1.34.0 (November 15, 2015)
 
 * Fix `block_unknown_urls` deprecation warning with capybara_webkit when running
   Javascript tests
 * Inherit staging's `action_mailer_host` config from production
 * Suspenders command line responds to `-v` and `--version` options
 * Clean up `bin/rake`
-* Remove email_validator gem from generated Gemfile
+* Remove `email_validator` gem from generated Gemfile
 * Fix Circle deploys by removing redundant remote
-* Add bullet as development dependency
+* Add `bullet` as development dependency
 * Use Heroku Local (Forego) instead of Foreman
 * Raise on missing Sprockets assets in test environment
 
-
 1.33.0 (October 23, 2015)
 
 * Add `quiet_assets` as development dependency

data/README.md

@@ -1,7 +1,7 @@
 # Suspenders [![Build Status](https://secure.travis-ci.org/thoughtbot/suspenders.svg?branch=master)](http://travis-ci.org/thoughtbot/suspenders)
 
 Suspenders is the base Rails application used at
-[thoughtbot](http://thoughtbot.com).
+[thoughtbot](https://thoughtbot.com/).
 
   ![Suspenders boy](http://media.tumblr.com/1TEAMALpseh5xzf0Jt6bcwSMo1_400.png)
 
@@ -17,6 +17,12 @@ Then run:
 
 This will create a Rails app in `projectname` using the latest version of Rails.
 
+### Associated services
+
+* Enable [Circle CI](https://circleci.com/) Continuous Integration
+* Enable [GitHub auto deploys to Heroku staging and review
+    apps](https://dashboard.heroku.com/apps/app-name-staging/deploy/github).
+
 ## Gemfile
 
 To see the latest and greatest gems, look at Suspenders'
@@ -41,7 +47,7 @@ It includes application gems like:
 * [Postgres](https://github.com/ged/ruby-pg) for access to the Postgres database
 * [Rack Canonical Host](https://github.com/tylerhunt/rack-canonical-host) to
   ensure all requests are served from the same domain
-* [Rack Timeout](https://github.com/kch/rack-timeout) to abort requests that are
+* [Rack Timeout](https://github.com/heroku/rack-timeout) to abort requests that are
   taking too long
 * [Recipient Interceptor](https://github.com/croaky/recipient_interceptor) to
   avoid accidentally sending emails to real people from staging
@@ -60,6 +66,8 @@ And development gems like:
   objects
 * [ByeBug](https://github.com/deivid-rodriguez/byebug) for interactively
   debugging behavior
+* [Bullet](https://github.com/flyerhzm/bullet) for help to kill N+1 queries and
+  unused eager loading
 * [Bundler Audit](https://github.com/rubysec/bundler-audit) for scanning the
   Gemfile for insecure dependencies based on published CVEs
 * [Spring](https://github.com/rails/spring) for fast Rails actions via
@@ -81,7 +89,7 @@ And testing gems like:
 * [RSpec Mocks](https://github.com/rspec/rspec-mocks) for stubbing and spying
 * [Shoulda Matchers](https://github.com/thoughtbot/shoulda-matchers) for common
   RSpec matchers
-* [Timecop](https://github.com/jtrupiano/timecop-console) for testing time
+* [Timecop](https://github.com/ferndopolis/timecop-console) for testing time
 
 ## Other goodies
 
@@ -102,8 +110,8 @@ Suspenders also comes with:
 * The analytics adapter [Segment][segment] (and therefore config for Google
   Analytics, Intercom, Facebook Ads, Twitter Ads, etc.)
 
-[setup]: http://robots.thoughtbot.com/bin-setup
-[compress]: http://robots.thoughtbot.com/content-compression-with-rack-deflater/
+[setup]: https://robots.thoughtbot.com/bin-setup
+[compress]: https://robots.thoughtbot.com/content-compression-with-rack-deflater
 [pool]: https://devcenter.heroku.com/articles/concurrency-and-database-connections
 [binstub]: https://github.com/thoughtbot/suspenders/pull/282
 [i18n]: https://github.com/thoughtbot/suspenders/pull/304
@@ -126,9 +134,11 @@ This:
 * Adds the [Rails Stdout Logging][logging-gem] gem
   to configure the app to log to standard out,
   which is how [Heroku's logging][heroku-logging] works.
+* Creates a [Heroku Pipeline] for review apps
 
 [logging-gem]: https://github.com/heroku/rails_stdout_logging
 [heroku-logging]: https://devcenter.heroku.com/articles/logging#writing-to-your-log
+[Heroku Pipeline]: https://devcenter.heroku.com/articles/pipelines
 
 You can optionally specify alternate Heroku flags:
 
@@ -200,13 +210,6 @@ Thank you, [contributors]!
 
 [contributors]: https://github.com/thoughtbot/suspenders/graphs/contributors
 
-## Need Help?
-
-We offer 1-on-1 coaching. We can help you set up a new Rails application, write
-your first feature, and get up and running on Heroku. [Get in touch].
-
-[Get in touch]: http://coaching.thoughtbot.com/rails/?utm_source=github
-
 ## License
 
 Suspenders is Copyright © 2008-2015 thoughtbot.

data/bin/setup

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 # Run this script immediately after cloning the codebase.
 

data/lib/suspenders/adapters/heroku.rb

@@ -7,10 +7,10 @@ module Suspenders
 
       def set_heroku_remotes
         remotes = <<-SHELL.strip_heredoc
-
-          # Set up the staging and production apps.
           #{command_to_join_heroku_app('staging')}
           #{command_to_join_heroku_app('production')}
+
+          git config heroku.remote staging
         SHELL
 
         app_builder.append_file "bin/setup", remotes
@@ -24,6 +24,20 @@ module Suspenders
         )
       end
 
+      def create_staging_heroku_app(flags)
+        rack_env = "RACK_ENV=staging RAILS_ENV=staging"
+        app_name = heroku_app_name_for("staging")
+
+        run_toolbelt_command "create #{app_name} #{flags}", "staging"
+        run_toolbelt_command "config:add #{rack_env}", "staging"
+      end
+
+      def create_production_heroku_app(flags)
+        app_name = heroku_app_name_for("production")
+
+        run_toolbelt_command "create #{app_name} #{flags}", "production"
+      end
+
       def set_heroku_rails_secrets
         %w(staging production).each do |environment|
           run_toolbelt_command(
@@ -33,6 +47,44 @@ module Suspenders
         end
       end
 
+      def provide_review_apps_setup_script
+        app_builder.template(
+          "bin_setup_review_app.erb",
+          "bin/setup_review_app",
+          force: true,
+        )
+        app_builder.run "chmod a+x bin/setup_review_app"
+      end
+
+      def create_heroku_pipelines_config_file
+        app_builder.template "app.json.erb", "app.json"
+      end
+
+      def create_heroku_pipeline
+        pipelines_plugin = `heroku plugins | grep pipelines`
+        if pipelines_plugin.empty?
+          puts "You need heroku pipelines plugin. Run: heroku plugins:install heroku-pipelines"
+          exit 1
+        end
+
+        heroku_app_name = app_builder.app_name.dasherize
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "pipelines:create #{heroku_app_name} -a #{heroku_app_name}-#{environment} --stage #{environment}",
+            environment,
+          )
+        end
+      end
+
+      def set_heroku_serve_static_files
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "config:add RAILS_SERVE_STATIC_FILES=true",
+            environment,
+          )
+        end
+      end
+
       private
 
       attr_reader :app_builder
@@ -40,6 +92,7 @@ module Suspenders
       def command_to_join_heroku_app(environment)
         heroku_app_name = heroku_app_name_for(environment)
         <<-SHELL
+
 if heroku join --app #{heroku_app_name} &> /dev/null; then
   git remote add #{environment} git@heroku.com:#{heroku_app_name}.git || true
   printf 'You are a collaborator on the "#{heroku_app_name}" Heroku app\n'

data/lib/suspenders/app_builder.rb

@@ -6,9 +6,15 @@ module Suspenders
     extend Forwardable
 
     def_delegators :heroku_adapter,
+                   :create_heroku_pipelines_config_file,
+                   :create_heroku_pipeline,
+                   :create_production_heroku_app,
+                   :create_staging_heroku_app,
+                   :provide_review_apps_setup_script,
+                   :set_heroku_rails_secrets,
                    :set_heroku_remotes,
-                   :set_up_heroku_specific_gems,
-                   :set_heroku_rails_secrets
+                   :set_heroku_serve_static_files,
+                   :set_up_heroku_specific_gems
 
     def readme
       template 'README.md.erb', 'README.md'
@@ -69,7 +75,7 @@ module Suspenders
     end
 
     def provide_setup_script
-      template "bin_setup.erb", "bin/setup", force: true
+      template "bin_setup", "bin/setup", force: true
       run "chmod a+x bin/setup"
     end
 
@@ -130,6 +136,10 @@ module Suspenders
     def enable_rack_canonical_host
       config = <<-RUBY
 
+  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
+    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+  end
+
   # Ensure requests are only served from one, canonical host name
   config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
@@ -137,7 +147,7 @@ module Suspenders
       inject_into_file(
         "config/environments/production.rb",
         config,
-        after: serve_static_files_line
+        after: "Rails.application.configure do",
       )
     end
 
@@ -266,11 +276,6 @@ end
       raise_on_missing_translations_in("test")
     end
 
-    def configure_i18n_tasks
-      run "cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/"
-      copy_file "config_i18n_tasks.yml", "config/i18n-tasks.yml"
-    end
-
     def configure_background_jobs_for_rspec
       run 'rails g delayed_job:active_record'
     end
@@ -330,8 +335,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
     end
 
     def set_up_forego
-      copy_file 'sample.env', '.sample.env'
-      copy_file 'Procfile', 'Procfile'
+      copy_file "Procfile", "Procfile"
     end
 
     def setup_stylesheets
@@ -375,31 +379,11 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       run 'git init'
     end
 
-    def create_staging_heroku_app(flags)
-      rack_env = "RACK_ENV=staging RAILS_ENV=staging"
-      app_name = heroku_app_name_for("staging")
-
-      run_heroku "create #{app_name} #{flags}", "staging"
-      run_heroku "config:add #{rack_env}", "staging"
-    end
-
-    def create_production_heroku_app(flags)
-      app_name = heroku_app_name_for("production")
-
-      run_heroku "create #{app_name} #{flags}", "production"
-    end
-
     def create_heroku_apps(flags)
       create_staging_heroku_app(flags)
       create_production_heroku_app(flags)
     end
 
-    def set_heroku_serve_static_files
-      %w(staging production).each do |environment|
-        run_heroku "config:add RAILS_SERVE_STATIC_FILES=true", environment
-      end
-    end
-
     def provide_deploy_script
       copy_file "bin_deploy", "bin/deploy"
 
@@ -419,7 +403,6 @@ you can deploy to staging and production with:
     end
 
     def configure_automatic_deployment
-      staging_remote_name = heroku_app_name_for("staging")
       deploy_command = <<-YML.strip_heredoc
       deployment:
         staging:
@@ -524,10 +507,6 @@ end
       uncomment_lines("config/environments/#{environment}.rb", config)
     end
 
-    def run_heroku(command, environment)
-      run "heroku #{command} --remote #{environment}"
-    end
-
     def heroku_adapter
       @heroku_adapter ||= Adapters::Heroku.new(self)
     end
@@ -535,9 +514,5 @@ end
     def serve_static_files_line
       "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
     end
-
-    def heroku_app_name_for(environment)
-      "#{app_name.dasherize}-#{environment}"
-    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -105,7 +105,6 @@ module Suspenders
       build :configure_spec_support_features
       build :configure_ci
       build :configure_i18n_for_test_environment
-      build :configure_i18n_tasks
       build :configure_action_mailer_in_specs
       build :configure_capybara_webkit
     end
@@ -177,9 +176,12 @@ module Suspenders
       if options[:heroku]
         say "Creating Heroku apps"
         build :create_heroku_apps, options[:heroku_flags]
+        build :provide_review_apps_setup_script
         build :set_heroku_serve_static_files
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
+        build :create_heroku_pipelines_config_file
+        build :create_heroku_pipeline
         build :provide_deploy_script
         build :configure_automatic_deployment
       end

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
   RAILS_VERSION = "~> 4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.34.0"
+  VERSION = "1.35.0"
 end

data/spec/features/heroku_spec.rb

@@ -20,12 +20,22 @@ RSpec.describe "Heroku" do
         "production",
         "SECRET_KEY_BASE",
       )
+      expect(FakeHeroku).to have_setup_pipeline_for(app_name)
 
       bin_setup_path = "#{project_path}/bin/setup"
       bin_setup = IO.read(bin_setup_path)
 
       expect(bin_setup).to include("heroku join --app #{app_name}-production")
       expect(bin_setup).to include("heroku join --app #{app_name}-staging")
+      expect(bin_setup).to include("git config heroku.remote staging")
+      expect(File.stat(bin_setup_path)).to be_executable
+
+      bin_setup_path = "#{project_path}/bin/setup_review_app"
+      bin_setup = IO.read(bin_setup_path)
+
+      expect(bin_setup).to include("heroku run rake db:migrate --app #{app_name}-staging-pr-$1")
+      expect(bin_setup).to include("heroku ps:scale worker=1 --app #{app_name}-staging-pr-$1")
+      expect(bin_setup).to include("heroku restart --app #{app_name}-staging-pr-$1")
       expect(File.stat(bin_setup_path)).to be_executable
 
       bin_deploy_path = "#{project_path}/bin/deploy"
@@ -50,6 +60,17 @@ RSpec.describe "Heroku" do
             - bin/deploy staging
       YML
     end
+
+    it "adds app.json file" do
+      expect(File).to exist("#{project_path}/app.json")
+    end
+
+    it "includes application name in app.json file" do
+      app_json_file = IO.read("#{project_path}/app.json")
+      app_name = SuspendersTestHelpers::APP_NAME.dasherize
+
+      expect(app_json_file).to match(/"name":"#{app_name}"/)
+    end
   end
 
   context "--heroku with region flag" do

data/spec/features/new_project_spec.rb

@@ -30,7 +30,9 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "copies dotfiles" do
-    expect(File).to exist("#{project_path}/.ctags")
+    %w[.ctags .env].each do |dotfile|
+      expect(File).to exist("#{project_path}/#{dotfile}")
+    end
   end
 
   it "loads secret_key_base from env" do
@@ -39,6 +41,16 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(secrets_file).to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
   end
 
+  it "adds bin/setup file" do
+    expect(File).to exist("#{project_path}/bin/setup")
+  end
+
+  it "makes bin/setup executable" do
+    bin_setup_path = "#{project_path}/bin/setup"
+
+    expect(File.stat(bin_setup_path)).to be_executable
+  end
+
   it "adds support file for action mailer" do
     expect(File).to exist("#{project_path}/spec/support/action_mailer.rb")
   end
@@ -98,17 +110,8 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
-  it "adds specs for missing or unused translations" do
-    expect(File).to exist("#{project_path}/spec/i18n_spec.rb")
-  end
-
-  it "configs i18n-tasks" do
-    expect(File).to exist("#{project_path}/config/i18n-tasks.yml")
-  end
-
   it "evaluates en.yml.erb" do
     locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
-    app_name = SuspendersTestHelpers::APP_NAME
 
     expect(locales_en_file).to match(/application: #{app_name.humanize}/)
   end
@@ -129,6 +132,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(prod_env_file).not_to match(/"HOST"/)
   end
 
+  it "configures language in html element" do
+    layout_path = "/app/views/layouts/application.html.erb"
+    layout_file = IO.read("#{project_path}#{layout_path}")
+    expect(layout_file).to match(/<html lang="en">/)
+  end
+
   it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
     test_config = IO.read("#{project_path}/config/environments/test.rb")
@@ -160,10 +169,9 @@ RSpec.describe "Suspend a new project with default configuration" do
   it "adds spring to binstubs" do
     expect(File).to exist("#{project_path}/bin/spring")
 
-    spring_line = /^ +load File.expand_path\('\.\.\/spring', __FILE__\)$/
     bin_stubs = %w(rake rails rspec)
     bin_stubs.each do |bin_stub|
-      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(spring_line)
+      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(/spring/)
     end
   end
 
@@ -186,6 +194,10 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(File).to exist("#{project_path}/spec/factories.rb")
   end
 
+  def app_name
+    SuspendersTestHelpers::APP_NAME
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/spec/support/fake_heroku.rb

@@ -6,6 +6,9 @@ class FakeHeroku
   end
 
   def run!
+    if @args.first == "plugins"
+      puts "heroku-pipelines@0.29.0"
+    end
     File.open(RECORDER, 'a') do |file|
       file.puts @args.join(' ')
     end
@@ -39,6 +42,11 @@ class FakeHeroku
     commands_ran =~ /^config:add #{var}=.+ --remote #{remote_name}\n/
   end
 
+  def self.has_setup_pipeline_for?(app_name)
+    commands_ran =~ /^pipelines:create #{app_name} -a #{app_name}-staging --stage staging/ &&
+      commands_ran =~ /^pipelines:create #{app_name} -a #{app_name}-production --stage production/
+  end
+
   def self.commands_ran
     @commands_ran ||= File.read(RECORDER)
   end

data/templates/Gemfile.erb

@@ -35,12 +35,11 @@ group :development, :test do
   gem "awesome_print"
   gem "bullet"
   gem "bundler-audit", require: false
-  gem "byebug"
   gem "dotenv-rails"
   gem "factory_girl_rails"
-  gem "i18n-tasks"
+  gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.3.0"
+  gem "rspec-rails", "~> 3.4.0"
 end
 
 group :test do

data/templates/app.json.erb

@@ -0,0 +1,39 @@
+{
+  "name":"<%= app_name.dasherize %>",
+  "scripts":{},
+  "env":{
+    "AIRBRAKE_API_KEY":{
+      "required":true
+    },
+    "EMAIL_RECIPIENTS":{
+      "required":true
+    },
+    "RACK_ENV":{
+      "required":true
+    },
+    "RAILS_ENV":{
+      "required":true
+    },
+    "SECRET_KEY_BASE":{
+      "generator":"secret"
+    },
+    "SMTP_ADDRESS":{
+      "required":true
+    },
+    "SMTP_DOMAIN":{
+      "required":true
+    },
+    "SMTP_PASSWORD":{
+      "required":true
+    },
+    "SMTP_USERNAME":{
+      "required":true
+    },
+    "WEB_CONCURRENCY":{
+      "required":true
+    }
+  },
+  "addons":[
+    "heroku-postgresql"
+  ]
+}

data/templates/{bin_setup.erb → bin_setup}

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 # Set up Rails app. Run this script immediately after cloning the codebase.
 # https://github.com/thoughtbot/guides/tree/master/protocol
@@ -10,11 +10,6 @@ set -e
 gem install bundler --conservative
 bundle check || bundle install
 
-# Set up configurable environment variables
-if [ ! -f .env ]; then
-  cp .sample.env .env
-fi
-
 # Set up database and add any development seed data
 bin/rake dev:prime
 

data/templates/bin_setup_review_app.erb

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Run this script to set up a review app's database and worker dyno
+
+set -e
+
+if [ -z "$1" ]; then
+  printf "You must provide a review app (same as the pull request) id.\n"
+  exit 64
+fi
+
+heroku pg:backups restore \
+  `heroku pg:backups public-url -a <%= app_name.dasherize %>-staging` \
+  DATABASE_URL \
+  --confirm <%= app_name.dasherize %>-staging-pr-$1 \
+  --app <%= app_name.dasherize %>-staging-pr-$1
+heroku run rake db:migrate --app <%= app_name.dasherize %>-staging-pr-$1
+heroku ps:scale worker=1 --app <%= app_name.dasherize %>-staging-pr-$1
+heroku restart --app <%= app_name.dasherize %>-staging-pr-$1

data/templates/circle.yml.erb

@@ -1,6 +1,3 @@
-checkout:
-  post:
-    - cp .sample.env .env
 database:
   override:
     - bin/setup

data/templates/{sample.env → dotfiles/.env}

@@ -1,6 +1,7 @@
 # https://github.com/ddollar/forego
 ASSET_HOST=localhost:3000
 APPLICATION_HOST=localhost:3000
+PORT=3000
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret
 EXECJS_RUNTIME=Node
@@ -8,3 +9,4 @@ SMTP_ADDRESS=smtp.example.com
 SMTP_DOMAIN=example.com
 SMTP_PASSWORD=password
 SMTP_USERNAME=username
+WEB_CONCURRENCY=1

data/templates/errors.rb

@@ -15,7 +15,7 @@ HTTP_ERRORS = [
   Net::HTTPBadResponse,
   Net::HTTPHeaderSyntaxError,
   Net::ProtocolError,
-  Timeout::Error
+  Timeout::Error,
 ]
 
 SMTP_SERVER_ERRORS = [
@@ -23,12 +23,12 @@ SMTP_SERVER_ERRORS = [
   Net::SMTPAuthenticationError,
   Net::SMTPServerBusy,
   Net::SMTPUnknownError,
-  TimeoutError
+  Timeout::Error,
 ]
 
 SMTP_CLIENT_ERRORS = [
   Net::SMTPFatalError,
-  Net::SMTPSyntaxError
+  Net::SMTPSyntaxError,
 ]
 
 SMTP_ERRORS = SMTP_SERVER_ERRORS + SMTP_CLIENT_ERRORS

data/templates/i18n.rb

@@ -1,3 +1,3 @@
 RSpec.configure do |config|
-  config.include AbstractController::Translation
+  config.include ActionView::Helpers::TranslationHelper
 end

data/templates/suspenders_gitignore

@@ -3,7 +3,7 @@
 *.swo
 *.swp
 /.bundle
-/.env
+/.env.local
 /coverage/*
 /db/*.sqlite3
 /log/*

data/templates/suspenders_layout.html.erb.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= I18n.locale %>">
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.34.0
+  version: 1.35.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -116,19 +116,21 @@ files:
 - templates/_flashes.html.erb
 - templates/_javascript.html.erb
 - templates/action_mailer.rb
+- templates/app.json.erb
 - templates/application.scss
 - templates/bin_deploy
-- templates/bin_setup.erb
+- templates/bin_setup
+- templates/bin_setup_review_app.erb
 - templates/browserslist
 - templates/bundler_audit.rake
 - templates/capybara_webkit.rb
 - templates/circle.yml.erb
-- templates/config_i18n_tasks.yml
 - templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/dev.rake
 - templates/disable_xml_params.rb
 - templates/dotfiles/.ctags
+- templates/dotfiles/.env
 - templates/errors.rb
 - templates/factories.rb
 - templates/factory_girl_rspec.rb
@@ -140,7 +142,6 @@ files:
 - templates/postgresql_database.yml.erb
 - templates/puma.rb
 - templates/rails_helper.rb
-- templates/sample.env
 - templates/secrets.yml
 - templates/shoulda_matchers_config_rspec.rb
 - templates/smtp.rb
@@ -161,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

data/templates/config_i18n_tasks.yml

@@ -1,13 +0,0 @@
-search:
-  paths:
-    - "app/controllers"
-    - "app/helpers"
-    - "app/presenters"
-    - "app/views"
-
-ignore_unused:
-  - activerecord.*
-  - date.*
-  - simple_form.*
-  - time.*
-  - titles.*