suspenders 1.44.0 → 1.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c484e3bcdd101a9754109743b48f4bd1365667af
-  data.tar.gz: 8172832bc1d310452d31368dd98b32c5563932d5
+  metadata.gz: 253fc6f3c173bce9e7858831161cf75924094222
+  data.tar.gz: 947de81dd1fc955c04f13ea1260e4391b505b0f2
 SHA512:
-  metadata.gz: 21e949d9c811b1264ee995b4fd5238f3690f294e41adbad8ac59ee1d8d0d720f32aae3b42eb8be074f2b7ad410068179b8ee8fa196c40ca54c077af075df2e0a
-  data.tar.gz: ee9e71d1473f0bd77f30192dfcfd462454c0cec67fabfedf794f1fec331fa0e75d6b4e328eb062d141cb6e93e5dae00c09c64832c74eb800af66bf67917551fe
+  metadata.gz: 003c8627d76eaad3f8a51f404608dc1cd66ee35dbaba8b45cf6f5ef0e9a06fc4fe7f826f9f387a51118d2670df7499a46b83a7441541e21f5a0b691a08a0e063
+  data.tar.gz: 3a08ab29152033941e6a1b2baba20743d2992ab9872e590e7815007cadcbba37514700cc6f9deaed72f02408458a21d1ed020f15c1e060e16250bd7da01a5553

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.4.1

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.4.0
+rvm: 2.4.1
 cache: bundler
 sudo: false
 before_install:

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008-2016 thoughtbot, inc.
+Copyright (c) 2008-2017 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,3 +1,30 @@
+1.45.0 (September 8, 2017)
+
+* Bump Rails to 5.1.3 (#857)
+* Configure HONEYBADGER_ENV for staging, production (#861)
+* Remove vestigial `staging` references (#860)
+* Prevent memory bloat in ActiveJob children (#856)
+* .git/safe is opt-in (#837)
+* Enforce SSL in production environment (#855)
+* Configures action mailer asset host (#853)
+* Install normalize.css via yarn (#851)
+* Update Rails to 5.1 (#847)
+* Update bourbon from 5.0.0.beta.7 to 5.0.0.beta.8 (#848)
+* Update Neat to 2.1 (#849)
+* Update Bitters to 1.7 (#850)
+* Fix incorrect Timecop link (#845)
+* Update Ruby to 2.4.1 (#841)
+* Update rspec-rails to 3.6 (#842)
+* Configure TimeCop safe mode (#840)
+* Pull normalize.css through Rails Assets (#839)
+* Fix fatal git failures in tests (#832)
+* Schedule Heroku Backups and Capture backup of existing staging database for
+  Review Apps (#826)
+* Use bundle-audit rake task from the gem (#831)
+* Update thoughtbot logo (#829)
+* Change terminal symbol in README's deploying section (#828)
+* Update Segment snippet to 4.0.0 (#822)
+
 1.44.0 (January 25, 2017)
 
 * Improve readability of `bin/setup-review-app` (#819)

data/README.md

@@ -87,7 +87,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/ferndopolis/timecop-console) for testing time
+* [Timecop](https://github.com/travisjeffery/timecop) for testing time
 
 ## Other goodies
 
@@ -127,9 +127,10 @@ This:
 
 * Creates a staging and production Heroku app
 * Sets them as `staging` and `production` Git remotes
-* Configures staging with `RACK_ENV` environment variable set
+* Configures staging with `HONEYBADGER_ENV` environment variable set
   to `staging`
 * Creates a [Heroku Pipeline] for review apps
+* Schedules automated backups for 10AM UTC for both `staging` and `production`
 
 [Heroku Pipeline]: https://devcenter.heroku.com/articles/pipelines
 
@@ -205,7 +206,7 @@ Thank you, [contributors]!
 
 ## License
 
-Suspenders is Copyright © 2008-2016 thoughtbot.
+Suspenders is Copyright © 2008-2017 thoughtbot.
 It is free software,
 and may be redistributed under the terms specified in the [LICENSE] file.
 
@@ -213,7 +214,7 @@ and may be redistributed under the terms specified in the [LICENSE] file.
 
 ## About thoughtbot
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+[![thoughtbot][thoughtbot-logo]][thoughtbot]
 
 Suspenders is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
@@ -222,5 +223,7 @@ We love open source software!
 See [our other projects][community].
 We are [available for hire][hire].
 
+[thoughtbot]: https://thoughtbot.com?utm_source=github
+[thoughtbot-logo]: http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com?utm_source=github

data/lib/suspenders.rb

@@ -1,5 +1,7 @@
 require 'suspenders/version'
 require 'suspenders/generators/app_generator'
+require "suspenders/generators/enforce_ssl_generator"
+require "suspenders/generators/initialize_active_job_generator"
 require 'suspenders/generators/static_generator'
 require 'suspenders/generators/stylesheet_base_generator'
 require 'suspenders/actions'

data/lib/suspenders/actions.rb

@@ -14,6 +14,11 @@ module Suspenders
       configure_environment(rails_env, config)
     end
 
+    def action_mailer_asset_host(rails_env, host)
+      config = "config.action_mailer.asset_host = { host: #{host} }"
+      configure_environment(rails_env, config)
+    end
+
     def configure_application_file(config)
       inject_into_file(
         "config/application.rb",
@@ -25,7 +30,7 @@ module Suspenders
     def configure_environment(rails_env, config)
       inject_into_file(
         "config/environments/#{rails_env}.rb",
-        "\n\n  #{config}",
+        "\n  #{config}",
         before: "\nend"
       )
     end

data/lib/suspenders/adapters/heroku.rb

@@ -37,6 +37,24 @@ module Suspenders
         end
       end
 
+      def set_heroku_honeybadger_env
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "config:add HONEYBADGER_ENV=#{environment}",
+            environment,
+          )
+        end
+      end
+
+      def set_heroku_backup_schedule
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "pg:backups:schedule DATABASE_URL --at '10:00 UTC'",
+            environment,
+          )
+        end
+      end
+
       def create_review_apps_setup_script
         app_builder.template(
           "bin_setup_review_app.erb",

data/lib/suspenders/app_builder.rb

@@ -5,15 +5,19 @@ module Suspenders
     include Suspenders::Actions
     extend Forwardable
 
-    def_delegators :heroku_adapter,
-                   :create_heroku_application_manifest_file,
-                   :create_heroku_pipeline,
-                   :create_production_heroku_app,
-                   :create_staging_heroku_app,
-                   :create_review_apps_setup_script,
-                   :set_heroku_rails_secrets,
-                   :set_heroku_remotes,
-                   :set_heroku_application_host
+    def_delegators(
+      :heroku_adapter,
+      :create_heroku_application_manifest_file,
+      :create_heroku_pipeline,
+      :create_production_heroku_app,
+      :create_review_apps_setup_script,
+      :create_staging_heroku_app,
+      :set_heroku_application_host,
+      :set_heroku_backup_schedule,
+      :set_heroku_honeybadger_env,
+      :set_heroku_rails_secrets,
+      :set_heroku_remotes,
+    )
 
     def readme
       template 'README.md.erb', 'README.md'
@@ -43,14 +47,6 @@ module Suspenders
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
-    def remove_turbolinks
-      replace_in_file(
-        "app/assets/javascripts/application.js",
-        "//= require turbolinks",
-        ""
-      )
-    end
-
     def set_test_delivery_method
       inject_into_file(
         "config/environments/development.rb",
@@ -157,11 +153,7 @@ module Suspenders
   config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
-      inject_into_file(
-        "config/environments/production.rb",
-        config,
-        after: "Rails.application.configure do",
-      )
+      configure_environment "production", config
     end
 
     def enable_rack_deflater
@@ -226,7 +218,7 @@ config.public_file_server.headers = {
     end
 
     def create_database
-      bundle_command 'exec rake db:create db:migrate'
+      bundle_command "exec rails db:create db:migrate"
     end
 
     def replace_gemfile(path)
@@ -310,8 +302,14 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
 
     def configure_action_mailer
       action_mailer_host "development", %{"localhost:3000"}
+      action_mailer_asset_host "development", %{"localhost:3000"}
       action_mailer_host "test", %{"www.example.com"}
+      action_mailer_asset_host "test", %{"www.example.com"}
       action_mailer_host "production", %{ENV.fetch("APPLICATION_HOST")}
+      action_mailer_asset_host(
+        "production",
+        %{ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))},
+      )
     end
 
     def configure_active_job
@@ -351,10 +349,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       directory("dotfiles", ".")
     end
 
-    def init_git
-      run 'git init'
-    end
-
     def create_heroku_apps(flags)
       create_staging_heroku_app(flags)
       create_production_heroku_app(flags)
@@ -370,8 +364,8 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
 If you have previously run the `./bin/setup` script,
 you can deploy to staging and production with:
 
-    $ ./bin/deploy staging
-    $ ./bin/deploy production
+    % ./bin/deploy staging
+    % ./bin/deploy production
       MARKDOWN
 
       append_file "README.md", instructions
@@ -401,7 +395,7 @@ you can deploy to staging and production with:
 
     def setup_bundler_audit
       copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
-      append_file "Rakefile", %{\ntask default: "bundler:audit"\n}
+      append_file "Rakefile", %{\ntask default: "bundle:audit"\n}
     end
 
     def setup_spring

data/lib/suspenders/generators/app_generator.rb

@@ -29,6 +29,12 @@ module Suspenders
     class_option :skip_test, type: :boolean, default: true,
       desc: "Skip Test Unit"
 
+    class_option :skip_system_test,
+                 type: :boolean, default: true, desc: "Skip system test files"
+
+    class_option :skip_turbolinks,
+                 type: :boolean, default: true, desc: "Skip turbolinks gem"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -47,7 +53,6 @@ module Suspenders
       invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
       invoke :setup_dotfiles
-      invoke :setup_git
       invoke :setup_database
       invoke :create_local_heroku_setup
       invoke :create_heroku_apps
@@ -56,6 +61,7 @@ module Suspenders
       invoke :setup_bundler_audit
       invoke :setup_spring
       invoke :generate_default
+      invoke :setup_default_directories
       invoke :outro
     end
 
@@ -80,7 +86,6 @@ module Suspenders
       say 'Setting up the development environment'
       build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
-      build :remove_turbolinks
       build :set_test_delivery_method
       build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
@@ -142,14 +147,6 @@ module Suspenders
       build :setup_rack_mini_profiler
     end
 
-    def setup_git
-      if !options[:skip_git]
-        say "Initializing git"
-        invoke :setup_default_directories
-        invoke :init_git
-      end
-    end
-
     def create_local_heroku_setup
       say "Creating local Heroku setup"
       build :create_review_apps_setup_script
@@ -164,6 +161,8 @@ module Suspenders
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :set_heroku_application_host
+        build :set_heroku_honeybadger_env
+        build :set_heroku_backup_schedule
         build :create_heroku_pipeline
         build :configure_automatic_deployment
       end
@@ -199,10 +198,6 @@ module Suspenders
       build :setup_spring
     end
 
-    def init_git
-      build :init_git
-    end
-
     def copy_miscellaneous_files
       say 'Copying miscellaneous support files'
       build :copy_miscellaneous_files
@@ -223,6 +218,8 @@ module Suspenders
 
     def generate_default
       run("spring stop")
+      generate("suspenders:initialize_active_job")
+      generate("suspenders:enforce_ssl")
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
     end

data/lib/suspenders/generators/enforce_ssl_generator.rb

@@ -0,0 +1,12 @@
+require "rails/generators"
+require_relative "../actions"
+
+module Suspenders
+  class EnforceSslGenerator < Rails::Generators::Base
+    include Suspenders::Actions
+
+    def enforce_ssl
+      configure_environment "production", "config.force_ssl = true"
+    end
+  end
+end

data/lib/suspenders/generators/initialize_active_job_generator.rb

@@ -0,0 +1,19 @@
+require "rails/generators"
+
+module Suspenders
+  class InitializeActiveJobGenerator < Rails::Generators::Base
+    source_root(
+      File.expand_path(
+        File.join("..", "..", "..", "templates"),
+        File.dirname(__FILE__),
+      ),
+    )
+
+    def initialize_active_job
+      copy_file(
+        "active_job.rb",
+        "config/initializers/active_job.rb",
+      )
+    end
+  end
+end

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -7,8 +7,8 @@ module Suspenders
       File.dirname(__FILE__))
 
     def add_stylesheet_gems
-      gem "bourbon", "~> 5.0.0.beta.7"
-      gem "neat", "~> 2.0.0.beta.1"
+      gem "bourbon", "~> 5.0.0.beta.8"
+      gem "neat", "~> 2.1"
       gem "refills", group: [:development, :test]
       Bundler.with_clean_env { run "bundle install" }
     end
@@ -33,5 +33,9 @@ module Suspenders
     def install_bitters
       run "bitters install --path app/assets/stylesheets"
     end
+
+    def install_normalize_css
+      run "bin/yarn add normalize.css"
+    end
   end
 end

data/lib/suspenders/version.rb

@@ -1,8 +1,8 @@
 module Suspenders
-  RAILS_VERSION = "~> 5.0.0".freeze
+  RAILS_VERSION = "~> 5.1.3".freeze
   RUBY_VERSION = IO.
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "1.44.0".freeze
+  VERSION = "1.45.0".freeze
 end

data/spec/adapters/heroku_spec.rb

@@ -30,6 +30,16 @@ module Suspenders
         )
       end
 
+      it "sets the heroku backup schedule" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:run)
+
+        Heroku.new(app_builder).set_heroku_backup_schedule
+
+        expect(app_builder).to have_backup_schedule("staging")
+        expect(app_builder).to have_backup_schedule("production")
+      end
+
       it "sets the application host" do
         app_builder = double(app_name: app_name)
         allow(app_builder).to receive(:run)
@@ -49,6 +59,11 @@ module Suspenders
         SuspendersTestHelpers::APP_NAME
       end
 
+      def have_backup_schedule(remote_name)
+        have_received(:run).
+          with(/pg:backups:schedule DATABASE_URL --at '10:00 UTC' --remote #{remote_name}/)
+      end
+
       def have_configured_var(remote_name, var)
         have_received(:run).with(/config:add #{var}=.+ --remote #{remote_name}/)
       end

data/spec/features/heroku_spec.rb

@@ -18,14 +18,10 @@ RSpec.describe "Heroku" do
         "production",
         "SECRET_KEY_BASE",
       )
-      expect(FakeHeroku).to have_configured_vars(
-        "staging",
-        "APPLICATION_HOST",
-      )
-      expect(FakeHeroku).to have_configured_vars(
-        "production",
-        "APPLICATION_HOST",
-      )
+      %w(staging production).each do |env|
+        expect(FakeHeroku).to have_configured_vars(env, "APPLICATION_HOST")
+        expect(FakeHeroku).to have_configured_vars(env, "HONEYBADGER_ENV")
+      end
       expect(FakeHeroku).to have_setup_pipeline_for(app_name)
 
       bin_setup_path = "#{project_path}/bin/setup"

data/spec/features/new_project_spec.rb

@@ -29,6 +29,14 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
+  it "includes the bundle:audit task" do
+    Dir.chdir(project_path) do
+      Bundler.with_clean_env do
+        expect(`rails -T`).to include("rails bundle:audit")
+      end
+    end
+  end
+
   it "creates .ruby-version from Suspenders .ruby-version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 
@@ -92,6 +100,11 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(env).to include "RACK_MINI_PROFILER=0"
   end
 
+  it "initializes ActiveJob to avoid memory bloat" do
+    expect(File).
+      to exist("#{project_path}/config/initializers/active_job.rb")
+  end
+
   it "creates a rack-mini-profiler initializer" do
     expect(File).
       to exist("#{project_path}/config/initializers/rack_mini_profiler.rb")
@@ -101,7 +114,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(analytics_partial).
       to include(%{<% if ENV["SEGMENT_KEY"] %>})
     expect(analytics_partial).
-      to include(%{window.analytics.load("<%= ENV["SEGMENT_KEY"] %>");})
+      to include(%{analytics.load("<%= ENV["SEGMENT_KEY"] %>");})
   end
 
   it "raises on unpermitted parameters in all environments" do
@@ -124,6 +137,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     )
   end
 
+  it "configures production environment to enforce SSL" do
+    expect(production_config).to match(
+      /^ +config.force_ssl = true/,
+    )
+  end
+
   it "raises on missing translations in development and test" do
     [development_config, test_config].each do |environment_file|
       expect(environment_file).to match(
@@ -147,6 +166,13 @@ RSpec.describe "Suspend a new project with default configuration" do
       to match(/^ +config.action_mailer.delivery_method = :file$/)
   end
 
+  it "sets action mailer default host and asset host" do
+    config_key = 'config\.action_mailer\.asset_host'
+    config_value =
+      '{ host: ENV\.fetch\("ASSET_HOST", ENV\.fetch\("APPLICATION_HOST"\)\) }'
+    expect(production_config).to match(/#{config_key} = #{config_value}/)
+  end
+
   it "uses APPLICATION_HOST, not HOST in the production config" do
     expect(production_config).to match(/"APPLICATION_HOST"/)
     expect(production_config).not_to match(/"HOST"/)
@@ -221,7 +247,8 @@ RSpec.describe "Suspend a new project with default configuration" do
 
     expect(bin_setup).to include("PARENT_APP_NAME=#{app_name.dasherize}-staging")
     expect(bin_setup).to include("APP_NAME=#{app_name.dasherize}-staging-pr-$1")
-    expect(bin_setup).to include("heroku run rake db:migrate --exit-code --app $APP_NAME")
+    expect(bin_setup).
+      to include("heroku run rails db:migrate --exit-code --app $APP_NAME")
     expect(bin_setup).to include("heroku ps:scale worker=1 --app $APP_NAME")
     expect(bin_setup).to include("heroku restart --app $APP_NAME")
 
@@ -232,7 +259,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     bin_deploy_path = "#{project_path}/bin/deploy"
     bin_deploy = IO.read(bin_deploy_path)
 
-    expect(bin_deploy).to include("heroku run rake db:migrate --exit-code")
+    expect(bin_deploy).to include("heroku run rails db:migrate --exit-code")
     expect(File.stat(bin_deploy_path)).to be_executable
   end
 
@@ -264,7 +291,9 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(read_project_file(flashes_path)).to match(/\$flashes/m)
 
     app_css = read_project_file(%w(app assets stylesheets application.scss))
-    expect(app_css).to match(/normalize-rails.*bourbon.*neat.*base.*refills/m)
+    expect(app_css).to match(
+      /normalize\.css\/normalize\.css.*bourbon.*neat.*base.*refills/m,
+    )
   end
 
   it "doesn't use turbolinks" do
@@ -272,6 +301,11 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(app_js).not_to match(/turbolinks/)
   end
 
+  it "configures Timecop safe mode" do
+    spec_helper = read_project_file(%w(spec spec_helper.rb))
+    expect(spec_helper).to match(/Timecop.safe_mode = true/)
+  end
+
   def development_config
     @_development_config ||=
       read_project_file %w(config environments development.rb)

data/spec/support/suspenders.rb

@@ -17,6 +17,12 @@ module SuspendersTestHelpers
         `
           #{suspenders_bin} #{APP_NAME} #{arguments}
         `
+        Dir.chdir(APP_NAME) do
+          with_env("HOME", tmp_path) do
+            `git add .`
+            `git commit -m 'Initial commit'`
+          end
+        end
       end
     end
   end
@@ -45,7 +51,7 @@ module SuspendersTestHelpers
     if File.exist?(project_path)
       Dir.chdir(project_path) do
         Bundler.with_clean_env do
-          `rake db:drop`
+          `rails db:drop`
         end
       end
     end
@@ -80,4 +86,14 @@ module SuspendersTestHelpers
   def root_path
     File.expand_path('../../../', __FILE__)
   end
+
+  def with_env(name, new_value)
+    prior = ENV[name]
+    ENV[name] = new_value.to_s
+
+    yield
+
+  ensure
+    ENV[name] = prior
+  end
 end

data/suspenders.gemspec

@@ -27,7 +27,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bitters', '~> 1.5'
+  s.add_dependency 'bitters', '~> 1.7'
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 

data/templates/Gemfile.erb

@@ -1,5 +1,10 @@
 source "https://rubygems.org"
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "autoprefixer-rails"
@@ -7,7 +12,6 @@ gem "delayed_job_active_record"
 gem "flutie"
 gem "honeybadger"
 gem "jquery-rails"
-gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "puma"
 gem "rack-canonical-host"
@@ -20,9 +24,13 @@ gem "sprockets", ">= 3.0.0"
 gem "suspenders"
 gem "title"
 gem "uglifier"
+<% if options[:webpack] %>
+gem "webpacker"
+<% end %>
 
 group :development do
   gem "listen"
+  gem "rack-mini-profiler", require: false
   gem "spring"
   gem "spring-commands-rspec"
   gem "web-console"
@@ -36,11 +44,7 @@ group :development, :test do
   gem "factory_girl_rails"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.5"
-end
-
-group :development, :staging do
-  gem "rack-mini-profiler", require: false
+  gem "rspec-rails", "~> 3.6"
 end
 
 group :test do
@@ -54,6 +58,6 @@ group :test do
   gem "webmock"
 end
 
-group :staging, :production do
+group :production do
   gem "rack-timeout"
 end

data/templates/Procfile

@@ -1,2 +1,2 @@
 web: bundle exec puma -p $PORT -C ./config/puma.rb
-worker: bundle exec rake jobs:work
+worker: bundle exec rails jobs:work

data/templates/_analytics.html.erb

@@ -1,7 +1,8 @@
 <% if ENV["SEGMENT_KEY"] %>
   <script type="text/javascript">
-    window.analytics=window.analytics||[],window.analytics.methods=["identify","group","track","page","pageview","alias","ready","on","once","off","trackLink","trackForm","trackClick","trackSubmit"],window.analytics.factory=function(t){return function(){var a=Array.prototype.slice.call(arguments);return a.unshift(t),window.analytics.push(a),window.analytics}};for(var i=0;i<window.analytics.methods.length;i++){var key=window.analytics.methods[i];window.analytics[key]=window.analytics.factory(key)}window.analytics.load=function(t){if(!document.getElementById("analytics-js")){var a=document.createElement("script");a.type="text/javascript",a.id="analytics-js",a.async=!0,a.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n)}},window.analytics.SNIPPET_VERSION="2.0.9",
-    window.analytics.load("<%= ENV["SEGMENT_KEY"] %>");
-    window.analytics.page();
+    !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="4.0.0";
+    analytics.load("<%= ENV["SEGMENT_KEY"] %>");
+    analytics.page();
+    }}();
   </script>
 <% end %>

data/templates/active_job.rb

@@ -0,0 +1,13 @@
+require "active_job/logging"
+
+ActiveSupport::Notifications.unsubscribe("enqueue.active_job")
+
+module ActiveJob
+  module Logging
+    class EnqueueLogSubscriber < LogSubscriber
+      define_method :enqueue, instance_method(:enqueue)
+    end
+  end
+end
+
+ActiveJob::Logging::EnqueueLogSubscriber.attach_to(:active_job)

data/templates/application.scss

@@ -1,6 +1,6 @@
 @charset "utf-8";
 
-@import "normalize-rails";
+@import "normalize.css/normalize.css";
 
 @import "bourbon";
 @import "neat";

data/templates/bin_deploy

@@ -8,5 +8,5 @@ branch="$(git symbolic-ref HEAD --short)"
 target="${1:-staging}"
 
 git push "$target" "$branch:master"
-heroku run rake db:migrate --exit-code --remote "$target"
+heroku run rails db:migrate --exit-code --remote "$target"
 heroku restart --remote "$target"

data/templates/bin_setup

@@ -11,10 +11,14 @@ gem install bundler --conservative
 bundle check || bundle install
 
 # Set up database and add any development seed data
-bin/rake dev:prime
+bin/rails dev:prime
 
-# Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
-mkdir -p .git/safe
+if [ ! -d .git/safe ] && echo $PATH | grep .git/safe > /dev/null; then
+  echo "-----------------------------------------------------------------------"
+  echo
+  echo "-> When you trust this repo, remember to run: mkdir -p .git/safe"
+  echo
+fi
 
 # Only if this isn't CI
 # if [ -z "$CI" ]; then

data/templates/bin_setup_review_app.erb

@@ -11,9 +11,12 @@ fi
 
 PARENT_APP_NAME=<%= app_name.dasherize %>-staging
 APP_NAME=<%= app_name.dasherize %>-staging-pr-$1
-URL=`heroku pg:backups public-url -a $PARENT_APP_NAME`
+
+heroku pg:backups:capture --app $PARENT_APP_NAME
+
+URL=`heroku pg:backups public-url --app $PARENT_APP_NAME`
 
 heroku pg:backups restore $URL DATABASE_URL --confirm $APP_NAME --app $APP_NAME
-heroku run rake db:migrate --exit-code --app $APP_NAME
+heroku run rails db:migrate --exit-code --app $APP_NAME
 heroku ps:scale worker=1 --app $APP_NAME
 heroku restart --app $APP_NAME

data/templates/bundler_audit.rake

@@ -1,12 +1,4 @@
 if Rails.env.development? || Rails.env.test?
-  require "bundler/audit/cli"
-
-  namespace :bundler do
-    desc "Updates the ruby-advisory-db and runs audit"
-    task :audit do
-      %w(update check).each do |command|
-        Bundler::Audit::CLI.start [command]
-      end
-    end
-  end
+  require "bundler/audit/task"
+  Bundler::Audit::Task.new
 end

data/templates/postgresql_database.yml.erb

@@ -17,5 +17,3 @@ production: &deploy
   pool: <%%= [Integer(ENV.fetch("MAX_THREADS", 5)), Integer(ENV.fetch("DB_POOL", 5))].max %>
   timeout: 5000
   url:  <%%= ENV.fetch("DATABASE_URL", "") %>
-
-staging: *deploy

data/templates/secrets.yml

@@ -1,14 +1,8 @@
-default: &default
+shared:
   secret_key_base: <%%= ENV["SECRET_KEY_BASE"] %>
 
 development:
-  <<: *default
 
 test:
-  <<: *default
-
-staging:
-  <<: *default
 
 production:
-  <<: *default

data/templates/spec_helper.rb

@@ -10,6 +10,7 @@ if ENV.fetch("COVERAGE", false)
 end
 
 require "webmock/rspec"
+require "timecop"
 
 # http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -27,3 +28,6 @@ RSpec.configure do |config|
 end
 
 WebMock.disable_net_connect!(allow_localhost: true)
+
+# Only allow Timecop with block syntax
+Timecop.safe_mode = true

data/templates/suspenders_gitignore

@@ -2,12 +2,17 @@
 *.DS_Store
 *.swo
 *.swp
+.byebug_history
 /.bundle
 /.env.local
 /coverage/*
 /db/*.sqlite3
+/db/*.sqlite3-journal
 /log/*
-/public/system
+/node_modules
 /public/assets
+/public/packs
+/public/system
 /tags
 /tmp/*
+/yarn-error.log

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.44.0
+  version: 1.45.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,8 @@ files:
 - lib/suspenders/adapters/heroku.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
+- lib/suspenders/generators/enforce_ssl_generator.rb
+- lib/suspenders/generators/initialize_active_job_generator.rb
 - lib/suspenders/generators/static_generator.rb
 - lib/suspenders/generators/stylesheet_base_generator.rb
 - lib/suspenders/version.rb
@@ -121,6 +123,7 @@ files:
 - templates/_flashes.html.erb
 - templates/_javascript.html.erb
 - templates/action_mailer.rb
+- templates/active_job.rb
 - templates/app.json.erb
 - templates/application.scss
 - templates/bin_deploy
@@ -165,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -173,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.