welaika-suspenders 2.32.2 → 2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde6a177dbc8f305be903441b88283e9bc6abc3f68c950bf2b732383239ec31e
-  data.tar.gz: ca845db387e49483fbff6a017754c88d3cf92c5b74c556cb43255c1d6978fe04
+  metadata.gz: 1feb33dee0a5957e4e4f475da9afc775414ba866f162781bc160dec04fcdd9f4
+  data.tar.gz: 6b6f4bd1656d5cb86bf9ffbc4d2131ecc69b1dc64bca69199b4e385f3df3e9df
 SHA512:
-  metadata.gz: 5ffb2c185c86290d917675281509a8388246b7992cbc3028afa0c199f27c5b0e0c584000850af7edee326b8b2f5991a4b1441a0faea467636cab7e788066d248
-  data.tar.gz: 6b9d50b7a7f8acbdc88bdd12b4af77783e7e6daff44b04ea92ba27ff6ff8715f97b121f75075071c4a5277823ff317acb630ae88279b32c394b920cf14780b56
+  metadata.gz: fe96258397d31d095e8db2b2259117d1a6fb78eebe4b27e39047408b4628ed910b91815cab7087f5bbd9dfa16214b722c72a56399f15f7acc3cf2fdf8ccbb1d9
+  data.tar.gz: 4a01c8d4b248329326ef71e2bde68eb4c5d67672e3a7be437b8e72a6ada4fb2a015730ca27f673faee473030bb70b8881e0bf61639406b4aba9d4cc50a895ada

data/CHANGELOG_WELAIKA.md

@@ -1,3 +1,13 @@
+2.33 (July 23th, 2019)
+* Feature: allow to deploy to heroku with push --force-with-lease (useful for staging)
+* Fix: make new Chrome versions (really) headless
+* Fix: remove code written for simple_cov on Circle CI
+* Change: create database snapshot on heroku at 2 am (UTC) instead of 10 am (UTC)
+* Documentation: add info about resetting the db on heroku
+* Feature: add factory_bot lint to gitlabci
+* Fix: SENTRY_ENV environment name was mismatched in .env file
+* Fix: Chrome now runs (again) on docker (for gitlabci)
+
 2.32.2 (June 24, 2019)
 * Fix: stylelint on gitlab was not working
 

data/lib/suspenders/adapters/heroku.rb

@@ -59,7 +59,7 @@ module Suspenders
       def set_heroku_backup_schedule
         %w(staging production).each do |environment|
           run_toolbelt_command(
-            "pg:backups:schedule DATABASE_URL --at '10:00 UTC'",
+            "pg:backups:schedule DATABASE_URL --at '2:00 UTC'",
             environment,
           )
         end

data/lib/suspenders/generators/import_dump_generator.rb

@@ -17,6 +17,26 @@ module Suspenders
 
             % ./bin/import_dump staging
             % ./bin/import_dump production
+
+        ## Resetting a database
+
+        If you want to reset (destroy and recreate) a database on Heroku, you
+        cannot use `heroku run rake db:drop`, instead use:
+
+            % heroku pg:reset DATABASE_URL --remote=staging
+
+        ( source: https://devcenter.heroku.com/articles/heroku-postgresql#pg-reset )
+
+        To load schema and seeds, you cannot use `heroku run rake db:setup`, instead use:
+
+            % heroku run rails db:schema:load db:seed --remote=staging
+
+        Remember to create a new backup schedule on Heroku after you reset your database!
+
+            % heroku pg:backups:schedule DATABASE_URL --at '2:00 UTC' --remote=staging
+
+        ( source: https://devcenter.heroku.com/articles/heroku-postgres-backups#scheduling-backups )
+
       MARKDOWN
 
       append_file "README.md", instructions

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

@@ -17,7 +17,9 @@ module Suspenders
           you can deploy to staging and production with:
 
               % ./bin/deploy staging
+              % ./bin/deploy -f staging # pushing with force-with-lease, attention!
               % ./bin/deploy production
+              % ./bin/deploy -f production # pushing with force-with-lease, attention!
         MARKDOWN
 
         append_file "README.md", instructions

data/lib/suspenders/version.rb

@@ -5,5 +5,5 @@ module Suspenders
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "2.32.2".freeze
+  VERSION = "2.33".freeze
 end

data/spec/adapters/heroku_spec.rb

@@ -61,7 +61,7 @@ module Suspenders
 
       def have_backup_schedule(remote_name)
         have_received(:run).
-          with(/pg:backups:schedule DATABASE_URL --at '10:00 UTC' --remote #{remote_name}/)
+          with(/pg:backups:schedule DATABASE_URL --at '2:00 UTC' --remote #{remote_name}/)
       end
 
       def have_configured_var(remote_name, var)

data/spec/features/staging/pull_requests_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "suspenders:staging:pull_requests", type: :generators 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/templates/bin_deploy

@@ -3,10 +3,22 @@
 # Run this script to deploy the app to Heroku.
 
 set -e
+# set -x # turn debugging on
+
+while getopts "f" options; do
+  case "${options}" in
+    f)
+      force='--force-with-lease'
+      ;;
+    *)
+      ;;
+  esac
+done
+shift $((OPTIND-1))
 
 branch="$(git symbolic-ref HEAD --short)"
 target="${1:-staging}"
 
-git push "$target" "$branch:master"
+git push $force "$target" "$branch:master"
 heroku run rails db:migrate --exit-code --remote "$target"
 heroku restart --remote "$target"

data/templates/capybara_silence_puma.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Capybara.server = :puma, { Silent: true }

data/templates/chromedriver.rb

@@ -10,19 +10,21 @@ end
 Capybara.register_driver :headless_chrome do |app|
   options = ::Selenium::WebDriver::Chrome::Options.new
   options.headless!
-  # Set a big (15" MBP retina resolution) window size so that
-  # `save_and_open_screenshot` captures the whole page.
-  options.add_argument "--window-size=1680,1050"
+  options.add_argument '--window-size=1680,1050'
 
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu] }
-  )
+  if ENV['CI'].present?
+    # NOTE: alternative, create a chrome user
+    #       https://github.com/GoogleChromeLabs/lighthousebot/blob/master/builder/Dockerfile#L35-L40
+    options.add_argument '--no-sandbox'
+
+    options.add_argument '--disable-gpu'
+    options.add_argument '--disable-dev-shm-usage'
+  end
 
   Capybara::Selenium::Driver.new(
     app,
     browser: :chrome,
-    options: options,
-    desired_capabilities: capabilities
+    options: options
   )
 end
 

data/templates/dotfiles/.env

@@ -12,4 +12,4 @@ SMTP_PASSWORD=password
 SMTP_USERNAME=username
 WEB_CONCURRENCY=1
 SENTRY_DSN=
-SENTRY_CURRENT_ENV=
+SENTRY_ENV=

data/templates/gitlab-ci.yml.erb

@@ -93,6 +93,26 @@ quality:rubycritic:
     - 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

data/templates/sentry.rb

@@ -3,6 +3,6 @@
 Raven.configure do |config|
   config.dsn = ENV.fetch('SENTRY_DSN')
   config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
-  config.environments = %w[ staging production ]
+  config.environments = %w[staging production]
   config.current_environment = ENV.fetch('SENTRY_ENV', Rails.env)
 end

data/templates/spec_helper.rb

@@ -7,11 +7,6 @@ SimpleCov.start 'rails' do
   add_group 'Interactions', 'app/interactions'
 end
 
-if ENV['CIRCLE_ARTIFACTS']
-  dir = File.join(ENV['CIRCLE_ARTIFACTS'], 'coverage')
-  SimpleCov.coverage_dir(dir)
-end
-
 require 'webmock/rspec'
 require 'timecop'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.32.2
+  version: '2.33'
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails