suspenders 1.47.0 → 1.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e585c8f3e53dfd7aa542261c004856ddd5e6372373d5a09fb23ad4adcafbfde1
-  data.tar.gz: ec2ff003f5d6ba7870fef1d617f3c60580a0b0dad6837bcdc5fcaf1600e62539
+  metadata.gz: 026c79f5c34397199d36e6bd17fa69c195f5c726ac8b1fdb8af6b83b733b361a
+  data.tar.gz: f66658fa08e388e6c57b90afbb3d434f0965c342e4e12dba101548a2a1b36e6b
 SHA512:
-  metadata.gz: 5ec04e0b9b8e16290547280ad3e76ebaf74f7cc427840eb13f4bef533eff595dc4d3b6829470b715b46104246b8465dd356ecb71b86da025a20356e1b1cf2efb
-  data.tar.gz: c95149425b13ea6b3ebedbe86207cafc3bf616293c2afab63eaffeb156b7e11ca459fb6bc89a30e882640b72dceea0e65de0ab7c86713e5d152d737234ace46c
+  metadata.gz: d0177c69ba8b3ea0f36a464896c8ce39b5740f4b31d5ff50733225ca351c7d08f2f17d9dd2e3b932c412a73972d338e7dbd741a728cfccfb683f13406b348bcb
+  data.tar.gz: 13f9f01d699a0805b5f66068754a3575e734b45246abd03af22810066c7166031108c0a41cb229d8a61300efa3d1b0f325f834c223796a2a9394ebbd022f868a

data/CONTRIBUTING.md

@@ -13,9 +13,6 @@ Set up your machine:
 
     ./bin/setup
 
-If you're having trouble installing `capybara-webkit` check their [installation
-instructions](https://github.com/thoughtbot/capybara-webkit#qt-dependency-and-installation-issues).
-
 Make sure the tests pass:
 
     rake

data/NEWS.md

@@ -1,3 +1,10 @@
+1.48.0 (August 10, 2018)
+
+* Bug fix: change production timeouts generator to use working configuration
+  method with latest version of Rack::Timeout
+* Bug fix: Only add email environment requirements if configuring for email
+* Breaking: Replace capybara-webkit with chromedriver
+
 1.47.0 (May 25, 2018)
 
 * Bug fix: normalize.css Sass import is concatenated with other styles now

data/README.md

@@ -76,7 +76,7 @@ And development gems like:
 And testing gems like:
 
 * [Capybara](https://github.com/jnicklas/capybara) and
-  [Capybara WebKit](https://github.com/thoughtbot/capybara-webkit) for
+  [Google Chromedriver]
   integration testing
 * [Factory Bot](https://github.com/thoughtbot/factory_bot) for test data
 * [Formulaic](https://github.com/thoughtbot/formulaic) for integration testing
@@ -182,10 +182,10 @@ Snow Leopard (OS X 10.6).
 Use [Command Line Tools for Xcode](https://developer.apple.com/downloads/index.action)
 for Lion (OS X 10.7) or Mountain Lion (OS X 10.8).
 
-We use [Capybara WebKit](https://github.com/thoughtbot/capybara-webkit) for
-full-stack JavaScript integration testing. It requires QT. Instructions for
-installing QT are
-[here](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
+We use [Google Chromedriver] for full-stack JavaScript integration testing. It
+requires Google Chrome or Chromium.
+
+[Google Chromedriver]: https://sites.google.com/a/chromium.org/chromedriver/home
 
 PostgreSQL needs to be installed and running for the `db:create` rake task.
 

data/lib/suspenders/actions.rb

@@ -26,5 +26,60 @@ module Suspenders
         before: "\nend"
       )
     end
+
+    def expand_json(file, data)
+      action ExpandJson.new(destination_root, file, data)
+    end
+
+    class ExpandJson
+      def initialize(destination_root, file, data)
+        @destination_root = destination_root
+        @file = file
+        @data = data
+      end
+
+      def invoke!
+        write_out { |existing_json| existing_json.merge(data) }
+      end
+
+      def revoke!
+        write_out { |existing_json| hash_unmerge(existing_json, data) }
+      end
+
+      private
+
+      attr_reader :destination_root, :file, :data
+
+      def write_out
+        new_json = yield(existing_json)
+        IO.write(destination_file, JSON.pretty_generate(new_json))
+      end
+
+      def destination_file
+        File.join(destination_root, file)
+      end
+
+      def existing_json
+        JSON.parse(IO.read(destination_file))
+      rescue Errno::ENOENT
+        {}
+      end
+
+      def hash_unmerge(hash, subhash)
+        subhash.reduce(hash) do |acc, (k, v)|
+          if hash.has_key?(k)
+            if v == hash[k]
+              acc.except(k)
+            elsif v.is_a?(Hash)
+              acc.merge(k => hash_unmerge(hash[k], v))
+            else
+              acc
+            end
+          else
+            acc
+          end
+        end
+      end
+    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -59,6 +59,7 @@ module Suspenders
       invoke :setup_default_directories
       invoke :create_local_heroku_setup
       invoke :create_heroku_apps
+      invoke :generate_production_default
       invoke :outro
     end
 
@@ -192,6 +193,9 @@ module Suspenders
       generate("suspenders:jobs")
       generate("suspenders:analytics")
       generate("suspenders:views")
+    end
+
+    def generate_production_default
       generate("suspenders:production:force_tls")
       generate("suspenders:production:email")
       generate("suspenders:production:timeout")

data/lib/suspenders/generators/js_driver_generator.rb

@@ -8,12 +8,13 @@ module Suspenders
     )
 
     def add_gems
-      gem "capybara-webkit", group: :test
+      gem "capybara-selenium", group: :test
+      gem "chromedriver-helper", group: :test
       Bundler.with_clean_env { run "bundle install" }
     end
 
-    def configure_capybara_webkit
-      copy_file "capybara_webkit.rb", "spec/support/capybara_webkit.rb"
+    def configure_chromedriver
+      copy_file "chromedriver.rb", "spec/support/chromedriver.rb"
     end
   end
 end

data/lib/suspenders/generators/production/email_generator.rb

@@ -1,8 +1,11 @@
 require "rails/generators"
+require_relative "../../actions"
 
 module Suspenders
   module Production
     class EmailGenerator < Rails::Generators::Base
+      include Suspenders::Actions
+
       source_root File.expand_path(
         File.join("..", "..", "..", "..", "templates"),
         File.dirname(__FILE__),
@@ -25,6 +28,18 @@ module Suspenders
         inject_into_file "config/environments/production.rb", config,
           after: "config.action_mailer.raise_delivery_errors = false"
       end
+
+      def env_vars
+        expand_json(
+          "app.json",
+          env: {
+            SMTP_ADDRESS: { required: true },
+            SMTP_DOMAIN: { required: true },
+            SMTP_PASSWORD: { required: true },
+            SMTP_USERNAME: { required: true },
+          },
+        )
+      end
     end
   end
 end

data/lib/suspenders/generators/production/timeout_generator.rb

@@ -8,13 +8,13 @@ module Suspenders
       end
 
       def configure_rack_timeout
-        append_file "config/environments/production.rb", rack_timeout_config
+        append_file ".env", rack_timeout_config
       end
 
       private
 
       def rack_timeout_config
-        %{Rack::Timeout.timeout = ENV.fetch("RACK_TIMEOUT", 10).to_i}
+        %{RACK_TIMEOUT_SERVICE_TIMEOUT=10}
       end
     end
   end

data/lib/suspenders/version.rb

@@ -4,5 +4,5 @@ module Suspenders
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "1.47.0".freeze
+  VERSION = "1.48.0".freeze
 end

data/spec/features/new_project_spec.rb

@@ -74,8 +74,8 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(File).to exist("#{project_path}/spec/support/action_mailer.rb")
   end
 
-  it "configures capybara-webkit" do
-    expect(File).to exist("#{project_path}/spec/support/capybara_webkit.rb")
+  it "configures capybara-chromedriver" do
+    expect(File).to exist("#{project_path}/spec/support/chromedriver.rb")
   end
 
   it "adds support file for i18n" do
@@ -276,7 +276,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   it "creates heroku application manifest file with application name in it" do
     app_json_file = IO.read("#{project_path}/app.json")
 
-    expect(app_json_file).to match(/"name":"#{app_name.dasherize}"/)
+    expect(app_json_file).to match(/"name":\s*"#{app_name.dasherize}"/)
   end
 
   def app_name

data/spec/features/production/email_spec.rb

@@ -5,11 +5,43 @@ RSpec.describe "suspenders:production:email" do
     with_app { generate("suspenders:production:email") }
 
     expect("config/smtp.rb").to match_contents(%r{SMTP_SETTINGS\s*=})
+
     expect("config/environments/production.rb").to \
       match_contents(%r{require.+config/smtp})
     expect("config/environments/production.rb").to \
       match_contents(%r{action_mailer.delivery_method\s*=\s*:smtp})
     expect("config/environments/production.rb").to \
       match_contents(%r{action_mailer.smtp_settings\s*=\s*SMTP_SETTINGS})
+
+    expect("app.json").to contain_json(
+      env: {
+        SMTP_ADDRESS: { required: true },
+        SMTP_DOMAIN: { required: true },
+        SMTP_PASSWORD: { required: true },
+        SMTP_USERNAME: { required: true },
+      },
+    )
+  end
+
+  it "destroys the configuration for a production email deployment" do
+    with_app { destroy("suspenders:production:email") }
+
+    expect("config/smtp.rb").not_to exist_as_a_file
+
+    expect("config/environments/production.rb").not_to \
+      match_contents(%r{require.+config/smtp})
+    expect("config/environments/production.rb").not_to \
+      match_contents(%r{action_mailer.delivery_method\s*=\s*:smtp})
+    expect("config/environments/production.rb").not_to \
+      match_contents(%r{action_mailer.smtp_settings\s*=\s*SMTP_SETTINGS})
+
+    expect("app.json").not_to contain_json(
+      env: {
+        SMTP_ADDRESS: { required: true },
+        SMTP_DOMAIN: { required: true },
+        SMTP_PASSWORD: { required: true },
+        SMTP_USERNAME: { required: true },
+      },
+    )
   end
 end

data/spec/support/contain_json_matcher.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "json"
+
+RSpec::Matchers.define :contain_json do
+  match do
+    sub_json = expected
+    filename = actual
+
+    filepath = File.join(project_path, filename)
+    json = JSON.parse(IO.read(filepath), symbolize_names: true)
+    sub_json <= json
+  end
+
+  failure_message do
+    sub_json = expected
+    filename = actual
+
+    filepath = File.join(project_path, filename)
+    json = JSON.parse(IO.read(filepath), symbolize_names: true)
+
+    "in #{filename}, expected to find\n#{sub_json.inspect}\nin\n#{json.inspect}"
+  end
+end

data/spec/support/exist_as_a_file_matcher.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :exist_as_a_file do
+  match do |filename|
+    File.exist?(File.join(project_path, filename))
+  end
+end

data/spec/support/suspenders.rb

@@ -66,6 +66,15 @@ module SuspendersTestHelpers
     end
   end
 
+  def destroy(generator)
+    run_in_project do
+      with_revision_for_honeybadger do
+        `bin/spring stop`
+        `#{project_rails_bin} destroy #{generator}`
+      end
+    end
+  end
+
   def suspenders_help_command
     run_in_tmp do
       debug `#{suspenders_bin} -h`

data/templates/app.json.erb

@@ -19,18 +19,6 @@
     },
     "SECRET_KEY_BASE":{
       "generator":"secret"
-    },
-    "SMTP_ADDRESS":{
-      "required":true
-    },
-    "SMTP_DOMAIN":{
-      "required":true
-    },
-    "SMTP_PASSWORD":{
-      "required":true
-    },
-    "SMTP_USERNAME":{
-      "required":true
     }
   },
   "addons":[

data/templates/chromedriver.rb

@@ -0,0 +1,17 @@
+require "selenium/webdriver"
+
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
+
+Capybara.register_driver :headless_chrome do |app|
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    chromeOptions: { args: %w(headless disable-gpu) },
+  )
+
+  Capybara::Selenium::Driver.new app,
+    browser: :chrome,
+    desired_capabilities: capabilities
+end
+
+Capybara.javascript_driver = :headless_chrome

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.47.0
+  version: 1.48.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -110,6 +110,8 @@ files:
 - spec/features/new_project_spec.rb
 - spec/features/production/email_spec.rb
 - spec/spec_helper.rb
+- spec/support/contain_json_matcher.rb
+- spec/support/exist_as_a_file_matcher.rb
 - spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
 - spec/support/match_contents_matcher.rb
@@ -131,7 +133,7 @@ files:
 - templates/bin_setup_review_app.erb
 - templates/browserslist
 - templates/bundler_audit.rake
-- templates/capybara_webkit.rb
+- templates/chromedriver.rb
 - templates/circle.yml.erb
 - templates/config_locales_en.yml.erb
 - templates/dev.rake
@@ -176,8 +178,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.7.4
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
-test_files: []
+test_files:
+- spec/adapters/heroku_spec.rb
+- spec/fakes/bin/heroku
+- spec/fakes/bin/hub
+- spec/features/api_spec.rb
+- spec/features/cli_help_spec.rb
+- spec/features/github_spec.rb
+- spec/features/heroku_spec.rb
+- spec/features/new_project_spec.rb
+- spec/features/production/email_spec.rb
+- spec/spec_helper.rb
+- spec/support/contain_json_matcher.rb
+- spec/support/exist_as_a_file_matcher.rb
+- spec/support/fake_github.rb
+- spec/support/fake_heroku.rb
+- spec/support/match_contents_matcher.rb
+- spec/support/suspenders.rb

data/templates/capybara_webkit.rb

@@ -1,5 +0,0 @@
-Capybara.javascript_driver = :webkit
-
-Capybara::Webkit.configure do |config|
-  config.block_unknown_urls
-end