suspenders 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c84dfa1e7611fed45b70b7147446db7aa380fadb
-  data.tar.gz: f61b0771f023f89ac39133a3a02599c0b73554a2
+  metadata.gz: c45cb5e9730cce1b2b1ca6dba0241da4ac8ec645
+  data.tar.gz: 166fed6505055e5c9fde429b2d1cf9506645aecf
 SHA512:
-  metadata.gz: f97210f50a6afd0db622d889d2be68f4d592b1a1823abbedd345e3ee6a2940dedef66be0ca7f90c98b2c966dcfe4e7edc6de8a6101851287043680494a9f72bb
-  data.tar.gz: a1be143b16487f789979d06d071308f5c40a1f4aa777d487946d267950750a38d99b124966cbe451e74d22236ff702ca82f4655c7b0b57a43354647be2cb7348
+  metadata.gz: d22cdcbce92e3cd22446ee39c7dbcb888a831ddadb7d75e0c414459428a9ab0e2c0698c33cc97821988006e86ac0acaee460f8cc56a385baba4cf29013dfb5f7
+  data.tar.gz: fa642db68f21266f693a533c2aeaceaaa5ffc0b9d62685a94a6e24f35ee0274b0d9416e3057e249f3b224bbcf6b3065fb154319e043a70156d82c3f99d1674c1

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
 before_install:
   - git config --global user.name 'Travis CI'
   - git config --global user.email 'travis-ci@example.com'

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    suspenders (1.8.1)
+    suspenders (1.9.0)
       bundler (~> 1.3)
-      rails (= 4.0.0)
+      rails (= 4.0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
+      mail (~> 2.5.4)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.3)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -37,7 +37,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    atomic (1.1.14)
+    atomic (1.1.16)
     builder (3.1.4)
     capybara (2.2.0)
       mime-types (>= 1.16)
@@ -69,7 +69,7 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.7.7)
+    multi_json (1.7.9)
     multi_test (0.0.1)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
@@ -79,17 +79,17 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
+      railties (= 4.0.3)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
@@ -101,7 +101,7 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    sprockets (2.10.1)
+    sprockets (2.12.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -111,13 +111,13 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/NEWS.md

@@ -1,3 +1,14 @@
+1.9.0 (March 24, 2014)
+
+* Add `awesome_print` gem.
+* Add `dev:prime` task placeholder for bootstrapping local dev data.
+* Add fix for I18n deprecation warning from `enforce_available_locales`.
+* Add generated `.travis.yml`.
+* Remove `better_errors` because of issues with Unicorn.
+* Remove fast-failing for RSpec; respect user's `~/.rspec` instead.
+* Update New Relic agent.
+* Update Rails to 4.0.3.
+
 1.8.1 (February 19, 2014)
 
 * Don't distribute rspec binstub with gem.

data/README.md

@@ -24,7 +24,7 @@ Gemfile
 -------
 
 To see the latest and greatest gems, look at Suspenders'
-[templates/Gemfile_clean](templates/Gemfile_clean),
+[Gemfile](templates/Gemfile.erb),
 which will be appended to the default generated projectname/Gemfile.
 
 It includes application gems like:
@@ -88,12 +88,14 @@ Suspenders also comes with:
 * [Fast-failing factories][fast]
 * A [low database connection pool limit][pool]
 * [Safe binstubs][binstub]
+* [t() and l() in specs without prefixing with I18n][i18n]
 
 [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
 
 Suspenders fixes several of Rails' [insecure defaults]:
 

data/lib/suspenders/app_builder.rb

@@ -30,6 +30,10 @@ module Suspenders
       run 'chmod a+x bin/setup'
     end
 
+    def provide_dev_prime_task
+      copy_file 'development_seeds.rb', 'lib/tasks/development_seeds.rake'
+    end
+
     def configure_generators
       config = <<-RUBY
     config.generators do |generate|
@@ -118,7 +122,7 @@ end
     def create_application_layout
       template 'suspenders_layout.html.erb.erb',
         'app/views/layouts/application.html.erb',
-        :force => true
+        force: true
     end
 
     def remove_turbolinks
@@ -129,7 +133,7 @@ end
 
     def use_postgres_config_template
       template 'postgresql_database.yml.erb', 'config/database.yml',
-        :force => true
+        force: true
     end
 
     def create_database
@@ -138,13 +142,11 @@ end
 
     def replace_gemfile
       remove_file 'Gemfile'
-      copy_file 'Gemfile_clean', 'Gemfile'
+      template 'Gemfile.erb', 'Gemfile'
     end
 
     def set_ruby_to_version_being_used
-      inject_into_file 'Gemfile', "\n\nruby '#{RUBY_VERSION}'",
-        after: /source 'https:\/\/rubygems.org'/
-      create_file '.ruby-version', "#{RUBY_VERSION}#{patchlevel}\n"
+      template 'ruby-version.erb', '.ruby-version'
     end
 
     def setup_heroku_specific_gems
@@ -166,6 +168,14 @@ end
       copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
     end
 
+    def configure_travis
+      template 'travis.yml.erb', '.travis.yml'
+    end
+
+    def configure_i18n_in_specs
+      copy_file 'i18n.rb', 'spec/support/i18n.rb'
+    end
+
     def use_spring_binstubs
       run 'bundle exec spring binstub --all'
     end
@@ -199,6 +209,14 @@ end
       action_mailer_host 'production', "#{app_name}.com"
     end
 
+    def fix_i18n_deprecation_warning
+      config = <<-RUBY
+    config.i18n.enforce_available_locales = true
+
+      RUBY
+      inject_into_class 'config/application.rb', 'Application', config
+    end
+
     def generate_rspec
       generate 'rspec:install'
     end
@@ -316,13 +334,5 @@ git remote add production git@heroku.com:#{app_name}-production.git
     def generate_secret
       SecureRandom.hex(64)
     end
-
-    def patchlevel
-      if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= '2.1.0'
-        ''
-      else
-        "-p#{RUBY_PATCHLEVEL}"
-      end
-    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -67,6 +67,7 @@ module Suspenders
       build :raise_on_delivery_errors
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
+      build :provide_dev_prime_task
       build :configure_generators
     end
 
@@ -80,6 +81,8 @@ module Suspenders
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_spec_support_features
+      build :configure_travis
+      build :configure_i18n_in_specs
     end
 
     def setup_production_environment
@@ -118,6 +121,7 @@ module Suspenders
       build :configure_time_formats
       build :configure_rack_timeout
       build :disable_xml_params
+      build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
       build :configure_unicorn
       build :setup_foreman
@@ -183,6 +187,10 @@ module Suspenders
       # Let's not: We'll bundle manually at the right spot
     end
 
+    def ruby_version_with_patch_level
+      "#{RUBY_VERSION}#{patch_level}"
+    end
+
     protected
 
     def get_builder_class
@@ -192,5 +200,13 @@ module Suspenders
     def using_active_record?
       !options[:skip_active_record]
     end
+
+    def patch_level
+      if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= '2.1.0'
+        ''
+      else
+        "-p#{RUBY_PATCHLEVEL}"
+      end
+    end
   end
 end

data/lib/suspenders/version.rb

@@ -1,3 +1,3 @@
 module Suspenders
-  VERSION = '1.8.1'
+  VERSION = '1.9.0'
 end

data/spec/features/new_project_spec.rb

@@ -21,11 +21,11 @@ feature 'Suspend a new project with default configuration' do
   end
 
   if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= '2.1.0'
-    scenario '.ruby-version does not include patchlevel for Ruby 2.1.0' do
+    scenario '.ruby-version does not include patchlevel for Ruby 2.1.0+' do
       run_suspenders
 
       ruby_version_file = IO.read("#{project_path}/.ruby-version")
-      expect(ruby_version_file).to eq "2.1.0\n"
+      expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
     end
   else
     scenario '.ruby-version includes patchlevel for all pre-Ruby 2.1.0 versions' do

data/suspenders.gemspec

@@ -6,7 +6,7 @@ require 'date'
 Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
   s.add_dependency 'bundler', '~> 1.3'
-  s.add_dependency 'rails', '4.0.0'
+  s.add_dependency 'rails', '4.0.3'
   s.add_development_dependency 'aruba', '~> 0.5.2'
   s.add_development_dependency 'cucumber', '~> 1.2'
   s.authors = ['thoughtbot']

data/templates/{Gemfile_clean → Gemfile.erb}

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby '<%= RUBY_VERSION %>'
+
 gem 'airbrake'
 gem 'bourbon'
 gem 'coffee-rails'
@@ -11,7 +13,7 @@ gem 'jquery-rails'
 gem 'neat'
 gem 'pg'
 gem 'rack-timeout'
-gem 'rails', '>= 4.0.0'
+gem 'rails', '>= 4.0.3'
 gem 'recipient_interceptor'
 gem 'sass-rails'
 gem 'simple_form'
@@ -20,14 +22,13 @@ gem 'uglifier'
 gem 'unicorn'
 
 group :development do
-  gem 'better_errors'
-  gem 'binding_of_caller'
   gem 'foreman'
   gem 'spring'
   gem 'spring-commands-rspec'
 end
 
 group :development, :test do
+  gem 'awesome_print'
   gem 'dotenv-rails'
   gem 'factory_girl_rails'
   gem 'pry-rails'
@@ -45,5 +46,5 @@ group :test do
 end
 
 group :staging, :production do
-  gem 'newrelic_rpm', '>= 3.6.7'
+  gem 'newrelic_rpm', '>= 3.7.3'
 end

data/templates/bin_setup

@@ -9,8 +9,8 @@ set -e
 # Set up Ruby dependencies via Bundler
 bundle install
 
-# Set up the database
-bundle exec rake db:setup
+# Set up database and add any development seed data
+bundle exec rake dev:prime
 
 # Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
 mkdir -p .git/safe

data/templates/development_seeds.rb

@@ -0,0 +1,13 @@
+if Rails.env.development?
+  require 'factory_girl'
+
+  namespace :dev do
+    desc 'Seed data for development environment'
+    task prime: 'db:setup' do
+      FactoryGirl.find_definitions
+      include FactoryGirl::Syntax::Methods
+
+      # create(:user, email: 'user@example.com', password: 'password')
+    end
+  end
+end

data/templates/i18n.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include AbstractController::Translation
+end

data/templates/ruby-version.erb

@@ -0,0 +1 @@
+<%= ruby_version_with_patch_level %>

data/templates/spec_helper.rb

@@ -19,7 +19,6 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.fail_fast = true
   config.include Features, type: :feature
   config.infer_base_class_for_anonymous_controllers = false
   config.order = 'random'

data/templates/travis.yml.erb

@@ -0,0 +1,13 @@
+before_script:
+- cp .sample.env .env
+branches:
+  only:
+  - master
+cache: bundler
+language: ruby
+notifications:
+  campfire:
+    on_success: change
+    on_failure: always
+    template: '%{repository_name} build #%{build_number} on %{branch} by %{author} finished: %{message}: %{build_url}'
+rvm: ruby-<%= ruby_version_with_patch_level %>

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -30,68 +30,68 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -106,8 +106,8 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -132,7 +132,7 @@ files:
 - spec/support/fake_heroku.rb
 - spec/support/suspenders.rb
 - suspenders.gemspec
-- templates/Gemfile_clean
+- templates/Gemfile.erb
 - templates/Procfile
 - templates/README.md.erb
 - templates/_flashes.html.erb
@@ -142,13 +142,16 @@ files:
 - templates/bin_setup
 - templates/config_locales_en.yml
 - templates/database_cleaner_rspec.rb
+- templates/development_seeds.rb
 - templates/disable_xml_params.rb
 - templates/errors.rb
 - templates/factories_spec.rb
 - templates/factories_spec_rake_task.rb
 - templates/factory_girl_syntax_rspec.rb
+- templates/i18n.rb
 - templates/postgresql_database.yml.erb
 - templates/rack_timeout.rb
+- templates/ruby-version.erb
 - templates/sample.env
 - templates/secret_token.rb
 - templates/smtp.rb
@@ -156,6 +159,7 @@ files:
 - templates/staging.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
+- templates/travis.yml.erb
 - templates/unicorn.rb
 homepage: http://github.com/thoughtbot/suspenders
 licenses:
@@ -163,22 +167,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.