welaika-suspenders 2.29.0 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5cebcef912d85ea26e0bdc42f2237f7c927abe821f5ba39b53235227cb37b8e
-  data.tar.gz: 2230a17985d108a17a8cb3056bc3f2a8b1ff93b58761634e4215ad35de4341fb
+  metadata.gz: 8ca30a79a04c6c0f4d08c421228a00b20d59afbf477c0ebace4fd2111746dbde
+  data.tar.gz: 7e6f3c35081463c596b65a061a0c56f0df6ab43e1fce9336e87c225c6cc7d0d3
 SHA512:
-  metadata.gz: e90abb0dd837139204d5bd7570f2278797f3d431fa0572bad0986a1014c1e70d9b91fdcf5fb193d9be1113357f6531e2940c3e30422a980066e764a331989148
-  data.tar.gz: 1a230f578d63a21a6287cd2663db49bc05d89cb8974b7d3c426fb731e9dc4753d3a4d1b0582a6a0c4e05e68792c1aa5f46ee3934fcc817ba842db2361dcd5e42
+  metadata.gz: 1e9844e030e5bf1298011b28068501a02b8c0646a01d1ad0e9ca02191b6e425a7cdf5ef5a70c8c4b36a909a2135db9572d28e9d59fa5b0c896ad43c24d5e9327
+  data.tar.gz: 39460d4cd9b9470f28ed665d6bd0009dfb8fbb996b47f83e35987c90bb9da4c0b59a98e88555e8427e5db729d7725fc1c61b46e55ca4990c97702e5590997943

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.1

data/.travis.yml

@@ -1,13 +1,12 @@
 language: ruby
-rvm: 2.5.1
+rvm: 2.6.1
 cache: bundler
 sudo: false
 before_install:
-  - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'
   - git config --global user.email 'travis-ci@example.com'
-  - gem install bundler
   - gem update --system
+  - gem install bundler -v '< 2'
 install: bundle install
 notifications:
   email: false

data/NEWS.md

@@ -1,3 +1,21 @@
+1.50.0 (December 28, 2018)
+
+* Removed: jquery-rails.
+* Changed: default FactoryBot to `use_parent_strategy = true`.
+* Upgraded: Ruby 2.5.3.
+* Fixed: set `ASSET_HOST` and `APPLICATION_HOST` at top of `production.rb`.
+* Fixed: `tzinfo-data` gem for Windows.
+* New generator: `suspenders:json` for JSON parsing.
+* New generator: `suspenders:staging:pull_requests` for Heroku app per PR.
+
+1.49.0 (October 19, 2018)
+
+* Removed: NOODP robots meta tags
+* Removed: flutie gem and body class in application layout
+* Upgraded: remove version constraint for pg gem
+* Fixed: install JavaScript dependencies in bin/setup
+* Fixed: include action_mailer SMTP settings in production config
+
 1.48.0 (August 10, 2018)
 
 * Bug fix: change production timeouts generator to use working configuration

data/README.md

@@ -1,4 +1,5 @@
 # weLaika's Suspenders [![Build Status](https://travis-ci.org/welaika/welaika-suspenders.svg?branch=master)](https://travis-ci.org/welaika/welaika-suspenders)
+=======
 
 This is a [suspenders](https://github.com/thoughtbot/suspenders) fork in use at [weLaika](http://dev.welaika.com).
 Big thanks to [thoughtbot](http://thoughtbot.com/community) for providing such a great starting point.
@@ -31,7 +32,7 @@ You can optionally specify alternate Heroku flags:
 
     welaika-suspenders projectname \
       --heroku true \
-      --heroku-flags "--region eu --addons heroku-postgresql,sendgrid,logentries,scheduler"
+      --heroku-flags "--addons sendgrid,logentries,scheduler"
 
 See all possible Heroku flags:
 

data/lib/suspenders.rb

@@ -8,6 +8,7 @@ require "suspenders/generators/factories_generator"
 require "suspenders/generators/lint_generator"
 require "suspenders/generators/views_generator"
 require "suspenders/generators/js_driver_generator"
+require "suspenders/generators/json_generator"
 require "suspenders/generators/testing_generator"
 require "suspenders/generators/decorator_generator"
 require "suspenders/generators/faker_generator"
@@ -16,6 +17,9 @@ require "suspenders/generators/production/force_tls_generator"
 require "suspenders/generators/production/email_generator"
 require "suspenders/generators/production/timeout_generator"
 require "suspenders/generators/production/error_reporting_generator"
+require "suspenders/generators/production/deployment_generator"
+require "suspenders/generators/production/manifest_generator"
+require "suspenders/generators/staging/pull_requests_generator"
 require "suspenders/actions"
 require "suspenders/adapters/heroku"
 require "suspenders/app_builder"

data/lib/suspenders/adapters/heroku.rb

@@ -39,12 +39,20 @@ module Suspenders
         end
       end
 
-      def set_heroku_error_reporting_env
+      def set_heroku_smtp_settings
         %w(staging production).each do |environment|
-          run_toolbelt_command(
-            "config:add SENTRY_ENV=#{environment}",
-            environment,
-          )
+          run_toolbelt_command("config:add SMTP_ADDRESS=smtp.example.com", environment)
+          run_toolbelt_command("config:add SMTP_DOMAIN=example.com", environment)
+          run_toolbelt_command("config:add SMTP_USERNAME=username", environment)
+          run_toolbelt_command("config:add SMTP_PASSWORD=password", environment)
+        end
+      end
+
+      def set_heroku_sentry_configuration
+        %w(staging production).each do |environment|
+          run_toolbelt_command("config:add SENTRY_ENV=#{environment}", environment)
+          run_toolbelt_command("config:add SENTRY_DSN='https://changeme@sentry.io/changeme'", environment)
+          run_toolbelt_command("labs:enable runtime-dyno-metadata", environment)
         end
       end
 
@@ -57,19 +65,6 @@ module Suspenders
         end
       end
 
-      def create_review_apps_setup_script
-        app_builder.template(
-          "bin_setup_review_app.erb",
-          "bin/setup_review_app",
-          force: true,
-        )
-        app_builder.run "chmod a+x bin/setup_review_app"
-      end
-
-      def create_heroku_application_manifest_file
-        app_builder.template "app.json.erb", "app.json"
-      end
-
       def create_heroku_pipeline
         pipelines_plugin = `heroku help | grep pipelines`
         if pipelines_plugin.empty?
@@ -99,15 +94,6 @@ module Suspenders
         end
       end
 
-      def set_heroku_metadata_for_sentry
-        %w(staging production).each do |environment|
-          run_toolbelt_command(
-            "labs:enable runtime-dyno-metadata",
-            environment
-          )
-        end
-      end
-
       def set_buildpacks
         %w(staging production).each do |environment|
           run_toolbelt_command(

data/lib/suspenders/app_builder.rb

@@ -7,17 +7,15 @@ module Suspenders
 
     def_delegators(
       :heroku_adapter,
-      :create_heroku_application_manifest_file,
       :create_heroku_pipeline,
       :create_production_heroku_app,
-      :create_review_apps_setup_script,
       :create_staging_heroku_app,
       :set_heroku_application_host,
       :set_heroku_backup_schedule,
-      :set_heroku_error_reporting_env,
       :set_heroku_rails_secrets,
       :set_heroku_remotes,
-      :set_heroku_metadata_for_sentry,
+      :set_heroku_sentry_configuration,
+      :set_heroku_smtp_settings,
       :set_buildpacks,
     )
 
@@ -102,11 +100,6 @@ module Suspenders
 
     def enable_rack_canonical_host
       config = <<-RUBY
-
-  if ENV.fetch("HEROKU_APP_NAME", "").include?("staging-pr-")
-    ENV["APPLICATION_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
-  end
-
   config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
@@ -243,26 +236,7 @@ config.public_file_server.headers = {
       create_production_heroku_app(flags)
     end
 
-    def create_deploy_script
-      copy_file "bin_deploy", "bin/deploy"
-
-      instructions = <<-MARKDOWN
-
-## Deploying
-
-If you have previously run the `./bin/setup` script,
-you can deploy to staging and production with:
-
-    % ./bin/deploy staging
-    % ./bin/deploy production
-      MARKDOWN
-
-      append_file "README.md", instructions
-      run "chmod a+x bin/deploy"
-    end
-
     def copy_miscellaneous_files
-      copy_file "browserslist", "browserslist"
       copy_file "errors.rb", "config/initializers/errors.rb"
       copy_file "json_encoding.rb", "config/initializers/json_encoding.rb"
     end
@@ -270,7 +244,6 @@ you can deploy to staging and production with:
     def customize_error_pages
       meta_tags =<<-EOS
   <meta charset="utf-8" />
-  <meta name="ROBOTS" content="NOODP" />
   <meta name="viewport" content="initial-scale=1" />
       EOS
 

data/lib/suspenders/generators/app_generator.rb

@@ -48,15 +48,14 @@ module Suspenders
       invoke :configure_app
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
-      invoke :remove_config_comment_lines
-      invoke :remove_routes_comment_lines
       invoke :setup_dotfiles
       invoke :setup_database
       invoke :generate_default
       invoke :setup_default_directories
-      invoke :create_local_heroku_setup
       invoke :create_heroku_apps
-      invoke :generate_production_default
+      invoke :generate_deployment_default
+      invoke :remove_config_comment_lines
+      invoke :remove_routes_comment_lines
       invoke :outro
     end
 
@@ -112,15 +111,6 @@ module Suspenders
       build :setup_rack_mini_profiler
     end
 
-    def create_local_heroku_setup
-      if options[:heroku]
-        say "Creating local Heroku setup"
-        build :create_review_apps_setup_script
-        build :create_deploy_script
-        build :create_heroku_application_manifest_file
-      end
-    end
-
     def create_heroku_apps
       if options[:heroku]
         say "Creating Heroku apps"
@@ -128,9 +118,9 @@ module Suspenders
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :set_heroku_application_host
-        build :set_heroku_error_reporting_env
         build :set_heroku_backup_schedule
-        build :set_heroku_metadata_for_sentry
+        build :set_heroku_sentry_configuration
+        build :set_heroku_smtp_settings
         build :set_buildpacks
         build :create_heroku_pipeline
         build :configure_automatic_deployment
@@ -164,6 +154,7 @@ module Suspenders
     end
 
     def generate_default
+      generate("suspenders:json")
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
       generate("suspenders:testing")
@@ -178,11 +169,14 @@ module Suspenders
       generate("suspenders:security")
     end
 
-    def generate_production_default
+    def generate_deployment_default
+      generate("suspenders:staging:pull_requests")
       generate("suspenders:production:force_tls")
       generate("suspenders:production:email")
       generate("suspenders:production:timeout")
       generate("suspenders:production:error_reporting")
+      generate("suspenders:production:deployment")
+      generate("suspenders:production:manifest")
     end
 
     def outro

data/lib/suspenders/generators/base.rb

@@ -0,0 +1,20 @@
+require "rails/generators"
+require_relative "../actions"
+
+module Suspenders
+  module Generators
+    class Base < Rails::Generators::Base
+      include Suspenders::Actions
+
+      def self.default_source_root
+        File.expand_path(File.join("..", "..", "..", "templates"), __dir__)
+      end
+
+      private
+
+      def app_name
+        Rails.app_class.parent_name.demodulize.underscore.dasherize
+      end
+    end
+  end
+end

data/lib/suspenders/generators/ci_generator.rb

@@ -1,16 +1,9 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class CiGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__))
-
-    def setup_gitlab_ci
+  class CiGenerator < Generators::Base
+    def configure_ci
       template 'gitlab-ci.yml.erb', '.gitlab-ci.yml'
-    end
-
-    def copy_database_yml_for_gitlab
       copy_file 'database.gitlab.yml', 'config/database.gitlab.yml'
     end
   end

data/lib/suspenders/generators/db_optimizations_generator.rb

@@ -1,7 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class DbOptimizationsGenerator < Rails::Generators::Base
+  class DbOptimizationsGenerator < Generators::Base
     def add_bullet
       gem "bullet", group: %i(development test)
       Bundler.with_clean_env { run "bundle install" }

data/lib/suspenders/generators/decorator_generator.rb

@@ -1,12 +1,7 @@
 require "rails/generators"
 
 module Suspenders
-  class DecoratorGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class DecoratorGenerator < Generators::Base
     def add_draper_gem
       gem "draper"
       Bundler.with_clean_env { run "bundle install" }

data/lib/suspenders/generators/factories_generator.rb

@@ -1,12 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class FactoriesGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class FactoriesGenerator < Generators::Base
     def add_factory_bot
       gem "factory_bot_rails", group: %i(development test)
       gem "database_cleaner", group: %i(development test)

data/lib/suspenders/generators/faker_generator.rb

@@ -1,12 +1,7 @@
 require "rails/generators"
 
 module Suspenders
-  class FakerGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class FakerGenerator < Generators::Base
     def add_factory_bot
       gem 'faker', group: %i(development test)
       Bundler.with_clean_env { run "bundle install" }

data/lib/suspenders/generators/js_driver_generator.rb

@@ -1,12 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class JsDriverGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class JsDriverGenerator < Generators::Base
     def add_gems
       gem 'capybara', '>= 2.15', '< 4.0', group: :test
       gem 'selenium-webdriver', group: :test

data/lib/suspenders/generators/json_generator.rb

@@ -0,0 +1,10 @@
+require_relative "base"
+
+module Suspenders
+  class JsonGenerator < Generators::Base
+    def add_oj
+      gem "oj"
+      Bundler.with_clean_env { run "bundle install" }
+    end
+  end
+end

data/lib/suspenders/generators/lint_generator.rb

@@ -1,12 +1,7 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
-  class LintGenerator < Rails::Generators::Base
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
+  class LintGenerator < Generators::Base
     def add_linters_gems
       gem 'rubocop', require: false, group: :development
       gem 'rubocop-rspec', require: false, group: :development

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

@@ -0,0 +1,27 @@
+require_relative "../base"
+
+module Suspenders
+  module Production
+    class DeploymentGenerator < Generators::Base
+      def copy_script
+        copy_file "bin_deploy", "bin/deploy"
+        chmod "bin/deploy", 0o755
+      end
+
+      def inform_user
+        instructions = <<~MARKDOWN
+
+          ## Deploying
+
+          If you have previously run the `./bin/setup` script,
+          you can deploy to staging and production with:
+
+              % ./bin/deploy staging
+              % ./bin/deploy production
+        MARKDOWN
+
+        append_file "README.md", instructions
+      end
+    end
+  end
+end