welaika-suspenders 2.20.0 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86640599cc5df36cdabc6ea722b26723c6f9ab13
-  data.tar.gz: 185f32536a6ac81b07bfcfa1e6d95ed933e86327
+  metadata.gz: caa6bea955825db755fa23569d1b1d70d5ebde16
+  data.tar.gz: 32bccbce056de85654fdb8999bcf3cde6a8c2c0b
 SHA512:
-  metadata.gz: 75d8fc0b591c67f41fb9714236f050b002cc0b917f1ff7c75affc6f47a872868ed3ff295cee5bc1069a78159481a2009cd252ffdfc09a77ccb1d3f3a2674dd21
-  data.tar.gz: 1841316d5ecaa685f147f54d14878a358433d9fba51d104d137b06323532e4ba89576c4c3d358e0765448a2f3036f15ef37e2133051ba6f469fd92b1c14aa4be
+  metadata.gz: 4dcc5577049163c170df77633aac90297fc4ecb09c174f3e63ef576ba80107046a4ef4cc15decf1f2cfeae993b266d056247ae9a470ef003fb0449da3af5546c
+  data.tar.gz: 40bda7c47ef7be947af94dee506fddd15ed2d3ea8128e7dcdb476ea1dc219f4aecc242ddbd5f255854a6f9797ea662702b8cdf44d76d6dfb35a3c996149cf8ed

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2012 Mike Burns and thoughtbot, inc.
+Copyright (c) 2008-2015 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,6 +1,20 @@
-1.34.0 (unreleased)
+HEAD
 
+* Add ability to use byebug navigation commands inside of Pry using the
+  `pry-byebug` gem
+
+1.34.0 (November 15, 2015)
+
+* Fix `block_unknown_urls` deprecation warning with capybara_webkit when running
+  Javascript tests
+* Inherit staging's `action_mailer_host` config from production
 * Suspenders command line responds to `-v` and `--version` options
+* Clean up `bin/rake`
+* Remove `email_validator` gem from generated Gemfile
+* Fix Circle deploys by removing redundant remote
+* Add `bullet` as development dependency
+* Use Heroku Local (Forego) instead of Foreman
+* Raise on missing Sprockets assets in test environment
 
 1.33.0 (October 23, 2015)
 

data/README.md

@@ -37,8 +37,6 @@ See all possible Heroku flags:
 This will create a rails app in `projectname`. This script creates a
 new git repository. It is not meant to be used against an existing repo.
 
-Then run:
-
     cd projectname && bin/setup
 
 If you want to add an empty bare repository as origin, run
@@ -64,11 +62,10 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - add [slim-rails](https://github.com/slim-template/slim-rails) gem
 - add some html meta tags
 - use EU region as default for Heroku
-- use pry-byebug instead of byebug
 - use CDATA wrapper for javascript
 - create a .ruby-gemset file with app name
 - create common folders like `app/queries`, `app/services`, etc.
-- use `application.css.sass` instead of `application.css.scss`
+- use `application.sass` instead of `application.scss`
 - add `brakeman` gem
 - change `i18n_tasks` configuration: set `it` as base locale
 - set `Rome` as `time_zone`
@@ -81,10 +78,11 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - add helpers for capybara (`page!`, `screenshot!`)
 - drop support for IE 9 in AutoPrefixer
 - removed [hound](https://houndci.com) configuration
-- add [bullet](https://github.com/flyerhzm/bullet)
 - 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

data/RELEASING.md

@@ -0,0 +1,19 @@
+# Releasing
+
+1. Update `lib/suspenders/version.rb` file accordingly.
+2. Update `NEWS.md` to reflect the changes since last release.
+3. Commit changes. There shouldn't be code changes, and thus CI doesn't need to
+   run, you can then add `[ci skip]` to the commit message.
+4. Tag the release: `git tag vVERSION -a`. The tag message should contain the
+   appropriate `NEWS.md` subsection.
+5. Push changes: `git push --tags`
+6. Build and publish to rubygems:
+   ```bash
+   gem build suspenders.gemspec
+   gem push suspenders-*.gem
+   ```
+
+7. Add a new GitHub release:
+   https://github.com/thoughtbot/suspenders/releases/new?tag=vVERSION
+8. Announce the new release, making sure to say "thank you" to the contributors
+   who helped shape this version!

data/lib/suspenders.rb

@@ -1,4 +1,5 @@
 require 'suspenders/version'
 require 'suspenders/generators/app_generator'
 require 'suspenders/actions'
+require "suspenders/adapters/heroku"
 require 'suspenders/app_builder'

data/lib/suspenders/adapters/heroku.rb

@@ -0,0 +1,68 @@
+module Suspenders
+  module Adapters
+    class Heroku
+      def initialize(app_builder)
+        @app_builder = app_builder
+      end
+
+      def set_heroku_remotes
+        remotes = <<-SHELL.strip_heredoc
+
+          # Set up the staging and production apps.
+          #{command_to_join_heroku_app('staging')}
+          #{command_to_join_heroku_app('production')}
+          git config heroku.remote staging
+        SHELL
+
+        app_builder.append_file "bin/setup", remotes
+      end
+
+      def set_up_heroku_specific_gems
+        app_builder.inject_into_file(
+          "Gemfile",
+          %{\n\s\sgem "rails_stdout_logging"},
+          after: /group :staging, :production do/,
+        )
+      end
+
+      def set_heroku_rails_secrets
+        %w(staging production).each do |environment|
+          run_toolbelt_command(
+            "config:add SECRET_KEY_BASE=#{generate_secret}",
+            environment,
+          )
+        end
+      end
+
+      private
+
+      attr_reader :app_builder
+
+      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
+      end
+
+      def heroku_app_name_for(environment)
+        "#{app_builder.app_name.dasherize}-#{environment}"
+      end
+
+      def generate_secret
+        SecureRandom.hex(64)
+      end
+
+      def run_toolbelt_command(command, environment)
+        app_builder.run(
+          "heroku #{command} --remote #{environment}",
+        )
+      end
+    end
+  end
+end

data/lib/suspenders/app_builder.rb

@@ -1,11 +1,27 @@
+require "forwardable"
+
 module Suspenders
   class AppBuilder < Rails::AppBuilder
     include Suspenders::Actions
+    extend Forwardable
+
+    def_delegators :heroku_adapter,
+                   :set_heroku_remotes,
+                   :set_up_heroku_specific_gems,
+                   :set_heroku_rails_secrets
 
     def readme
       template 'README.md.erb', 'README.md'
     end
 
+    def raise_on_missing_assets_in_test
+      inject_into_file(
+        "config/environments/test.rb",
+        "\n  config.assets.raise_runtime_errors = true",
+        after: "Rails.application.configure do",
+      )
+    end
+
     def raise_on_delivery_errors
       replace_in_file 'config/environments/development.rb',
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
@@ -19,17 +35,21 @@ module Suspenders
       )
     end
 
-    def configure_bullet
-      config = <<-RUBY.strip_heredoc
-      config.after_initialize do
-          Bullet.enable = true
-          Bullet.bullet_logger = true
-          Bullet.console = true
-          Bullet.rails_logger = true
-          # Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
-        end
+    def add_bullet_gem_configuration
+      config = <<-RUBY
+  config.after_initialize do
+    Bullet.enable = true
+    Bullet.bullet_logger = true
+    Bullet.rails_logger = true
+  end
+
       RUBY
-      configure_environment "development", config
+
+      inject_into_file(
+        "config/environments/development.rb",
+        config,
+        after: "config.action_mailer.raise_delivery_errors = true\n",
+      )
     end
 
     def raise_on_unpermitted_parameters
@@ -212,14 +232,6 @@ end
       create_file '.ruby-gemset', "#{app_name}\n"
     end
 
-    def setup_heroku_specific_gems
-      inject_into_file(
-        "Gemfile",
-        %{\n\s\sgem "rails_stdout_logging"},
-        after: /group :staging, :production do/
-      )
-    end
-
     def enable_database_cleaner
       copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
     end
@@ -243,10 +255,6 @@ end
       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
@@ -276,16 +284,14 @@ end
     def configure_locales
       remove_file "config/locales/en.yml"
       template "config_locales_it.yml.erb", "config/locales/it.yml"
-    end
-
-    def configure_time_formats
-      replace_in_file "config/application.rb",
-        "# config.time_zone = 'Central Time (US & Canada)'",
-        "config.time_zone = 'Rome'"
 
       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'"
     end
 
     def configure_rack_timeout
@@ -341,25 +347,14 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       copy_file "puma.rb", "config/puma.rb"
     end
 
-    def setup_foreman
-      copy_file 'sample.env', '.sample.env'
-      copy_file 'Procfile', 'Procfile'
+    def set_up_forego
+      copy_file "Procfile", "Procfile"
     end
 
     def setup_stylesheets
       remove_file 'app/assets/stylesheets/application.css'
-      copy_file 'application.css.sass',
-        'app/assets/stylesheets/application.css.sass'
-    end
-
-    def install_refills
-      run "rails generate refills:import flashes"
-      run "rm app/views/refills/_flashes.html.erb"
-      run "rmdir app/views/refills"
-    end
-
-    def install_bitters
-      run "bitters install --path app/assets/stylesheets"
+      copy_file 'application.sass',
+        'app/assets/stylesheets/application.sass'
     end
 
     def gitignore_files
@@ -415,35 +410,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       create_production_heroku_app(flags)
     end
 
-    def set_heroku_remotes
-      remotes = <<-SHELL
-
-# Set up the staging and production apps.
-#{join_heroku_app('staging')}
-#{join_heroku_app('production')}
-      SHELL
-
-      append_file 'bin/setup', remotes
-    end
-
-    def 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
-    end
-
-    def set_heroku_rails_secrets
-      %w(staging production).each do |environment|
-        run_heroku "config:add SECRET_KEY_BASE=#{generate_secret}", environment
-      end
-    end
-
     def set_heroku_serve_static_files
       %w(staging production).each do |environment|
         run_heroku "config:add RAILS_SERVE_STATIC_FILES=true", environment
@@ -468,23 +434,8 @@ you can deploy to staging and production with:
       run "chmod a+x bin/deploy"
     end
 
-    def configure_automatic_deployment
-      staging_remote_name = heroku_app_name_for("staging")
-      deploy_command = <<-YML.strip_heredoc
-      deployment:
-        staging:
-          branch: master
-          commands:
-            - git remote add staging git@heroku.com:#{staging_remote_name}.git
-            - bin/deploy staging
-      YML
-
-      append_file "circle.yml", deploy_command
-    end
-
     def create_github_repo(repo_name)
-      path_addition = override_path_for_tests
-      run "#{path_addition} hub create #{repo_name}"
+      run "hub create #{repo_name}"
     end
 
     def setup_bundler_audit
@@ -507,6 +458,7 @@ you can deploy to staging and production with:
     def create_binstubs
       bundle_command "binstubs brakeman"
       bundle_command "binstubs rubocop"
+      bundle_command "binstubs i18n-tasks"
     end
 
     def copy_miscellaneous_files
@@ -588,20 +540,12 @@ task default: "bundler:audit"
       uncomment_lines("config/environments/#{environment}.rb", config)
     end
 
-    def override_path_for_tests
-      if ENV['TESTING']
-        support_bin = File.expand_path(File.join('..', '..', 'spec', 'fakes', 'bin'))
-        "PATH=#{support_bin}:$PATH"
-      end
-    end
-
     def run_heroku(command, environment)
-      path_addition = override_path_for_tests
-      run "#{path_addition} heroku #{command} --remote #{environment}"
+      run "heroku #{command} --remote #{environment}"
     end
 
-    def generate_secret
-      SecureRandom.hex(64)
+    def heroku_adapter
+      @heroku_adapter ||= Adapters::Heroku.new(self)
     end
 
     def serve_static_files_line

data/lib/suspenders/generators/app_generator.rb

@@ -39,8 +39,6 @@ module Suspenders
       invoke :create_suspenders_views
       invoke :configure_app
       invoke :setup_stylesheets
-      invoke :install_bitters
-      invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_config_comment_lines
@@ -61,7 +59,7 @@ module Suspenders
       build :set_ruby_to_version_being_used
 
       if options[:heroku]
-        build :setup_heroku_specific_gems
+        build :set_up_heroku_specific_gems
       end
 
       bundle_command 'install'
@@ -80,9 +78,11 @@ module Suspenders
 
     def setup_development_environment
       say 'Setting up the development environment'
+      build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
       build :configure_letter_opener
-      build :configure_bullet
+      build :set_test_delivery_method
+      build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
       build :provide_dev_prime_task
@@ -105,7 +105,6 @@ 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_i18n_tasks
       build :configure_action_mailer_in_specs
@@ -145,15 +144,13 @@ module Suspenders
       build :configure_action_mailer
       build :configure_locales
       build :configure_active_job
-      build :configure_rack_timeout
-      build :configure_time_formats
       build :configure_slim
       build :disable_xml_params
       build :configure_available_locales
       build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
       build :configure_puma
-      build :setup_foreman
+      build :set_up_forego
     end
 
     def setup_stylesheets
@@ -161,16 +158,6 @@ module Suspenders
       build :setup_stylesheets
     end
 
-    def install_bitters
-      say 'Install Bitters'
-      build :install_bitters
-    end
-
-    def install_refills
-      say "Install Refills"
-      build :install_refills
-    end
-
     def setup_git
       if !options[:skip_git]
         say 'Initializing git'
@@ -187,7 +174,6 @@ module Suspenders
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :provide_deploy_script
-        build :configure_automatic_deployment
       end
     end
 
@@ -240,7 +226,7 @@ module Suspenders
 
     def outro
       say "Congratulations!"
-      say "Remember to run 'bin/setup' and configure errbit"
+      say "Now read the README.md"
     end
 
     protected

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
   RAILS_VERSION = "~> 4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.20.0"
+  VERSION = "2.21.0"
 end

data/spec/adapters/heroku_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+
+module Suspenders
+  module Adapters
+    RSpec.describe Heroku do
+      it "sets the heroku remotes" do
+        setup_file = "bin/setup"
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:append_file)
+
+        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/)
+        expect(app_builder).to have_received(:append_file).
+          with(setup_file, /heroku join --app #{app_name.dasherize}-staging/)
+      end
+
+      it "sets up the heroku specific gems" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:inject_into_file)
+
+        Heroku.new(app_builder).set_up_heroku_specific_gems
+
+        expect(app_builder).to have_received(:inject_into_file).
+          with("Gemfile", /rails_stdout_logging/, anything)
+      end
+
+      it "sets the heroku rails secrets" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:run)
+
+        Heroku.new(app_builder).set_heroku_rails_secrets
+
+        expect(app_builder).to(
+          have_configured_var("staging", "SECRET_KEY_BASE"),
+        )
+        expect(app_builder).to(
+          have_configured_var("production", "SECRET_KEY_BASE"),
+        )
+      end
+
+      def app_name
+        SuspendersTestHelpers::APP_NAME
+      end
+
+      def have_configured_var(remote_name, var)
+        have_received(:run).with(/config:add #{var}=.+ --remote #{remote_name}/)
+      end
+    end
+  end
+end

data/spec/features/heroku_spec.rb

@@ -1,56 +1,62 @@
 require "spec_helper"
 
 RSpec.describe "Heroku" do
-  before do
-    drop_dummy_database
-    remove_project_directory
+  context "--heroku" do
+    before(:all) do
+      clean_up
+      run_suspenders("--heroku=true")
+    end
+
+    it "suspends a project for Heroku" do
+      app_name = SuspendersTestHelpers::APP_NAME.dasherize
+
+      expect(FakeHeroku).to(
+        have_gem_included(project_path, "rails_stdout_logging"),
+      )
+      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",
+      )
+
+      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(File.stat(bin_setup_path)).to be_executable
+
+      bin_deploy_path = "#{project_path}/bin/deploy"
+      bin_deploy = IO.read(bin_deploy_path)
+
+      expect(bin_deploy).to include("heroku run rake db:migrate")
+      expect(File.stat(bin_deploy_path)).to be_executable
+
+      readme = IO.read("#{project_path}/README.md")
+
+      expect(readme).to include("./bin/deploy staging")
+      expect(readme).to include("./bin/deploy production")
+    end
   end
 
-  it "suspends a project for Heroku" do
-    run_suspenders("--heroku=true")
-
-    expect(FakeHeroku).to have_gem_included(project_path, "rails_stdout_logging")
-    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")
-
-    bin_setup_path = "#{project_path}/bin/setup"
-    bin_setup = IO.read(bin_setup_path)
-    app_name = SuspendersTestHelpers::APP_NAME.dasherize
-
-    expect(bin_setup).to include("heroku join --app #{app_name}-production")
-    expect(bin_setup).to include("heroku join --app #{app_name}-staging")
-    expect(File.stat(bin_setup_path)).to be_executable
-
-    bin_deploy_path = "#{project_path}/bin/deploy"
-    bin_deploy = IO.read(bin_deploy_path)
-
-    expect(bin_deploy).to include("heroku run rake db:migrate")
-    expect(File.stat(bin_deploy_path)).to be_executable
+  context "--heroku with region flag" do
+    before(:all) do
+      clean_up
+      run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
+    end
 
-    readme = IO.read("#{project_path}/README.md")
-
-    expect(readme).to include("./bin/deploy staging")
-    expect(readme).to include("./bin/deploy production")
-
-    circle_yml_path = "#{project_path}/circle.yml"
-    circle_yml = IO.read(circle_yml_path)
-
-    expect(circle_yml).to include <<-YML.strip_heredoc
-    deployment:
-      staging:
-        branch: master
-        commands:
-          - git remote add staging git@heroku.com:#{app_name}-staging.git
-          - bin/deploy staging
-    YML
+    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
 
-  it "suspends a project with extra Heroku flags" do
-    run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
-
-    expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
-    expect(FakeHeroku).to have_created_app_for("production", "--region eu")
+  def clean_up
+    drop_dummy_database
+    remove_project_directory
+    FakeHeroku.clear!
   end
 end

data/spec/features/new_project_spec.rb

@@ -36,7 +36,9 @@ RSpec.describe "Suspend a new project with default configuration" do
   end
 
   it "copies dotfiles" do
-    expect(File).to exist("#{project_path}/.ctags")
+    %w[.ctags .env].each do |dotfile|
+      expect(File).to exist("#{project_path}/#{dotfile}")
+    end
   end
 
   it "loads secret_key_base from env" do
@@ -141,6 +143,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(prod_env_file).not_to match(/"HOST"/)
   end
 
+  it "configures language in html element" do
+    layout_path = "/app/views/layouts/application.html.slim"
+    layout_file = IO.read("#{project_path}#{layout_path}")
+    expect(layout_file).to match(/html lang="it"/)
+  end
+
   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")
@@ -153,13 +161,28 @@ 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$/
+  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$/,
+    )
+  end
+
   it "adds spring to binstubs" do
     expect(File).to exist("#{project_path}/bin/spring")
 
-    spring_line = /^ +load File.expand_path\("\.\.\/spring", __FILE__\)$/
     bin_stubs = %w(rake rails rspec)
     bin_stubs.each do |bin_stub|
-      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(spring_line)
+      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(/spring/)
     end
   end
 

data/spec/spec_helper.rb

@@ -11,11 +11,11 @@ RSpec.configure do |config|
   config.include SuspendersTestHelpers
 
   config.before(:all) do
+    add_fakes_to_path
     create_tmp_directory
   end
 
   config.before(:each) do
-    FakeHeroku.clear!
     FakeGithub.clear!
   end
 end

data/spec/support/fake_heroku.rb

@@ -36,8 +36,10 @@ class FakeHeroku
   end
 
   def self.has_configured_vars?(remote_name, var)
-    File.foreach(RECORDER).any? do |line|
-      line =~ /^config:add #{var}=.+ --remote #{remote_name}\n$/
-    end
+    commands_ran =~ /^config:add #{var}=.+ --remote #{remote_name}\n/
+  end
+
+  def self.commands_ran
+    @commands_ran ||= File.read(RECORDER)
   end
 end

data/spec/support/suspenders.rb

@@ -12,9 +12,10 @@ module SuspendersTestHelpers
   def run_suspenders(arguments = nil)
     Dir.chdir(tmp_path) do
       Bundler.with_clean_env do
-        ENV['TESTING'] = '1'
-
-        %x(#{suspenders_bin} #{APP_NAME} #{arguments})
+        add_fakes_to_path
+        `
+          #{suspenders_bin} #{APP_NAME} #{arguments}
+        `
       end
     end
   end
@@ -29,6 +30,10 @@ module SuspendersTestHelpers
     end
   end
 
+  def add_fakes_to_path
+    ENV["PATH"] = "#{support_bin}:#{ENV['PATH']}"
+  end
+
   def project_path
     @project_path ||= Pathname.new("#{tmp_path}/#{APP_NAME}")
   end
@@ -43,6 +48,10 @@ module SuspendersTestHelpers
     File.join(root_path, 'bin', 'welaika-suspenders')
   end
 
+  def support_bin
+    File.join(root_path, "spec", "fakes", "bin")
+  end
+
   def root_path
     File.expand_path('../../../', __FILE__)
   end

data/suspenders.gemspec

@@ -25,11 +25,9 @@ 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 'bitters', '~> 1.1.0'
-  s.add_dependency 'bundler', '~> 1.3'
+  s.add_dependency 'bundler', '>= 1.8.4'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
-  s.add_dependency 'nokogiri', '1.6.0' # temp fix for iconv.h problem
 
-  s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'pry-byebug'
 end

data/templates/Gemfile.erb

@@ -29,7 +29,6 @@ gem "uglifier"
 group :development do
   gem "letter_opener"
   gem "quiet_assets"
-  gem "refills"
   gem "spring"
   gem "spring-commands-rspec"
   gem "web-console"

data/templates/README.md.erb

@@ -7,26 +7,10 @@ with the necessary dependencies to run and test this app:
 
     % ./bin/setup
 
-It assumes you have a machine equipped with Ruby, Postgres, etc. If not, set up
-your machine with [this script].
+It assumes you have a machine equipped with Ruby, Postgres, etc.
 
-[this script]: https://github.com/thoughtbot/laptop
+After setting up, you can run the application using [Heroku Local]:
 
-After setting up, you can run the application using [foreman]:
+    % heroku local
 
-    % foreman start
-
-If you don't have `foreman`, see [Foreman's install instructions][foreman]. It
-is [purposefully excluded from the project's `Gemfile`][exclude].
-
-[foreman]: https://github.com/ddollar/foreman
-[exclude]: https://github.com/ddollar/foreman/pull/437#issuecomment-41110407
-
-## Guidelines
-
-Use the following guides for getting things done, programming well, and
-programming in style.
-
-* [Protocol](http://github.com/thoughtbot/guides/blob/master/protocol)
-* [Best Practices](http://github.com/thoughtbot/guides/blob/master/best-practices)
-* [Style](http://github.com/thoughtbot/guides/blob/master/style)
+[Heroku Local]: https://devcenter.heroku.com/articles/heroku-local

data/templates/{application.css.sass → application.sass}

@@ -2,7 +2,4 @@
 
 @import "normalize-rails"
 @import "bourbon"
-@import "base/grid-settings"
 @import "neat"
-@import "base/base"
-@import "refills/flashes"

data/templates/bin_setup.erb

@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
 
 # Set up Rails app. Run this script immediately after cloning the codebase.
-# https://github.com/thoughtbot/guides/tree/master/protocol
 
 # Exit if any subcommand fails
 set -e
@@ -10,26 +9,12 @@ set -e
 gem install bundler --conservative
 bundle check || bundle install
 
-# Set up configurable environment variables
-if [ ! -f .env ]; then
-  cp .sample.env .env
-fi
-
 # Set up database and add any development seed data
 bin/rake dev:prime
 
 # Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
 mkdir -p .git/safe
 
-# Pick a port for Foreman
-if ! grep --quiet --no-messages --fixed-strings 'port' .foreman; then
-  printf 'port: 3000\n' >> .foreman
-fi
-
-if ! command -v foreman > /dev/null; then
-  gem install foreman
-fi
-
 # Only if this isn't CI
 # if [ -z "$CI" ]; then
 # fi

data/templates/{sample.env → dotfiles/.env}

@@ -1,6 +1,7 @@
-# http://ddollar.github.com/foreman/
+# https://github.com/ddollar/forego
 ASSET_HOST=localhost:3000
 APPLICATION_HOST=localhost:3000
+PORT=3000
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret
 EXECJS_RUNTIME=Node
@@ -8,3 +9,4 @@ SMTP_ADDRESS=smtp.example.com
 SMTP_DOMAIN=example.com
 SMTP_PASSWORD=password
 SMTP_USERNAME=username
+WEB_CONCURRENCY=1

data/templates/suspenders_gitignore

@@ -3,8 +3,7 @@
 *.swo
 *.swp
 /.bundle
-/.env
-/.foreman
+/.env.local
 /coverage/*
 /db/*.sqlite3
 /log/*

data/templates/suspenders_layout.html.slim

@@ -1,5 +1,5 @@
 doctype html
-html
+html lang="it"
   head
     meta charset="utf-8"
     meta http-equiv="X-UA-Compatible" content="IE=edge"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.21.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,36 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bitters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !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
@@ -53,34 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +86,7 @@ files:
 - LICENSE
 - NEWS.md
 - README.md
+- RELEASING.md
 - Rakefile
 - bin/rake
 - bin/rspec
@@ -121,9 +94,11 @@ files:
 - bin/welaika-suspenders
 - lib/suspenders.rb
 - lib/suspenders/actions.rb
+- lib/suspenders/adapters/heroku.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
 - lib/suspenders/version.rb
+- spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
 - spec/features/github_spec.rb
@@ -140,7 +115,7 @@ files:
 - templates/_flashes.html.slim
 - templates/_javascript.html.slim
 - templates/action_mailer.rb
-- templates/application.css.sass
+- templates/application.sass
 - templates/bin_deploy
 - templates/bin_setup.erb
 - templates/brakeman.rake
@@ -154,6 +129,7 @@ files:
 - templates/dev.rake
 - templates/disable_xml_params.rb
 - templates/dotfiles/.ctags
+- templates/dotfiles/.env
 - templates/errors.rb
 - templates/factories.rb
 - templates/factory_girl_rspec.rb
@@ -168,7 +144,6 @@ files:
 - templates/rails_helper.rb
 - templates/rubocop.rake
 - templates/rubocop.yml
-- templates/sample.env
 - templates/secrets.yml
 - templates/shoulda_matchers_config_rspec.rb
 - templates/slim.rb
@@ -198,11 +173,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 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/github_spec.rb