suspenders 1.52.0 → 1.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac150f675b3270f914eb84e55db71e6572b28739664d1deae487d5032ca15efb
-  data.tar.gz: 3fe1ff01eec2e5e65ec5d36fd9f3393d31ba293b1c03c05a459bcaa763b78695
+  metadata.gz: 8aa31ed704361dcb4c7c5dae040f6000a65e958f436038df81a74fa719ccdd47
+  data.tar.gz: ceb17403f61961694b1b08298c4100188c26d1d64abc6b5db0f97216f7a9093e
 SHA512:
-  metadata.gz: c29d991bc59425305115fb9e8bb1f41cf7ed7fcd61db8ee47c138fabfc82ab03700bdc087cd2d9b9663550ec26610fef5dd91f089511428db8379bd03b4605d7
-  data.tar.gz: 168f752abb44cad62c016ce5c801cf0f72e891adee72910522c4498f832d558842e8dba055c703c44dcaf66d95dfafd790c8a74ee2c4b4b50ee193a2c211398f
+  metadata.gz: 54d43d08ed81085648996f38127d960bffa732ae61735e40bfd19de93f5593b7e71a9bdc5c42e69f20410eaa0f8d79fcface14285158494510d9f231c422b45d
+  data.tar.gz: '083ab7ad3e0a0a473d78f01e5d542ac15462a2965d0179b56dcd98b7ab32ff62d504251e359e907a5ac0e333eb3eb1127e4f0dfc2bbe265422f9ddd6aeb674c0'

data/.travis.yml

@@ -10,3 +10,5 @@ before_install:
 install: bundle install
 notifications:
   email: false
+services:
+  - postgresql

data/NEWS.md

@@ -1,3 +1,11 @@
+1.53.0 (August 23, 2019)
+* Upgraded: Rails 6.0.
+* New generator: `suspenders:inline_svg` for setting up the inline_svg gem.
+* Changed: silence Puma's startup messages in JS specs.
+* Changed: improve chromedriver configuration.
+* Added: documentation for deploying to Heroku.
+* Fixed: indentation in production config file.
+
 1.52.0 (June 7, 2019)
 * Changed: Setup system tests instead of feature specs
 * Upgraded: Rails 5.2.3

data/README.md

@@ -117,6 +117,8 @@ Suspenders also comes with:
 
 ## Heroku
 
+Read the documentation on [deploying to Heroku][heroku deploy]
+
 You can optionally create Heroku staging and production apps:
 
     suspenders app --heroku true
@@ -131,6 +133,7 @@ This:
 * Schedules automated backups for 10AM UTC for both `staging` and `production`
 
 [Heroku Pipeline]: https://devcenter.heroku.com/articles/pipelines
+[heroku deploy]: https://github.com/thoughtbot/suspenders/blob/master/docs/heroku_deploy.md
 
 You can optionally specify alternate Heroku flags:
 

data/docs/heroku_deploy.md

@@ -0,0 +1,22 @@
+# Deploying to Heroku
+
+## Setup
+
+Deploying to Heroku requires two additional steps:
+
+1. Manually add buildpacks `node.js` and `ruby` (in that order) to your Heroku
+   app. This is necessary because build order is important and Heroku's
+   auto-detection will add them in the wrong order.
+
+2. Set the following environment variables:
+
+- `ASSET_HOST`: `siteURL.herokuapp.com`
+- `APPLICATION_HOST`: `siteURL.herokuapp.com`
+- `SMTP_ADDRESS`: `smtp.example.com`
+- `SMTP_DOMAIN`: `example.com`
+- `SMTP_USERNAME`: `username`
+- `SMTP_PASSWORD`: `password`
+
+## Execution
+
+- Use the `./bin/deploy` convention for deploying to Heroku

data/lib/suspenders.rb

@@ -14,6 +14,7 @@ require "suspenders/generators/views_generator"
 require "suspenders/generators/js_driver_generator"
 require "suspenders/generators/json_generator"
 require "suspenders/generators/testing_generator"
+require "suspenders/generators/inline_svg_generator"
 require "suspenders/generators/production/force_tls_generator"
 require "suspenders/generators/production/email_generator"
 require "suspenders/generators/production/timeout_generator"

data/lib/suspenders/app_builder.rb

@@ -98,7 +98,7 @@ module Suspenders
 
     def enable_rack_canonical_host
       config = <<-RUBY
-  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
+config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
       configure_environment "production", config
@@ -242,7 +242,6 @@ config.public_file_server.headers = {
     end
 
     def copy_miscellaneous_files
-      copy_file "browserslist", "browserslist"
       copy_file "errors.rb", "config/initializers/errors.rb"
       copy_file "json_encoding.rb", "config/initializers/json_encoding.rb"
     end

data/lib/suspenders/generators/app_generator.rb

@@ -185,7 +185,7 @@ module Suspenders
       generate("suspenders:lint")
       generate("suspenders:jobs")
       generate("suspenders:analytics")
-      generate("suspenders:views")
+      generate("suspenders:inline_svg")
     end
 
     def generate_deployment_default
@@ -197,6 +197,10 @@ module Suspenders
       generate("suspenders:production:manifest")
     end
 
+    def generate_views
+      generate("suspenders:views")
+    end
+
     def outro
       say 'Congratulations! You just pulled our suspenders.'
       say honeybadger_outro

data/lib/suspenders/generators/base.rb

@@ -13,7 +13,7 @@ module Suspenders
       private
 
       def app_name
-        Rails.app_class.parent_name.demodulize.underscore.dasherize
+        Rails.app_class.module_parent_name.demodulize.underscore.dasherize
       end
     end
   end

data/lib/suspenders/generators/inline_svg_generator.rb

@@ -0,0 +1,14 @@
+require_relative "base"
+
+module Suspenders
+  class InlineSvgGenerator < Generators::Base
+    def add_inline_svg
+      gem "inline_svg"
+      Bundler.with_clean_env { run "bundle install" }
+    end
+
+    def configure_inline_svg
+      copy_file "inline_svg.rb", "config/initializers/inline_svg.rb"
+    end
+  end
+end

data/lib/suspenders/generators/js_driver_generator.rb

@@ -8,8 +8,12 @@ module Suspenders
       Bundler.with_clean_env { run "bundle install" }
     end
 
-    def configure_chromedriver
+    def configure_capybara
       copy_file "chromedriver.rb", "spec/support/chromedriver.rb"
+      copy_file(
+        "capybara_silence_puma.rb",
+        "spec/support/capybara_silence_puma.rb",
+      )
     end
   end
 end

data/lib/suspenders/version.rb

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

data/spec/features/inline_svg_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:inline_svg", type: :generator do
+  it "generates the configuration for inline_svg" do
+    with_app { generate("suspenders:inline_svg") }
+
+    expect("config/initializers/inline_svg.rb").to match_contents(/InlineSvg/)
+    expect("Gemfile").to match_contents(/inline_svg/)
+  end
+end

data/spec/features/new_project_spec.rb

@@ -308,7 +308,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "doesn't use turbolinks" do
-    app_js = read_project_file(%w(app assets javascripts application.js))
+    app_js = read_project_file(%w(app javascript packs application.js))
     expect(app_js).not_to match(/turbolinks/)
   end
 

data/spec/features/staging/pull_requests_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "suspenders:staging:pull_requests", type: :generators do
+RSpec.describe "suspenders:staging:pull_requests", type: :generator do
   it "generates the configuration for Heroku pipeline review apps" do
     with_app { generate("suspenders:staging:pull_requests") }
 

data/suspenders.gemspec

@@ -32,4 +32,5 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency 'rack-timeout'
 end

data/templates/Gemfile.erb

@@ -10,6 +10,7 @@ ruby "<%= Suspenders::RUBY_VERSION %>"
 <% unless options[:api] %>
 gem "autoprefixer-rails"
 <% end %>
+gem "bootsnap", require: false
 gem "honeybadger"
 gem "pg"
 gem "puma"
@@ -21,11 +22,7 @@ gem "skylight"
 gem "sprockets", ">= 3.0.0"
 gem "title"
 gem "tzinfo-data", platforms: [:mingw, :x64_mingw, :mswin, :jruby]
-gem "uglifier"
-gem "bootsnap", require: false
-<% if options[:webpack] %>
 gem "webpacker"
-<% end %>
 
 group :development do
   gem "listen"

data/templates/_javascript.html.erb

@@ -1,3 +1,3 @@
-<%= javascript_include_tag :application %>
+<%= javascript_pack_tag :application %>
 
 <%= yield :javascript %>

data/templates/capybara_silence_puma.rb

@@ -0,0 +1 @@
+Capybara.server = :puma, { Silent: true }

data/templates/chromedriver.rb

@@ -5,13 +5,13 @@ Capybara.register_driver :chrome do |app|
 end
 
 Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w(headless disable-gpu) },
-  )
+  options = ::Selenium::WebDriver::Chrome::Options.new
+  options.headless!
+  options.add_argument "--window-size=1680,1050"
 
   Capybara::Selenium::Driver.new app,
     browser: :chrome,
-    desired_capabilities: capabilities
+    options: options
 end
 
 Capybara.javascript_driver = :headless_chrome

data/templates/dotfiles/.env

@@ -5,7 +5,6 @@ PORT=3000
 RACK_ENV=development
 RACK_MINI_PROFILER=0
 SECRET_KEY_BASE=development_secret
-EXECJS_RUNTIME=Node
 SMTP_ADDRESS=smtp.example.com
 SMTP_DOMAIN=example.com
 SMTP_PASSWORD=password

data/templates/inline_svg.rb

@@ -0,0 +1,3 @@
+InlineSvg.configure do |config|
+  config.raise_on_file_not_found = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.52.0
+  version: 1.53.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rack-timeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Suspenders is a base Rails project that you can upgrade. It is used by
   thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
@@ -79,6 +93,7 @@ files:
 - bin/rspec
 - bin/setup
 - bin/suspenders
+- docs/heroku_deploy.md
 - lib/suspenders.rb
 - lib/suspenders/actions.rb
 - lib/suspenders/adapters/heroku.rb
@@ -90,6 +105,7 @@ files:
 - lib/suspenders/generators/db_optimizations_generator.rb
 - lib/suspenders/generators/factories_generator.rb
 - lib/suspenders/generators/forms_generator.rb
+- lib/suspenders/generators/inline_svg_generator.rb
 - lib/suspenders/generators/jobs_generator.rb
 - lib/suspenders/generators/js_driver_generator.rb
 - lib/suspenders/generators/json_generator.rb
@@ -113,6 +129,7 @@ files:
 - spec/features/cli_help_spec.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
+- spec/features/inline_svg_spec.rb
 - spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/production/deployment_spec.rb
@@ -144,8 +161,8 @@ files:
 - templates/bin_deploy
 - templates/bin_setup
 - templates/bin_setup_review_app.erb
-- templates/browserslist
 - templates/bundler_audit.rake
+- templates/capybara_silence_puma.rb
 - templates/chromedriver.rb
 - templates/circle.yml.erb
 - templates/config_locales_en.yml.erb
@@ -159,6 +176,7 @@ files:
 - templates/flashes_helper.rb
 - templates/hound.yml
 - templates/i18n.rb
+- templates/inline_svg.rb
 - templates/json_encoding.rb
 - templates/postgresql_database.yml.erb
 - templates/puma.rb
@@ -203,6 +221,7 @@ test_files:
 - spec/features/cli_help_spec.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
+- spec/features/inline_svg_spec.rb
 - spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/production/deployment_spec.rb

data/templates/browserslist

@@ -1,3 +0,0 @@
-Last 2 versions
-Explorer >= 11
-Android >= 4.4