suspenders 1.55.1 → 1.56.1

data/templates/partials/email_smtp.rb

@@ -1,2 +1,2 @@
-config.action_mailer.delivery_method = :smtp
-config.action_mailer.smtp_settings = SMTP_SETTINGS
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = SMTP_SETTINGS

data/templates/partials/pull_requests_config.rb

@@ -1,4 +1,5 @@
-if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
-  ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
-  ENV["ASSET_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
-end
+  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
+    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+    ENV["ASSET_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
+  end
+

data/templates/postgresql_database.yml.erb

@@ -6,6 +6,7 @@ development: &default
   pool: <%%= Integer(ENV.fetch("DB_POOL", 5)) %>
   reaping_frequency: <%%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>
   timeout: 5000
+  url:  <%%= ENV["DATABASE_URL"] %>
 
 test:
   <<: *default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.55.1
+  version: 1.56.1
 platform: ruby
 authors:
 - thoughtbot
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.4
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +120,21 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".gitignore"
 - ".ruby-version"
-- ".standard.yml"
-- ".travis.yml"
 - CONTRIBUTING.md
 - GOALS.md
-- Gemfile
 - LICENSE
 - NEWS.md
 - README.md
 - RELEASING.md
-- Rakefile
-- USAGE
-- bin/rake
-- bin/rspec
-- bin/setup
 - bin/suspenders
 - docs/heroku_deploy.md
 - lib/suspenders.rb
 - lib/suspenders/actions.rb
+- lib/suspenders/actions/strip_comments_action.rb
 - lib/suspenders/adapters/heroku.rb
 - lib/suspenders/app_builder.rb
+- lib/suspenders/exit_on_failure.rb
 - lib/suspenders/generators/advisories_generator.rb
 - lib/suspenders/generators/analytics_generator.rb
 - lib/suspenders/generators/app_generator.rb
@@ -113,7 +148,6 @@ files:
 - lib/suspenders/generators/js_driver_generator.rb
 - lib/suspenders/generators/json_generator.rb
 - lib/suspenders/generators/lint_generator.rb
-- lib/suspenders/generators/preloader_generator.rb
 - lib/suspenders/generators/production/compression_generator.rb
 - lib/suspenders/generators/production/deployment_generator.rb
 - lib/suspenders/generators/production/email_generator.rb
@@ -130,44 +164,6 @@ files:
 - lib/suspenders/generators/testing_generator.rb
 - lib/suspenders/generators/views_generator.rb
 - lib/suspenders/version.rb
-- spec/adapters/heroku_spec.rb
-- spec/expand_json_spec.rb
-- spec/fakes/bin/heroku
-- spec/fakes/bin/hub
-- spec/features/advisories_spec.rb
-- spec/features/api_spec.rb
-- spec/features/ci_spec.rb
-- spec/features/cli_help_spec.rb
-- spec/features/db_optimizations_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/lint_spec.rb
-- spec/features/new_project_spec.rb
-- spec/features/preloader_spec.rb
-- spec/features/production/compression_spec.rb
-- spec/features/production/deployment_spec.rb
-- spec/features/production/email_spec.rb
-- spec/features/production/manifest_spec.rb
-- spec/features/production/single_redirect_spec.rb
-- spec/features/profiler_spec.rb
-- spec/features/runner_spec.rb
-- spec/features/staging/pull_requests_spec.rb
-- spec/features/static_spec.rb
-- spec/features/stylelint_spec.rb
-- spec/spec_helper.rb
-- spec/support/be_executable_matcher.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/generators.rb
-- spec/support/match_contents_matcher.rb
-- spec/support/project_files.rb
-- spec/support/rails_template.rb
-- spec/support/suspenders.rb
-- suspenders.gemspec
 - templates/Gemfile.erb
 - templates/Procfile
 - templates/README.md.erb
@@ -203,7 +199,6 @@ files:
 - templates/descriptions/json.md
 - templates/descriptions/lint.md
 - templates/descriptions/manifest.md
-- templates/descriptions/preloader.md
 - templates/descriptions/profiler.md
 - templates/descriptions/pull_requests.md
 - templates/descriptions/runner.md
@@ -224,6 +219,7 @@ files:
 - templates/i18n.rb
 - templates/inline_svg.rb
 - templates/json_encoding.rb
+- templates/oj.rb
 - templates/partials/ci_simplecov.rb
 - templates/partials/db_optimizations_configuration.rb
 - templates/partials/deployment_readme.md
@@ -240,7 +236,6 @@ files:
 - templates/shoulda_matchers_config_rspec.rb
 - templates/smtp.rb
 - templates/spec_helper.rb
-- templates/spring.rb
 - templates/stylelintrc.json
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
@@ -248,7 +243,7 @@ homepage: http://github.com/thoughtbot/suspenders
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -257,52 +252,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.6
+      version: 2.7.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.7.4
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
-test_files:
-- spec/adapters/heroku_spec.rb
-- spec/expand_json_spec.rb
-- spec/fakes/bin/heroku
-- spec/fakes/bin/hub
-- spec/features/advisories_spec.rb
-- spec/features/api_spec.rb
-- spec/features/ci_spec.rb
-- spec/features/cli_help_spec.rb
-- spec/features/db_optimizations_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/lint_spec.rb
-- spec/features/new_project_spec.rb
-- spec/features/preloader_spec.rb
-- spec/features/production/compression_spec.rb
-- spec/features/production/deployment_spec.rb
-- spec/features/production/email_spec.rb
-- spec/features/production/manifest_spec.rb
-- spec/features/production/single_redirect_spec.rb
-- spec/features/profiler_spec.rb
-- spec/features/runner_spec.rb
-- spec/features/staging/pull_requests_spec.rb
-- spec/features/static_spec.rb
-- spec/features/stylelint_spec.rb
-- spec/spec_helper.rb
-- spec/support/be_executable_matcher.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/generators.rb
-- spec/support/match_contents_matcher.rb
-- spec/support/project_files.rb
-- spec/support/rails_template.rb
-- spec/support/suspenders.rb
+test_files: []

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-*.swp
-Gemfile.lock
-/.bundle
-/tmp

data/.standard.yml

@@ -1,2 +0,0 @@
-ignore:
-  - "templates/partials/db_optimizations_configuration.rb"

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-rvm: 2.6.6
-cache: bundler
-before_install:
-  - nvm install 13.12.0
-  - git config --global user.name 'Travis CI'
-  - git config --global user.email 'travis-ci@example.com'
-  - gem update --system
-  - gem install bundler
-  - bundler config --global disable_platform_warnings true
-install: bundle install
-notifications:
-  email: false
-services:
-  - postgresql

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/Rakefile

@@ -1,9 +0,0 @@
-require "bundler/setup"
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "standard/rake"
-
-RSpec::Core::RakeTask.new(:rspec)
-
-desc "Run the test suite"
-task default: [:rspec, :standard]

data/USAGE

@@ -1,13 +0,0 @@
-Description:
-    Suspenders is a Rails template with thoughtbot standard
-    defaults, ready to deploy to Heroku.
-
-    For full details on the changes we've made compared to
-    a vanilla Rails app, check our GitHub project:
-        https://github.com/thoughtbot/suspenders
-
-Example:
-    suspenders ~/Code/weblog
-
-    This generates a Rails installation in ~/Code/weblog configured
-    with our preferred defaults.

data/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'rspec')

data/bin/setup

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Run this script immediately after cloning the codebase.
-
-# Exit if any subcommand fails
-set -e
-
-# Set up Ruby dependencies via Bundler
-bundle install
-
-# Add binstubs to PATH in ~/.zshenv like this:
-#   export PATH=".git/safe/../../bin:$PATH"
-mkdir -p .git/safe

data/lib/suspenders/generators/preloader_generator.rb

@@ -1,122 +0,0 @@
-require_relative "base"
-
-module Suspenders
-  class PreloaderGenerator < Generators::Base
-    def spring_config
-      template "spring.rb", "config/spring.rb", force: false, skip: true
-    end
-
-    def spring_gem
-      always_gsub_file("Gemfile", /# Spring speeds up development.*/, "")
-
-      gem_group :development do
-        gem "spring"
-        gem "spring-watcher-listen", "~> 2.0.0"
-      end
-
-      Bundler.with_unbundled_env { run "bundle install" }
-    end
-
-    def cache_classes_test
-      action UncacheClasses.new(self, "config/environments/test.rb")
-    end
-
-    def spring_binstubs
-      action SpringBinstubs.new(self)
-    end
-
-    class SpringBinstubs
-      def initialize(base)
-        @base = base
-      end
-
-      def invoke!
-        Bundler.with_unbundled_env do
-          @base.send(:always_run, "spring binstub --all")
-        end
-      end
-
-      def revoke!
-        Bundler.with_unbundled_env do
-          @base.send(:always_run, "spring binstub --remove --all")
-        end
-      end
-    end
-
-    class UncacheClasses
-      def initialize(base, config_file)
-        @base = base
-        @config_file = config_file
-      end
-
-      def invoke!
-        @base.send(
-          :always_gsub_file,
-          @config_file,
-          "config.cache_classes = true",
-          "config.cache_classes = false"
-        )
-      end
-
-      def revoke!
-        @base.send(
-          :always_gsub_file,
-          @config_file,
-          "config.cache_classes = false",
-          "config.cache_classes = true"
-        )
-      end
-    end
-
-    protected
-
-    def always_run(command, with: nil, verbose: true, env: nil, capture: nil,
-      abort_on_failure: nil)
-      destination = relative_to_original_destination_root(
-        destination_root,
-        false
-      )
-      desc = "#{command} from #{destination.inspect}"
-
-      if with
-        desc = "#{File.basename(with.to_s)} #{desc}"
-        command = "#{with} #{command}"
-      end
-
-      say_status :run, desc, verbose
-
-      return if options[:pretend]
-
-      env_splat = [env] if env
-
-      if capture
-        result, status = Open3.capture2e(*env_splat, command.to_s)
-        success = status.success?
-      else
-        result = system(*env_splat, command.to_s)
-        success = result
-      end
-
-      if abort_on_failure.nil?
-        abort_on_failure = self.class.send(:exit_on_failure?)
-      end
-
-      if !success && abort_on_failure
-        abort
-      end
-
-      result
-    end
-
-    def always_gsub_file(path, flag, replacement, verbose: true)
-      path = File.expand_path(path, destination_root)
-      say_status :gsub, relative_to_original_destination_root(path), verbose
-
-      unless options[:pretend]
-        content = File.binread(path)
-        content.gsub!(flag, replacement)
-        File.open(path, "wb") { |file| file.write(content) }
-      end
-    end
-  end
-end

data/spec/adapters/heroku_spec.rb

@@ -1,98 +0,0 @@
-require "spec_helper"
-
-module Suspenders
-  module Adapters
-    RSpec.describe Heroku do
-      it "sets the heroku remotes" do
-        setup_file = "bin/setup"
-        app_builder = double(app_name: app_name)
-        allow(app_builder).to receive(:append_file)
-
-        Heroku.new(app_builder).set_heroku_remotes
-
-        expect(app_builder).to have_received(:append_file)
-          .with(setup_file, /heroku apps:info --app #{app_name.dasherize}-production/)
-        expect(app_builder).to have_received(:append_file)
-          .with(setup_file, /heroku apps:info --app #{app_name.dasherize}-staging/)
-      end
-
-      it "sets the heroku rails secrets" do
-        app_builder = double(app_name: app_name)
-        allow(app_builder).to receive(:run)
-
-        Heroku.new(app_builder).set_heroku_rails_secrets
-
-        expect(app_builder).to(
-          have_configured_var("staging", "SECRET_KEY_BASE")
-        )
-        expect(app_builder).to(
-          have_configured_var("production", "SECRET_KEY_BASE")
-        )
-      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)
-
-        Heroku.new(app_builder).set_heroku_application_host
-
-        expect(app_builder).to(
-          have_configured_var("staging", "APPLICATION_HOST")
-        )
-
-        expect(app_builder).to(
-          have_configured_var("production", "APPLICATION_HOST")
-        )
-      end
-
-      it "configures nodejs and ruby packs" do
-        app_builder = double(app_name: app_name)
-        allow(app_builder).to receive(:run)
-
-        Heroku.new(app_builder).set_heroku_buildpacks
-
-        %w[staging production].each do |remote|
-          expect(app_builder).to(
-            have_configured_buildpack(
-              remote_name: remote, index: 1, packname: "heroku/nodejs"
-            )
-          )
-          expect(app_builder).to(
-            have_configured_buildpack(
-              remote_name: remote, index: 2, packname: "heroku/ruby"
-            )
-          )
-        end
-      end
-
-      def app_name
-        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
-
-      def have_configured_buildpack(remote_name:, index:, packname:)
-        have_received(:run).with(
-          /buildpacks:add --index #{index} #{packname} --remote #{remote_name}/
-        )
-      end
-    end
-  end
-end

data/spec/expand_json_spec.rb

@@ -1,89 +0,0 @@
-require "spec_helper"
-
-RSpec.describe Suspenders::Actions::ExpandJson do
-  let(:destination_root) { File.join(root_path, "tmp") }
-  let(:destination_file_name) { "app.json" }
-  let(:destination_path) { File.join(destination_root, destination_file_name) }
-
-  before do
-    FileUtils.rm destination_path if File.exist?(destination_path)
-  end
-
-  describe "#invoke!" do
-    context "when calling multiple times with the same root key" do
-      before do
-        described_class.new(
-          destination_root,
-          destination_file_name,
-          env: {
-            SMTP_ADDRESS: {required: true}
-          }
-        ).invoke!
-      end
-
-      it "deep merges the hash" do
-        described_class.new(
-          destination_root,
-          destination_file_name,
-          env: {
-            HEROKU_APP_NAME: {required: true}
-          }
-        ).invoke!
-
-        expected = <<~JSON
-          {
-            "env": {
-              "SMTP_ADDRESS": {
-                "required": true
-              },
-              "HEROKU_APP_NAME": {
-                "required": true
-              }
-            }
-          }
-        JSON
-        expect(existing_json).to eq(expected.chomp)
-      end
-    end
-  end
-
-  describe "#revoke!" do
-    before do
-      described_class.new(
-        destination_root,
-        destination_file_name,
-        env: {
-          foo: {required: true},
-          bar: {required: true}
-        }
-      ).invoke!
-    end
-
-    it "removes data from the JSON" do
-      described_class.new(
-        destination_root,
-        destination_file_name,
-        env: {
-          foo: {required: true}
-        }
-      ).revoke!
-
-      expected = <<~JSON
-        {
-          "env": {
-            "bar": {
-              "required": true
-            }
-          }
-        }
-      JSON
-      expect(existing_json).to eq(expected.chomp)
-    end
-  end
-
-  private
-
-  def existing_json
-    IO.read(destination_path)
-  end
-end

data/spec/fakes/bin/heroku

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.join("..", "..", "support", "fake_heroku"), File.dirname(__FILE__))
-
-FakeHeroku.new(ARGV).run!