suspenders 1.50.0 → 1.54.1

data/spec/features/production/compression_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:production:compression", type: :generator do
+  context "generate" do
+    it "adds Rack::Deflater to the middleware" do
+      with_app { generate("suspenders:production:compression") }
+
+      expect("config/environments/production.rb").to match_contents(
+        %r{config.middleware.use Rack::Deflater},
+      )
+    end
+  end
+
+  context "destroy" do
+    it "removes Rack::Deflater to the middleware" do
+      with_app { destroy("suspenders:production:compression") }
+
+      expect("config/environments/production.rb").not_to match_contents(
+        %r{Rack::Deflater},
+      )
+    end
+  end
+end

data/spec/features/production/deployment_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:production:deployment", type: :generator do
+  it "generates the configuration for a production deployment" do
+    rm "bin/deploy"
+
+    with_app { generate("suspenders:production:deployment") }
+
+    expect("bin/deploy").to exist_as_a_file
+    expect("bin/deploy").to be_executable
+    expect("README.md").to match_contents(%r{bin/deploy})
+  end
+
+  it "destroys the configuration for a production deployment" do
+    touch "bin/deploy"
+
+    with_app { destroy("suspenders:production:deployment") }
+
+    expect("bin/deploy").not_to exist_as_a_file
+    expect("README.md").not_to match_contents(%r{bin/deploy})
+  end
+end

data/spec/features/production/email_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "suspenders:production:email" do
+RSpec.describe "suspenders:production:email", type: :generator do
   it "generates the configuration for a production email deployment" do
     with_app { generate("suspenders:production:email") }
 

data/spec/features/production/manifest_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:production:manifest", type: :generator do
+  it "generates the manifest for a production build" do
+    with_app { generate("suspenders:production:manifest") }
+
+    expect("app.json").to contain_json(
+      name: SuspendersTestHelpers::APP_NAME.dasherize,
+      env: {
+        APPLICATION_HOST: { required: true },
+        AUTO_MIGRATE_DB: { value: true },
+        EMAIL_RECIPIENTS: { required: true },
+        HEROKU_APP_NAME: { required: true },
+        HEROKU_PARENT_APP_NAME: { required: true },
+        RACK_ENV: { required: true },
+        SECRET_KEY_BASE: { generator: "secret" },
+      },
+    )
+  end
+
+  it "destroys the manifest for a production build" do
+    with_app { destroy("suspenders:production:manifest") }
+
+    expect("app.json").not_to contain_json(
+      name: SuspendersTestHelpers::APP_NAME.dasherize,
+      env: {
+        APPLICATION_HOST: { required: true },
+        AUTO_MIGRATE_DB: { value: true },
+        EMAIL_RECIPIENTS: { required: true },
+        HEROKU_APP_NAME: { required: true },
+        HEROKU_PARENT_APP_NAME: { required: true },
+        RACK_ENV: { required: true },
+        SECRET_KEY_BASE: { generator: "secret" },
+      },
+    )
+  end
+end

data/spec/features/production/single_redirect_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:production:single_redirect", type: :generator do
+  context "generate" do
+    it "adds Rack::CanonicalHost to the production middleware" do
+      with_app { generate("suspenders:production:single_redirect") }
+      middleware_canonical_host = %r{config.middleware.use Rack::CanonicalHost, ENV.fetch\("APPLICATION_HOST"\)}
+
+      expect("config/environments/production.rb").to match_contents(
+        middleware_canonical_host,
+      )
+    end
+  end
+
+  context "destroy" do
+    it "removes Rack::CanonicalHost from the production middleware" do
+      with_app { destroy("suspenders:production:single_redirect") }
+      middleware_canonical_host = %r{config.middleware.use Rack::CanonicalHost, ENV.fetch\("APPLICATION_HOST"\)}
+
+      expect("config/environments/production.rb").not_to match_contents(
+        middleware_canonical_host,
+      )
+    end
+  end
+end

data/spec/features/profiler_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:profiler", type: :generator do
+  it "sets up rack-min-profiler" do
+    with_app { generate("suspenders:profiler") }
+
+    expect("config/initializers/rack_mini_profiler.rb").to \
+      match_contents(/Rack::MiniProfilerRails.initialize/)
+    expect("Gemfile").to match_contents(/rack-mini-profiler/)
+    expect(".env").to match_contents(/RACK_MINI_PROFILER=0/)
+  end
+
+  it "removes rack-min-profiler" do
+    with_app { destroy("suspenders:profiler") }
+
+    expect("config/initializers/rack_mini_profiler.rb").not_to exist_as_a_file
+    expect("Gemfile").not_to match_contents(/rack-mini-profiler/)
+    expect(".env").not_to exist_as_a_file
+  end
+end

data/spec/features/runner_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:runner", type: :generator do
+  it "configures the app for running" do
+    with_app { generate("suspenders:runner") }
+
+    expect("Procfile").to exist_as_a_file
+    expect(".sample.env").to exist_as_a_file
+    expect("bin/setup").to match_contents(/\.sample\.env/)
+    expect("README.md").to match_contents(/\.sample\.env/)
+  end
+
+  it "removes custom app running configuration" do
+    with_app { destroy("suspenders:runner") }
+
+    expect("README.md").not_to match_contents(/\.sample\.env/)
+    expect("bin/setup").not_to match_contents(/\.sample\.env/)
+    expect(".sample.env").not_to exist_as_a_file
+    expect("Procfile").not_to exist_as_a_file
+  end
+
+  it "configures the app with a shell script bin/setup" do
+    with_app do
+      copy_file "bin_setup", "bin/setup"
+      generate("suspenders:runner")
+    end
+
+    expect("bin/setup").to match_contents(/\.sample\.env/)
+  end
+end

data/spec/features/staging/pull_requests_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "suspenders:staging:pull_requests" do
+RSpec.describe "suspenders:staging:pull_requests", type: :generator do
   it "generates the configuration for Heroku pipeline review apps" do
     with_app { generate("suspenders:staging:pull_requests") }
 

data/spec/features/static_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:static", type: :generator do
+  it "adds the gem and pages directory" do
+    with_app { generate("suspenders:static") }
+
+    expect("Gemfile").to match_contents(/high_voltage/)
+    expect("app/views/pages/.keep").to exist_as_a_file
+  end
+
+  it "removes the gem and pages directory" do
+    with_app { destroy("suspenders:static") }
+
+    expect("app/views/pages/.keep").not_to exist_as_a_file
+    expect("Gemfile").not_to match_contents(/high_voltage/)
+  end
+end

data/spec/features/stylelint_spec.rb

@@ -0,0 +1,60 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:stylelint", type: :generator do
+  context "generate" do
+    it "creates .stylelintrc.json" do
+      with_app { generate("suspenders:stylelint") }
+
+      expect(".stylelintrc.json").
+        to match_contents(%r{"extends": "@thoughtbot/stylelint-config"})
+    end
+
+    it "adds stylelint and @thoughtbot/stylelint-config to the package.json" do
+      with_app { generate("suspenders:stylelint") }
+
+      expect("package.json").to match_contents(/devDependencies/)
+      expect("package.json").to match_contents(/stylelint/)
+      expect("package.json").to match_contents(%r{@thoughtbot/stylelint-config})
+    end
+
+    it "uncomments the hound config_file option" do
+      with_app { generate("suspenders:stylelint") }
+
+      expect(".hound.yml").to(
+        match_contents(/^  config_file: \.stylelintrc\.json/),
+      )
+    end
+  end
+
+  context "destroy" do
+    it "removes .stylelintrc.json" do
+      with_app do
+        generate("suspenders:stylelint")
+        destroy("suspenders:stylelint")
+      end
+
+      expect(".stylelintrc.json").not_to exist_as_a_file
+    end
+
+    it "removes stylelint and @thoughtbot/stylelint-config from package.json" do
+      with_app do
+        generate("suspenders:stylelint")
+        destroy("suspenders:stylelint")
+      end
+
+      expect("package.json").not_to match_contents(/stylelint/)
+      expect("package.json").
+        not_to match_contents(%r{@thoughtbot/stylelint-config})
+    end
+
+    it "comments in the hound config_file option" do
+      with_app do
+        generate("suspenders:stylelint")
+        destroy("suspenders:stylelint")
+      end
+
+      expect(".hound.yml").
+        to match_contents(/^  # config_file: \.stylelintrc\.json/)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ Dir['./spec/support/**/*.rb'].each { |file| require file }
 
 RSpec.configure do |config|
   config.include SuspendersTestHelpers
+  config.include ProjectFiles
 
   config.before(:all) do
     add_fakes_to_path

data/spec/support/be_executable_matcher.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :be_executable do
+  match do |filename|
+    File.stat(File.join(project_path, filename)).executable?
+  end
+end

data/spec/support/contain_json_matcher.rb

@@ -4,21 +4,27 @@ require "json"
 
 RSpec::Matchers.define :contain_json do
   match do
-    sub_json = expected
-    filename = actual
+    @sub_json = expected
+    @filename = actual
 
-    filepath = File.join(project_path, filename)
-    json = JSON.parse(IO.read(filepath), symbolize_names: true)
-    sub_json <= json
+    @filepath = File.join(project_path, @filename)
+    @json = JSON.parse(IO.read(@filepath), symbolize_names: true)
+
+    subhash?(@sub_json, @json)
   end
 
   failure_message do
-    sub_json = expected
-    filename = actual
+    "in #{@filename}, expected to find\n#{@sub_json.inspect}\n" \
+      "in\n#{@json.inspect}"
+  end
 
-    filepath = File.join(project_path, filename)
-    json = JSON.parse(IO.read(filepath), symbolize_names: true)
+  private
 
-    "in #{filename}, expected to find\n#{sub_json.inspect}\nin\n#{json.inspect}"
+  def subhash?(inner, outer)
+    if inner.is_a?(Hash) && outer.is_a?(Hash)
+      inner.all? { |key, value| subhash?(value, outer[key]) }
+    else
+      inner == outer
+    end
   end
 end

data/spec/support/generators.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.before(:each, type: :generator) do
+    remove_project_directory
+  end
+end

data/spec/support/project_files.rb

@@ -0,0 +1,25 @@
+module ProjectFiles
+  def touch(filename)
+    path = File.join(project_path, filename)
+    dirname = File.dirname(path)
+    FileUtils.mkdir_p(dirname)
+    FileUtils.touch(path)
+  end
+
+  def rm(filename)
+    path = File.join(project_path, filename)
+    FileUtils.rm_rf(path)
+  end
+
+  def copy_file(from_in_templates, to_in_project)
+    destination = File.join(project_path, to_in_project)
+    destination_dirname = File.dirname(destination)
+
+    FileUtils.mkdir_p(destination_dirname)
+
+    FileUtils.cp(
+      File.join(root_path, "templates", from_in_templates),
+      destination,
+    )
+  end
+end

data/spec/support/rails_template.rb

@@ -0,0 +1 @@
+gem "suspenders", path: File.expand_path("../..", __dir__)

data/spec/support/suspenders.rb

@@ -19,10 +19,7 @@ module SuspendersTestHelpers
       end
 
       Dir.chdir(APP_NAME) do
-        with_env("HOME", tmp_path) do
-          debug `git add .`
-          debug `git commit -m 'Initial commit'`
-        end
+        commit_all
       end
     end
   end
@@ -41,18 +38,11 @@ module SuspendersTestHelpers
       add_fakes_to_path
 
       with_revision_for_honeybadger do
-        debug `#{system_rails_bin} new #{APP_NAME}`
+        debug `#{system_rails_bin} new #{APP_NAME} -m #{rails_template_path}`
       end
 
       Dir.chdir(APP_NAME) do
-        File.open("Gemfile", "a") do |file|
-          file.puts %{gem "suspenders", path: #{root_path.inspect}}
-        end
-
-        with_env("HOME", tmp_path) do
-          debug `git add .`
-          debug `git commit -m 'Initial commit'`
-        end
+        commit_all
       end
     end
   end
@@ -135,6 +125,19 @@ module SuspendersTestHelpers
     File.expand_path('../../../', __FILE__)
   end
 
+  def rails_template_path
+    File.join(root_path, "spec", "support", "rails_template.rb")
+  end
+
+  def commit_all
+    with_env("HOME", tmp_path) do
+      debug `git config user.email suspenders@example.com`
+      debug `git config user.name "Suspenders Boy"`
+      debug `git add .`
+      debug `git commit -m 'Initial commit'`
+    end
+  end
+
   def with_env(name, new_value)
     had_key = ENV.has_key?(name)
     prior = ENV[name]
@@ -158,7 +161,7 @@ module SuspendersTestHelpers
 
   def run_in_tmp
     Dir.chdir(tmp_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         yield
       end
     end
@@ -166,7 +169,7 @@ module SuspendersTestHelpers
 
   def run_in_project
     Dir.chdir(project_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         yield
       end
     end

data/suspenders.gemspec

@@ -28,7 +28,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bitters', '~> 1.7'
+  s.add_dependency 'bitters', '>= 2.0.4'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.2'

data/templates/Gemfile.erb

@@ -7,35 +7,30 @@ end
 
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
+<% unless options[:api] %>
 gem "autoprefixer-rails"
+<% end %>
+gem "bootsnap", require: false
 gem "honeybadger"
 gem "pg"
 gem "puma"
 gem "rack-canonical-host"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "recipient_interceptor"
-gem "sass-rails", "~> 5.0"
+gem "sassc-rails"
 gem "skylight"
-gem "sprockets", ">= 3.0.0"
+gem "sprockets", "< 4"
 gem "title"
 gem "tzinfo-data", platforms: [:mingw, :x64_mingw, :mswin, :jruby]
-gem "uglifier"
-gem "bootsnap", require: false
-<% if options[:webpack] %>
 gem "webpacker"
-<% end %>
 
 group :development do
   gem "listen"
-  gem "rack-mini-profiler", require: false
-  gem "spring"
   gem "web-console"
 end
 
 group :development, :test do
   gem "awesome_print"
-  gem "bundler-audit", ">= 0.5.0", require: false
-  gem "dotenv-rails"
   gem "pry-byebug"
   gem "pry-rails"
 end
@@ -43,7 +38,6 @@ end
 group :test do
   gem "formulaic"
   gem "launchy"
-  gem "simplecov", require: false
   gem "timecop"
   gem "webmock"
 end