welaika-suspenders 2.25.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35275d2042fd17e7555c3395e05fc82256ec40a5
-  data.tar.gz: e946e11fa1984ae6607fcd4283989c26accbae5f
+  metadata.gz: 1ecce30cf53025a563d920bdab67f869721f4beb
+  data.tar.gz: 8416bd5f21aaada18c56be47cfaaa918b63edbbb
 SHA512:
-  metadata.gz: 28a6065760b7660c88390c0f32075c36e3c03e7573943eaa4f36634a62ebf9126e19d45a0328c10f881a000052a5893ad0186979daa1b65d874abe2ef4b47463
-  data.tar.gz: af6c24992c6fc71b47c5f925e053075f5f72a62951954b2384c151c0f1fb6d8af8fdb3e9ae271c16fe3a006a72fddd0e57dc5df9dab89b86246bd761afde5338
+  metadata.gz: acde67c5a7d352813e7f924c29cdadd7671f70ef119efe4b913fe98a9bba447e71647d07bcc1cb37961e24e90fbeb2c49244458a2c718435e2a9cec70fdc8a8c
+  data.tar.gz: ac6bdc80ed994e47251c51da9f40010b7e1068dddfabe556f67e4cfd3ca5546e6773e703ae3b904c51f56f994c044ba04838114caf19a2bfa7a4a7af8b0c4e1a

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.0

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.3.1
+rvm: 2.4.0
 cache: bundler
 sudo: false
 before_install:

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008-2016 thoughtbot, inc.
+Copyright (c) 2008-2017 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,4 +1,32 @@
-master
+1.44.0 (January 25, 2017)
+
+* Improve readability of `bin/setup-review-app` (#819)
+* Update scripts to be `sh`-compatible (#820)
+* Remove `rails_stdout_logging` gem (#818)
+* Remove `12factor` gem (#817)
+* Update Ruby to 2.4.0 (#814)
+
+1.43.0 (November 8, 2016)
+
+* Update Bourbon to 5.0.0.beta.7
+* Update Neat to 2.0.0.beta.1
+* Update Bitters to 1.5.0
+* Drop sprockets-es6
+* Bugfix: doesn’t generate unused `test/` directory
+
+1.42.0 (July 23, 2016)
+
+* [#784] Require refills once
+* [#790] Ensure stylesheet_base generator runs with a clean bundle
+* [#791] Use Rails' 5 syntax for `public_file_server.headers`
+* [#792] Remove turbolinks from application.js file
+
+1.41.0 (July 1, 2016)
+
+* Update to Rails 5
+* Drop quiet_assets
+* Drop unneeded `suspenders` aliases: `--skip-test-unit`, `--skip-turbolinks`,
+  `--skip-bundle`. Drops `-G` that clashes with Rails’ `--skip-git` alias.
 
 1.40.0 (June 25, 2016)
 

data/README.md

@@ -9,11 +9,6 @@ First install the suspenders gem:
 
     gem install welaika-suspenders
 
-If you are using RVM, please before create a new gemset named like `projectname`:
-
-    rvm gemset create projectname
-    rvm gemset use projectname
-
 If you want to use heroku, please install the [heroku toolbelt](https://toolbelt.heroku.com/) and run
 
     heroku login
@@ -62,7 +57,6 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - add some html meta tags
 - use EU region as default for Heroku
 - use CDATA wrapper for javascript
-- create a .ruby-gemset file with app name
 - create common folders like `app/queries`, `app/services`, etc.
 - use `application.sass` instead of `application.scss`
 - add `brakeman` gem

data/USAGE

@@ -2,12 +2,15 @@ Description:
     Suspenders is a Rails template with thoughtbot standard
     defaults, ready to deploy to Heroku.
 
+    This is a forked version by weLaika.
+
     For full details on the changes we've made compared to
     a vanilla Rails app, check our GitHub project:
         https://github.com/thoughtbot/suspenders
+        https://github.com/welaika/welaika-suspenders
 
 Example:
-    suspenders ~/Code/weblog
+    welaika-suspenders ~/Code/weblog
 
     This generates a Rails installation in ~/Code/weblog configured
     with our preferred defaults.

data/lib/suspenders/adapters/heroku.rb

@@ -6,7 +6,7 @@ module Suspenders
       end
 
       def set_heroku_remotes
-        remotes = <<-SHELL.strip_heredoc
+        remotes = <<~SHELL
           #{command_to_join_heroku_app('staging')}
           #{command_to_join_heroku_app('production')}
 
@@ -37,6 +37,15 @@ module Suspenders
         end
       end
 
+      def set_heroku_backup_schedule
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "pg:backups:schedule DATABASE_URL --at '10:00 UTC'",
+            environment,
+          )
+        end
+      end
+
       def create_review_apps_setup_script
         app_builder.template(
           "bin_setup_review_app.erb",
@@ -70,15 +79,6 @@ module Suspenders
         )
       end
 
-      def set_heroku_serve_static_files
-        %w(staging production).each do |environment|
-          run_toolbelt_command(
-            "config:add RAILS_SERVE_STATIC_FILES=true",
-            environment,
-          )
-        end
-      end
-
       def set_heroku_application_host
         %w(staging production).each do |environment|
           run_toolbelt_command(
@@ -94,14 +94,14 @@ module Suspenders
 
       def command_to_join_heroku_app(environment)
         heroku_app_name = heroku_app_name_for(environment)
-        <<-SHELL
-
-if heroku join --app #{heroku_app_name} &> /dev/null; 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'
-else
-  printf 'Ask for access to the "#{heroku_app_name}" Heroku app\n'
-fi
+        <<~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'
+          else
+            printf 'Ask for access to the "#{heroku_app_name}" Heroku app\n'
+          fi
         SHELL
       end
 

data/lib/suspenders/app_builder.rb

@@ -12,9 +12,9 @@ module Suspenders
                    :create_staging_heroku_app,
                    :create_review_apps_setup_script,
                    :set_heroku_rails_secrets,
+                   :set_heroku_backup_schedule,
                    :set_heroku_remotes,
-                   :set_heroku_application_host,
-                   :set_heroku_serve_static_files
+                   :set_heroku_application_host
 
     def readme
       template 'README.md.erb', 'README.md'
@@ -44,7 +44,15 @@ module Suspenders
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
-    def configure_letter_opener
+    def remove_turbolinks
+      replace_in_file(
+        "app/assets/javascripts/application.js",
+        "//= require turbolinks",
+        ""
+      )
+    end
+
+    def set_test_delivery_method
       inject_into_file(
         "config/environments/development.rb",
         "\n  config.action_mailer.delivery_method = :letter_opener",
@@ -79,7 +87,7 @@ module Suspenders
 
     def configure_quiet_assets
       config = <<-RUBY
-    config.quiet_assets = true
+    config.assets.quiet = true
       RUBY
 
       inject_into_class "config/application.rb", "Application", config
@@ -98,8 +106,9 @@ module Suspenders
       config = <<-RUBY
 
     config.generators do |generate|
+      generate.controller_specs false
       generate.helper false
-      generate.javascript_engine false
+      generate.javascripts false
       generate.request_specs false
       generate.routing_specs false
       generate.stylesheets false
@@ -171,10 +180,13 @@ module Suspenders
         "config.assets.version = '1.0'",
         'config.assets.version = (ENV["ASSETS_VERSION"] || "1.0")'
 
-      configure_environment(
-        "production",
-        'config.static_cache_control = "public, max-age=31557600"',
-      )
+      config = <<-EOD
+config.public_file_server.headers = {
+    "Cache-Control" => "public, max-age=31557600",
+  }
+      EOD
+
+      configure_environment("production", config)
     end
 
     def setup_secret_token
@@ -235,10 +247,6 @@ module Suspenders
       create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
     end
 
-    def create_ruby_gemset_file
-      create_file '.ruby-gemset', "#{app_name}\n"
-    end
-
     def enable_database_cleaner
       copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
     end
@@ -262,6 +270,10 @@ module Suspenders
       copy_file "spec_helper.rb", "spec/spec_helper.rb"
     end
 
+    def configure_ci
+      template "circle.yml.erb", "circle.yml"
+    end
+
     def configure_i18n_for_test_environment
       copy_file "i18n.rb", "spec/support/i18n.rb"
     end
@@ -283,23 +295,17 @@ module Suspenders
       copy_file "capybara_webkit.rb", "spec/support/capybara_webkit.rb"
     end
 
-    def configure_locales
+    def configure_locales_and_time_zone
       remove_file "config/locales/en.yml"
       template "config_locales_it.yml.erb", "config/locales/it.yml"
 
-      replace_in_file "config/application.rb",
-        "# config.i18n.default_locale = :de",
-        "config.i18n.default_locale = :it"
-
-      replace_in_file "config/application.rb",
-        "# config.time_zone = 'Central Time (US & Canada)'",
-        "config.time_zone = 'Rome'"
-
-      available_locales_config = <<-RUBY
+      config = <<-RUBY
     config.i18n.available_locales = [:en, :it]
+    config.i18n.default_locale = :it
+    config.time_zone = 'Rome'
       RUBY
 
-      inject_into_class 'config/application.rb', 'Application', available_locales_config
+      inject_into_class 'config/application.rb', 'Application', config
     end
 
     def configure_rack_timeout
@@ -335,8 +341,8 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       generate 'rspec:install'
     end
 
-    def configure_puma
-      copy_file "puma.rb", "config/puma.rb"
+    def replace_default_puma_configuration
+      copy_file "puma.rb", "config/puma.rb", force: true
     end
 
     def set_up_forego
@@ -345,19 +351,19 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
 
     def setup_default_directories
       [
-        'app/forms',
         'app/decorators',
+        'app/forms',
         'app/queries',
         'app/services',
         'app/views/pages',
-        'spec/controllers',
+        'spec/decorators',
+        'spec/fixtures',
         'spec/forms',
         'spec/helpers',
         'spec/lib',
-        'spec/decorators',
         'spec/queries',
+        'spec/requests',
         'spec/services',
-        'spec/fixtures',
         'spec/support/matchers',
         'spec/support/mixins',
         'spec/support/shared_examples'
@@ -389,22 +395,14 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
 If you have previously run the `./bin/setup` script,
 you can deploy to staging and production with:
 
-    $ ./bin/deploy staging
-    $ ./bin/deploy production
+    % ./bin/deploy staging
+    % ./bin/deploy production
       MARKDOWN
 
       append_file "README.md", instructions
       run "chmod a+x bin/deploy"
     end
 
-    def create_github_repo(repo_name)
-      run "hub create #{repo_name}"
-    end
-
-    def setup_bundler_audit
-      copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
-    end
-
     def setup_brakeman
       copy_file "brakeman.rake", "lib/tasks/brakeman.rake"
     end
@@ -414,6 +412,10 @@ you can deploy to staging and production with:
       copy_file "rubocop.yml", ".rubocop.yml"
     end
 
+    def setup_bundler_audit
+      copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
+    end
+
     def setup_spring
       bundle_command "exec spring binstub --all"
     end
@@ -485,7 +487,7 @@ end
 task default: :rubocop
 task default: :spec
 task default: "brakeman:check"
-task default: "bundler:audit"
+task default: "bundle:audit"
         EOS
       end
     end

data/lib/suspenders/generators/app_generator.rb

@@ -14,18 +14,6 @@ module Suspenders
     class_option :heroku_flags, type: :string, default: "--region eu",
       desc: "Set extra Heroku flags"
 
-    class_option :github, type: :string, aliases: "-G", default: nil,
-      desc: "Create Github repository and add remote origin pointed to repo"
-
-    class_option :skip_test_unit, type: :boolean, aliases: "-T", default: true,
-      desc: "Skip Test::Unit files"
-
-    class_option :skip_turbolinks, type: :boolean, default: true,
-      desc: "Skip turbolinks gem"
-
-    class_option :skip_bundle, type: :boolean, aliases: "-B", default: true,
-      desc: "Don't run bundle install"
-
     class_option :version, type: :boolean, aliases: "-v", group: :suspenders,
       desc: "Show Suspenders version number and quit"
 
@@ -35,6 +23,9 @@ module Suspenders
     class_option :path, type: :string, default: nil,
       desc: "Path to the gem"
 
+    class_option :skip_test, type: :boolean, default: true,
+      desc: "Skip Test Unit"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -48,25 +39,22 @@ module Suspenders
       invoke :setup_secret_token
       invoke :create_suspenders_views
       invoke :configure_app
-      invoke :setup_stylesheets
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
       invoke :setup_dotfiles
-      invoke :setup_git
       invoke :setup_database
       invoke :create_local_heroku_setup
       invoke :create_heroku_apps
-      invoke :create_github_repo
       invoke :setup_spring
       invoke :create_binstubs
       invoke :generate_default
+      invoke :setup_git
       invoke :outro
     end
 
     def customize_gemfile
-      build :create_ruby_gemset_file
       build :replace_gemfile, options[:path]
       build :set_ruby_to_version_being_used
       bundle_command 'install'
@@ -87,7 +75,8 @@ module Suspenders
       say 'Setting up the development environment'
       build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
-      build :configure_letter_opener
+      build :remove_turbolinks
+      build :set_test_delivery_method
       build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
@@ -111,6 +100,7 @@ module Suspenders
       build :enable_database_cleaner
       build :provide_shoulda_matchers_config
       build :configure_spec_support_features
+      build :configure_ci
       build :configure_i18n_for_test_environment
       build :configure_action_mailer_in_specs
       build :set_up_faker
@@ -143,21 +133,16 @@ module Suspenders
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
-      build :configure_locales
+      build :configure_locales_and_time_zone
       build :configure_active_job
       build :configure_slim
       build :configure_time_formats
       build :setup_default_rake_task
-      build :configure_puma
+      build :replace_default_puma_configuration
       build :set_up_forego
       build :setup_rack_mini_profiler
     end
 
-    def setup_stylesheets
-      say 'Set up stylesheets'
-      build :setup_stylesheets
-    end
-
     def setup_git
       if !options[:skip_git]
         say "Initializing git"
@@ -177,22 +162,15 @@ module Suspenders
       if options[:heroku]
         say "Creating Heroku apps"
         build :create_heroku_apps, options[:heroku_flags]
-        build :set_heroku_serve_static_files
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :set_heroku_application_host
+        build :set_heroku_backup_schedule
         build :create_heroku_pipeline
         build :configure_automatic_deployment
       end
     end
 
-    def create_github_repo
-      if !options[:skip_git] && options[:github]
-        say 'Creating Github repo'
-        build :create_github_repo, options[:github]
-      end
-    end
-
     def setup_dotfiles
       build :copy_dotfiles
     end
@@ -235,11 +213,8 @@ module Suspenders
 
     def generate_default
       run("spring stop")
-
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
-
-      bundle_command "install"
     end
 
     def outro

data/lib/suspenders/generators/static_generator.rb

@@ -4,6 +4,7 @@ module Suspenders
   class StaticGenerator < Rails::Generators::Base
     def add_high_voltage
       gem "high_voltage"
+      Bundler.with_clean_env { run "bundle install" }
     end
   end
 end

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -6,10 +6,6 @@ module Suspenders
       File.join("..", "..", "..", "templates"),
       File.dirname(__FILE__))
 
-    def add_stylesheet_gems
-      gem "bourbon", "5.0.0.beta.6"
-    end
-
     def add_css_config
       copy_file(
         "application.sass",

data/lib/suspenders/version.rb

@@ -1,8 +1,8 @@
 module Suspenders
-  RAILS_VERSION = "~> 4.2.0".freeze
+  RAILS_VERSION = "~> 5.0.0".freeze
   RUBY_VERSION = IO.
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "2.25.0".freeze
+  VERSION = "2.26.0".freeze
 end

data/lib/welaika-suspenders.rb

@@ -1 +1,7 @@
-require 'suspenders'
+require 'suspenders/version'
+require 'suspenders/generators/app_generator'
+require 'suspenders/generators/static_generator'
+require 'suspenders/generators/stylesheet_base_generator'
+require 'suspenders/actions'
+require "suspenders/adapters/heroku"
+require 'suspenders/app_builder'

data/spec/adapters/heroku_spec.rb

@@ -30,6 +30,16 @@ module Suspenders
         )
       end
 
+      it "sets the heroku backup schedule" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:run)
+
+        Heroku.new(app_builder).set_heroku_backup_schedule
+
+        expect(app_builder).to have_backup_schedule("staging")
+        expect(app_builder).to have_backup_schedule("production")
+      end
+
       it "sets the application host" do
         app_builder = double(app_name: app_name)
         allow(app_builder).to receive(:run)
@@ -49,6 +59,11 @@ module Suspenders
         SuspendersTestHelpers::APP_NAME
       end
 
+      def have_backup_schedule(remote_name)
+        have_received(:run).
+          with(/pg:backups:schedule DATABASE_URL --at '10:00 UTC' --remote #{remote_name}/)
+      end
+
       def have_configured_var(remote_name, var)
         have_received(:run).with(/config:add #{var}=.+ --remote #{remote_name}/)
       end

data/spec/features/heroku_spec.rb

@@ -31,9 +31,9 @@ RSpec.describe "Heroku" do
       bin_setup_path = "#{project_path}/bin/setup"
       bin_setup = IO.read(bin_setup_path)
 
-      expect(bin_setup).to include("heroku join --app #{app_name}-production")
-      expect(bin_setup).to include("heroku join --app #{app_name}-staging")
-      expect(bin_setup).to include("git config heroku.remote staging")
+      expect(bin_setup).to match(/^if heroku join --app #{app_name}-production/)
+      expect(bin_setup).to match(/^if heroku join --app #{app_name}-staging/)
+      expect(bin_setup).to match(/^git config heroku.remote staging/)
       expect(File.stat(bin_setup_path)).to be_executable
 
       readme = IO.read("#{project_path}/README.md")

data/spec/features/new_project_spec.rb

@@ -29,28 +29,35 @@ 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(`rake -T`).to include('rake bundle:audit')
+      end
+    end
+  end
+
   it "creates .ruby-version from Suspenders .ruby-version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 
     expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
   end
 
-  it 'creates .ruby-gemset from app name' do
-    ruby_gemset_file = IO.read("#{project_path}/.ruby-gemset")
-
-    expect(ruby_gemset_file).to eq("#{app_name}\n")
-  end
-
   it "copies dotfiles" do
     %w[.ctags .env].each do |dotfile|
       expect(File).to exist("#{project_path}/#{dotfile}")
     end
   end
 
+  it "doesn't generate test directory" do
+    expect(File).not_to exist("#{project_path}/test")
+  end
+
   it "loads secret_key_base from env" do
     secrets_file = IO.read("#{project_path}/config/secrets.yml")
 
-    expect(secrets_file).to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
+    expect(secrets_file).
+      to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
   end
 
   it "adds bin/setup file" do
@@ -124,22 +131,17 @@ RSpec.describe "Suspend a new project with default configuration" do
   it "adds explicit quiet_assets configuration" do
     result = IO.read("#{project_path}/config/application.rb")
 
-    expect(result).to match(
-      /^ +config.quiet_assets = true$/
-    )
+    expect(result).to match(/^ +config.assets.quiet = true$/)
   end
 
-  it "configures static_cache_control in production" do
-    prod_env_file = IO.read("#{project_path}/config/environments/production.rb")
-    expect(prod_env_file).to match(
-      /config.static_cache_control = "public, max-age=.+"/,
+  it "configures public_file_server.headers in production" do
+    expect(production_config).to match(
+      /^ +config.public_file_server.headers = {\n +"Cache-Control" => "public,/,
     )
   end
 
   it "raises on missing translations in development and test" do
-    %w[development test].each do |environment|
-      environment_file =
-        IO.read("#{project_path}/config/environments/#{environment}.rb")
+    [development_config, test_config].each do |environment_file|
       expect(environment_file).to match(
         /^ +config.action_view.raise_on_missing_translations = true$/
       )
@@ -168,9 +170,8 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "uses APPLICATION_HOST, not HOST in the production config" do
-    prod_env_file = IO.read("#{project_path}/config/environments/production.rb")
-    expect(prod_env_file).to match(/"APPLICATION_HOST"/)
-    expect(prod_env_file).not_to match(/"HOST"/)
+    expect(production_config).to match(/"APPLICATION_HOST"/)
+    expect(production_config).not_to match(/"HOST"/)
   end
 
   it "configures email interceptor in smtp config" do
@@ -187,7 +188,6 @@ RSpec.describe "Suspend a new project with default configuration" do
 
   it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
-    test_config = IO.read("#{project_path}/config/environments/test.rb")
 
     expect(application_config).to match(
       /^ +config.active_job.queue_adapter = :delayed_job$/
@@ -198,16 +198,12 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "configs bullet gem in development" do
-    test_config = IO.read("#{project_path}/config/environments/development.rb")
-
-    expect(test_config).to match /^ +Bullet.enable = true$/
-    expect(test_config).to match /^ +Bullet.bullet_logger = true$/
-    expect(test_config).to match /^ +Bullet.rails_logger = true$/
+    expect(development_config).to match /^ +Bullet.enable = true$/
+    expect(development_config).to match /^ +Bullet.bullet_logger = true$/
+    expect(development_config).to match /^ +Bullet.rails_logger = true$/
   end
 
   it "configs missing assets to raise in test" do
-    test_config = IO.read("#{project_path}/config/environments/test.rb")
-
     expect(test_config).to match(
       /^ +config.assets.raise_runtime_errors = true$/,
     )
@@ -240,9 +236,9 @@ RSpec.describe "Suspend a new project with default configuration" do
     config_files = [
       IO.read("#{project_path}/config/application.rb"),
       IO.read("#{project_path}/config/environment.rb"),
-      IO.read("#{project_path}/config/environments/development.rb"),
-      IO.read("#{project_path}/config/environments/production.rb"),
-      IO.read("#{project_path}/config/environments/test.rb"),
+      development_config,
+      test_config,
+      production_config,
     ]
 
     config_files.each do |file|
@@ -255,12 +251,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     bin_setup_path = "#{project_path}/bin/setup_review_app"
     bin_setup = IO.read(bin_setup_path)
 
-    expect(bin_setup).to include("heroku run rake db:migrate --exit-code "\
-                                 "--app #{app_name.dasherize}-staging-pr-$1")
-    expect(bin_setup).to include("heroku ps:scale worker=1 "\
-                                 "--app #{app_name.dasherize}-staging-pr-$1")
-    expect(bin_setup).to include("heroku restart "\
-                                 "--app #{app_name.dasherize}-staging-pr-$1")
+    expect(bin_setup).to include("PARENT_APP_NAME=#{app_name.dasherize}-staging")
+    expect(bin_setup).to include("APP_NAME=#{app_name.dasherize}-staging-pr-$1")
+    expect(bin_setup).to include("heroku run rake db:migrate --exit-code --app $APP_NAME")
+    expect(bin_setup).to include("heroku ps:scale worker=1 --app $APP_NAME")
+    expect(bin_setup).to include("heroku restart --app $APP_NAME")
+
     expect(File.stat(bin_setup_path)).to be_executable
   end
 
@@ -278,12 +274,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(app_json_file).to match(/"name":"#{app_name.dasherize}"/)
   end
 
-  it "sets up heroku specific gems" do
-    gemfile_file = IO.read("#{project_path}/Gemfile")
-
-    expect(gemfile_file).to include %{gem "rails_stdout_logging"}
-  end
-
   def app_name
     SuspendersTestHelpers::APP_NAME
   end
@@ -293,15 +283,23 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(gemfile).to match(/high_voltage/)
   end
 
-  it "adds bourbon" do
-    gemfile = read_project_file("Gemfile")
+  it "doesn't use turbolinks" do
+    app_js = read_project_file(%w(app assets javascripts application.js))
+    expect(app_js).not_to match(/turbolinks/)
+  end
+
+  def development_config
+    @_development_config ||=
+      read_project_file %w(config environments development.rb)
+  end
 
-    expect(gemfile).to match(/bourbon/)
+  def test_config
+    @_test_config ||= read_project_file %w(config environments test.rb)
   end
 
-  it "configures bourbon" do
-    app_css = read_project_file(%w(app assets stylesheets application.sass))
-    expect(app_css).to match(/normalize-rails.*bourbon/m)
+  def production_config
+    @_production_config ||=
+      read_project_file %w(config environments production.rb)
   end
 
   def read_project_file(path)

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require "bundler/setup"
-require "pry-byebug"
+require 'bundler/setup'
 
 Bundler.require(:default, :test)
 
@@ -14,11 +13,4 @@ RSpec.configure do |config|
     add_fakes_to_path
     create_tmp_directory
   end
-
-  config.before(:each) do
-    FakeGithub.clear!
-  end
-
-  config.example_status_persistence_file_path = "tmp/rspec_examples.txt"
-  config.order = :random
 end

data/spec/support/suspenders.rb

@@ -17,6 +17,12 @@ module SuspendersTestHelpers
         `
           #{suspenders_bin} #{APP_NAME} #{arguments}
         `
+        Dir.chdir(APP_NAME) do
+          with_env("HOME", tmp_path) do
+            `git add .`
+            `git commit -m 'Initial commit'`
+          end
+        end
       end
     end
   end
@@ -80,4 +86,14 @@ module SuspendersTestHelpers
   def root_path
     File.expand_path('../../../', __FILE__)
   end
+
+  def with_env(name, new_value)
+    prior = ENV[name]
+    ENV[name] = new_value.to_s
+
+    yield
+
+  ensure
+    ENV[name] = prior
+  end
 end

data/suspenders.gemspec

@@ -25,9 +25,8 @@ weLaika's fork of the famous thoughbot suspenders gem.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bundler', '~> 1.3'
+  s.add_dependency 'bundler', '>= 1.8.4'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
-  s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'rspec', '~> 3.6'
 end

data/templates/Gemfile.erb

@@ -1,18 +1,23 @@
 source "https://rubygems.org"
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
+gem "bundler", ">= 1.8.4"
+
 gem "airbrake"
 gem "autoprefixer-rails"
-gem "coffee-rails", "~> 4.1.0"
+gem "coffee-rails", "~> 4.2"
 gem "delayed_job_active_record"
-gem "draper"
 gem "email_validator"
 gem "flutie"
 gem "jquery-rails"
-gem "normalize-rails", "~> 3.0.0"
 gem "pg"
-gem "puma"
+gem "puma", "~> 3.0"
 gem "rack-canonical-host"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "rails-i18n"
@@ -21,16 +26,21 @@ gem "sass-rails", "~> 5.0"
 gem "simple_form"
 gem "skylight"
 gem "slim-rails"
-gem "welaika-suspenders", ">= <%= Suspenders::VERSION %>"
 gem "title"
-gem "uglifier"
+gem "uglifier", ">= 1.3.0"
+gem "welaika-suspenders"
+
+source "https://rails-assets.org" do
+  gem "rails-assets-normalize-css"
+end
 
 group :development do
   gem "letter_opener"
-  gem "quiet_assets"
+  gem "listen", "~> 3.0.5"
   gem "spring"
   gem "spring-commands-rspec"
-  gem "web-console"
+  gem "spring-watcher-listen", "~> 2.0.0"
+  gem "web-console", ">= 3.3.0"
 end
 
 group :development, :test do
@@ -41,10 +51,9 @@ group :development, :test do
   gem "dotenv-rails"
   gem "factory_girl_rails"
   gem "faker"
-  gem "priscilla"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.4.0"
+  gem "rspec-rails", "~> 3.5"
   gem "rubocop", require: false
 end
 
@@ -55,7 +64,6 @@ end
 group :test do
   gem "capybara-webkit"
   gem "database_cleaner"
-  gem "formulaic"
   gem "launchy"
   gem "shoulda-matchers"
   gem "simplecov", require: false
@@ -66,5 +74,4 @@ end
 
 group :staging, :production do
   gem "rack-timeout"
-  gem "rails_stdout_logging"
 end

data/templates/application.sass

@@ -1,4 +1,3 @@
-@charset "utf-8"
+@charset 'utf-8'
 
-@import "normalize-rails"
-@import "bourbon"
+@import 'normalize-css'

data/templates/bin_setup_review_app.erb

@@ -9,11 +9,14 @@ if [ -z "$1" ]; then
   exit 64
 fi
 
-heroku pg:backups restore \
-  `heroku pg:backups public-url -a <%= app_name.dasherize %>-staging` \
-  DATABASE_URL \
-  --confirm <%= app_name.dasherize %>-staging-pr-$1 \
-  --app <%= app_name.dasherize %>-staging-pr-$1
-heroku run rake db:migrate --exit-code --app <%= app_name.dasherize %>-staging-pr-$1
-heroku ps:scale worker=1 --app <%= app_name.dasherize %>-staging-pr-$1
-heroku restart --app <%= app_name.dasherize %>-staging-pr-$1
+PARENT_APP_NAME=<%= app_name.dasherize %>-staging
+APP_NAME=<%= app_name.dasherize %>-staging-pr-$1
+
+heroku pg:backups:capture --app $PARENT_APP_NAME
+
+URL=`heroku pg:backups public-url --app $PARENT_APP_NAME`
+
+heroku pg:backups restore $URL DATABASE_URL --confirm $APP_NAME --app $APP_NAME
+heroku run rake db:migrate --exit-code --app $APP_NAME
+heroku ps:scale worker=1 --app $APP_NAME
+heroku restart --app $APP_NAME

data/templates/bundler_audit.rake

@@ -1,12 +1,4 @@
 if Rails.env.development? || Rails.env.test?
-  require "bundler/audit/cli"
-
-  namespace :bundler do
-    desc "Updates the ruby-advisory-db and runs audit"
-    task :audit do
-      %w(update check).each do |command|
-        Bundler::Audit::CLI.start [command]
-      end
-    end
-  end
+  require "bundler/audit/task"
+  Bundler::Audit::Task.new
 end

data/templates/capybara_webkit.rb

@@ -9,16 +9,10 @@ module CapybaraHelper
   def screenshot!
     save_and_open_screenshot
   end
-
-  def blur!
-    page.find('body').click
-  end
 end
 
 Capybara::Webkit.configure do |config|
-  config.allow_url(
-    %w(fonts.googleapis.com)
-  )
+  config.allow_url(%w[fonts.googleapis.com])
 end
 
 RSpec.configure do |config|

data/templates/circle.yml.erb

@@ -0,0 +1,6 @@
+database:
+  override:
+    - bin/setup
+test:
+  override:
+    - COVERAGE=true bin/rake

data/templates/database_cleaner_rspec.rb

@@ -1,21 +1,28 @@
 RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+
   config.before(:suite) do
-    DatabaseCleaner.clean_with(:deletion)
+    DatabaseCleaner.clean_with(:truncation)
   end
 
   config.before(:each) do
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, js: true) do
-    DatabaseCleaner.strategy = :deletion
+  config.before(:each, type: :feature) do
+    driver_shares_db_connection_with_specs =
+      Capybara.current_driver == :rack_test
+
+    unless driver_shares_db_connection_with_specs
+      DatabaseCleaner.strategy = :truncation
+    end
   end
 
   config.before(:each) do
     DatabaseCleaner.start
   end
 
-  config.after(:each) do
+  config.append_after(:each) do
     DatabaseCleaner.clean
   end
 end

data/templates/factory_girl_rspec.rb

@@ -1,12 +1,3 @@
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-
-  config.before(:suite) do
-    begin
-      DatabaseCleaner.start
-      FactoryGirl.lint
-    ensure
-      DatabaseCleaner.clean
-    end
-  end
 end

data/templates/rails_helper.rb

@@ -5,18 +5,11 @@ abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]
 
 require "rspec/rails"
 
-Dir[Rails.root.join("spec/support/**/*.rb")].sort.each { |file| require file }
-
-module Features
-  # Extend this module in spec/support/features/*.rb
-  include Formulaic::Dsl
-end
+Dir[Rails.root.join("spec", "support", "**", "*.rb")].sort.each { |file| require file }
 
 RSpec.configure do |config|
-  config.include Features, type: :feature
   config.infer_base_class_for_anonymous_controllers = false
   config.infer_spec_type_from_file_location!
-  config.use_transactional_fixtures = false
 
   config.filter_rails_from_backtrace!
   # arbitrary gems may also be filtered via:

data/templates/suspenders_layout.html.slim

@@ -2,7 +2,6 @@ doctype html
 html lang="it"
   head
     meta charset="utf-8"
-    meta http-equiv="X-UA-Compatible" content="IE=edge"
     meta name="ROBOTS" content="NOODP"
     meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.26.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,64 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 description: 'weLaika''s fork of the famous thoughbot suspenders gem.
 
 '
@@ -80,7 +66,6 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTING.md
@@ -106,13 +91,10 @@ files:
 - lib/welaika-suspenders.rb
 - spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku
-- spec/fakes/bin/hub
 - spec/features/cli_help_spec.rb
-- spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/new_project_spec.rb
 - spec/spec_helper.rb
-- spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
 - spec/support/suspenders.rb
 - suspenders.gemspec
@@ -132,6 +114,7 @@ files:
 - templates/browserslist
 - templates/bundler_audit.rake
 - templates/capybara_webkit.rb
+- templates/circle.yml.erb
 - templates/config_locales_it.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/dev.rake
@@ -172,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -180,19 +163,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
 test_files:
 - spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku
-- spec/fakes/bin/hub
 - spec/features/cli_help_spec.rb
-- spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/new_project_spec.rb
 - spec/spec_helper.rb
-- spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
 - spec/support/suspenders.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-welaika-suspenders

data/spec/fakes/bin/hub

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.join('..', '..', 'support', 'fake_github'), File.dirname(__FILE__))
-
-FakeGithub.new(ARGV).run!

data/spec/features/github_spec.rb

@@ -1,16 +0,0 @@
-require "spec_helper"
-
-RSpec.describe "GitHub" do
-  before do
-    drop_dummy_database
-    remove_project_directory
-  end
-
-  it "suspends a project with --github option" do
-    repo_name = 'test'
-    run_suspenders("--github=#{repo_name}")
-    setup_app_dependencies
-
-    expect(FakeGithub).to have_created_repo(repo_name)
-  end
-end

data/spec/support/fake_github.rb

@@ -1,21 +0,0 @@
-class FakeGithub
-  RECORDER = File.expand_path(File.join('..', '..', 'tmp', 'hub_commands'), File.dirname(__FILE__))
-
-  def initialize(args)
-    @args = args
-  end
-
-  def run!
-    File.open(RECORDER, 'a') do |file|
-      file.write @args.join(' ')
-    end
-  end
-
-  def self.clear!
-    FileUtils.rm_rf RECORDER
-  end
-
-  def self.has_created_repo?(repo_name)
-    File.read(RECORDER) == "create #{repo_name}"
-  end
-end