suspenders 1.28.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5c9a1f436bfb675715cd69381f374c36bbe8af
-  data.tar.gz: 452c5dbeafa70ba43c4e320b75c74a7827208c82
+  metadata.gz: b1c5bbaee1a756025cd9d7682c0d3f2e0cd7681a
+  data.tar.gz: c01b10195b95bbcda715f73bb10e4e55311f6ec2
 SHA512:
-  metadata.gz: 2523526b87854cd8b9136cc900b0ad6b97c73b5db802e7ba9ced1405ac9c0cd4c02511bb685bbf7ef8e4544832ec567c0db5c15ce334c899e645d259998ffaba
-  data.tar.gz: a82acee4b6d591536bd50a5ec8add13967938aa5de2c9c9c7fd4c19b0c77fc4aebb3b52036d2a9d07ba31cfd01ef86bb5fc1b6a06046072d60d50b0d8a5851ae
+  metadata.gz: 9678004a0610ec1aa35d4829870da67dbe3d64c69a90822223c11faa1cd5b1fa9c8ee75b77b0a927313752bb13286aa72d098817f335568ccdab6712e2e6f925
+  data.tar.gz: 626aaecb11ce0f0f02ed50add9d214f41af8ef5b6c1885b8d2b7d4eeec3d2958bd1780bdf41837dd5eb812816148e62252b06ba8398889b0032ad38cfdd69f8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    suspenders (1.27.0)
+    suspenders (1.29.0)
       bitters (~> 1.0.0)
       bundler (~> 1.3)
       rails (= 4.2.1)
@@ -49,35 +49,27 @@ GEM
       bourbon (>= 3.2)
       sass (>= 3.2)
       thor
-    bourbon (4.2.2)
+    bourbon (4.2.3)
       sass (~> 3.4)
       thor
     builder (3.2.2)
-    capybara (2.3.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.5.1)
-    multi_json (1.11.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    rack (1.6.0)
-    rack-test (0.6.2)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.1)
       actionmailer (= 4.2.1)
@@ -104,36 +96,37 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.0)
-    rspec-expectations (2.99.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.0)
-    sass (3.4.13)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    sass (3.4.14)
+    sprockets (3.2.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 2.2, >= 2.2.0)
-  rspec (~> 2.0)
+  rspec (~> 3.2)
   suspenders!
+
+BUNDLED WITH
+   1.10.4

data/NEWS.md

@@ -1,3 +1,10 @@
+1.29.0 (June 16, 2015)
+
+* Generate rake, rails and rspec binstubs with Spring
+* Remove Capybara and use RSpec 3.2 for development
+* Improves suspenders' test suite speed
+* Refills `flashes.scss` bugfix
+
 1.28.0 (May 9, 2015)
 
 * Require spec/support files in a certain order

data/README.md

@@ -97,7 +97,8 @@ Suspenders 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 Pro][travis] continuous integration
+* Configuration for [Travis][travis] 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.)
 
@@ -107,6 +108,7 @@ Suspenders also comes with:
 [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/
+[hound]: https://houndci.com
 [segment]: https://segment.com
 
 ## Heroku
@@ -157,6 +159,14 @@ This has the same effect as running:
 
     hub create organization/project
 
+## Spring
+
+Suspenders 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`.
+And if you'd rather not use spring, add `DISABLE_SPRING=1` to your login file.
+
 ## Dependencies
 
 Suspenders requires the latest version of Ruby.

data/lib/suspenders/app_builder.rb

@@ -58,6 +58,10 @@ module Suspenders
       copy_file 'factory_girl_rspec.rb', 'spec/support/factory_girl.rb'
     end
 
+    def set_up_hound
+      copy_file "hound.yml", ".hound.yml"
+    end
+
     def configure_newrelic
       template 'newrelic.yml.erb', 'config/newrelic.yml'
     end
@@ -289,6 +293,12 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
                 "app/assets/stylesheets/application.scss"
     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"
     end
@@ -401,6 +411,10 @@ you can deploy to staging and production with:
       append_file "Rakefile", %{\ntask default: "bundler:audit"\n}
     end
 
+    def setup_spring
+      bundle_command "exec spring binstub --all"
+    end
+
     def copy_miscellaneous_files
       copy_file "browserslist", "browserslist"
       copy_file "errors.rb", "config/initializers/errors.rb"

data/lib/suspenders/generators/app_generator.rb

@@ -40,6 +40,7 @@ module Suspenders
       invoke :configure_app
       invoke :setup_stylesheets
       invoke :install_bitters
+      invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
@@ -49,6 +50,7 @@ module Suspenders
       invoke :create_github_repo
       invoke :setup_segment
       invoke :setup_bundler_audit
+      invoke :setup_spring
       invoke :outro
     end
 
@@ -87,6 +89,7 @@ module Suspenders
     def setup_test_environment
       say 'Setting up the test environment'
       build :set_up_factory_girl_for_rspec
+      build :set_up_hound
       build :generate_rspec
       build :configure_rspec
       build :configure_background_jobs_for_rspec
@@ -149,6 +152,11 @@ module Suspenders
       build :install_bitters
     end
 
+    def install_refills
+      say "Install Refills"
+      build :install_refills
+    end
+
     def setup_git
       if !options[:skip_git]
         say 'Initializing git'
@@ -189,6 +197,11 @@ module Suspenders
       build :setup_bundler_audit
     end
 
+    def setup_spring
+      say "Springifying binstubs"
+      build :setup_spring
+    end
+
     def init_git
       build :init_git
     end

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
   RAILS_VERSION = "4.2.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.28.0"
+  VERSION = "1.29.0"
 end

data/spec/features/github_spec.rb

@@ -1,7 +1,12 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'GitHub' do
-  scenario 'Suspend a project with --github option' do
+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}")
 

data/spec/features/heroku_spec.rb

@@ -1,7 +1,12 @@
 require "spec_helper"
 
-feature "Heroku" do
-  scenario "Suspend a project for Heroku" do
+RSpec.describe "Heroku" do
+  before do
+    drop_dummy_database
+    remove_project_directory
+  end
+
+  it "suspends a project for Heroku" do
     run_suspenders("--heroku=true")
 
     expect(FakeHeroku).to(
@@ -32,7 +37,7 @@ feature "Heroku" do
     expect(readme).to include("./bin/deploy production")
   end
 
-  scenario "Suspend a project with extra Heroku flags" do
+  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")

data/spec/features/new_project_spec.rb

@@ -1,9 +1,13 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Suspend a new project with default configuration' do
-  scenario 'specs pass' do
+RSpec.describe "Suspend a new project with default configuration" do
+  before(:all) do
+    drop_dummy_database
+    remove_project_directory
     run_suspenders
+  end
 
+  it "ensures project specs pass" do
     Dir.chdir(project_path) do
       Bundler.with_clean_env do
         expect(`rake`).to include('0 failures')
@@ -11,9 +15,7 @@ feature 'Suspend a new project with default configuration' do
     end
   end
 
-  scenario 'staging config is inherited from production' do
-    run_suspenders
-
+  it "inherits staging config from production" do
     staging_file = IO.read("#{project_path}/config/environments/staging.rb")
     config_stub = "Rails.application.configure do"
 
@@ -21,37 +23,33 @@ feature 'Suspend a new project with default configuration' do
     expect(staging_file).to match(/#{config_stub}/), staging_file
   end
 
-  scenario 'generated .ruby-version is pulled from Suspenders .ruby-version' do
-    run_suspenders
-
+  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
 
-  scenario 'secrets.yml reads secret from env' do
-    run_suspenders
-
+  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"\] %>/)
   end
 
-  scenario 'action mailer support file is added' do
-    run_suspenders
-
+  it "adds support file for action mailer" do
     expect(File).to exist("#{project_path}/spec/support/action_mailer.rb")
   end
 
-  scenario "i18n support file is added" do
-    run_suspenders
-
+  it "adds support file for i18n" do
     expect(File).to exist("#{project_path}/spec/support/i18n.rb")
   end
 
-  scenario 'newrelic.yml reads NewRelic license from env' do
-    run_suspenders
+  it "creates good default .hound.yml" do
+    hound_config_file = IO.read("#{project_path}/.hound.yml")
+
+    expect(hound_config_file).to include "enabled: true"
+  end
 
+  it "ensures newrelic.yml reads NewRelic license from env" do
     newrelic_file = IO.read("#{project_path}/config/newrelic.yml")
 
     expect(newrelic_file).to match(
@@ -59,18 +57,14 @@ feature 'Suspend a new project with default configuration' do
     )
   end
 
-  scenario 'records pageviews through Segment if ENV variable set' do
-    run_suspenders
-
+  it "records pageviews through Segment if ENV variable set" do
     expect(analytics_partial).
       to include(%{<% if ENV["SEGMENT_KEY"] %>})
     expect(analytics_partial).
       to include(%{window.analytics.load("<%= ENV["SEGMENT_KEY"] %>");})
   end
 
-  scenario "raises on unpermitted parameters in all environments" do
-    run_suspenders
-
+  it "raises on unpermitted parameters in all environments" do
     result = IO.read("#{project_path}/config/application.rb")
 
     expect(result).to match(
@@ -78,9 +72,7 @@ feature 'Suspend a new project with default configuration' do
     )
   end
 
-  scenario "raises on missing translations in development and test" do
-    run_suspenders
-
+  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")
@@ -90,44 +82,32 @@ feature 'Suspend a new project with default configuration' do
     end
   end
 
-  scenario "specs for missing or unused translations" do
-    run_suspenders
-
+  it "adds specs for missing or unused translations" do
     expect(File).to exist("#{project_path}/spec/i18n_spec.rb")
   end
 
-  scenario "config file for i18n tasks" do
-    run_suspenders
-
+  it "configs i18n-tasks" do
     expect(File).to exist("#{project_path}/config/i18n-tasks.yml")
   end
 
-  scenario "generated en.yml is evaluated" do
-    run_suspenders
-
+  it "evaluates en.yml.erb" do
     locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
     app_name = SuspendersTestHelpers::APP_NAME
 
     expect(locales_en_file).to match(/application: #{app_name.humanize}/)
   end
 
-  scenario "config simple_form" do
-    run_suspenders
-
+  it "configs simple_form" do
     expect(File).to exist("#{project_path}/config/initializers/simple_form.rb")
   end
 
-  scenario "config :test email delivery method for development" do
-    run_suspenders
-
+  it "configs :test email delivery method for development" do
     dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
     expect(dev_env_file).
       to match(/^ +config.action_mailer.delivery_method = :test$/)
   end
 
-  scenario "config active job queue adapter" do
-    run_suspenders
-
+  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")
 
@@ -139,6 +119,16 @@ feature 'Suspend a new project with default configuration' do
     )
   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)
+    end
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'capybara/rspec'
 require 'bundler/setup'
 
 Bundler.require(:default, :test)
@@ -15,9 +14,6 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    drop_dummy_database
-    remove_project_directory
-
     FakeHeroku.clear!
     FakeGithub.clear!
   end

data/suspenders.gemspec

@@ -31,6 +31,5 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
-  s.add_development_dependency 'rspec', '~> 2.0'
-  s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.0'
+  s.add_development_dependency 'rspec', '~> 3.2'
 end

data/templates/hound.yml

@@ -0,0 +1,17 @@
+# See https://houndci.com/configuration for help.
+coffeescript:
+  # config_file: .coffeescript-style.json
+  enabled: true
+haml:
+  # config_file: .haml-style.yml
+  enabled: true
+javascript:
+  # config_file: .javascript-style.json
+  enabled: true
+  # ignore_file: .javascript_ignore
+ruby:
+  # config_file: .ruby-style.yml
+  enabled: true
+scss:
+  # config_file: .scss-style.yml
+  enabled: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -58,34 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3.2'
 description: |
   Suspenders is a base Rails project that you can upgrade. It is used by
   thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
@@ -147,6 +127,7 @@ files:
 - templates/errors.rb
 - templates/factory_girl_rspec.rb
 - templates/flashes_helper.rb
+- templates/hound.yml
 - templates/i18n.rb
 - templates/json_encoding.rb
 - templates/newrelic.yml.erb