welaika-suspenders 2.29.0.alpha.2 → 2.29.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99c15d50a9c274c2685a1a9807bd5dd3c68e23308e4f9367da74d1ca7270aef1
-  data.tar.gz: 28b04a2011baaa632eb1ab8889bf413a42aede7b102e2b167760aea3fd808c31
+  metadata.gz: 6543a7a9ee1ede8d0c5899ff21f196adb6beddd61d6d4a1bb2dbb2bf77a71714
+  data.tar.gz: 836eec798f86aa54690d957cf5cadfbda9bee96554ace32e060e192c216dbcda
 SHA512:
-  metadata.gz: 113ae2339f91f79d66f7cee8fba15e2f11f78cbad5fd0db05ae75e8dec9c2b1342da198c2f4118dde86256a2266a2557f39ae885ce28fb57819d612d95327e27
-  data.tar.gz: 3c9fad55bfb2c5826956a20de2b1a4255df2b0ab4a7f44defe47d39be6b7f37e55f11ae6a256f26001362455cb4557c82dd32b2bcf7e9e2ba1fe377312cd8ac4
+  metadata.gz: b35628cbffa9f3c50bd139663239e8b7153800bcedc33669b4c30e2b8802ca6462e68fa0a328222dfad0a6d29f5854fcd3918445f4d8a6acbf1bbd0cc2026c85
+  data.tar.gz: a74e0583ffe8d76c1f55679f8ac7d0cf13b177117366c4e0a4c76c1e7400772817d672b3983c0ebfeeca5c02d8b6cfc2c6b414222fa89eb2923b6612a354c11a

data/README.md

@@ -5,12 +5,13 @@ Big thanks to [thoughtbot](http://thoughtbot.com/community) for providing such a
 
 ## Installation
 
-First ensure you have PostgreSQL, npm and yarn.
+First ensure you have PostgreSQL, npm, yarn and chromedriver
 
     $ brew install postgresql
     $ brew install node
     $ npm install npm@latest -g # To update npm if you have already installed it
     $ brew install yarn
+    $ brew casks install chromedriver
 
 then install the suspenders gem:
 
@@ -30,7 +31,7 @@ You can optionally specify alternate Heroku flags:
 
     welaika-suspenders projectname \
       --heroku true \
-      --heroku-flags "--region eu --addons heroku-postgresql,sendgrid,logentries,scheduler,newrelic"
+      --heroku-flags "--region eu --addons heroku-postgresql,sendgrid,logentries,scheduler"
 
 See all possible Heroku flags:
 

data/lib/suspenders.rb

@@ -2,7 +2,6 @@ require "suspenders/version"
 require "suspenders/generators/app_generator"
 require "suspenders/generators/static_generator"
 require "suspenders/generators/stylesheet_base_generator"
-require "suspenders/generators/forms_generator"
 require "suspenders/generators/ci_generator"
 require "suspenders/generators/db_optimizations_generator"
 require "suspenders/generators/factories_generator"
@@ -11,12 +10,12 @@ require "suspenders/generators/views_generator"
 require "suspenders/generators/js_driver_generator"
 require "suspenders/generators/testing_generator"
 require "suspenders/generators/decorator_generator"
-require "suspenders/generators/error_reporting_generator"
 require "suspenders/generators/faker_generator"
 require "suspenders/generators/security_generator"
 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/actions"
 require "suspenders/adapters/heroku"
 require "suspenders/app_builder"

data/lib/suspenders/adapters/heroku.rb

@@ -7,9 +7,11 @@ module Suspenders
 
       def set_heroku_remotes
         remotes = <<~SHELL
+          echo "\n== Adding Heroku remotes =="
           #{command_to_join_heroku_app('staging')}
           #{command_to_join_heroku_app('production')}
 
+          echo "\n== Setting default heroku remote to 'staging' =="
           git config heroku.remote staging
         SHELL
 
@@ -37,10 +39,10 @@ module Suspenders
         end
       end
 
-      def set_heroku_honeybadger_env
+      def set_heroku_error_reporting_env
         %w(staging production).each do |environment|
           run_toolbelt_command(
-            "config:add HONEYBADGER_ENV=#{environment}",
+            "config:add SENTRY_ENV=#{environment}",
             environment,
           )
         end
@@ -97,6 +99,28 @@ 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(
+            "buildpacks:add --index 1 heroku/nodejs",
+            environment
+          )
+          run_toolbelt_command(
+            "buildpacks:add --index 2 heroku/ruby",
+            environment
+          )
+        end
+      end
+
       private
 
       attr_reader :app_builder
@@ -105,11 +129,10 @@ module Suspenders
         heroku_app_name = heroku_app_name_for(environment)
         <<~SHELL
 
-          if heroku join --app #{heroku_app_name} > /dev/null 2>&1; then
-            git remote add #{environment} git@heroku.com:#{heroku_app_name}.git || true
-            printf 'You are a collaborator on the "#{heroku_app_name}" Heroku app\n'
+          if heroku apps | grep #{heroku_app_name} > /dev/null 2>&1; then
+            git remote add -f #{environment} git@heroku.com:#{heroku_app_name}.git || true
           else
-            printf 'Ask for access to the "#{heroku_app_name}" Heroku app\n'
+            echo "** Ask for access to the '#{heroku_app_name}' Heroku app and run this script again **"
           fi
         SHELL
       end

data/lib/suspenders/app_builder.rb

@@ -14,9 +14,11 @@ module Suspenders
       :create_staging_heroku_app,
       :set_heroku_application_host,
       :set_heroku_backup_schedule,
-      :set_heroku_honeybadger_env,
+      :set_heroku_error_reporting_env,
       :set_heroku_rails_secrets,
       :set_heroku_remotes,
+      :set_heroku_metadata_for_sentry,
+      :set_buildpacks,
     )
 
     def readme
@@ -155,7 +157,7 @@ config.public_file_server.headers = {
     def replace_gemfile(path)
       template 'Gemfile.erb', 'Gemfile', force: true do |content|
         if path
-          content.gsub(%r{gem .suspenders.}) { |s| %{#{s}, path: "#{path}"} }
+          content.gsub(%r{gem ['"]welaika-suspenders['"].*}) { |s| %{#{s}, path: "#{path}"} }
         else
           content
         end
@@ -259,10 +261,6 @@ you can deploy to staging and production with:
       run "chmod a+x bin/deploy"
     end
 
-    def setup_spring
-      bundle_command "exec spring binstub --all"
-    end
-
     def copy_miscellaneous_files
       copy_file "browserslist", "browserslist"
       copy_file "errors.rb", "config/initializers/errors.rb"

data/lib/suspenders/generators/app_generator.rb

@@ -32,6 +32,9 @@ module Suspenders
     class_option :skip_turbolinks,
                  type: :boolean, default: true, desc: "Skip turbolinks gem"
 
+    class_option :skip_spring, type: :boolean, default: true,
+                 desc: "Don't install Spring application preloader"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -49,7 +52,6 @@ module Suspenders
       invoke :remove_routes_comment_lines
       invoke :setup_dotfiles
       invoke :setup_database
-      invoke :setup_spring
       invoke :generate_default
       invoke :setup_default_directories
       invoke :create_local_heroku_setup
@@ -126,8 +128,10 @@ module Suspenders
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :set_heroku_application_host
-        build :set_heroku_honeybadger_env
+        build :set_heroku_error_reporting_env
         build :set_heroku_backup_schedule
+        build :set_heroku_metadata_for_sentry
+        build :set_buildpacks
         build :create_heroku_pipeline
         build :configure_automatic_deployment
       end
@@ -141,11 +145,6 @@ module Suspenders
       build :setup_default_directories
     end
 
-    def setup_spring
-      say "Springifying binstubs"
-      build :setup_spring
-    end
-
     def copy_miscellaneous_files
       say 'Copying miscellaneous support files'
       build :copy_miscellaneous_files
@@ -165,15 +164,11 @@ module Suspenders
     end
 
     def generate_default
-      run("spring stop")
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
       generate("suspenders:testing")
       generate("suspenders:ci")
       generate("suspenders:js_driver")
-      unless options[:api]
-        generate("suspenders:forms")
-      end
       generate("suspenders:db_optimizations")
       generate("suspenders:factories")
       generate("suspenders:lint")
@@ -181,13 +176,13 @@ module Suspenders
       generate("suspenders:decorator")
       generate("suspenders:faker")
       generate("suspenders:security")
-      generate("suspenders:error_reporting")
     end
 
     def generate_production_default
       generate("suspenders:production:force_tls")
       generate("suspenders:production:email")
       generate("suspenders:production:timeout")
+      generate("suspenders:production:error_reporting")
     end
 
     def outro
@@ -196,7 +191,7 @@ module Suspenders
     end
 
     def self.banner
-      "suspenders #{arguments.map(&:usage).join(' ')} [options]"
+      "welaika-suspenders #{arguments.map(&:usage).join(' ')} [options]"
     end
 
     protected

data/lib/suspenders/generators/ci_generator.rb

@@ -6,17 +6,12 @@ module Suspenders
       File.join("..", "..", "..", "templates"),
       File.dirname(__FILE__))
 
-    def simplecov_test_integration
-      inject_into_file "spec/spec_helper.rb", before: 'SimpleCov.start "rails"' do
-        <<-RUBY
-
-  if ENV["CIRCLE_ARTIFACTS"]
-    dir = File.join(ENV["CIRCLE_ARTIFACTS"], "coverage")
-    SimpleCov.coverage_dir(dir)
-  end
+    def setup_gitlab_ci
+      template 'gitlab-ci.yml.erb', '.gitlab-ci.yml'
+    end
 
-        RUBY
-      end
+    def copy_database_yml_for_gitlab
+      copy_file 'database.gitlab.yml', 'config/database.gitlab.yml'
     end
   end
 end

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

@@ -0,0 +1,57 @@
+require "rails/generators"
+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__),
+      )
+
+      def add_sentry
+        gem "sentry-raven"
+        Bundler.with_clean_env { run "bundle install" }
+      end
+
+      def set_up_sentry
+        copy_file "sentry.rb", "config/initializers/sentry.rb"
+      end
+
+      def configure_sentry_context
+        inject_into_class(
+          "app/controllers/application_controller.rb",
+          'ApplicationController',
+          context_configuration
+        )
+      end
+
+      def env_vars
+        expand_json(
+          "app.json",
+          env: {
+            SENTRY_DSN: { required: true },
+            SENTRY_ENV: { required: true }
+          }
+        )
+      end
+
+      private
+
+      def context_configuration
+        <<-RUBY
+    before_action :set_raven_context
+
+    private
+
+    def set_raven_context
+      Raven.user_context(id: session[:current_user_id])
+      Raven.extra_context(params: params.to_unsafe_h, url: request.url)
+    end
+        RUBY
+      end
+    end
+  end
+end

data/lib/suspenders/generators/security_generator.rb

@@ -14,7 +14,10 @@ module Suspenders
     end
 
     def create_binstubs
-      Bundler.with_clean_env { run "bundle binstubs brakeman" }
+      Bundler.with_clean_env do
+        run "bundle binstubs brakeman"
+        run "bundle binstubs bundler-audit"
+      end
     end
   end
 end

data/lib/suspenders/generators/testing_generator.rb

@@ -8,7 +8,6 @@ module Suspenders
     )
 
     def add_testing_gems
-      gem "spring-commands-rspec", group: :development
       gem "rspec-rails", "~> 3.8", group: %i(development test)
       gem "shoulda-matchers", group: :test
 
@@ -34,8 +33,7 @@ module Suspenders
     end
 
     def configure_spec_support_features
-      empty_directory_with_keep_file "spec/features"
-      empty_directory_with_keep_file "spec/support/features"
+      empty_directory_with_keep_file "spec/system"
     end
 
     def configure_i18n_for_test_environment
@@ -54,10 +52,6 @@ module Suspenders
       copy_file 'queries_helper_rspec.rb', 'spec/support/queries_helper.rb'
     end
 
-    def add_capybara_helper
-      copy_file 'capybara_helpers.rb', 'spec/support/capybara_helpers.rb'
-    end
-
     private
 
     def empty_directory_with_keep_file(destination)

data/lib/suspenders/version.rb

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

data/spec/features/cli_help_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe "Command line help output" do
   it "provides the correct usage statement for suspenders" do
     expect(help_text).to include <<~EOH
       Usage:
-        suspenders APP_PATH [options]
+        welaika-suspenders APP_PATH [options]
     EOH
   end
 

data/spec/features/heroku_spec.rb

@@ -13,14 +13,10 @@ RSpec.describe "Heroku" do
 
       expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
       expect(FakeHeroku).to have_created_app_for("production", "--region eu")
-      expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
-      expect(FakeHeroku).to have_configured_vars(
-        "production",
-        "SECRET_KEY_BASE",
-      )
       %w(staging production).each do |env|
         expect(FakeHeroku).to have_configured_vars(env, "APPLICATION_HOST")
-        expect(FakeHeroku).to have_configured_vars(env, "HONEYBADGER_ENV")
+        expect(FakeHeroku).to have_configured_vars(env, "SENTRY_DSN")
+        expect(FakeHeroku).to have_configured_vars(env, "SECRET_KEY_BASE")
       end
       expect(FakeHeroku).to have_setup_pipeline_for(app_name)
 
@@ -39,19 +35,6 @@ 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/new_project_spec.rb

@@ -11,13 +11,13 @@ RSpec.describe "Suspend a new project with default configuration" do
   it "uses custom Gemfile" do
     gemfile_file = IO.read("#{project_path}/Gemfile")
     expect(gemfile_file).to match(
-      /^ruby "#{Suspenders::RUBY_VERSION}"$/,
+      /^ruby '#{Suspenders::RUBY_VERSION}'$/,
     )
     expect(gemfile_file).to match(
-      /^gem "autoprefixer-rails"$/,
+      /^gem 'autoprefixer-rails'$/,
     )
     expect(gemfile_file).to match(
-      /^gem "rails", "#{Suspenders::RAILS_VERSION}"$/,
+      /^gem 'rails', '#{Suspenders::RAILS_VERSION}'$/,
     )
   end
 
@@ -29,14 +29,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
-  it "includes the bundle:audit task" do
-    Dir.chdir(project_path) do
-      Bundler.with_clean_env do
-        expect(`rails -T`).to include("rails bundle:audit")
-      end
-    end
-  end
-
   it "creates .ruby-version from Suspenders .ruby-version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 
@@ -82,14 +74,10 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(File).to exist("#{project_path}/spec/support/i18n.rb")
   end
 
-  it "adds rspec helper for fixtures" do
-    expect(File).to exist("#{project_path}/spec/support/fixtures_helper.rb")
-  end
-
   it "ensures Gemfile contains `rack-mini-profiler`" do
     gemfile = IO.read("#{project_path}/Gemfile")
 
-    expect(gemfile).to include %{gem "rack-mini-profiler", require: false}
+    expect(gemfile).to include %{gem 'rack-mini-profiler', require: false}
   end
 
   it "ensures .sample.env defaults to RACK_MINI_PROFILER=0" do
@@ -98,11 +86,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(env).to include "RACK_MINI_PROFILER=0"
   end
 
-  it "initializes ActiveJob to avoid memory bloat" do
-    expect(File).
-      to exist("#{project_path}/config/initializers/active_job.rb")
-  end
-
   it "creates a rack-mini-profiler initializer" do
     expect(File).
       to exist("#{project_path}/config/initializers/rack_mini_profiler.rb")
@@ -160,10 +143,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(locales_it_file).to match(/application: #{app_name.humanize}/)
   end
 
-  it "configs simple_form" do
-    expect(File).to exist("#{project_path}/config/initializers/simple_form.rb")
-  end
-
   it "configs :letter_opener as email delivery method for development" do
     dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
     expect(dev_env_file).
@@ -208,15 +187,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     )
   end
 
-  it "adds spring to binstubs" do
-    expect(File).to exist("#{project_path}/bin/spring")
-
-    bin_stubs = %w(rake rails rspec)
-    bin_stubs.each do |bin_stub|
-      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(/spring/)
-    end
-  end
-
   it "adds rspec's helper files" do
     expect(File).to exist("#{project_path}/spec/spec_helper.rb")
     expect(File).to exist("#{project_path}/spec/rails_helper.rb")

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ RSpec.configure do |config|
 
   config.example_status_persistence_file_path = 'tmp/rspec_examples.txt'
 
+  config.default_formatter = 'doc'
+
   config.before(:all) do
     add_fakes_to_path
     create_tmp_directory

data/spec/support/suspenders.rb

@@ -21,7 +21,7 @@ module SuspendersTestHelpers
       Dir.chdir(APP_NAME) do
         with_env("HOME", tmp_path) do
           debug `git add .`
-          debug `git commit -m 'Initial commit'`
+          debug `OVERCOMMIT_DISABLE=1 git commit -m 'Initial commit'`
         end
       end
     end
@@ -41,17 +41,17 @@ module SuspendersTestHelpers
       add_fakes_to_path
 
       with_revision_for_honeybadger do
-        debug `#{system_rails_bin} new #{APP_NAME}`
+        debug `#{system_rails_bin} new #{APP_NAME} --skip-spring`
       end
 
       Dir.chdir(APP_NAME) do
         File.open("Gemfile", "a") do |file|
-          file.puts %{gem "suspenders", path: #{root_path.inspect}}
+          file.puts %{gem "welaika-suspenders", path: #{root_path.inspect}}
         end
 
         with_env("HOME", tmp_path) do
           debug `git add .`
-          debug `git commit -m 'Initial commit'`
+          debug `OVERCOMMIT_DISABLE=1 git commit -m 'Initial commit'`
         end
       end
     end
@@ -60,7 +60,6 @@ module SuspendersTestHelpers
   def generate(generator)
     run_in_project do
       with_revision_for_honeybadger do
-        debug `bin/spring stop`
         debug `#{project_rails_bin} generate #{generator}`
       end
     end
@@ -69,7 +68,6 @@ module SuspendersTestHelpers
   def destroy(generator)
     run_in_project do
       with_revision_for_honeybadger do
-        `bin/spring stop`
         `#{project_rails_bin} destroy #{generator}`
       end
     end

data/templates/Gemfile.erb

@@ -32,7 +32,6 @@ group :development do
   gem 'letter_opener'
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'rack-mini-profiler', require: false
-  gem 'spring'
   gem 'web-console', '>= 3.3.0'
 end
 

data/templates/README.md.erb

@@ -16,12 +16,6 @@ To install Postgres:
 
     $ brew install postgresql
 
-To install MySQL:
-
-    $ brew tap homebrew/versions
-    $ brew install mysql55
-    $ brew link --force mysql55
-
 To install Node:
 
     $ brew install node
@@ -36,7 +30,7 @@ To install Yarn:
 
 To install Chromedriver (for integration test):
 
-    $ brew install chromedriver
+    $ brew cask install chromedriver
 
 To install ImageMagick:
 

data/templates/_css_overrides.html.slim

@@ -1,4 +1,5 @@
 - if Rails.env.test?
-  sass:
-    *
-      transition-property: none !important
+  css:
+    * {
+      transition-property: none !important;
+    }

data/templates/_javascript.html.slim

@@ -1,8 +1,3 @@
 = javascript_include_tag :application
 
 = yield :javascript
-
-- if Rails.env.test?
-  coffee:
-    $.fx.off = true
-    $.ajaxSetup(async: false)

data/templates/application.sass

@@ -1,3 +1,3 @@
 @charset 'utf-8'
 
-@import 'normalize.css/normalize.css'
+@import 'normalize.css/normalize'

data/templates/bin_setup

@@ -1,34 +1,22 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-include FileUtils
+#!/bin/sh
 
-APP_ROOT = File.expand_path('..', __dir__)
+# Set up Rails app. Run this script immediately after cloning the codebase.
 
-def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
-end
+# Exit if any subcommand fails
+set -e
 
-chdir APP_ROOT do
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
+echo '== Installing dependencies =='
+gem install bundler --conservative
+bundle check || bundle install
+bin/yarn
 
-  system('bin/yarn')
+echo "\n== Copying sample files =="
+if [ ! -f .env.local ]; then
+  cp .env .env.local
+fi
 
-  puts "\n== Copying sample files =="
-  unless File.exist?('.env.local')
-    cp '.env', '.env.local'
-  end
+echo "\n== Preparing database and seeds =="
+bin/rails dev:prime
 
-  puts "\n== Preparing database and seeds =="
-  system! 'bin/rake dev:prime'
-
-  puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
-
-  puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
-
-  puts "\n== Activating overcommit =="
-  system! 'bin/overcommit --install'
-end
+echo "\n== Activating overcommit =="
+bin/overcommit --install

data/templates/chromedriver.rb

@@ -2,9 +2,7 @@
 
 require 'selenium/webdriver'
 
-Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome)
-end
+Capybara.server = :puma, { Silent: true }
 
 Capybara.register_driver :headless_chrome do |app|
   capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
@@ -18,5 +16,27 @@ Capybara.register_driver :headless_chrome do |app|
   )
 end
 
-Capybara.javascript_driver = :headless_chrome
-Capybara.asset_host = 'http://localhost:3000'
+RSpec.configure do |config|
+  config.before(:each, type: :system) do
+    if ENV['SELENIUM_REMOTE_URL'].present?
+      # Make the test app listen to outside requests, for the remote Selenium instance.
+      Capybara.server_host = '0.0.0.0'
+
+      # Specify the driver
+      driven_by :selenium, using: :chrome, screen_size: [1400, 2000],
+                           options: { url: ENV['SELENIUM_REMOTE_URL'] }
+
+      # Get the rails application IP
+      rails_ip = Socket.ip_address_list.find(&:ipv4_private?).ip_address
+
+      # Set the rails application Port (choose what you want)
+      Capybara.server_port = 3001
+
+      # Use the IP instead of localhost so Capybara knows where to direct Selenium
+      host! "http://#{rails_ip}:#{Capybara.server_port}"
+    else
+      # Otherwise, use the local machine's chromedriver
+      driven_by :headless_chrome
+    end
+  end
+end

data/templates/database.gitlab.yml

@@ -0,0 +1,8 @@
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: rails_app_test
+  pool: 5
+  host: postgres # should match gitlab service name
+  username: root
+  password: ''

data/templates/factory_bot.rake

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'database_cleaner'
-
 namespace :factory_bot do
   desc 'Verify that all FactoryBot factories are valid'
   task lint: :environment do
     if Rails.env.test?
+      require 'database_cleaner'
+
       sh 'bundle exec rails db:migrate'
       DatabaseCleaner.clean_with :truncation
       DatabaseCleaner.strategy = :transaction

data/templates/gitlab-ci.yml.erb

@@ -0,0 +1,114 @@
+image: ruby:<%= Suspenders::RUBY_VERSION %>
+
+variables:
+  GET_SOURCES_ATTEMPTS: 3
+  ARTIFACT_DOWNLOAD_ATTEMPTS: 3
+  RESTORE_CACHE_ATTEMPTS: 3
+  POSTGRES_DB: rails_app_test
+  POSTGRES_USER: root
+  POSTGRES_PASSWORD: ''
+  SELENIUM_REMOTE_URL: "http://selenium__standalone-chrome:4444/wd/hub/"
+
+.services: &rails-services
+  - postgres:<%= Suspenders::POSTGRES_VERSION %>
+  - selenium/standalone-chrome:latest
+
+.cache: &gems-cache-settings
+  key: "gems-$CI_COMMIT_REF_SLUG"
+  paths:
+    - vendor/bundle
+
+stages:
+  - setup
+  - quality
+  - test
+
+prepare:
+  stage: setup
+  cache:
+    <<: *gems-cache-settings
+  script:
+    - bundle install --retry 3 --deployment --jobs $(nproc)
+
+quality:rubocop:
+  stage: quality
+  cache:
+    <<: *gems-cache-settings
+    policy: pull
+  script:
+    - bundle check --path vendor/bundle
+    - bundle exec rubocop
+
+quality:slim_lint:
+  stage: quality
+  cache:
+    <<: *gems-cache-settings
+    policy: pull
+  script:
+    - bundle check --path vendor/bundle
+    - bundle exec slim-lint app/views/
+
+quality:bundler-audit:
+  stage: quality
+  cache:
+    <<: *gems-cache-settings
+    policy: pull
+  script:
+    - bundle check --path vendor/bundle
+    - bundle exec bundle-audit check --update
+
+quality:brakeman:
+  stage: quality
+  cache:
+    <<: *gems-cache-settings
+    policy: pull
+  script:
+    - bundle check --path vendor/bundle
+    - bundle exec brakeman -z --skip-files vendor/bundle
+
+quality:rubycritic:
+  stage: quality
+  cache:
+    <<: *gems-cache-settings
+    policy: pull
+  script:
+    - bundle check --path vendor/bundle
+    - bundle exec rubycritic app/ config/ lib/ --no-browser --minimum-score 94 --format console
+
+test:rspec:
+  stage: test
+  services: *rails-services
+  cache:
+    <<: *gems-cache-settings
+    policy: pull
+  script:
+    # Install node
+    - curl -sL https://deb.nodesource.com/setup_10.x | bash -
+    - apt-get update -qq && apt-get install -qq nodejs
+
+    # Install yarn
+    - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+    - echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+    - apt-get update -qq && apt-get install -qq yarn
+
+    # 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/overcommit.yml

@@ -11,4 +11,4 @@ PreCommit:
   SlimLint:
     enabled: true
     on_warn: fail # Treat all warnings as failures
-    command: ['bundle', 'exec', 'slim-lint'] # Invoke within Bundler context
+    command: ['bundle', 'exec', 'slim-lint', 'app/views/'] # Invoke within Bundler context

data/templates/rails_helper.rb

@@ -4,10 +4,10 @@ ENV['RACK_ENV'] = 'test'
 
 require File.expand_path('../config/environment', __dir__)
 
-
 abort('DATABASE_URL environment variable is set') if ENV['DATABASE_URL']
 
 require 'rspec/rails'
+require 'capybara/rails'
 
 Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |file| require file }
 

data/templates/rakefile_template.rb

@@ -11,10 +11,12 @@ task(:default).clear
 desc 'Run linters, quality, security and tests'
 task :default do
   sh 'bundle exec rubocop'
+  sh 'bundle exec slim-lint app/views/'
   sh 'bundle exec rubycritic app/ config/ lib/ --no-browser --minimum-score 94 --format console'
   sh 'bundle exec bundle-audit check --update'
   sh 'bundle exec brakeman -z'
-  sh 'bundle exec rails db:migrate RAILS_ENV=test'
+  sh 'bundle exec rails db:setup RAILS_ENV=test'
+  sh 'bundle exec rails db:migrate RAILS_ENV=test' # runs any pending migrations
   sh 'bundle exec rake factory_bot:lint RAILS_ENV=test'
   sh 'bundle exec rspec spec/'
 end

data/templates/rubocop.yml

@@ -10,10 +10,6 @@ AllCops:
     - 'tmp/**/*'
     - 'vendor/**/*'
 
-Lint/Debugger:
-  Exclude:
-    - 'spec/support/capybara_helpers.rb'
-
 Metrics/BlockLength:
   Exclude:
     - 'app/admin/**/*'

data/templates/sentry.rb

@@ -4,5 +4,5 @@ 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.current_environment = ENV.fetch('SENTRY_CURRENT_ENV', Rails.env)
+  config.current_environment = ENV.fetch('SENTRY_ENV', Rails.env)
 end

data/todo.txt

@@ -0,0 +1,15 @@
+# TODO
+configurare gitlab ci
+
+# DONE
+controllare che :sass e :coffee nei file slim funzionino in produzione
+rake file con rubocop, brakeman, bla bla
+controllare se ci sono altri linters da mettere
+aggiungere sentry
+aggiornare rspec
+configurare rubocop
+configurare overcommit
+aggiungere jquery ad application.js oppure rimuoverlo del tutto!
+
+# SKIPPED
+aggiungere sidekiq, oppure rimuovere delayed_job:w

data/todo_suspenders.md

@@ -0,0 +1 @@
+* aggiornare rspec-rails

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.29.0.alpha.2
+  version: 2.29.0.alpha.3
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,13 +75,12 @@ files:
 - lib/suspenders/generators/ci_generator.rb
 - lib/suspenders/generators/db_optimizations_generator.rb
 - lib/suspenders/generators/decorator_generator.rb
-- lib/suspenders/generators/error_reporting_generator.rb
 - lib/suspenders/generators/factories_generator.rb
 - lib/suspenders/generators/faker_generator.rb
-- lib/suspenders/generators/forms_generator.rb
 - lib/suspenders/generators/js_driver_generator.rb
 - lib/suspenders/generators/lint_generator.rb
 - lib/suspenders/generators/production/email_generator.rb
+- lib/suspenders/generators/production/error_reporting_generator.rb
 - lib/suspenders/generators/production/force_tls_generator.rb
 - lib/suspenders/generators/production/timeout_generator.rb
 - lib/suspenders/generators/security_generator.rb
@@ -118,9 +117,9 @@ files:
 - templates/bin_setup
 - templates/bin_setup_review_app.erb
 - templates/browserslist
-- templates/capybara_helpers.rb
 - templates/chromedriver.rb
 - templates/config_locales_it.yml.erb
+- templates/database.gitlab.yml
 - templates/dev.rake
 - templates/dotfiles/.ctags
 - templates/dotfiles/.env
@@ -130,6 +129,7 @@ files:
 - templates/factory_bot_rspec.rb
 - templates/faker_rspec.rb
 - templates/flashes_helper.rb
+- templates/gitlab-ci.yml.erb
 - templates/i18n.rb
 - templates/json_encoding.rb
 - templates/overcommit.yml
@@ -151,6 +151,8 @@ files:
 - templates/spec_helper.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.slim
+- todo.txt
+- todo_suspenders.md
 homepage: http://github.com/welaika/welaika-suspenders
 licenses:
 - MIT

data/lib/suspenders/generators/error_reporting_generator.rb

@@ -1,55 +0,0 @@
-require "rails/generators"
-require_relative "../actions"
-
-module Suspenders
-  class ErrorReportingGenerator < Rails::Generators::Base
-    include Suspenders::Actions
-
-    source_root File.expand_path(
-      File.join("..", "..", "..", "templates"),
-      File.dirname(__FILE__),
-    )
-
-    def add_sentry
-      gem "sentry-raven"
-      Bundler.with_clean_env { run "bundle install" }
-    end
-
-    def set_up_sentry
-      copy_file "sentry.rb", "config/initializers/sentry.rb"
-    end
-
-    def configure_sentry_context
-      inject_into_class(
-        "app/controllers/application_controller.rb",
-        'ApplicationController',
-        context_configuration
-      )
-    end
-
-    def env_vars
-      expand_json(
-        "app.json",
-        env: {
-          SENTRY_DSN: { required: true },
-          SENTRY_CURRENT_ENV: { required: true }
-        }
-      )
-    end
-
-    private
-
-    def context_configuration
-      <<-RUBY
-  before_action :set_raven_context
-
-  private
-
-  def set_raven_context
-    Raven.user_context(id: session[:current_user_id])
-    Raven.extra_context(params: params.to_unsafe_h, url: request.url)
-  end
-      RUBY
-    end
-  end
-end

data/lib/suspenders/generators/forms_generator.rb

@@ -1,18 +0,0 @@
-require "rails/generators"
-
-module Suspenders
-  class FormsGenerator < Rails::Generators::Base
-    def add_simple_form
-      gem "simple_form"
-      Bundler.with_clean_env { run "bundle install" }
-    end
-
-    def configure_simple_form
-      create_file "config/initializers/simple_form.rb" do
-        "SimpleForm.setup {|config|}"
-      end
-
-      generate "simple_form:install", "--force"
-    end
-  end
-end

data/templates/capybara_helpers.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module CapybaraHelpers
-  def page!
-    save_and_open_page
-  end
-
-  def screenshot!
-    save_and_open_screenshot
-  end
-end
-
-RSpec.configure do |config|
-  config.include CapybaraHelpers, type: :feature
-end