welaika-suspenders 2.33 → 2.34

data/templates/email.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-if ENV["EMAIL_RECIPIENTS"].present?
+if ENV['EMAIL_RECIPIENTS'].present?
   Mail.register_interceptor(
-    RecipientInterceptor.new(ENV["EMAIL_RECIPIENTS"], subject_prefix: '[STAGING]')
+    RecipientInterceptor.new(ENV['EMAIL_RECIPIENTS'], subject_prefix: '[STAGING]')
   )
 end

data/templates/factory_bot_rspec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-#
+
 FactoryBot.use_parent_strategy = true
 
 RSpec.configure do |config|

data/templates/gitlab-ci.yml.erb

@@ -27,8 +27,8 @@ variables:
 
 stages:
   - setup
-  - quality
   - test
+  - quality
 
 prepare:
   <<: *job-creation-policy
@@ -39,6 +39,55 @@ prepare:
   script:
     - bundle install --retry 3 --deployment --jobs $(nproc)
 
+test:factory_lint:
+  <<: *job-creation-policy
+  stage: test
+  services: *rails-services
+  cache:
+    <<: *cache-settings
+  script:
+    # Verify node and yarn versions
+    - node --version
+    - yarn --version
+
+    # Setup environment
+    - cp -f config/database.gitlab.yml config/database.yml
+    - bundle check --path vendor/bundle
+    - bin/yarn
+    - bundle exec rails db:setup RAILS_ENV=test
+
+    # Run factory_bot lint
+    - bundle exec rake factory_bot:lint RAILS_ENV=test
+
+test:rspec:
+  <<: *job-creation-policy
+  stage: test
+  services: *rails-services
+  cache:
+    <<: *cache-settings
+  script:
+    # Verify node and yarn versions
+    - node --version
+    - yarn --version
+
+    # Setup environment
+    - cp -f config/database.gitlab.yml config/database.yml
+    - bundle check --path vendor/bundle
+    - bin/yarn
+    - bundle exec rails db:setup RAILS_ENV=test
+
+    # Run tests
+    - bundle exec rspec spec/
+  coverage: '/\(\d+.\d+\%\) covered/'
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+    when: always
+    expire_in: 5 days
+    paths:
+      - coverage/
+      - tmp/screenshots/
+      - tmp/capybara/
+
 quality:rubocop:
   <<: *job-creation-policy
   stage: quality
@@ -92,52 +141,3 @@ quality:rubycritic:
   script:
     - bundle check --path vendor/bundle
     - bundle exec rubycritic app/ config/ lib/ --no-browser --minimum-score 94 --format console
-
-test:factory_lint:
-  <<: *job-creation-policy
-  stage: test
-  services: *rails-services
-  cache:
-    <<: *cache-settings
-  script:
-    # Verify node and yarn versions
-    - node --version
-    - yarn --version
-
-    # Setup environment
-    - cp -f config/database.gitlab.yml config/database.yml
-    - bundle check --path vendor/bundle
-    - bin/yarn
-    - bundle exec rails db:setup RAILS_ENV=test
-
-    # Run factory_bot lint
-    - bundle exec rake factory_bot:lint RAILS_ENV=test
-
-test:rspec:
-  <<: *job-creation-policy
-  stage: test
-  services: *rails-services
-  cache:
-    <<: *cache-settings
-  script:
-    # Verify node and yarn versions
-    - node --version
-    - yarn --version
-
-    # Setup environment
-    - cp -f config/database.gitlab.yml config/database.yml
-    - bundle check --path vendor/bundle
-    - bin/yarn
-    - bundle exec rails db:setup RAILS_ENV=test
-
-    # Run tests
-    - bundle exec rspec spec/
-  coverage: '/\(\d+.\d+\%\) covered/'
-  artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
-    when: always
-    expire_in: 5 days
-    paths:
-      - coverage/
-      - tmp/screenshots/
-      - tmp/capybara/

data/templates/inline_svg.rb

@@ -0,0 +1,3 @@
+InlineSvg.configure do |config|
+  config.raise_on_file_not_found = true
+end

data/templates/rack_mini_profiler.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-if ENV["RACK_MINI_PROFILER"].to_i > 0
-  require "rack-mini-profiler"
+if ENV['RACK_MINI_PROFILER'].to_i.positive?
+  require 'rack-mini-profiler'
 
   Rack::MiniProfilerRails.initialize!(Rails.application)
 end

data/templates/rubocop.yml

@@ -1,14 +1,15 @@
+---
 require:
   - rubocop-rspec
   - rubocop-performance
   - rubocop-rails
+
 inherit_from: .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
   Exclude:
     - 'bin/*'
-    - 'config/**/*'
     - 'db/**/*'
     - 'tmp/**/*'
     - 'vendor/**/*'
@@ -16,14 +17,23 @@ AllCops:
 Metrics/BlockLength:
   Exclude:
     - 'app/admin/**/*'
+    - 'config/environments/*'
     - 'lib/tasks/*.rake'
     - 'spec/**/*'
 
 Metrics/LineLength:
   Max: 100
+  Exclude:
+    - 'config/initializers/backtrace_silencers.rb'
+    - 'config/initializers/content_security_policy.rb'
 
 Rails:
   Enabled: true
 
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/features/**/*'
+    - 'spec/system/**/*'
+
 Style/Documentation:
   Enabled: false

data/templates/smtp.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 SMTP_SETTINGS = {
-  address: ENV.fetch("SMTP_ADDRESS"), # example: "smtp.sendgrid.net"
-  authentication: :plain,
-  domain: ENV.fetch("SMTP_DOMAIN"), # example: "heroku.com"
+  address: ENV.fetch('SMTP_ADDRESS'), # example: "smtp.sendgrid.net"
+  authentication: :login,
+  domain: ENV.fetch('SMTP_DOMAIN'), # example: "heroku.com"
   enable_starttls_auto: true,
-  password: ENV.fetch("SMTP_PASSWORD"),
-  port: "587",
-  user_name: ENV.fetch("SMTP_USERNAME")
-}
+  password: ENV.fetch('SMTP_PASSWORD'),
+  port: '587',
+  user_name: ENV.fetch('SMTP_USERNAME')
+}.freeze

data/templates/spec_support_sidekiq.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'sidekiq/testing'
+Sidekiq::Testing.inline!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: '2.33'
+  version: '2.34'
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.3
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,7 @@ files:
 - bin/setup
 - bin/welaika-suspenders
 - diff_suspenders.sh
+- docs/heroku_deploy.md
 - lib/suspenders.rb
 - lib/suspenders/actions.rb
 - lib/suspenders/adapters/heroku.rb
@@ -108,6 +123,8 @@ files:
 - lib/suspenders/generators/factories_generator.rb
 - lib/suspenders/generators/faker_generator.rb
 - lib/suspenders/generators/import_dump_generator.rb
+- lib/suspenders/generators/inline_svg_generator.rb
+- lib/suspenders/generators/jobs_generator.rb
 - lib/suspenders/generators/js_driver_generator.rb
 - lib/suspenders/generators/json_generator.rb
 - lib/suspenders/generators/lint_generator.rb
@@ -127,11 +144,13 @@ files:
 - lib/suspenders/version.rb
 - lib/welaika-suspenders.rb
 - spec/adapters/heroku_spec.rb
+- spec/expand_json_spec.rb
 - spec/fakes/bin/heroku
 - spec/features/api_spec.rb
 - spec/features/cli_help_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/import_dump_spec.rb
+- spec/features/inline_svg_spec.rb
 - spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/production/deployment_spec.rb
@@ -158,14 +177,15 @@ files:
 - templates/_javascript.html.slim
 - templates/action_mailer.rb
 - templates/application.sass
+- templates/bin_auto_migrate
 - templates/bin_deploy
 - templates/bin_import_dump.erb
 - templates/bin_setup
 - templates/bin_setup_review_app.erb
-- templates/browserslist
 - templates/capybara_silence_puma.rb
 - templates/chromedriver.rb
 - templates/config_locales_it.yml.erb
+- templates/config_sidekiq.yml
 - templates/database.gitlab.yml
 - templates/dev.rake
 - templates/dockerignore
@@ -179,6 +199,7 @@ files:
 - templates/flashes_helper.rb
 - templates/gitlab-ci.yml.erb
 - templates/i18n.rb
+- templates/inline_svg.rb
 - templates/json_encoding.rb
 - templates/overcommit.yml
 - templates/postgresql_database.yml.erb
@@ -197,13 +218,16 @@ files:
 - templates/slim.rb
 - templates/smtp.rb
 - templates/spec_helper.rb
+- templates/spec_support_sidekiq.rb
 - templates/stylelintrc.json
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.slim
 homepage: http://github.com/welaika/welaika-suspenders
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/welaika/welaika-suspenders/blob/master/CHANGELOG_WELAIKA.md
+  source_code_uri: https://github.com/welaika/welaika-suspenders
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -213,24 +237,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.3
+      version: 2.6.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.7.4
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
 test_files:
 - spec/adapters/heroku_spec.rb
+- spec/expand_json_spec.rb
 - spec/fakes/bin/heroku
 - spec/features/api_spec.rb
 - spec/features/cli_help_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/import_dump_spec.rb
+- spec/features/inline_svg_spec.rb
 - spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/production/deployment_spec.rb

data/templates/browserslist

@@ -1 +0,0 @@
-Last 2 versions