suspenders 1.52.0 → 1.55.1

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

@@ -0,0 +1,15 @@
+require_relative "../base"
+
+module Suspenders
+  module Production
+    class SingleRedirect < Generators::Base
+      def add_rack_canonical_host
+        inject_into_file(
+          "config/environments/production.rb",
+          %{\n  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")},
+          before: "\nend"
+        )
+      end
+    end
+  end
+end

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

@@ -5,16 +5,17 @@ module Suspenders
     class TimeoutGenerator < Generators::Base
       def add_gem
         gem "rack-timeout", group: :production
+        Bundler.with_unbundled_env { run "bundle install" }
       end
 
       def configure_rack_timeout
-        append_file ".env", rack_timeout_config
+        append_file ".sample.env", rack_timeout_config
       end
 
       private
 
       def rack_timeout_config
-        %{RACK_TIMEOUT_SERVICE_TIMEOUT=10}
+        %(RACK_TIMEOUT_SERVICE_TIMEOUT=10)
       end
     end
   end

data/lib/suspenders/generators/profiler_generator.rb

@@ -0,0 +1,35 @@
+require_relative "base"
+
+module Suspenders
+  class ProfilerGenerator < Generators::Base
+    def augment_default_env
+      append_to_file ".sample.env", "RACK_MINI_PROFILER=0\n"
+    rescue Errno::ENOENT
+      create_file ".sample.env", "RACK_MINI_PROFILER=0\n"
+    rescue Thor::Error => e
+      if e.message.match?(/does not appear to exist/)
+        create_file ".sample.env", "RACK_MINI_PROFILER=0\n"
+      else
+        raise
+      end
+    end
+
+    def add_gem
+      gem "rack-mini-profiler", require: false
+      Bundler.with_unbundled_env { run "bundle install" }
+    end
+
+    def configure_rack_mini_profiler
+      copy_file(
+        "rack_mini_profiler.rb",
+        "config/initializers/rack_mini_profiler.rb",
+        force: false,
+        skip: true
+      )
+    end
+
+    def update_readme
+      append_template_to_file "README.md", "partials/profiler_readme.md"
+    end
+  end
+end

data/lib/suspenders/generators/runner_generator.rb

@@ -0,0 +1,48 @@
+require_relative "base"
+
+module Suspenders
+  class RunnerGenerator < Generators::Base
+    def procfile
+      copy_file "Procfile", "Procfile"
+    end
+
+    def sample_env
+      copy_file "sample_env", ".sample.env"
+    end
+
+    def copy_sample_env
+      if bin_setup_is_ruby?
+        inject_template_into_file(
+          "bin/setup",
+          "partials/runner_setup.rb",
+          before: %(  puts "\\n== Preparing database ==")
+        )
+      elsif bin_setup_mentions_ci?
+        inject_into_file(
+          "bin/setup",
+          %(  cp -i .sample.env .env\n),
+          after: %(if [ -z "$CI" ]; then\n)
+        )
+      else
+        append_to_file(
+          "bin/setup",
+          %(\nif [ -z "$CI" ]; then\n  cp -i .sample.env .env\nfi)
+        )
+      end
+    end
+
+    def update_readme
+      append_template_to_file "README.md", "partials/runner_readme.md"
+    end
+
+    private
+
+    def bin_setup_is_ruby?
+      File.read("bin/setup", 20).match?(%r{#!/usr/bin/env ruby})
+    end
+
+    def bin_setup_mentions_ci?
+      File.read("bin/setup").match?(/if \[ -z "\$CI" \]/)
+    end
+  end
+end

data/lib/suspenders/generators/staging/pull_requests_generator.rb

@@ -4,18 +4,10 @@ module Suspenders
   module Staging
     class PullRequestsGenerator < Generators::Base
       def configure_heroku_staging_pr_pipeline_host
-        config = <<-RUBY
-
-  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
-        RUBY
-
-        inject_into_file(
+        inject_template_into_file(
           "config/environments/production.rb",
-          config,
-          after: "Rails.application.configure do\n",
+          "partials/pull_requests_config.rb",
+          after: "Rails.application.configure do\n"
         )
       end
 
@@ -23,7 +15,7 @@ module Suspenders
         template(
           "bin_setup_review_app.erb",
           "bin/setup_review_app",
-          force: true,
+          force: true
         )
 
         run "chmod a+x bin/setup_review_app"

data/lib/suspenders/generators/static_generator.rb

@@ -4,7 +4,11 @@ module Suspenders
   class StaticGenerator < Generators::Base
     def add_high_voltage
       gem "high_voltage"
-      Bundler.with_clean_env { run "bundle install" }
+      Bundler.with_unbundled_env { run "bundle install" }
+    end
+
+    def make_placeholder_directory
+      empty_directory_with_keep_file "app/views/pages"
     end
   end
 end

data/lib/suspenders/generators/stylelint_generator.rb

@@ -26,7 +26,8 @@ module Suspenders
         @base.invoke @generator
       end
 
-      def revoke!; end
+      def revoke!
+      end
     end
 
     class ToggleComments

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -3,23 +3,22 @@ require_relative "base"
 module Suspenders
   class StylesheetBaseGenerator < Generators::Base
     def add_stylesheet_gems
-      gem "bourbon", ">= 5.0.1"
-      gem "neat", ">= 3.0.1"
-      Bundler.with_clean_env { run "bundle install" }
+      gem "bourbon", ">= 6.0.0"
+      Bundler.with_unbundled_env { run "bundle install" }
+    end
+
+    def remove_prior_config
+      remove_file "app/assets/stylesheets/application.css"
     end
 
     def add_css_config
       copy_file(
         "application.scss",
         "app/assets/stylesheets/application.scss",
-        force: true,
+        force: true
       )
     end
 
-    def remove_prior_config
-      remove_file "app/assets/stylesheets/application.css"
-    end
-
     def install_bitters
       run "bitters install --path app/assets/stylesheets"
     end

data/lib/suspenders/generators/testing_generator.rb

@@ -4,10 +4,10 @@ module Suspenders
   class TestingGenerator < Generators::Base
     def add_testing_gems
       gem "spring-commands-rspec", group: :development
-      gem "rspec-rails", "~> 3.6", group: %i(development test)
+      gem "rspec-rails", "~> 3.6", group: %i[development test]
       gem "shoulda-matchers", group: :test
 
-      Bundler.with_clean_env { run "bundle install" }
+      Bundler.with_unbundled_env { run "bundle install" }
     end
 
     def generate_rspec
@@ -24,7 +24,7 @@ module Suspenders
     def provide_shoulda_matchers_config
       copy_file(
         "shoulda_matchers_config_rspec.rb",
-        "spec/support/shoulda_matchers.rb",
+        "spec/support/shoulda_matchers.rb"
       )
     end
 
@@ -40,16 +40,5 @@ module Suspenders
     def configure_action_mailer_in_specs
       copy_file "action_mailer.rb", "spec/support/action_mailer.rb"
     end
-
-    private
-
-    def empty_directory_with_keep_file(destination)
-      empty_directory(destination, {})
-      keep_file(destination)
-    end
-
-    def keep_file(destination)
-      create_file(File.join(destination, ".keep"))
-    end
   end
 end

data/lib/suspenders/version.rb

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

data/spec/adapters/heroku_spec.rb

@@ -10,10 +10,10 @@ module Suspenders
 
         Heroku.new(app_builder).set_heroku_remotes
 
-        expect(app_builder).to have_received(:append_file).
-          with(setup_file, /heroku join --app #{app_name.dasherize}-production/)
-        expect(app_builder).to have_received(:append_file).
-          with(setup_file, /heroku join --app #{app_name.dasherize}-staging/)
+        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
@@ -23,10 +23,10 @@ module Suspenders
         Heroku.new(app_builder).set_heroku_rails_secrets
 
         expect(app_builder).to(
-          have_configured_var("staging", "SECRET_KEY_BASE"),
+          have_configured_var("staging", "SECRET_KEY_BASE")
         )
         expect(app_builder).to(
-          have_configured_var("production", "SECRET_KEY_BASE"),
+          have_configured_var("production", "SECRET_KEY_BASE")
         )
       end
 
@@ -47,26 +47,52 @@ module Suspenders
         Heroku.new(app_builder).set_heroku_application_host
 
         expect(app_builder).to(
-          have_configured_var("staging", "APPLICATION_HOST"),
+          have_configured_var("staging", "APPLICATION_HOST")
         )
 
         expect(app_builder).to(
-          have_configured_var("production", "APPLICATION_HOST"),
+          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}/)
+        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

@@ -0,0 +1,89 @@
+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 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join('..', '..', 'support', 'fake_heroku'), File.dirname(__FILE__))
+require File.expand_path(File.join("..", "..", "support", "fake_heroku"), File.dirname(__FILE__))
 
 FakeHeroku.new(ARGV).run!

data/spec/fakes/bin/hub

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