slining 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 972c6a92854641e7b46c0f0c3f256135576f65bc
-  data.tar.gz: 0b1c182f4447b13d01cf414f97ca7da37218ddfb
+  metadata.gz: 42d9762ac323a494ce17c4118dcd30f012013c88
+  data.tar.gz: 8a2760aab2790ac14eb37db94da78df715067948
 SHA512:
-  metadata.gz: c76e65fcb2b9bf07644ea139a6fe5fe6515d169a10fba40a3ffdfbd24e07d4ed3d5d6df3daca4c51f4aab6c6d3cc89e54d77727b502228eeafb712442a729272
-  data.tar.gz: 5941faec56ed4fe5f34fa454fca9c3a41887b33d8717647524c3b3a4b2541c816420cb7fb21f0957db929bad8e81c45d3bc4d6cf3935da078206b3fe2218e233
+  metadata.gz: d91d7677e8df1366d44e6d712346ca2cb08ab44ec27da873af7ec61d6b67736cf755afeb320b9da42f543eb934a146d1dc5ff7d9fcb43371bd72737359f4821d
+  data.tar.gz: 99707fa9618fae7608c7cf7d93055c7783d19264f50a5bd1f25065b4884b2dfaf362f1b82c6bc1e3d36b900536181c0ed244bf4ef4af4f8818b9afceb366fec9

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 *.swp
+Gemfile.lock
 /.bundle
 /tmp

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.2.3

data/CONTRIBUTING.md

@@ -45,4 +45,4 @@ We may suggest changes.
 ## Versions
 
 To update the Ruby version,
-change `.ruby-version` and `.travis.yml`.
+change `.ruby-version`.

data/LICENSE

@@ -1,7 +1,7 @@
 The MIT License
 
-Copyright (c) 2015+ and vaporware, inc.
-Copyright (c) 2010-2012 Mike Burns and thoughtbot, inc.
+Copyright (c) 2015+ vaporware, 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,3 +1,70 @@
+1.2.0 (November 17, 2015)
+* Changed addon references for Heroku [upstream-1]
+* Upgraded to Ruby 2.2.3
+* Upgraded to RSpec 3.3 [upstream-2]
+* Replaced TravisCI with CircleCI [upstream-3], [upstream-11], [upstream-29]
+* Rename Dev Seeds [upstream-4]
+* Remove Unicorn in favor of Puma, as [recommended by Heroku] [upstream-5], [upstream-18]
+* Remove Gemfile.lock [upstream-6]
+* Add ctags configuration dotfile [upstream-7]
+* Rename `$HOST` to `$APPLICATION_HOST` for zsh compatibility [upstream-8],[upstream-9]
+* Remove comments and newlines in config files [upstream-10]
+* Abort tests run if `DATABASE_URL` env variable is setup [upstream-12]
+* Fix on port 3000 [upstream-13]
+* Add mandatory environment variables to .sample.env [upstream-14]
+* Provide Shoulda Matchers config [upstream-15], [upstream-16]
+* Move i18n tasks out of production for performance [upstream-17]
+* Add quiet_assets as development dependency [upstream-19]
+* Generate empty spec/factories.rb file [upstream-20]
+* Fix deprecation warning from capybara-webkit [upstream-21]
+* Slining command line responds to `-v` and `--version` options [upstream-22]
+* Configure simple_form earlier [upstream-23], [upstream-28]
+* Remove old deprecation [upstream-24]
+* Removed `action_mailer_host` in staging [upstream-25]
+* Cleanup generated `bin/setup` file and rake binstub [upstream-26], [upstream-27]
+* Add `bullet` as development dependency [upstream-30]
+* Add adapter for heroku actions [upstream-31]
+* Replace foreman with heroku local ([Forego]) [upstream-32]
+* Add RELEASING document [upstream-33]
+* Raise on missing Sprockets assets in test [upstream-34]
+
+[recommended by Heroku]: https://devcenter.heroku.com/changelog-items/594
+[upstream-1]: https://github.com/thoughtbot/suspenders/commit/f34ab5189300a57e14c28aaeca17bd5573080f1d
+[upstream-2]: https://github.com/thoughtbot/suspenders/commit/35979868ba9f8a8d0e89f58722ecf7687ae7bf14
+[upstream-3]: https://github.com/thoughtbot/suspenders/commit/ac3924da64bb2c71f8611919e5f43b85261da600
+[upstream-4]: https://github.com/thoughtbot/suspenders/commit/2cd79f5f6b0919340fe0ed4c69d83ff4f449dadb
+[upstream-5]: https://github.com/thoughtbot/suspenders/commit/c681ed379f4117dd62e64ff4e910a38e1a4cbf47
+[upstream-6]: https://github.com/thoughtbot/suspenders/commit/539b5c6e7fe68ee6ccad168ea6e267c7f12ae9bd
+[upstream-7]: https://github.com/thoughtbot/suspenders/commit/390c0c4f8164729927890a66d5ad62b26b10f9f4
+[upstream-8]: https://github.com/thoughtbot/suspenders/commit/9d27905884540e44109cc66630062101307f150a
+[upstream-9]: https://github.com/thoughtbot/suspenders/commit/f6f4869f9dbad9104597bc4380330e8311f75d08
+[upstream-10]: https://github.com/thoughtbot/suspenders/commit/f65e94d919796c353c399e7d1a814cd5bbf6c50d
+[upstream-11]: https://github.com/thoughtbot/suspenders/commit/741677f47ad614bdbd023e38788a2d0dcc06e1ad
+[upstream-12]: https://github.com/thoughtbot/suspenders/commit/2c069e1e387e3a538aa44a2d235f05e22b0cb03a
+[upstream-13]: https://github.com/thoughtbot/suspenders/commit/4292fea5b17a3ee9a4c1ed11aef4430f0fb71921
+[upstream-14]: https://github.com/thoughtbot/suspenders/commit/efff20491c492715ed6fd8fb2700bbcd8b99709f
+[upstream-15]: https://github.com/thoughtbot/suspenders/commit/af523754f3a27b14ac76e0b9a43391a87541e34c
+[upstream-16]: https://github.com/thoughtbot/suspenders/commit/6f4bc189a91b68dfbb7d37bb669e799602d8d4fd
+[upstream-17]: https://github.com/thoughtbot/suspenders/commit/66d048be81cf5608ea5ee42075bdccf29122256f
+[upstream-18]: https://github.com/thoughtbot/suspenders/commit/bfd75f9f16f8557ddf91a069525d13f7bdc7ce8f
+[upstream-19]: https://github.com/thoughtbot/suspenders/commit/3a06edfd2a66047912cc08a85af32a7dfac16324
+[upstream-20]: https://github.com/thoughtbot/suspenders/commit/0243f89579363fc6a487e46b2ba14b50a9fc23d4
+[upstream-21]: https://github.com/thoughtbot/suspenders/commit/791d938f91bf5fb5ae5ec987d6ceaffbec8f923e
+[upstream-22]: https://github.com/thoughtbot/suspenders/commit/e1a5b2f1101a94a55753020266288b354160cf4f
+[upstream-23]: https://github.com/thoughtbot/suspenders/commit/4b517a11547f880df4b9237c1dd6e96a2cba9cc7
+[upstream-24]: https://github.com/thoughtbot/suspenders/commit/cde3eb1748172c56b6d857a140bc1ed6314c5b34
+[upstream-25]: https://github.com/thoughtbot/suspenders/commit/0a4dfa2c293993272938cf1de80c7934337b52fc
+[upstream-26]: https://github.com/thoughtbot/suspenders/commit/53b2fea247740eef92d8e63a144ab66c1109add7
+[upstream-27]: https://github.com/thoughtbot/suspenders/commit/8e75eef9fae0b44e3300704ea91c454318808925
+[upstream-28]: https://github.com/thoughtbot/suspenders/commit/8974398f31e6cb276798da36366ab76510706025
+[upstream-29]: https://github.com/thoughtbot/suspenders/commit/6ac8874496e15da3f0e5906cbb2b5e7261be00ca
+[upstream-30]: https://github.com/thoughtbot/suspenders/commit/e077da95487698467080f94aa397147a6617a9f8
+[upstream-31]: https://github.com/thoughtbot/suspenders/commit/f733bb413ad92edcf81d3ce3273ccb3382878be9
+[upstream-32]: https://github.com/thoughtbot/suspenders/commit/6b7614a8dc7ff2a7dd32d087039e49fd5984a35d
+[Forego]: https://github.com/ddollar/forego
+[upstream-33]: https://github.com/thoughtbot/suspenders/commit/e96f8450ebfebacd13973d091fcbc9115ace00bc
+[upstream-34]: https://github.com/thoughtbot/suspenders/commit/dd6b2037e5a7f5cd99b96187be143129af9ab2cb
+
 1.1.0 (June 23, 2015)
 * Added HAML and HAML Rails
 * Added Twitter Bootstrap

data/README.md

@@ -1,7 +1,7 @@
-# Slining [![Build Status](https://secure.travis-ci.org/vaporware/slining.svg?branch=master)](http://travis-ci.org/vaporware/slining) [![Gem Version](https://badge.fury.io/rb/slining.svg)](http://badge.fury.io/rb/slining) [![Gem Version](https://badge.fury.io/rb/slining.svg)](http://badge.fury.io/rb/slining) [![Code Climate](https://codeclimate.com/github/vaporware/slining/badges/gpa.svg)](https://codeclimate.com/github/vaporware/slining) [![Test Coverage](https://codeclimate.com/github/vaporware/slining/badges/coverage.svg)](https://codeclimate.com/github/vaporware/slining/coverage) 
+# Slining
 
 Slining is the Silver Lining to Vaporware's Rails development, i.e. the base Rails application used at
-[vaporware](http://vaporwa.re). It's a forked project from [thoughtbot's suspenders](http://github.com/thoughtbot/suspenders).
+[vaporware](http://vaporwa.re). It's a forked project from [thoughtbot's suspenders](https://github.com/thoughtbot/suspenders).
 
 ## Installation
 
@@ -40,7 +40,7 @@ It includes application gems like:
 * [Postgres](https://github.com/ged/ruby-pg) for access to the Postgres database
 * [Rack Canonical Host](https://github.com/tylerhunt/rack-canonical-host) to
   ensure all requests are served from the same domain
-* [Rack Timeout](https://github.com/kch/rack-timeout) to abort requests that are
+* [Rack Timeout](https://github.com/heroku/rack-timeout) to abort requests that are
   taking too long
 * [Recipient Interceptor](https://github.com/croaky/recipient_interceptor) to
   avoid accidentally sending emails to real people from staging
@@ -48,7 +48,7 @@ It includes application gems like:
   and style
 * [Title](https://github.com/calebthompson/title) for storing titles in
   translations
-* [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests.
+* [Puma](https://github.com/puma/puma) to serve HTTP requests.
 
 And development gems like:
 
@@ -57,12 +57,16 @@ And development gems like:
   objects
 * [ByeBug](https://github.com/deivid-rodriguez/byebug) for interactively
   debugging behavior
+* [Bullet](https://github.com/flyerhzm/bullet) for help to kill N+1 queries and
+  unused eager loading
 * [Bundler Audit](https://github.com/rubysec/bundler-audit) for scanning the
   Gemfile for insecure dependencies based on published CVEs
 * [Spring](https://github.com/rails/spring) for fast Rails actions via
   pre-loading
 * [Web Console](https://github.com/rails/web-console) for better debugging via
   in-browser IRB consoles.
+* [Quiet Assets](https://github.com/evrone/quiet_assets) for muting assets
+  pipeline log messages
 
 And testing gems like:
 
@@ -76,7 +80,7 @@ And testing gems like:
 * [RSpec Mocks](https://github.com/rspec/rspec-mocks) for stubbing and spying
 * [Shoulda Matchers](https://github.com/thoughtbot/shoulda-matchers) for common
   RSpec matchers
-* [Timecop](https://github.com/jtrupiano/timecop-console) for testing time
+* [Timecop](https://github.com/ferndopolis/timecop-console) for testing time
 
 ## Other goodies
 
@@ -92,17 +96,17 @@ Slining also comes with:
 * [t() and l() in specs without prefixing with I18n][i18n]
 * An automatically-created `SECRET_KEY_BASE` environment variable in all
   environments
-* Configuration for [Travis][travis] Continuous Integration (tests)
+* Configuration for [CircleCI][circle] Continuous Integration (tests)
 * Configuration for [Hound][hound] Continuous Integration (style)
 * The analytics adapter [Segment][segment] (and therefore config for Google
   Analytics, Intercom, Facebook Ads, Twitter Ads, etc.)
 
-[setup]: http://robots.thoughtbot.com/bin-setup
-[compress]: http://robots.thoughtbot.com/content-compression-with-rack-deflater/
+[setup]: https://robots.thoughtbot.com/bin-setup
+[compress]: https://robots.thoughtbot.com/content-compression-with-rack-deflater
 [pool]: https://devcenter.heroku.com/articles/concurrency-and-database-connections
 [binstub]: https://github.com/thoughtbot/suspenders/pull/282
 [i18n]: https://github.com/thoughtbot/suspenders/pull/304
-[travis]: http://docs.travis-ci.com/user/travis-pro/
+[circle]: https://circleci.com/docs
 [hound]: https://houndci.com
 [segment]: https://segment.com
 
@@ -129,7 +133,7 @@ You can optionally specify alternate Heroku flags:
 
     slining app \
       --heroku true \
-      --heroku-flags "--region eu --addons newrelic,pgbackups,sendgrid,ssl"
+      --heroku-flags "--region eu --addons deployhooks,scheduler,ssl"
 
 See all possible Heroku flags:
 
@@ -156,7 +160,7 @@ This has the same effect as running:
 
 ## Spring
 
-Suspenders uses [spring](https://github.com/rails/spring) by default.
+Slining uses [spring](https://github.com/rails/spring) by default.
 It makes Rails applications load faster, but it might introduce confusing issues
 around stale code not being refreshed.
 If you think your application is running old code, run `spring stop`.
@@ -164,6 +168,13 @@ And if you'd rather not use spring, add `DISABLE_SPRING=1` to your login file.
 
 ## Dependencies
 
+[![Gem Version](http://img.shields.io/gem/v/slining.svg?style=flat)][gem]
+[![License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)][license]
+[![Dependency Status](http://img.shields.io/gemnasium/vaporware/slining.svg?style=flat)][gemnasium]
+[![Build Status](https://img.shields.io/circleci/project/vaporware/slining.svg?style=flat)][circleci]
+[![Code Coverage](http://img.shields.io/codeclimate/coverage/github/vaporware/slining.svg?style=flat)][codeclimate]
+[![Code Quality](http://img.shields.io/codeclimate/github/vaporware/slining.svg?style=flat)][codeclimate]
+
 Slining requires the latest version of Ruby.
 
 Some gems included in Slining have native extensions. You should have GCC
@@ -193,12 +204,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 Thank you, [contributors]!
 
-[contributors]: https://github.com/vaporware/slining/graphs/contributors
-
 ## License
-Slining is Copyright © 2015+ vaporware.
-
-Slining is a forked project from Suspenders. Suspenders is Copyright © 2008-2015 thoughtbot.
-It is free software, and may be redistributed under the terms specified in the [LICENSE] file.
-
-[LICENSE]: LICENSE
+Slining is Copyright © 2015+ vaporware. MIT Licensed, see [LICENSE] for details.
+
+[gem]: https://rubygems.org/gems/slining
+[circleci]: https://circleci.com/gh/vaporware/slining
+[gemnasium]: https://gemnasium.com/vaporware/slining
+[codeclimate]: https://codeclimate.com/github/vaporware/slining
+[rubyinstaller]: http://rubyinstaller.org/
+[rubydoc]: http://rubydoc.info/github/vaporware/slining
+[LICENSE]: https://github.com/vaporware/slining/blob/master/LICENSE.md
+[contributors]: https://github.com/vaporware/slining/graphs/contributors

data/RELEASING.md

@@ -0,0 +1,19 @@
+# Releasing
+
+1. Update `lib/slining/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 slining.gemspec
+   gem push slining-*.gem
+   ```
+
+7. Add a new GitHub release:
+   https://github.com/vaporware/slining/releases/new?tag=vVERSION
+8. Announce the new release, making sure to say "thank you" to the contributors
+   who helped shape this version!

data/bin/slining

@@ -6,9 +6,9 @@ $LOAD_PATH << source_path
 
 require 'slining'
 
-if ['create', '--create'].include? ARGV[0]
-  ARGV.shift
-  puts "[WARNING] the slining create argument is deprecated. Just use `slining #{ARGV.join}` instead"
+if ['-v', '--version'].include? ARGV[0]
+  puts Slining::VERSION
+  exit 0
 end
 
 templates_root = File.expand_path(File.join("..", "templates"), File.dirname(__FILE__))

data/lib/slining.rb

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

data/lib/slining/adapters/heroku.rb

@@ -0,0 +1,67 @@
+module Slining
+  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')}
+        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/slining/app_builder.rb

@@ -1,11 +1,27 @@
+require "forwardable"
+
 module Slining
   class AppBuilder < Rails::AppBuilder
     include Slining::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,6 +35,23 @@ module Slining
       )
     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
+
+      inject_into_file(
+        "config/environments/development.rb",
+        config,
+        after: "config.action_mailer.raise_delivery_errors = true\n",
+      )
+    end
+
     def raise_on_unpermitted_parameters
       config = <<-RUBY
     config.action_controller.action_on_unpermitted_parameters = :raise
@@ -27,13 +60,21 @@ module Slining
       inject_into_class "config/application.rb", "Application", config
     end
 
+    def configure_quiet_assets
+      config = <<-RUBY
+    config.quiet_assets = true
+      RUBY
+
+      inject_into_class "config/application.rb", "Application", config
+    end
+
     def provide_setup_script
-      template "bin_setup.erb", "bin/setup", port_number: port, force: true
+      template "bin_setup.erb", "bin/setup", force: true
       run "chmod a+x bin/setup"
     end
 
     def provide_dev_prime_task
-      copy_file 'development_seeds.rb', 'lib/tasks/development_seeds.rake'
+      copy_file 'dev.rake', 'lib/tasks/dev.rake'
     end
 
     def configure_generators
@@ -58,6 +99,10 @@ module Slining
       copy_file 'factory_girl_rspec.rb', 'spec/support/factory_girl.rb'
     end
 
+    def generate_factories_file
+      copy_file "factories.rb", "spec/factories.rb"
+    end
+
     def set_up_hound
       copy_file "hound.yml", ".hound.yml"
     end
@@ -79,14 +124,14 @@ module Slining
       RUBY
 
       inject_into_file 'config/environments/production.rb', config,
-        :after => 'config.action_mailer.raise_delivery_errors = false'
+        after: 'config.action_mailer.raise_delivery_errors = false'
     end
 
     def enable_rack_canonical_host
       config = <<-RUBY
 
   # Ensure requests are only served from one, canonical host name
-  config.middleware.use Rack::CanonicalHost, ENV.fetch("HOST")
+  config.middleware.use Rack::CanonicalHost, ENV.fetch("APPLICATION_HOST")
       RUBY
 
       inject_into_file(
@@ -113,7 +158,7 @@ module Slining
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
         "# config.action_controller.asset_host = 'http://assets.example.com'",
-        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("HOST"))'
+        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))'
 
       replace_in_file 'config/initializers/assets.rb',
         "config.assets.version = '1.0'",
@@ -185,18 +230,14 @@ end
       create_file '.ruby-version', "#{Slining::RUBY_VERSION}\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
 
+    def provide_shoulda_matchers_config
+      copy_file "shoulda_matchers_config_rspec.rb", "spec/support/shoulda_matchers.rb"
+    end
+
     def configure_spec_support_features
       empty_directory_with_keep_file 'spec/features'
       empty_directory_with_keep_file 'spec/support/features'
@@ -209,8 +250,8 @@ end
       copy_file "spec_helper.rb", "spec/spec_helper.rb"
     end
 
-    def configure_travis
-      template 'travis.yml.erb', '.travis.yml'
+    def configure_ci
+      template 'circle.yml.erb', 'circle.yml'
     end
 
     def configure_i18n_for_test_environment
@@ -235,6 +276,10 @@ end
       copy_file 'action_mailer.rb', 'spec/support/action_mailer.rb'
     end
 
+    def configure_capybara_webkit
+      copy_file "capybara_webkit.rb", "spec/support/capybara_webkit.rb"
+    end
+
     def configure_time_formats
       remove_file "config/locales/en.yml"
       template "config_locales_en.yml.erb", "config/locales/en.yml"
@@ -253,10 +298,9 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
     end
 
     def configure_action_mailer
-      action_mailer_host "development", %{"localhost:#{port}"}
+      action_mailer_host "development", %{"localhost:3000"}
       action_mailer_host "test", %{"www.example.com"}
-      action_mailer_host "staging", %{ENV.fetch("HOST")}
-      action_mailer_host "production", %{ENV.fetch("HOST")}
+      action_mailer_host "production", %{ENV.fetch("APPLICATION_HOST")}
     end
 
     def configure_active_job
@@ -278,11 +322,11 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       generate 'rspec:install'
     end
 
-    def configure_unicorn
-      copy_file 'unicorn.rb', 'config/unicorn.rb'
+    def configure_puma
+      copy_file "puma.rb", "config/puma.rb"
     end
 
-    def setup_foreman
+    def set_up_forego
       copy_file 'sample.env', '.sample.env'
       copy_file 'Procfile', 'Procfile'
     end
@@ -310,6 +354,10 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       end
     end
 
+    def copy_dotfiles
+      directory("dotfiles",".")
+    end
+
     def init_git
       run 'git init'
     end
@@ -333,34 +381,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|
@@ -386,9 +406,21 @@ 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:
+            - 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_segment
@@ -419,11 +451,33 @@ you can deploy to staging and production with:
       EOS
 
       %w(500 404 422).each do |page|
-        inject_into_file "public/#{page}.html", meta_tags, :after => "<head>\n"
+        inject_into_file "public/#{page}.html", meta_tags, after: "<head>\n"
         replace_in_file "public/#{page}.html", /<!--.+-->\n/, ''
       end
     end
 
+    def remove_config_comment_lines
+      config_files = [
+        "application.rb",
+        "environment.rb",
+        "environments/development.rb",
+        "environments/production.rb",
+        "environments/test.rb",
+      ]
+
+      config_files.each do |config_file|
+        path = File.join(destination_root, "config/#{config_file}")
+
+        accepted_content = File.readlines(path).reject do |line|
+          line =~ /^.*#.*$/ || line =~ /^$\n/
+        end
+
+        File.open(path, "w") do |file|
+          accepted_content.each { |line| file.puts line }
+        end
+      end
+    end
+
     def remove_routes_comment_lines
       replace_in_file 'config/routes.rb',
         /Rails\.application\.routes\.draw do.*end/m,
@@ -458,24 +512,12 @@ end
       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}"
-    end
-
-    def generate_secret
-      SecureRandom.hex(64)
+      run "heroku #{command} --remote #{environment}"
     end
 
-    def port
-      @port ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
+    def heroku_adapter
+      @heroku_adapter ||= Adapters::Heroku.new(self)
     end
 
     def serve_static_files_line