welaika-suspenders 2.27.0 → 2.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7d61cff79cf0d5c347e8b757138d8d50ea67ed
-  data.tar.gz: 8e3ece8af262909611bee9c04ac1b69d232f5259
+  metadata.gz: fb58f9064558206c892628144c70454883cb9d5a
+  data.tar.gz: be931d3210db58476f0b83f9cdad1f7657cb0948
 SHA512:
-  metadata.gz: 76de0368d9bb59a427005823ebaab568a15645981bb5dc78af626fb1d8597e716ea2eab424749995f288e460c87cf9f404a08d76ed08bc27968c6bc61f93f7f4
-  data.tar.gz: 43e6470856aee3672b5957b5ef09d2ea3f0dd2436c84a6a06b5469e9da2e81aa179b74bb71f5b0e0f43d95017e11db0945c99e0538e6787d80709651e897af81
+  metadata.gz: e7ea1c8aa4ccbca4a1452b6dad622b280e4ea73d14b025f978b052577e2425e02bf9158aada3f1b21743f81917c725d54b7bdb9814422ec40dbf00242ea0c7af
+  data.tar.gz: 3e4b7a2fb33324933a13a5014c900b8effe9979d148d458cbdc0047418b11aadb38ff315e66fd8c31a05276f720f5775b7a096dc3fd0af59bc3fa6609f2582d7

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/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}"
+      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,15 @@ 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(

data/lib/suspenders/app_builder.rb

@@ -5,16 +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_backup_schedule,
-                   :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'
@@ -152,11 +155,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
@@ -222,7 +221,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)
@@ -330,8 +329,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", %{"http://localhost:3000"}
       action_mailer_host "test", %{"www.example.com"}
+      action_mailer_asset_host "test", %{"http://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
@@ -380,10 +385,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)

data/lib/suspenders/generators/app_generator.rb

@@ -26,11 +26,11 @@ 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_system_test,
+                 type: :boolean, default: true, desc: "Skip system test files"
 
-    class_option :skip_turbolinks, type: :boolean, default: true,
-      desc: "Skip turbolinks gem"
+    class_option :skip_turbolinks,
+                 type: :boolean, default: true, desc: "Skip turbolinks gem"
 
     def finish_template
       invoke :suspenders_customization
@@ -56,7 +56,7 @@ module Suspenders
       invoke :setup_spring
       invoke :create_binstubs
       invoke :generate_default
-      invoke :setup_git
+      invoke :setup_default_directories
       invoke :outro
     end
 
@@ -152,14 +152,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
@@ -174,6 +166,7 @@ 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
@@ -198,10 +191,6 @@ module Suspenders
       build :create_binstubs
     end
 
-    def init_git
-      build :init_git
-    end
-
     def copy_miscellaneous_files
       say 'Copying miscellaneous support files'
       build :copy_miscellaneous_files
@@ -222,6 +211,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/version.rb

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

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/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

@@ -32,7 +32,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   it "includes the bundle:audit task" do
     Dir.chdir(project_path) do
       Bundler.with_clean_env do
-        expect(`rake -T`).to include('rake bundle:audit')
+        expect(`rails -T`).to include("rails bundle:audit")
       end
     end
   end
@@ -102,6 +102,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")
@@ -140,6 +145,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(
@@ -169,6 +180,13 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(spec_helper_file).to match(/^SimpleCov.start 'rails' do$/)
   end
 
+  it "sets action mailer default host and asset host" do
+    config_key = 'config\.action_mailer\.asset_host'
+    config_value =
+      %q{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"/)
@@ -180,12 +198,6 @@ RSpec.describe "Suspend a new project with default configuration" do
       to match(/RecipientInterceptor.new\(ENV\["EMAIL_RECIPIENTS"\]\)/)
   end
 
-  it "configures language in html element" do
-    layout_path = "/app/views/layouts/application.html.slim"
-    layout_file = IO.read("#{project_path}#{layout_path}")
-    expect(layout_file).to match(/html lang="it"/)
-  end
-
   it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
 
@@ -253,7 +265,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")
 
@@ -264,7 +277,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
 

data/spec/support/suspenders.rb

@@ -51,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

data/templates/Gemfile.erb

@@ -37,6 +37,7 @@ gem "welaika-suspenders"
 group :development do
   gem "letter_opener"
   gem "listen", ">= 3.0.5", "< 3.2"
+  gem "rack-mini-profiler", require: false
   gem "spring"
   gem "spring-commands-rspec"
   gem "spring-watcher-listen", "~> 2.0.0"
@@ -60,10 +61,6 @@ group :development, :test do
   gem "slim_lint", require: false
 end
 
-group :development, :staging do
-  gem "rack-mini-profiler", require: false
-end
-
 group :test do
   gem "capybara"
   gem "database_cleaner"
@@ -75,6 +72,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/action_mailer.rb

@@ -1,5 +1,5 @@
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before do
     ActionMailer::Base.deliveries.clear
   end
 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/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

@@ -10,10 +10,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

@@ -17,6 +17,6 @@ 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,4 +1,4 @@
 if Rails.env.development? || Rails.env.test?
-  require 'bundler/audit/task'
+  require "bundler/audit/task"
   Bundler::Audit::Task.new
 end

data/templates/database_cleaner_rspec.rb

@@ -5,7 +5,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.strategy = :transaction
   end
 
@@ -18,11 +18,11 @@ RSpec.configure do |config|
     end
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.start
   end
 
-  config.append_after(:each) do
+  config.append_after do
     DatabaseCleaner.clean
   end
 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/rubocop.yml

@@ -30,6 +30,10 @@ Metrics/BlockLength:
 Metrics/LineLength:
   Max: 100
 
+Naming/FileName:
+  Exclude:
+    - 'app/views/**/*'
+
 Rails:
   Enabled: true
 

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/suspenders_gitignore

@@ -2,16 +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
-/public/packs
-/node_modules

data/templates/suspenders_layout.html.slim

@@ -1,5 +1,5 @@
 doctype html
-html lang="it"
+html lang=I18n.locale
   head
     meta charset="utf-8"
     meta name="ROBOTS" content="NOODP"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 2.28.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,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
@@ -105,6 +107,7 @@ files:
 - templates/_flashes.html.slim
 - templates/_javascript.html.slim
 - templates/action_mailer.rb
+- templates/active_job.rb
 - templates/app.json.erb
 - templates/application.sass
 - templates/bin_deploy
@@ -168,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.