suspenders 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ed82bbed26013b10a8da6e00c1bbfd20ae852bd
-  data.tar.gz: dbbb9f4dd43bf2311392125b8739a4672b5e51b9
+  metadata.gz: 5f8164830fb3ff981e7d5a410cf0edbebb99dd3b
+  data.tar.gz: 339126a56d93d04c8962ccfb76c745c5006a3d99
 SHA512:
-  metadata.gz: a730d820d42a75b9e30825e3a8a6f429fd83bd0f89a39074117ec03f1bc7d6092235cb2feef9b9d114e7f61d9fd10b4536189df32c8aa9091f3cd249e63d2bd9
-  data.tar.gz: 2ef3565187f9ba9503679df275bfc4dc1323ce4ae29700750bd3c8ccb5451196e1a6799862f56603f1459e361778a484b1c3e3109e1a35a0627ce80aefef21c4
+  metadata.gz: 0da7e5681330e072141c4d9786aaca5fe7d2799dc6ac2aedce374871b48bf89f63ccaabcb79d5bbe4818500b94458145d4731fa949687f5cbb2a38d7a4d9f8b5
+  data.tar.gz: be69aea7445300aadd43dba59237fcd1963b1b20c7b19d63d83ebcb0e57457ff61e345e5754557eb1831f9aca69aaacbb52dcb2885e0749509fbc254b7509bba

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.1.4

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.3
+  - 2.1.4
 before_install:
   - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'

data/Gemfile.lock

@@ -1,35 +1,35 @@
 PATH
   remote: .
   specs:
-    suspenders (1.18.0)
+    suspenders (1.19.0)
       bitters (~> 0.10.0)
       bundler (~> 1.3)
-      rails (= 4.1.6)
+      rails (= 4.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
       arel (~> 5.0.0)
-    activesupport (4.1.6)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -70,11 +70,11 @@ GEM
     hike (1.2.3)
     i18n (0.6.11)
     json (1.8.1)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    minitest (5.4.2)
+    minitest (5.4.3)
     multi_json (1.10.1)
     multi_test (0.1.1)
     nokogiri (1.6.2.1)
@@ -82,19 +82,19 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -106,8 +106,8 @@ GEM
     rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.0)
-    sass (3.4.6)
-    sprockets (2.12.2)
+    sass (3.4.8)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/NEWS.md

@@ -1,3 +1,15 @@
+1.19.0 (November 23, 2014)
+
+* Use Ruby 2.1.4.
+* Use Rails 4.1.8.
+* Add Bundler Audit gem for scanning the Gemfile
+  for insecure dependencies based on published CVEs.
+* Use Heroku-recommended timeout numbers.
+* [Improve memory] of app on Heroku with New Relic.
+* Turn off RSpec verbose mode by default.
+
+[Improve memory]: http://forum.upcase.com/t/how-to-free-up-swap-space-heroku/3017/13?u=croaky
+
 1.18.0 (October 23, 2014)
 
 * Use Ruby 2.1.3.

data/README.md

@@ -59,6 +59,8 @@ And development gems like:
   objects
 * [ByeBug](https://github.com/deivid-rodriguez/byebug) for interactively
   debugging behavior
+* [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
 
@@ -85,19 +87,17 @@ Suspenders also comes with:
 * Rails' flashes set up and in application layout
 * A few nice time formats set up for localization
 * `Rack::Deflater` to [compress responses with Gzip][compress]
-* [Fast-failing factories][fast]
 * A [low database connection pool limit][pool]
 * [Safe binstubs][binstub]
 * [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.
-* The analytics adapter [Segment.io][segment] (and therefore config for Google
-  Analytics, Intercom, Facebook Ads, Twitter Ads, etc.).
+  environments
+* Configuration for [Travis Pro][travis] continuous integration
+* The analytics adapter [Segment][segment] (and therefore config for Google
+  Analytics, Intercom, Facebook Ads, Twitter Ads, etc.)
 
 [bin]: http://robots.thoughtbot.com/bin-setup
 [compress]: http://robots.thoughtbot.com/content-compression-with-rack-deflater/
-[fast]: http://robots.thoughtbot.com/testing-your-factories-first
 [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

data/lib/suspenders/app_builder.rb

@@ -280,10 +280,9 @@ end
     end
 
     def create_heroku_apps
-      path_addition = override_path_for_tests
-      run "#{path_addition} heroku create #{app_name}-production --remote=production"
-      run "#{path_addition} heroku create #{app_name}-staging --remote=staging"
-      run "#{path_addition} heroku config:add RACK_ENV=staging RAILS_ENV=staging --remote=staging"
+      run_heroku "create #{app_name}-production", "production"
+      run_heroku "create #{app_name}-staging", "staging"
+      run_heroku "config:add RACK_ENV=staging RAILS_ENV=staging", "staging"
     end
 
     def set_heroku_remotes
@@ -310,9 +309,15 @@ fi
     end
 
     def set_heroku_rails_secrets
-      path_addition = override_path_for_tests
-      run "#{path_addition} heroku config:add SECRET_KEY_BASE=#{generate_secret} --remote=staging"
-      run "#{path_addition} heroku config:add SECRET_KEY_BASE=#{generate_secret} --remote=production"
+      %w(staging production).each do |environment|
+        run_heroku "config:add SECRET_KEY_BASE=#{generate_secret}", environment
+      end
+    end
+
+    def set_memory_management_variable
+      %w(staging production).each do |environment|
+        run_heroku "config:add NEW_RELIC_AGGRESSIVE_KEEPALIVE=1", environment
+      end
     end
 
     def create_github_repo(repo_name)
@@ -325,6 +330,11 @@ fi
         'app/views/application/_analytics.html.erb'
     end
 
+    def setup_bundler_audit
+      copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
+      append_file "Rakefile", %{\ntask default: "bundler:audit"\n}
+    end
+
     def copy_miscellaneous_files
       copy_file 'errors.rb', 'config/initializers/errors.rb'
     end
@@ -354,7 +364,17 @@ fi
 
     def setup_default_rake_task
       append_file 'Rakefile' do
-        "task(:default).clear\ntask default: [:spec]\n"
+        <<-EOS
+task(:default).clear
+task default: [:spec]
+
+if defined? RSpec
+  task(:spec).clear
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.verbose = false
+  end
+end
+        EOS
       end
     end
 
@@ -373,6 +393,11 @@ fi
       end
     end
 
+    def run_heroku(command, environment)
+      path_addition = override_path_for_tests
+      run "#{path_addition} heroku #{command} --remote #{environment}"
+    end
+
     def factories_spec_rake_task
       IO.read find_in_source_paths('factories_spec_rake_task.rb')
     end

data/lib/suspenders/generators/app_generator.rb

@@ -40,6 +40,7 @@ module Suspenders
       invoke :create_heroku_apps
       invoke :create_github_repo
       invoke :setup_segment_io
+      invoke :setup_bundler_audit
       invoke :outro
     end
 
@@ -156,6 +157,7 @@ module Suspenders
         build :create_heroku_apps
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
+        build :set_memory_management_variable
       end
     end
 
@@ -175,6 +177,11 @@ module Suspenders
       build :gitignore_files
     end
 
+    def setup_bundler_audit
+      say "Setting up bundler-audit"
+      build :setup_bundler_audit
+    end
+
     def init_git
       build :init_git
     end

data/lib/suspenders/version.rb

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

data/spec/support/fake_heroku.rb

@@ -25,14 +25,14 @@ class FakeHeroku
 
   def self.has_created_app_for?(remote_name)
     app_name = "#{SuspendersTestHelpers::APP_NAME}-#{remote_name}"
-    expected_line = "create #{app_name} --remote=#{remote_name}\n"
+    expected_line = "create #{app_name} --remote #{remote_name}\n"
 
     File.foreach(RECORDER).any? { |line| line == expected_line }
   end
 
   def self.has_configured_vars?(remote_name, var)
     File.foreach(RECORDER).any? do |line|
-      line =~ /^config:add #{var}=.+ --remote=#{remote_name}\n$/
+      line =~ /^config:add #{var}=.+ --remote #{remote_name}\n$/
     end
   end
 end

data/templates/Gemfile.erb

@@ -12,7 +12,7 @@ gem "high_voltage"
 gem "i18n-tasks"
 gem "jquery-rails"
 gem "neat", "~> 1.5.1"
-gem "newrelic_rpm", ">= 3.7.3"
+gem "newrelic_rpm"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "rack-timeout"
@@ -25,6 +25,7 @@ gem "uglifier"
 gem "unicorn"
 
 group :development do
+  gem "bundler-audit"
   gem "spring"
   gem "spring-commands-rspec"
 end

data/templates/bin_setup.erb

@@ -7,10 +7,7 @@
 set -e
 
 # Set up Ruby dependencies via Bundler
-if ! command -v bundle > /dev/null; then
-  gem install bundler --no-document
-fi
-
+bundle --version &> /dev/null || gem install bundler --no-document
 bundle install
 
 # Set up configurable environment variables

data/templates/bundler_audit.rake

@@ -0,0 +1,11 @@
+if Rails.env.development? || Rails.env.test?
+  require "bundler/audit/cli"
+
+  namespace :bundler do
+    task :audit do
+      %w(update check).each do |command|
+        Bundler::Audit::CLI.start [command]
+      end
+    end
+  end
+end

data/templates/rack_timeout.rb

@@ -1 +1 @@
-Rack::Timeout.timeout = (ENV["TIMEOUT_IN_SECONDS"] || 5).to_i
+Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i

data/templates/unicorn.rb

@@ -1,7 +1,7 @@
 # https://devcenter.heroku.com/articles/rails-unicorn
 
-worker_processes (ENV["WEB_CONCURRENCY"] || 3).to_i
-timeout (ENV["WEB_TIMEOUT"] || 5).to_i
+worker_processes (ENV["UNICORN_WORKERS"] || 3).to_i
+timeout (ENV["UNICORN_TIMEOUT"] || 15).to_i
 preload_app true
 
 before_fork do |server, worker|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - templates/application.css.scss
 - templates/background_jobs_rspec.rb
 - templates/bin_setup.erb
+- templates/bundler_audit.rake
 - templates/config_i18n_tasks.yml
 - templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
@@ -199,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.3
+      version: 2.1.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.