suspenders 1.52.0 → 1.55.1

data/lib/suspenders/app_builder.rb

@@ -15,10 +15,11 @@ module Suspenders
       :set_heroku_honeybadger_env,
       :set_heroku_rails_secrets,
       :set_heroku_remotes,
+      :set_heroku_buildpacks
     )
 
     def readme
-      template 'README.md.erb', 'README.md'
+      template "README.md.erb", "README.md"
     end
 
     def gitignore
@@ -32,7 +33,7 @@ module Suspenders
     def setup_rack_mini_profiler
       copy_file(
         "rack_mini_profiler.rb",
-        "config/initializers/rack_mini_profiler.rb",
+        "config/initializers/rack_mini_profiler.rb"
       )
     end
 
@@ -41,15 +42,15 @@ module Suspenders
     end
 
     def raise_on_delivery_errors
-      replace_in_file 'config/environments/development.rb',
-        'raise_delivery_errors = false', 'raise_delivery_errors = true'
+      replace_in_file "config/environments/development.rb",
+        "raise_delivery_errors = false", "raise_delivery_errors = true"
     end
 
     def set_test_delivery_method
       inject_into_file(
         "config/environments/development.rb",
         "\n  config.action_mailer.delivery_method = :file",
-        after: "config.action_mailer.raise_delivery_errors = true",
+        after: "config.action_mailer.raise_delivery_errors = true"
       )
     end
 
@@ -89,47 +90,35 @@ module Suspenders
 
       RUBY
 
-      inject_into_class 'config/application.rb', 'Application', config
+      inject_into_class "config/application.rb", "Application", config
     end
 
     def configure_local_mail
       copy_file "email.rb", "config/initializers/email.rb"
     end
 
-    def enable_rack_canonical_host
-      config = <<-RUBY
-  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
-      RUBY
-
-      configure_environment "production", config
-    end
-
-    def enable_rack_deflater
-      configure_environment "production", "config.middleware.use Rack::Deflater"
-    end
-
     def setup_asset_host
-      replace_in_file 'config/environments/production.rb',
+      replace_in_file "config/environments/production.rb",
         "# config.action_controller.asset_host = 'http://assets.example.com'",
         'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))'
 
       if File.exist?("config/initializers/assets.rb")
-        replace_in_file 'config/initializers/assets.rb',
+        replace_in_file "config/initializers/assets.rb",
           "config.assets.version = '1.0'",
           'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
       end
 
-      config = <<-EOD
-config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=31557600",
-  }
+      config = <<~EOD
+        config.public_file_server.headers = {
+            "Cache-Control" => "public, max-age=31557600",
+          }
       EOD
 
       configure_environment("production", config)
     end
 
     def setup_secret_token
-      template 'secrets.yml', 'config/secrets.yml', force: true
+      template "secrets.yml", "config/secrets.yml", force: true
     end
 
     def disallow_wrapping_parameters
@@ -137,7 +126,7 @@ config.public_file_server.headers = {
     end
 
     def use_postgres_config_template
-      template 'postgresql_database.yml.erb', 'config/database.yml',
+      template "postgresql_database.yml.erb", "config/database.yml",
         force: true
     end
 
@@ -146,9 +135,9 @@ config.public_file_server.headers = {
     end
 
     def replace_gemfile(path)
-      template 'Gemfile.erb', 'Gemfile', force: true do |content|
+      template "Gemfile.erb", "Gemfile", force: true do |content|
         if path
-          content.gsub(%r{gem .suspenders.}) { |s| %{#{s}, path: "#{path}"} }
+          content.gsub(%r{gem .suspenders.}) { |s| %(#{s}, path: "#{path}") }
         else
           content
         end
@@ -156,7 +145,7 @@ config.public_file_server.headers = {
     end
 
     def ruby_version
-      create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
+      create_file ".ruby-version", "#{Suspenders::RUBY_VERSION}\n"
     end
 
     def configure_i18n_for_missing_translations
@@ -165,7 +154,7 @@ config.public_file_server.headers = {
     end
 
     def configure_action_mailer_in_specs
-      copy_file 'action_mailer.rb', 'spec/support/action_mailer.rb'
+      copy_file "action_mailer.rb", "spec/support/action_mailer.rb"
     end
 
     def configure_time_formats
@@ -174,109 +163,51 @@ config.public_file_server.headers = {
     end
 
     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 "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"))},
+        %{ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))}
       )
     end
 
-    def replace_default_puma_configuration
-      copy_file "puma.rb", "config/puma.rb", force: true
-    end
-
-    def set_up_forego
-      copy_file "Procfile", "Procfile"
-    end
-
-    def setup_default_directories
-      [
-        'app/views/pages',
-        'spec/lib',
-        'spec/controllers',
-        'spec/helpers',
-        'spec/support/matchers',
-        'spec/support/mixins',
-        'spec/support/shared_examples'
-      ].each do |dir|
-        empty_directory_with_keep_file dir
-      end
-    end
-
-    def copy_dotfiles
-      directory("dotfiles", ".")
-    end
-
     def create_heroku_apps(flags)
       create_staging_heroku_app(flags)
       create_production_heroku_app(flags)
     end
 
     def configure_automatic_deployment
-      deploy_command = <<-YML.strip_heredoc
-      deployment:
-        staging:
-          branch: master
-          commands:
-            - bin/deploy staging
-      YML
-
-      append_file "circle.yml", deploy_command
+      append_file "Procfile", "release: bin/auto_migrate\n"
+      copy_file "bin_auto_migrate", "bin/auto_migrate"
     end
 
     def create_github_repo(repo_name)
       run "hub create #{repo_name}"
     end
 
-    def setup_bundler_audit
-      copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
-      append_file "Rakefile", %{\ntask default: "bundle:audit"\n}
-    end
-
-    def setup_spring
-      bundle_command "exec spring binstub --all"
-    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
 
-    def customize_error_pages
-      meta_tags =<<-EOS
-  <meta charset="utf-8" />
-  <meta name="viewport" content="initial-scale=1" />
-      EOS
-
-      %w(500 404 422).each do |page|
-        path = "public/#{page}.html"
-        if File.exist?(path)
-          inject_into_file path, meta_tags, after: "<head>\n"
-          replace_in_file path, /<!--.+-->\n/, ''
-        end
-      end
-    end
-
     def remove_config_comment_lines
       config_files = [
         "application.rb",
         "environment.rb",
         "environments/development.rb",
         "environments/production.rb",
-        "environments/test.rb",
+        "environments/test.rb"
       ]
 
       config_files.each do |config_file|
         path = File.join(destination_root, "config/#{config_file}")
 
-        accepted_content = File.readlines(path).reject do |line|
+        accepted_content = File.readlines(path).reject { |line|
           line =~ /^.*#.*$/ || line =~ /^$\n/
-        end
+        }
 
         File.open(path, "w") do |file|
           accepted_content.each { |line| file.puts line }
@@ -285,23 +216,23 @@ config.public_file_server.headers = {
     end
 
     def remove_routes_comment_lines
-      replace_in_file 'config/routes.rb',
+      replace_in_file "config/routes.rb",
         /Rails\.application\.routes\.draw do.*end/m,
         "Rails.application.routes.draw do\nend"
     end
 
     def setup_default_rake_task
-      append_file 'Rakefile' do
-        <<-EOS
-task(:default).clear
-task default: [:spec]
-
-if defined? RSpec
-  task(:spec).clear
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.verbose = false
-  end
-end
+      append_file "Rakefile" do
+        <<~EOS
+          task(:default).clear
+          task default: [:spec]
+          
+          if defined? RSpec
+            task(:spec).clear
+            RSpec::Core::RakeTask.new(:spec) do |t|
+              t.verbose = false
+            end
+          end
         EOS
       end
     end
@@ -309,7 +240,7 @@ end
     private
 
     def raise_on_missing_translations_in(environment)
-      config = 'config.action_view.raise_on_missing_translations = true'
+      config = "config.action_view.raise_on_missing_translations = true"
 
       uncomment_lines("config/environments/#{environment}.rb", config)
     end

data/lib/suspenders/generators/advisories_generator.rb

@@ -0,0 +1,15 @@
+require_relative "base"
+
+module Suspenders
+  class AdvisoriesGenerator < Generators::Base
+    def bundler_audit_gem
+      gem "bundler-audit", ">= 0.7.0", require: false, group: %i[development test]
+      Bundler.with_unbundled_env { run "bundle install" }
+    end
+
+    def rake_task
+      copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
+      append_file "Rakefile", %(\ntask default: "bundle:audit"\n)
+    end
+  end
+end

data/lib/suspenders/generators/analytics_generator.rb

@@ -10,7 +10,7 @@ module Suspenders
     def render_partial
       if File.exist?(js_partial)
         inject_into_file js_partial,
-          %{\n\n<%= render "analytics" %>},
+          %(\n\n<%= render "analytics" %>),
           after: "<%= yield :javascript %>"
       end
     end

data/lib/suspenders/generators/app_generator.rb

@@ -1,39 +1,39 @@
-require 'rails/generators'
-require 'rails/generators/rails/app/app_generator'
+require "rails/generators"
+require "rails/generators/rails/app/app_generator"
 
 module Suspenders
   class AppGenerator < Rails::Generators::AppGenerator
     hide!
 
     class_option :database, type: :string, aliases: "-d", default: "postgresql",
-      desc: "Configure for selected database (options: #{DATABASES.join("/")})"
+                            desc: "Configure for selected database (options: #{DATABASES.join("/")})"
 
     class_option :heroku, type: :boolean, aliases: "-H", default: false,
-      desc: "Create staging and production Heroku apps"
+                          desc: "Create staging and production Heroku apps"
 
     class_option :heroku_flags, type: :string, default: "",
-      desc: "Set extra Heroku flags"
+                                desc: "Set extra Heroku flags"
 
     class_option :github, type: :string, default: nil,
-      desc: "Create Github repository and add remote origin pointed to repo"
+                          desc: "Create Github repository and add remote origin pointed to repo"
 
     class_option :version, type: :boolean, aliases: "-v", group: :suspenders,
-      desc: "Show Suspenders version number and quit"
+                           desc: "Show Suspenders version number and quit"
 
-    class_option :help, type: :boolean, aliases: '-h', group: :suspenders,
-      desc: "Show this help message and quit"
+    class_option :help, type: :boolean, aliases: "-h", group: :suspenders,
+                        desc: "Show this help message and quit"
 
     class_option :path, type: :string, default: nil,
-      desc: "Path to the gem"
+                        desc: "Path to the gem"
 
     class_option :skip_test, type: :boolean, default: true,
-      desc: "Skip Test Unit"
+                             desc: "Skip Test Unit"
 
     class_option :skip_system_test,
-                 type: :boolean, default: true, desc: "Skip system test files"
+      type: :boolean, default: true, desc: "Skip system test files"
 
     class_option :skip_turbolinks,
-                 type: :boolean, default: true, desc: "Skip turbolinks gem"
+      type: :boolean, default: true, desc: "Skip turbolinks gem"
 
     def finish_template
       invoke :suspenders_customization
@@ -47,14 +47,9 @@ module Suspenders
       invoke :setup_secret_token
       invoke :configure_app
       invoke :copy_miscellaneous_files
-      invoke :customize_error_pages
-      invoke :setup_dotfiles
       invoke :setup_database
       invoke :create_github_repo
-      invoke :setup_bundler_audit
-      invoke :setup_spring
       invoke :generate_default
-      invoke :setup_default_directories
       invoke :create_heroku_apps
       invoke :generate_deployment_default
       invoke :remove_config_comment_lines
@@ -64,13 +59,13 @@ module Suspenders
 
     def customize_gemfile
       build :replace_gemfile, options[:path]
-      bundle_command 'install'
+      bundle_command "install"
     end
 
     def setup_database
-      say 'Setting up database'
+      say "Setting up database"
 
-      if 'postgresql' == options[:database]
+      if options[:database] == "postgresql"
         build :use_postgres_config_template
       end
 
@@ -78,7 +73,7 @@ module Suspenders
     end
 
     def setup_development_environment
-      say 'Setting up the development environment'
+      say "Setting up the development environment"
       build :configure_local_mail
       build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
@@ -91,25 +86,20 @@ module Suspenders
     end
 
     def setup_production_environment
-      say 'Setting up the production environment'
-      build :enable_rack_canonical_host
-      build :enable_rack_deflater
+      say "Setting up the production environment"
       build :setup_asset_host
     end
 
     def setup_secret_token
-      say 'Moving secret token out of version control'
+      say "Moving secret token out of version control"
       build :setup_secret_token
     end
 
     def configure_app
-      say 'Configuring app'
+      say "Configuring app"
       build :configure_action_mailer
       build :configure_time_formats
       build :setup_default_rake_task
-      build :replace_default_puma_configuration
-      build :set_up_forego
-      build :setup_rack_mini_profiler
     end
 
     def create_heroku_apps
@@ -121,6 +111,7 @@ module Suspenders
         build :set_heroku_application_host
         build :set_heroku_honeybadger_env
         build :set_heroku_backup_schedule
+        build :set_heroku_buildpacks
         build :create_heroku_pipeline
         build :configure_automatic_deployment
       end
@@ -128,39 +119,16 @@ module Suspenders
 
     def create_github_repo
       if !options[:skip_git] && options[:github]
-        say 'Creating Github repo'
+        say "Creating Github repo"
         build :create_github_repo, options[:github]
       end
     end
 
-    def setup_dotfiles
-      build :copy_dotfiles
-    end
-
-    def setup_default_directories
-      build :setup_default_directories
-    end
-
-    def setup_bundler_audit
-      say "Setting up bundler-audit"
-      build :setup_bundler_audit
-    end
-
-    def setup_spring
-      say "Springifying binstubs"
-      build :setup_spring
-    end
-
     def copy_miscellaneous_files
-      say 'Copying miscellaneous support files'
+      say "Copying miscellaneous support files"
       build :copy_miscellaneous_files
     end
 
-    def customize_error_pages
-      say 'Customizing the 500/404/422 pages'
-      build :customize_error_pages
-    end
-
     def remove_config_comment_lines
       build :remove_config_comment_lines
     end
@@ -171,6 +139,8 @@ module Suspenders
 
     def generate_default
       run("spring stop")
+      generate("suspenders:runner")
+      generate("suspenders:profiler")
       generate("suspenders:json")
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
@@ -185,11 +155,15 @@ module Suspenders
       generate("suspenders:lint")
       generate("suspenders:jobs")
       generate("suspenders:analytics")
-      generate("suspenders:views")
+      generate("suspenders:inline_svg")
+      generate("suspenders:advisories")
+      generate("suspenders:preloader")
     end
 
     def generate_deployment_default
       generate("suspenders:staging:pull_requests")
+      generate("suspenders:production:single_redirect")
+      generate("suspenders:production:compression")
       generate("suspenders:production:force_tls")
       generate("suspenders:production:email")
       generate("suspenders:production:timeout")
@@ -197,13 +171,17 @@ module Suspenders
       generate("suspenders:production:manifest")
     end
 
+    def generate_views
+      generate("suspenders:views")
+    end
+
     def outro
-      say 'Congratulations! You just pulled our suspenders.'
+      say "Congratulations! You just pulled our suspenders."
       say honeybadger_outro
     end
 
     def self.banner
-      "suspenders #{arguments.map(&:usage).join(' ')} [options]"
+      "suspenders #{arguments.map(&:usage).join(" ")} [options]"
     end
 
     protected