suspenders 1.50.0 → 1.54.1

data/lib/suspenders/generators/views_generator.rb

@@ -1,12 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class ViewsGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class ViewsGenerator < Generators::Base
     def create_partials_directory
       empty_directory "app/views/application"
     end

data/lib/suspenders/version.rb

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

data/spec/adapters/heroku_spec.rb

@@ -11,9 +11,9 @@ 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/)
+          with(setup_file, /heroku apps:info --app #{app_name.dasherize}-production/)
         expect(app_builder).to have_received(:append_file).
-          with(setup_file, /heroku join --app #{app_name.dasherize}-staging/)
+          with(setup_file, /heroku apps:info --app #{app_name.dasherize}-staging/)
       end
 
       it "sets the heroku rails secrets" do
@@ -55,6 +55,26 @@ module Suspenders
         )
       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
@@ -67,6 +87,12 @@ module Suspenders
       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/features/advisories_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:advisories", type: :generator do
+  it "configures bundler-audit" do
+    with_app { generate("suspenders:advisories") }
+
+    run_in_project do
+      expect(`rake -T`).to include("rake bundle:audit")
+    end
+    expect("lib/tasks/bundler_audit.rake").to \
+      match_contents(/Bundler::Audit::Task.new/)
+    expect("Gemfile").to match_contents(/bundler-audit/)
+  end
+
+  it "removes bundler-audit" do
+    with_app { destroy("suspenders:advisories") }
+
+    expect("Gemfile").not_to match_contents(/bundler-audit/)
+    expect("lib/tasks/bundler_audit.rake").not_to exist_as_a_file
+    run_in_project do
+      expect(`rake -T`).not_to include("rake bundle:audit")
+    end
+  end
+end

data/spec/features/api_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe "Suspend a new project with --api flag" do
     run_suspenders("--api")
 
     Dir.chdir(project_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         expect(`rake`).to include("0 failures")
       end
     end

data/spec/features/ci_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:ci", type: :generator do
+  it "configures Circle with SimpleCov" do
+    with_app { generate("suspenders:ci") }
+
+    expect("Gemfile").to match_contents(/simplecov/)
+    expect("test/test_helper.rb").to match_contents(/SimpleCov.coverage_dir/)
+    expect("test/test_helper.rb").to match_contents(/SimpleCov.start/)
+    expect("circle.yml").to exist_as_a_file
+  end
+
+  it "removes Circle and SimpleCov" do
+    with_app { destroy("suspenders:ci") }
+
+    expect("circle.yml").not_to exist_as_a_file
+    expect("test/test_helper.rb").not_to match_contents(/SimpleCov/)
+    expect("Gemfile").not_to match_contents(/simplecov/)
+  end
+
+  it "configures RSpec" do
+    with_app do
+      copy_file "spec_helper.rb", "spec/spec_helper.rb"
+
+      generate("suspenders:ci")
+    end
+
+    expect("spec/spec_helper.rb").to match_contents(/SimpleCov.coverage_dir/)
+    expect("spec/spec_helper.rb").to match_contents(/SimpleCov.start/)
+  end
+end

data/spec/features/db_optimizations_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:db_optimizations", type: :generator do
+  it "configures bullet" do
+    with_app { generate("suspenders:db_optimizations") }
+
+    expect("Gemfile").to match_contents(/bullet/)
+    expect("config/environments/development.rb").to \
+      match_contents(/Bullet.enable/)
+  end
+
+  it "removes bullet" do
+    with_app { destroy("suspenders:db_optimizations") }
+
+    expect("Gemfile").not_to match_contents(/bullet/)
+    expect("config/environments/development.rb").not_to \
+      match_contents(/Bullet.enable/)
+  end
+end

data/spec/features/heroku_spec.rb

@@ -27,26 +27,15 @@ RSpec.describe "Heroku" do
       bin_setup_path = "#{project_path}/bin/setup"
       bin_setup = IO.read(bin_setup_path)
 
-      expect(bin_setup).to match(/^if heroku join --app #{app_name}-production/)
-      expect(bin_setup).to match(/^if heroku join --app #{app_name}-staging/)
+      expect(bin_setup).to assert_access_to_heroku_app("#{app_name}-production")
+      expect(bin_setup).to assert_access_to_heroku_app("#{app_name}-staging")
       expect(bin_setup).to match(/^git config heroku.remote staging/)
-      expect(File.stat(bin_setup_path)).to be_executable
+      expect("bin/setup").to be_executable
 
       readme = IO.read("#{project_path}/README.md")
 
       expect(readme).to include("./bin/deploy staging")
       expect(readme).to include("./bin/deploy production")
-
-      circle_yml_path = "#{project_path}/circle.yml"
-      circle_yml = IO.read(circle_yml_path)
-
-      expect(circle_yml).to include <<-YML.strip_heredoc
-      deployment:
-        staging:
-          branch: master
-          commands:
-            - bin/deploy staging
-      YML
     end
   end
 
@@ -63,6 +52,10 @@ RSpec.describe "Heroku" do
     end
   end
 
+  def assert_access_to_heroku_app(app_name)
+    match(/^if heroku apps:info --app #{app_name}/)
+  end
+
   def clean_up
     drop_dummy_database
     remove_project_directory

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/json_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "suspenders:json" do
+RSpec.describe "suspenders:json", type: :generator do
   it "generates the Gemfile for JSON parsing" do
     with_app { generate("suspenders:json") }
 

data/spec/features/new_project_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe "Suspend a new project with default configuration" do
 
   it "ensures project specs pass" do
     Dir.chdir(project_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         expect(`rake`).to include('0 failures')
       end
     end
@@ -31,7 +31,7 @@ RSpec.describe "Suspend a new project with default configuration" do
 
   it "includes the bundle:audit task" do
     Dir.chdir(project_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         expect(`rails -T`).to include("rails bundle:audit")
       end
     end
@@ -44,9 +44,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "copies dotfiles" do
-    %w[.ctags .env].each do |dotfile|
-      expect(File).to exist("#{project_path}/#{dotfile}")
-    end
+    expect(File).to exist("#{project_path}/.env")
   end
 
   it "doesn't generate test directory" do
@@ -65,9 +63,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "makes bin/setup executable" do
-    bin_setup_path = "#{project_path}/bin/setup"
-
-    expect(File.stat(bin_setup_path)).to be_executable
+    expect("bin/setup").to be_executable
   end
 
   it "adds support file for action mailer" do
@@ -88,28 +84,11 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(hound_config_file).to include "enabled: true"
   end
 
-  it "ensures Gemfile contains `rack-mini-profiler`" do
-    gemfile = IO.read("#{project_path}/Gemfile")
-
-    expect(gemfile).to include %{gem "rack-mini-profiler", require: false}
-  end
-
-  it "ensures .sample.env defaults to RACK_MINI_PROFILER=0" do
-    env = IO.read("#{project_path}/.env")
-
-    expect(env).to include "RACK_MINI_PROFILER=0"
-  end
-
   it "initializes ActiveJob to avoid memory bloat" do
     expect(File).
       to exist("#{project_path}/config/initializers/active_job.rb")
   end
 
-  it "creates a rack-mini-profiler initializer" do
-    expect(File).
-      to exist("#{project_path}/config/initializers/rack_mini_profiler.rb")
-  end
-
   it "records pageviews through Segment if ENV variable set" do
     expect(analytics_partial).
       to include(%{<% if ENV["SEGMENT_KEY"] %>})
@@ -258,20 +237,18 @@ RSpec.describe "Suspend a new project with default configuration" do
 
     expect(bin_setup).to include("PARENT_APP_NAME=#{app_name.dasherize}-staging")
     expect(bin_setup).to include("APP_NAME=#{app_name.dasherize}-staging-pr-$1")
-    expect(bin_setup).
-      to include("heroku run rails db:migrate --exit-code --app $APP_NAME")
     expect(bin_setup).to include("heroku ps:scale worker=1 --app $APP_NAME")
     expect(bin_setup).to include("heroku restart --app $APP_NAME")
 
-    expect(File.stat(bin_setup_path)).to be_executable
+    expect("bin/setup_review_app").to be_executable
   end
 
   it "creates deploy script" do
     bin_deploy_path = "#{project_path}/bin/deploy"
     bin_deploy = IO.read(bin_deploy_path)
 
-    expect(bin_deploy).to include("heroku run rails db:migrate --exit-code")
-    expect(File.stat(bin_deploy_path)).to be_executable
+    expect(bin_deploy).to include("git push")
+    expect("bin/deploy").to be_executable
   end
 
   it "creates heroku application manifest file with application name in it" do
@@ -289,22 +266,27 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(gemfile).to match(/high_voltage/)
   end
 
-  it "adds and configures bourbon and neat" do
+  it "adds sassc-rails" do
+    gemfile = read_project_file("Gemfile")
+
+    expect(gemfile).to match(/sassc-rails/)
+  end
+
+  it "adds and configures bourbon" do
     gemfile = read_project_file("Gemfile")
 
     expect(gemfile).to match(/bourbon/)
-    expect(gemfile).to match(/neat/)
   end
 
-  it "configures bourbon, neat, and bitters" do
+  it "configures bourbon, and bitters" do
     app_css = read_project_file(%w(app assets stylesheets application.scss))
     expect(app_css).to match(
-      /normalize\.css\/normalize.*bourbon.*neat.*base/m,
+      /normalize\.css\/normalize.*bourbon.*base/m,
     )
   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/preloader_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:preloader", type: :generator do
+  it "adds binstubs for Spring" do
+    with_app { generate("suspenders:preloader") }
+
+    expect("bin/rails").to match_contents(/spring/)
+    expect("config/spring.rb").to exist_as_a_file
+    expect("config/environments/test.rb").to \
+      match_contents(/config.cache_classes = false/)
+    expect("Gemfile").to match_contents(/spring/)
+    expect("Gemfile").to match_contents(/spring-watcher-listen/)
+  end
+
+  it "removes Spring binstubs" do
+    with_app { destroy("suspenders:preloader") }
+
+    expect("config/environments/test.rb").to \
+      match_contents(/config.cache_classes = true/)
+    expect("config/spring.rb").not_to exist_as_a_file
+    expect("bin/rails").not_to match_contents(/spring/)
+    expect("Gemfile").not_to match_contents(/spring-watcher-listen/)
+    expect("Gemfile").not_to match_contents(/spring/)
+  end
+end