suspenders 1.9.3 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0152238c3011c893d503649500d9b5a40fdbbf59
-  data.tar.gz: c27664d7c142b6b9521d9d2c977dfad77d3afc47
+  metadata.gz: d11e413ba023fcf89b30a5673a23c52fd338093a
+  data.tar.gz: 924687edbeaf3fb28dcf213a77cd0173fa8c9edb
 SHA512:
-  metadata.gz: a7d1e9dc555cf3c14a00a5c3f6b455d56ae32835a3e8051138b6892f6d47db504fa462a7e549fd34fc24d3875bf8510817d05c39819daabf2e4c1d75c9aee254
-  data.tar.gz: 78129944dc4b6735352f1a62af7e90900a72a28127d5bbc5c75bb9b5adf277e4c207639ab546e354cca49c14a946da1ae3f1c62e3128bbaa51585a91e32f0360
+  metadata.gz: cf5aa4110d4e855f12e9a0cd9b1c26fdd2900e3228b79a6152914315813d8d5e0861d0825459e8672c570d32714fb09b093c2deb9da0990834133295ae8efe56
+  data.tar.gz: 1eb883a7cd0f8e37c886a3ba1724bb47ad088cd201516c2d050e55e5007c0e58a59445e62172a47cda7647f7ec06129410d2d623bc8ec1a55f57445e1ea53b70

data/Gemfile.lock

@@ -1,38 +1,40 @@
 PATH
   remote: .
   specs:
-    suspenders (1.9.3)
+    suspenders (1.10.0)
       bundler (~> 1.3)
-      rails (= 4.0.3)
+      rails (~> 4.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.0)
+      actionview (= 4.1.0)
+      activesupport (= 4.1.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
-      builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
@@ -62,12 +64,13 @@ GEM
       multi_json (~> 1.3)
     hike (1.2.3)
     i18n (0.6.9)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile (0.5.2)
-    minitest (4.7.5)
+    minitest (5.3.3)
     multi_json (1.7.9)
     multi_test (0.0.1)
     nokogiri (1.6.1)
@@ -78,20 +81,22 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.1.0)
+      actionmailer (= 4.1.0)
+      actionpack (= 4.1.0)
+      actionview (= 4.1.0)
+      activemodel (= 4.1.0)
+      activerecord (= 4.1.0)
+      activesupport (= 4.1.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+      railties (= 4.1.0)
+      sprockets-rails (~> 2.0)
+    railties (4.1.0)
+      actionpack (= 4.1.0)
+      activesupport (= 4.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.2.2)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -105,7 +110,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -115,7 +120,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/NEWS.md

@@ -1,3 +1,9 @@
+1.10.0 (April 21, 2014)
+
+* Generate a Rails 4.1 app.
+* Generate a working .ruby-version for Ruby >= 2.1.0.
+* Update Unicorn template to version now preferred by Heroku.
+
 1.9.3 (April 13, 2014)
 
 * Use FactoryGirl.lint instead of custom-generated factory-testing code.

data/README.md

@@ -15,7 +15,7 @@ Then run:
 
     suspenders projectname
 
-This will create a Rails 4.0 app in `projectname`.
+This will create a Rails 4.1 app in `projectname`.
 
 By default this script creates a new git repository. See below if you
 want to use it against an existing repo.
@@ -89,6 +89,8 @@ Suspenders also comes with:
 * 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.
 
 [bin]: http://robots.thoughtbot.com/bin-setup
 [compress]: http://robots.thoughtbot.com/content-compression-with-rack-deflater/
@@ -97,16 +99,6 @@ Suspenders also comes with:
 [binstub]: https://github.com/thoughtbot/suspenders/pull/282
 [i18n]: https://github.com/thoughtbot/suspenders/pull/304
 
-Suspenders fixes several of Rails' [insecure defaults]:
-
-* Suspenders uses Unicorn instead of WEBrick, allowing less verbose Server
-  headers.
-* Suspenders is configured to pull your application secret key base from an
-  environment variable, which means you won't need to risk placing it in version
-  control.
-
-[insecure defaults]: http://blog.codeclimate.com/blog/2013/03/27/rails-insecure-defaults/
-
 Heroku
 ------
 

data/lib/suspenders/app_builder.rb

@@ -88,7 +88,7 @@ module Suspenders
 
       config = <<-RUBY
 
-#{app_name.classify}::Application.configure do
+Rails.application.configure do
   # ...
 end
       RUBY
@@ -97,9 +97,7 @@ end
     end
 
     def setup_secret_token
-      template 'secret_token.rb',
-        'config/initializers/secret_token.rb',
-        :force => true
+      template 'secrets.yml', 'config/secrets.yml', force: true
     end
 
     def create_partials_directory
@@ -171,10 +169,6 @@ end
       copy_file 'i18n.rb', 'spec/support/i18n.rb'
     end
 
-    def use_spring_binstubs
-      run 'bundle exec spring binstub --all'
-    end
-
     def configure_background_jobs_for_rspec
       copy_file 'background_jobs_rspec.rb', 'spec/support/background_jobs.rb'
       run 'rails g delayed_job:active_record'
@@ -302,8 +296,8 @@ heroku join --app #{app_name}-production
 
     def remove_routes_comment_lines
       replace_in_file 'config/routes.rb',
-        /Application\.routes\.draw do.*end/m,
-        "Application.routes.draw do\nend"
+        /Rails\.application\.routes\.draw do.*end/m,
+        "Rails.application.routes.draw do\nend"
     end
 
     def disable_xml_params

data/lib/suspenders/generators/app_generator.rb

@@ -76,7 +76,6 @@ module Suspenders
       build :set_up_factory_girl_for_rspec
       build :generate_rspec
       build :configure_rspec
-      build :use_spring_binstubs
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_spec_support_features
@@ -201,7 +200,7 @@ module Suspenders
     end
 
     def patch_level
-      if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= '2.1.0'
+      if RUBY_VERSION >= '2.1.0'
         ''
       else
         "-p#{RUBY_PATCHLEVEL}"

data/lib/suspenders/version.rb

@@ -1,3 +1,3 @@
 module Suspenders
-  VERSION = '1.9.3'
+  VERSION = '1.10.0'
 end

data/spec/features/new_project_spec.rb

@@ -15,12 +15,12 @@ feature 'Suspend a new project with default configuration' do
     run_suspenders
 
     staging_file = IO.read("#{project_path}/config/environments/staging.rb")
-    config_stub = "Dummy::Application.configure do"
+    config_stub = "Rails.application.configure do"
     expect(staging_file).to match(/^require_relative 'production'/)
     expect(staging_file).to match(/#{config_stub}/), staging_file
   end
 
-  if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= '2.1.0'
+  if RUBY_VERSION >= '2.1.0'
     scenario '.ruby-version does not include patchlevel for Ruby 2.1.0+' do
       run_suspenders
 

data/spec/support/suspenders.rb

@@ -13,7 +13,6 @@ module SuspendersTestHelpers
     Dir.chdir(tmp_path) do
       Bundler.with_clean_env do
         ENV['TESTING'] = '1'
-        ENV['DISABLE_SPRING'] = '1'
 
         %x(#{suspenders_bin} #{APP_NAME} #{arguments})
       end

data/suspenders.gemspec

@@ -4,9 +4,9 @@ require 'suspenders/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 1.9.3'
   s.add_dependency 'bundler', '~> 1.3'
-  s.add_dependency 'rails', '4.0.3'
+  s.add_dependency 'rails', '~> 4.1.0'
   s.add_development_dependency 'aruba', '~> 0.5.2'
   s.add_development_dependency 'cucumber', '~> 1.2'
   s.authors = ['thoughtbot']

data/templates/Gemfile.erb

@@ -13,9 +13,9 @@ gem 'jquery-rails'
 gem 'neat'
 gem 'pg'
 gem 'rack-timeout'
-gem 'rails', '>= 4.0.3'
+gem 'rails', '~> 4.1.0'
 gem 'recipient_interceptor'
-gem 'sass-rails', '>= 4.0.2'
+gem 'sass-rails'
 gem 'simple_form'
 gem 'title'
 gem 'uglifier'

data/templates/secrets.yml

@@ -0,0 +1,14 @@
+default: &default
+  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+staging:
+  <<: *default
+
+production:
+  <<: *default

data/templates/unicorn.rb

@@ -21,7 +21,8 @@ after_fork do |server, worker|
   end
 
   if defined? ActiveRecord::Base
-    config = Rails.application.config.database_configuration[Rails.env]
+    config = ActiveRecord::Base.configurations[Rails.env] ||
+      Rails.application.config.database_configuration[Rails.env]
     config['reaping_frequency'] = (ENV['DB_REAPING_FREQUENCY'] || 10).to_i
     config['pool'] = (ENV['DB_POOL'] || 2).to_i
     ActiveRecord::Base.establish_connection(config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ files:
 - templates/rack_timeout.rb
 - templates/ruby-version.erb
 - templates/sample.env
-- templates/secret_token.rb
+- templates/secrets.yml
 - templates/smtp.rb
 - templates/spec_helper.rb
 - templates/staging.rb
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/templates/secret_token.rb

@@ -1,10 +0,0 @@
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
-
-# Make sure your secret_key_base is kept private
-# if you're sharing your code publicly.
-<%= app_const %>.config.secret_key_base = ENV['SECRET_KEY_BASE']