suspenders 1.51.0 → 1.55.0

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,13 +24,13 @@ 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
 
-    def configure_spec_support_features
-      empty_directory_with_keep_file "spec/features"
-      empty_directory_with_keep_file "spec/support/features"
+    def configure_system_tests
+      empty_directory_with_keep_file "spec/system"
+      empty_directory_with_keep_file "spec/support/system"
     end
 
     def configure_i18n_for_test_environment
@@ -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.0".freeze
-  RUBY_VERSION = IO.
-    read("#{File.dirname(__FILE__)}/../../.ruby-version").
-    strip.
-    freeze
-  VERSION = "1.51.0".freeze
+  RAILS_VERSION = "~> 6.0.0".freeze
+  RUBY_VERSION = IO
+    .read("#{File.dirname(__FILE__)}/../../.ruby-version")
+    .strip
+    .freeze
+  VERSION = "1.55.0".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!

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

@@ -20,10 +20,10 @@ RSpec.describe "Command line help output" do
 
   it "provides help and version usage within the suspenders group" do
     expect(help_text).to include <<~EOH
-Suspenders options:
-  -h, [--help], [--no-help]        # Show this help message and quit
-  -v, [--version], [--no-version]  # Show Suspenders version number and quit
-EOH
+      Suspenders options:
+        -h, [--help], [--no-help]        # Show this help message and quit
+        -v, [--version], [--no-version]  # Show Suspenders version number and quit
+    EOH
   end
 
   it "does not show the default extended rails help section" do

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

@@ -16,9 +16,9 @@ RSpec.describe "Heroku" do
       expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
       expect(FakeHeroku).to have_configured_vars(
         "production",
-        "SECRET_KEY_BASE",
+        "SECRET_KEY_BASE"
       )
-      %w(staging production).each do |env|
+      %w[staging production].each do |env|
         expect(FakeHeroku).to have_configured_vars(env, "APPLICATION_HOST")
         expect(FakeHeroku).to have_configured_vars(env, "HONEYBADGER_ENV")
       end
@@ -27,8 +27,8 @@ 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("bin/setup").to be_executable
 
@@ -36,24 +36,13 @@ RSpec.describe "Heroku" do
 
       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
 
   context "--heroku with region flag" do
     before(:all) do
       clean_up
-      run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
+      run_suspenders(%(--heroku=true --heroku-flags="--region eu"))
       setup_app_dependencies
     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/lint_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:lint", type: :generator do
+  it "sets up standard" do
+    with_app { generate("suspenders:lint") }
+
+    expect("Gemfile").to match_contents(/standard/)
+
+    run_in_project do
+      expect(`rake -T`).to include("rake standard")
+    end
+  end
+
+  it "removes standard" do
+    with_app do
+      generate("suspenders:lint")
+      destroy("suspenders:lint")
+    end
+
+    expect("Gemfile").not_to match_contents(/standard/)
+
+    run_in_project do
+      expect(`rake -T`).not_to include("rake standard")
+    end
+  end
+end