welaika-suspenders 2.30.0 → 2.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca30a79a04c6c0f4d08c421228a00b20d59afbf477c0ebace4fd2111746dbde
-  data.tar.gz: 7e6f3c35081463c596b65a061a0c56f0df6ab43e1fce9336e87c225c6cc7d0d3
+  metadata.gz: 481695d6f96c668275a33508d56f895dc39e4db46449ef9ab2c9a033660ecef4
+  data.tar.gz: 25c5807eec92e54601a670a33909230c9152fd41adaf7bce883cdaf71be17308
 SHA512:
-  metadata.gz: 1e9844e030e5bf1298011b28068501a02b8c0646a01d1ad0e9ca02191b6e425a7cdf5ef5a70c8c4b36a909a2135db9572d28e9d59fa5b0c896ad43c24d5e9327
-  data.tar.gz: 39460d4cd9b9470f28ed665d6bd0009dfb8fbb996b47f83e35987c90bb9da4c0b59a98e88555e8427e5db729d7725fc1c61b46e55ca4990c97702e5590997943
+  metadata.gz: 85bfef921287615e993923e897ba6e19228fc866bd8481678e56fef63794ce395c3672eb29645671ca20464f3b4861b42e51d448d691cfa377717f66ac4160fc
+  data.tar.gz: 9f01d5156c6515a5d5a30215228953c36015ca73dc13f71a79ebd4602c966ec0b3abe63b64feab78f187f990e0dea152481d773c20e87a83a86c485ca4216a20

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.2

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.6.1
+rvm: 2.6.2
 cache: bundler
 sudo: false
 before_install:

data/README.md

@@ -8,7 +8,7 @@ Big thanks to [thoughtbot](http://thoughtbot.com/community) for providing such a
 
 First ensure you have PostgreSQL, npm, yarn and chromedriver
 
-    $ brew install postgresql
+    $ brew install postgresql@10
     $ brew install node
     $ npm install npm@latest -g # To update npm if you have already installed it
     $ brew install yarn
@@ -47,47 +47,14 @@ If you want to add an empty bare repository as origin, run
 
     git remote add origin git@github.com:welaika/projectname.git
 
+## Sentry && Heroku
+
+After deploying for the first time on Heroku, please run
+
+`heroku labs:enable runtime-dyno-metadata`
+
+for Sentry's release detection to work correctly.
+
 ## Version number
 
 `welaika-suspenders` version number isn't related to thoughbot's [suspenders](https://github.com/thoughtbot/suspenders).
-
-## Changelog
-
-We merge commits from thoughbot's [suspenders](https://github.com/thoughtbot/suspenders) periodically.
-
-List of changes we made since [this is commit](https://github.com/thoughtbot/suspenders/tree/d24d6eab4cc254f8bebfd73fd2b26fbbd2647e86):
-- remove `host` key in database.yml
-- add [priscilla](https://github.com/Arkham/priscilla) gem
-- add [rails-i18n](https://github.com/svenfuchs/rails-i18n) gem and use italian, english as available locales
-- add [letter_opener](https://github.com/ryanb/letter_opener) gem
-- add [faker](https://github.com/stympy/faker) gem
-- remove segment.io javascript code
-- add [slim-rails](https://github.com/slim-template/slim-rails) gem
-- add some html meta tags
-- use EU region as default for Heroku
-- use CDATA wrapper for javascript
-- create common folders like `app/queries`, `app/interactions`, etc.
-- use `application.sass` instead of `application.scss`
-- add `brakeman` gem
-- set `Rome` as `time_zone`
-- set `:it` as `default_locale`
-- add [simplecov](https://github.com/colszowka/simplecov)
-- add [simplecov-json](https://github.com/vicentllongo/simplecov-json)
-- add fixtures helper for `rspec`
-- add queries helper for `rspec`
-- configure asset host for capybara
-- add helpers for capybara (`page!`, `screenshot!`)
-- drop support for IE 9 in AutoPrefixer
-- remove [hound](https://houndci.com) configuration
-- add [draper](https://github.com/drapergem/draper) gem and rename `presenters` folder to `decorators`
-- add [rubocop](https://github.com/bbatsov/rubocop) and a template of `.rubocop.yml`
-- change rake default task: now includes rubocop and brakeman too
-- prefer a single file for each `factory_girl` factories
-- remove new-relic
-- add [email-validator](https://github.com/balexand/email_validator) gem
-- remove circle-ci
-- remove bitters and refills
-- lint factory girl's factories
-- remove automatic deployment
-- use airbrake instead of honeybadger
-- use coffeescript instead of es6

data/lib/suspenders.rb

@@ -13,6 +13,7 @@ require "suspenders/generators/testing_generator"
 require "suspenders/generators/decorator_generator"
 require "suspenders/generators/faker_generator"
 require "suspenders/generators/security_generator"
+require "suspenders/generators/import_dump_generator"
 require "suspenders/generators/production/force_tls_generator"
 require "suspenders/generators/production/email_generator"
 require "suspenders/generators/production/timeout_generator"

data/lib/suspenders/generators/app_generator.rb

@@ -167,6 +167,7 @@ module Suspenders
       generate("suspenders:decorator")
       generate("suspenders:faker")
       generate("suspenders:security")
+      generate("suspenders:import_dump")
     end
 
     def generate_deployment_default

data/lib/suspenders/generators/decorator_generator.rb

@@ -1,4 +1,4 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
   class DecoratorGenerator < Generators::Base

data/lib/suspenders/generators/faker_generator.rb

@@ -1,4 +1,4 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
   class FakerGenerator < Generators::Base

data/lib/suspenders/generators/import_dump_generator.rb

@@ -0,0 +1,25 @@
+require_relative "base"
+
+module Suspenders
+  class ImportDumpGenerator < Generators::Base
+    def copy_script
+      template "bin_import_dump.erb", "bin/import_dump"
+      chmod "bin/import_dump", 0o755
+    end
+
+    def inform_user
+      instructions = <<~MARKDOWN
+
+        ## Importing a dump from Heroku
+
+        If you have configured the heroku remotes successfully,
+        you can import a fresh dump from staging or production with:
+
+            % ./bin/import_dump staging
+            % ./bin/import_dump production
+      MARKDOWN
+
+      append_file "README.md", instructions
+    end
+  end
+end

data/lib/suspenders/generators/security_generator.rb

@@ -1,4 +1,4 @@
-require "rails/generators"
+require_relative "base"
 
 module Suspenders
   class SecurityGenerator < Generators::Base

data/lib/suspenders/version.rb

@@ -1,9 +1,9 @@
 module Suspenders
   RAILS_VERSION = "~> 5.2.2".freeze
-  POSTGRES_VERSION = "10.4".freeze # Used in CI
+  POSTGRES_VERSION = "10.6".freeze # Used in CI
   RUBY_VERSION = IO.
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "2.30.0".freeze
+  VERSION = "2.31.0".freeze
 end

data/spec/features/import_dump_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:import_dump", type: :generator do
+  it "generates the configuration for dump import from heroku" do
+    rm "bin/import_dump"
+
+    with_app { generate("suspenders:import_dump") }
+
+    expect("bin/import_dump").to exist_as_a_file
+    expect("bin/import_dump").to be_executable
+  end
+
+  it "destroys the configuration for dump import from heroku" do
+    touch "bin/import_dump"
+
+    with_app { destroy("suspenders:import_dump") }
+
+    expect("bin/import_dump").not_to exist_as_a_file
+  end
+end

data/spec/features/new_project_spec.rb

@@ -170,7 +170,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     email_config = IO.read(email_file)
 
     expect(email_config).
-      to include(%{RecipientInterceptor.new(ENV["EMAIL_RECIPIENTS"])})
+      to include(%{RecipientInterceptor.new(ENV["EMAIL_RECIPIENTS"], subject_prefix: '[STAGING]'})
   end
 
   it "configs bullet gem in development" do

data/templates/README.md.erb

@@ -14,12 +14,14 @@ or the [rvm guide](https://rvm.io/rvm/install).
 
 To install Postgres:
 
-    $ brew install postgresql
+    $ brew install postgresql@10
 
 To install Node:
 
     $ brew install node
 
+(or use [nvm](https://github.com/creationix/nvm) if you want).
+
 To update Node:
 
     $ npm install npm@latest -g
@@ -32,12 +34,50 @@ To install Chromedriver (for integration test):
 
     $ brew cask install chromedriver
 
-To install ImageMagick:
+To install ImageMagick (delete if not applicable):
+
+    $ brew install imagemagick@6
+
+After setting up, you can run the application using [Heroku Local](https://devcenter.heroku.com/articles/heroku-local):
+
+    $ heroku local
+
+## Setup on Heroku (delete if not applicable):
+
+### Database
+
+https://elements.heroku.com/addons/heroku-postgresql
+
+Choose the PostgreSQL version you want to use (e.g. 10):
+
+    $ heroku addons:create heroku-postgresql:hobby-dev --version=10 --remote=staging
+    $ heroku addons:create heroku-postgresql:hobby-dev --version=10 --remote=production
+
+Further reading:
+
+https://devcenter.heroku.com/articles/heroku-postgres-plans
+
+### Logs
+
+https://elements.heroku.com/addons/logentries
+
+    $ heroku addons:create logentries:le_tryit --remote=staging
+    $ heroku addons:create logentries:le_tryit --remote=production
+
+### Cronjobs (if you need them):
+
+https://elements.heroku.com/addons/scheduler
+
+    $ https://elements.heroku.com/addons/scheduler
+
+### Sentry
+
+For Sentry's release detection to work correctly, please run
 
-    $ brew install imagemagick
+    $ heroku labs:enable runtime-dyno-metadata
 
-After setting up, you can run the application using [Heroku Local]:
+### Redis (if you need for Sidekiq):
 
-    % heroku local
+https://elements.heroku.com/addons/heroku-redis
 
-[Heroku Local]: https://devcenter.heroku.com/articles/heroku-local
+    $ heroku addons:create heroku-redis:hobby-dev

data/templates/bin_import_dump.erb

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Downloads a live dump from Heroku remote
+
+# Exit if any subcommand fails
+set -e
+
+target="${1:-staging}"
+
+heroku pg:backups:capture --remote "$target"
+heroku pg:backups:download --remote "$target"
+pg_restore --verbose --clean --no-acl --no-owner -h localhost -U $(whoami) -d <%= app_name %>_development latest.dump
+rm latest.dump

data/templates/email.rb

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

data/templates/gitlab-ci.yml.erb

@@ -9,6 +9,13 @@ variables:
   POSTGRES_PASSWORD: ''
   SELENIUM_REMOTE_URL: "http://selenium__standalone-chrome:4444/wd/hub/"
 
+.job-creation-policy: &job-creation-policy
+  only:
+    - master
+    - merge_requests
+  except:
+    - staging
+
 .services: &rails-services
   - postgres:<%= Suspenders::POSTGRES_VERSION %>
   - selenium/standalone-chrome:latest
@@ -26,6 +33,7 @@ stages:
   - test
 
 prepare:
+  <<: *job-creation-policy
   stage: setup
   cache:
     <<: *cache-settings
@@ -34,6 +42,7 @@ prepare:
     - bundle install --retry 3 --deployment --jobs $(nproc)
 
 quality:rubocop:
+  <<: *job-creation-policy
   stage: quality
   cache:
     <<: *cache-settings
@@ -42,6 +51,7 @@ quality:rubocop:
     - bundle exec rubocop
 
 quality:slim_lint:
+  <<: *job-creation-policy
   stage: quality
   cache:
     <<: *cache-settings
@@ -50,6 +60,7 @@ quality:slim_lint:
     - bundle exec slim-lint app/views/
 
 quality:bundler-audit:
+  <<: *job-creation-policy
   stage: quality
   cache:
     <<: *cache-settings
@@ -58,6 +69,7 @@ quality:bundler-audit:
     - bundle exec bundle-audit check --update
 
 quality:brakeman:
+  <<: *job-creation-policy
   stage: quality
   cache:
     <<: *cache-settings
@@ -66,6 +78,7 @@ quality:brakeman:
     - bundle exec brakeman -z --skip-files vendor/bundle
 
 quality:rubycritic:
+  <<: *job-creation-policy
   stage: quality
   cache:
     <<: *cache-settings
@@ -74,6 +87,7 @@ quality:rubycritic:
     - bundle exec rubycritic app/ config/ lib/ --no-browser --minimum-score 94 --format console
 
 test:rspec:
+  <<: *job-creation-policy
   stage: test
   services: *rails-services
   cache:

data/templates/suspenders_gitignore

@@ -19,3 +19,4 @@
 /tags
 /tmp/*
 /yarn-error.log
+/latest.dump

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.30.0
+  version: 2.31.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,7 +69,7 @@ dependencies:
         version: '1.8'
 description: 'weLaika''s fork of the famous thoughbot suspenders gem.
 
-'
+  '
 email: info@welaika.com
 executables:
 - welaika-suspenders
@@ -106,6 +106,7 @@ files:
 - lib/suspenders/generators/decorator_generator.rb
 - lib/suspenders/generators/factories_generator.rb
 - lib/suspenders/generators/faker_generator.rb
+- lib/suspenders/generators/import_dump_generator.rb
 - lib/suspenders/generators/js_driver_generator.rb
 - lib/suspenders/generators/json_generator.rb
 - lib/suspenders/generators/lint_generator.rb
@@ -128,6 +129,7 @@ files:
 - spec/features/api_spec.rb
 - spec/features/cli_help_spec.rb
 - spec/features/heroku_spec.rb
+- spec/features/import_dump_spec.rb
 - spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/production/deployment_spec.rb
@@ -153,6 +155,7 @@ files:
 - templates/action_mailer.rb
 - templates/application.sass
 - templates/bin_deploy
+- templates/bin_import_dump.erb
 - templates/bin_setup
 - templates/bin_setup_review_app.erb
 - templates/chromedriver.rb
@@ -204,14 +207,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.1
+      version: 2.6.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.7.4
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
@@ -221,6 +224,7 @@ test_files:
 - spec/features/api_spec.rb
 - spec/features/cli_help_spec.rb
 - spec/features/heroku_spec.rb
+- spec/features/import_dump_spec.rb
 - spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/production/deployment_spec.rb