welaika-suspenders 2.29.0 → 2.30.0

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

@@ -1,16 +1,8 @@
-require "rails/generators"
-require_relative "../../actions"
+require_relative "../base"
 
 module Suspenders
   module Production
-    class EmailGenerator < Rails::Generators::Base
-      include Suspenders::Actions
-
-      source_root File.expand_path(
-        File.join("..", "..", "..", "..", "templates"),
-        File.dirname(__FILE__),
-      )
-
+    class EmailGenerator < Generators::Base
       def smtp_configuration
         copy_file "smtp.rb", "config/smtp.rb"
 
@@ -26,7 +18,7 @@ module Suspenders
         RUBY
 
         inject_into_file "config/environments/production.rb", config,
-          after: "config.action_mailer.raise_delivery_errors = false"
+          after: "config.action_mailer.perform_caching = false"
       end
 
       def env_vars

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

@@ -3,14 +3,7 @@ require_relative "../../actions"
 
 module Suspenders
   module Production
-    class ErrorReportingGenerator < Rails::Generators::Base
-      include Suspenders::Actions
-
-      source_root File.expand_path(
-        File.join("..", "..", "..", "..", "templates"),
-        File.dirname(__FILE__),
-      )
-
+    class ErrorReportingGenerator < Generators::Base
       def add_sentry
         gem "sentry-raven"
         Bundler.with_clean_env { run "bundle install" }

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

@@ -1,11 +1,8 @@
-require "rails/generators"
-require_relative "../../actions"
+require_relative "../base"
 
 module Suspenders
   module Production
-    class ForceTlsGenerator < Rails::Generators::Base
-      include Suspenders::Actions
-
+    class ForceTlsGenerator < Generators::Base
       def config_enforce_ssl
         configure_environment "production", "config.force_ssl = true"
       end

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

@@ -0,0 +1,24 @@
+require_relative "../base"
+
+module Suspenders
+  module Production
+    class ManifestGenerator < Generators::Base
+      def render_manifest
+        expand_json(
+          "app.json",
+          name: app_name.dasherize,
+          scripts: {},
+          env: {
+            APPLICATION_HOST: { required: 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" },
+          },
+          addons: ["heroku-postgresql"],
+        )
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
-require "rails/generators"
+require_relative "../base"
 
 module Suspenders
   module Production
-    class TimeoutGenerator < Rails::Generators::Base
+    class TimeoutGenerator < Generators::Base
       def add_gem
         gem "rack-timeout", group: :production
       end

data/lib/suspenders/generators/security_generator.rb

@@ -1,12 +1,7 @@
 require "rails/generators"
 
 module Suspenders
-  class SecurityGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class SecurityGenerator < Generators::Base
     def add_checkers_gems
       gem 'brakeman', require: false, group: :development
       gem 'bundler-audit', '>= 0.5.0', require: false, group: :development

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

@@ -0,0 +1,33 @@
+require_relative "../base"
+
+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(
+          "config/environments/production.rb",
+          config,
+          after: "Rails.application.configure do\n",
+        )
+      end
+
+      def create_review_apps_setup_script
+        template(
+          "bin_setup_review_app.erb",
+          "bin/setup_review_app",
+          force: true,
+        )
+
+        run "chmod a+x bin/setup_review_app"
+      end
+    end
+  end
+end

data/lib/suspenders/generators/static_generator.rb

@@ -1,7 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class StaticGenerator < Rails::Generators::Base
+  class StaticGenerator < Generators::Base
     def add_high_voltage
       gem "high_voltage"
       Bundler.with_clean_env { run "bundle install" }

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -1,11 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class StylesheetBaseGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__))
-
+  class StylesheetBaseGenerator < Generators::Base
     def add_css_config
       copy_file(
         "application.sass",

data/lib/suspenders/generators/testing_generator.rb

@@ -1,12 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class TestingGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class TestingGenerator < Generators::Base
     def add_testing_gems
       gem "rspec-rails", "~> 3.8", group: %i(development test)
       gem "shoulda-matchers", group: :test

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 add_slim_gem
       gem "slim-rails"
       Bundler.with_clean_env { run "bundle install" }

data/lib/suspenders/version.rb

@@ -1,9 +1,9 @@
 module Suspenders
-  RAILS_VERSION = "~> 5.2.1".freeze
+  RAILS_VERSION = "~> 5.2.2".freeze
   POSTGRES_VERSION = "10.4".freeze # Used in CI
   RUBY_VERSION = IO.
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "2.29.0".freeze
+  VERSION = "2.30.0".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, /git remote add -f production #{app_name.dasherize}-production/)
+          with(setup_file, /git remote add -f production git@heroku\.com:#{app_name.dasherize}-production\.git/)
         expect(app_builder).to have_received(:append_file).
-          with(setup_file, /git remote add -f staging #{app_name.dasherize}-staging/)
+          with(setup_file, /git remote add -f staging git@heroku\.com:#{app_name.dasherize}-staging\.git/)
       end
 
       it "sets the heroku rails secrets" do

data/spec/features/heroku_spec.rb

@@ -7,26 +7,29 @@ RSpec.describe "Heroku" do
       run_suspenders("--heroku=true")
       setup_app_dependencies
     end
+    let(:app_name) { SuspendersTestHelpers::APP_NAME.dasherize }
 
     it "suspends a project for Heroku" do
-      app_name = SuspendersTestHelpers::APP_NAME.dasherize
-
       expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
       expect(FakeHeroku).to have_created_app_for("production", "--region eu")
       %w(staging production).each do |env|
         expect(FakeHeroku).to have_configured_vars(env, "APPLICATION_HOST")
         expect(FakeHeroku).to have_configured_vars(env, "SENTRY_DSN")
-        expect(FakeHeroku).to have_configured_vars(env, "SECRET_KEY_BASE")
+        expect(FakeHeroku).to have_configured_vars(env, "SENTRY_ENV")
+        expect(FakeHeroku).to have_configured_vars(env, "SMTP_ADDRESS")
+        expect(FakeHeroku).to have_configured_vars(env, "SMTP_DOMAIN")
+        expect(FakeHeroku).to have_configured_vars(env, "SMTP_PASSWORD")
+        expect(FakeHeroku).to have_configured_vars(env, "SMTP_USERNAME")
       end
       expect(FakeHeroku).to have_setup_pipeline_for(app_name)
 
       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 match(/^if heroku apps | grep #{app_name}-production/)
+      expect(bin_setup).to match(/^if heroku apps | grep #{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")
 
@@ -35,6 +38,19 @@ RSpec.describe "Heroku" do
     end
   end
 
+  context "--heroku with region flag" do
+    before(:all) do
+      clean_up
+      run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
+      setup_app_dependencies
+    end
+
+    it "suspends a project with extra Heroku flags" do
+      expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
+      expect(FakeHeroku).to have_created_app_for("production", "--region eu")
+    end
+  end
+
   def clean_up
     drop_dummy_database
     remove_project_directory

data/spec/features/json_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:json", type: :generator do
+  it "generates the Gemfile for JSON parsing" do
+    with_app { generate("suspenders:json") }
+
+    expect("Gemfile").to match_contents(%r{gem .oj.})
+  end
+
+  it "cleans up the Gemfile from JSON parsing" do
+    with_app { destroy("suspenders:json") }
+
+    expect("Gemfile").not_to match_contents(%r{gem .oj.})
+  end
+end

data/spec/features/new_project_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe "Suspend a new project with default configuration" do
       /^ruby '#{Suspenders::RUBY_VERSION}'$/,
     )
     expect(gemfile_file).to match(
-      /^gem 'autoprefixer-rails'$/,
+      /^gem 'active_interaction'/,
     )
     expect(gemfile_file).to match(
       /^gem 'rails', '#{Suspenders::RAILS_VERSION}'$/,
@@ -57,9 +57,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
@@ -213,8 +211,9 @@ RSpec.describe "Suspend a new project with default configuration" do
     ]
 
     config_files.each do |file|
-      expect(file).not_to match(/.*#.*/)
-      expect(file).not_to match(/^$\n/)
+      expect(file).not_to match(%r{.*#.*})
+      expect(file).not_to eq(file.strip)
+      expect(file).not_to match(%r{^$\n\n})
     end
   end
 
@@ -229,7 +228,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     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
@@ -237,7 +236,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     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 be_executable
   end
 
   it "creates heroku application manifest file with application name in it" do
@@ -255,6 +254,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(gemfile).to match(/high_voltage/)
   end
 
+  it "adds sassc-rails" do
+    gemfile = read_project_file("Gemfile")
+
+    expect(gemfile).to match(/sassc-rails/)
+  end
+
   it "doesn't use turbolinks" do
     app_js = read_project_file(%w(app assets javascripts application.js))
     expect(app_js).not_to match(/turbolinks/)

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,35 @@
+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 },
+        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 },
+        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/staging/pull_requests_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:staging:pull_requests", type: :generators do
+  it "generates the configuration for Heroku pipeline review apps" do
+    with_app { generate("suspenders:staging:pull_requests") }
+
+    expect("config/environments/production.rb").to \
+      match_contents(%r{HEROKU_APP_NAME})
+
+    expect("bin/setup_review_app").to \
+      match_contents(%r{APP_NAME=dummy-app-staging-pr-\$1})
+  end
+
+  it "destroys the configuration for Heroku pipeline review apps" do
+    with_app { destroy("suspenders:staging:pull_requests") }
+
+    expect("config/environments/production.rb").not_to \
+      match_contents(%r{APP_NAME=dummy-app-staging-pr-\$1})
+
+    expect("bin/setup_review_app").not_to exist_as_a_file
+  end
+end