suspenders 1.10.2 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e26c8eb974dd085097abba50f6fd119bbaf8829
-  data.tar.gz: 270d556f226063e3fe85e10064b0123dd9f3bd19
+  metadata.gz: 15e552d7d17ba6f3e6abcce8e48e7357f759b3d5
+  data.tar.gz: cf5e84b547ccc981b720be0e0db2a853836fa557
 SHA512:
-  metadata.gz: 69e4d8b4f3e13c11d3167e70ec35b56ce80eb9f0835c6961ac835ab5dd64b63e2404bd783fc4b41bcb7ab40a5970c4aca516c9fc4e8c78f5b80f54f6465ad50d
-  data.tar.gz: ccf491a165331e44dadb931857c80039ad8ac2817631e8b66da4c62ad64a68ebe232396c88d24e66f69c1372e9ee543ff420f8014652fa7814b1ed57fdbaa979
+  metadata.gz: fc35351a500d302415077fcedc6809df78b8872c9988ba04c1b9cf1274f88063e412c0a20e84c9e56884ba409e19fb3967c7d3490152f36b38325eddcf632d89
+  data.tar.gz: f689a5d0f922bb1ffcc8f7e152ffa664ad1275ace7ed67abb9f13526be6bb2c28cdb7d2255ee5e1ed8b4ddb0d096830a96c7263e7e4a892aabb1638d8b2a864f

data/.ruby-version

@@ -0,0 +1 @@
+2.1.1

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
   - 2.1.1
 before_install:
+  - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'
   - git config --global user.email 'travis-ci@example.com'
 install:

data/CONTRIBUTING.md

@@ -1,38 +1,36 @@
-We love pull requests. Here's a quick guide:
+# Contributing
 
-1. Fork the repo.
+We love pull requests. Here's a quick guide.
 
-2. Run the tests. We only take pull requests with passing tests, and it's great
-to know that you have a clean slate: `bundle && rake`
+Fork the repo:
 
-3. Add a test for your change. Only refactoring and documentation changes
-require no new tests. If you are adding functionality or fixing a bug, we need
-a test!
+    git clone git@github.com:thoughtbot/suspenders.git
 
-4. Make the test pass.
+Set up your machine:
 
-5. Push to your fork and submit a pull request.
+    ./bin/setup
 
+Make sure the tests pass:
 
-At this point you're waiting on us. We like to at least comment on, if not
-accept, pull requests within three business days (and, typically, one business
-day). We may suggest some changes or improvements or alternatives.
+    rake
 
-Some things that will increase the chance that your pull request is accepted,
-taken straight from the Ruby on Rails guide:
+Make your change. Add tests for your change. Make the tests pass:
 
-* Use Rails idioms and helpers
-* Include tests that fail without your code, and pass with it
-* Update the documentation, the surrounding one, examples elsewhere, guides,
-  whatever is affected by your contribution
+    rake
 
-Syntax:
+Push to your fork and [submit a pull request][pr].
 
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Prefer &&/|| over and/or.
-* my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
+[pr]: https://github.com/thoughtbot/suspenders/compare/
 
-And in case we didn't emphasize it enough: we love tests!
+At this point you're waiting on us. We like to at least comment on pull requests
+within three business days (and, typically, one business day). We may suggest
+some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted:
+
+* Write tests.
+* Follow our [style guide][style].
+* Write a [good commit message][commit].
+
+[style]: https://github.com/thoughtbot/guides/tree/master/style
+[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    suspenders (1.10.2)
+    suspenders (1.11.0)
       bundler (~> 1.3)
       rails (~> 4.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
+    actionmailer (4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
       mail (~> 2.5.4)
-    actionpack (4.1.0)
-      actionview (= 4.1.0)
-      activesupport (= 4.1.0)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.0)
-      activesupport (= 4.1.0)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
       builder (~> 3.1)
-    activerecord (4.1.0)
-      activemodel (= 4.1.0)
-      activesupport (= 4.1.0)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
       arel (~> 5.0.0)
-    activesupport (4.1.0)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -70,7 +70,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile (0.5.2)
-    minitest (5.3.3)
+    minitest (5.3.4)
     multi_json (1.7.9)
     multi_test (0.0.1)
     nokogiri (1.6.1)
@@ -81,22 +81,22 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    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)
+    rails (4.1.1)
+      actionmailer (= 4.1.1)
+      actionpack (= 4.1.1)
+      actionview (= 4.1.1)
+      activemodel (= 4.1.1)
+      activerecord (= 4.1.1)
+      activesupport (= 4.1.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0)
+      railties (= 4.1.1)
       sprockets-rails (~> 2.0)
-    railties (4.1.0)
-      actionpack (= 4.1.0)
-      activesupport (= 4.1.0)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)

data/NEWS.md

@@ -1,3 +1,15 @@
+1.11.0 (May 17, 2014)
+
+* Generate a Rails 4.1.1 app and implement fixes for compatibility.
+* Escape ERb in secrets.yml
+* Maintain ActiveRecord test schema.
+* Make Shoulda Matchers work with Spring.
+* Unify Ruby version for gem and suspended apps.
+* Move SMTP variable settings out of initializer.
+* Connect to Postgres on localhost.
+* Add `bin/setup` for contributors.
+* Improve and document TravisCI configuration.
+
 1.10.2 (April 28, 2014)
 
 * Fix bundling Bourbon and Neat.

data/README.md

@@ -15,7 +15,7 @@ Then run:
 
     suspenders projectname
 
-This will create a Rails 4.1 app in `projectname`.
+This will create a Rails app in `projectname` using the latest version of Rails.
 
 By default this script creates a new git repository. See below if you
 want to use it against an existing repo.
@@ -24,8 +24,8 @@ Gemfile
 -------
 
 To see the latest and greatest gems, look at Suspenders'
-[Gemfile](templates/Gemfile.erb),
-which will be appended to the default generated projectname/Gemfile.
+[Gemfile](templates/Gemfile.erb), which will be appended to the default
+generated projectname/Gemfile.
 
 It includes application gems like:
 
@@ -91,6 +91,7 @@ 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.
 
 [bin]: http://robots.thoughtbot.com/bin-setup
 [compress]: http://robots.thoughtbot.com/content-compression-with-rack-deflater/
@@ -98,6 +99,7 @@ Suspenders also comes with:
 [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/
 
 Heroku
 ------
@@ -137,7 +139,7 @@ This has the same effect as running:
 Dependencies
 ------------
 
-Suspenders requires Ruby 1.9.2 or greater.
+Suspenders requires the latest version of Ruby.
 
 Some gems included in Suspenders have native extensions. You should have GCC
 installed on your machine before generating an app with Suspenders.
@@ -149,7 +151,7 @@ Use [Command Line Tools for XCode](https://developer.apple.com/downloads/index.a
 for Lion (OS X 10.7) or Mountain Lion (OS X 10.8).
 
 We use [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
-full-stack Javascript integration testing. It requires QT. Instructions for
+full-stack JavaScript integration testing. It requires QT. Instructions for
 installing QT are
 [here](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
 
@@ -159,12 +161,14 @@ Issues
 ------
 
 If you have problems, please create a
-[Github Issue](https://github.com/thoughtbot/suspenders/issues).
+[GitHub Issue](https://github.com/thoughtbot/suspenders/issues).
 
 Contributing
 ------------
 
-Please see CONTRIBUTING.md for details.
+To update Suspenders' Ruby version, change `.ruby-version` and `.travis.yml`.
+
+Please see CONTRIBUTING.md for further details.
 
 Credits
 -------

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/setup

@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# Run this script immediately after cloning the codebase.
+
+# Exit if any subcommand fails
+set -e
+
+# Set up Ruby dependencies via Bundler
+bundle install
+
+# Add binstubs to PATH in ~/.zshenv like this:
+#   export PATH=".git/safe/../../bin:$PATH"
+mkdir -p .git/safe

data/lib/suspenders.rb

@@ -1,3 +1,4 @@
+require 'suspenders/version'
 require 'suspenders/generators/app_generator'
 require 'suspenders/actions'
 require 'suspenders/app_builder'

data/lib/suspenders/app_builder.rb

@@ -56,10 +56,10 @@ module Suspenders
     end
 
     def configure_smtp
-      copy_file 'smtp.rb', 'config/initializers/smtp.rb'
+      copy_file 'smtp.rb', 'config/smtp.rb'
 
       prepend_file 'config/environments/production.rb',
-        "require Rails.root.join('config/initializers/smtp')\n"
+        "require Rails.root.join('config/smtp')\n"
 
       config = <<-RUBY
 
@@ -139,7 +139,7 @@ end
     end
 
     def set_ruby_to_version_being_used
-      template 'ruby-version.erb', '.ruby-version'
+      create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
     end
 
     def setup_heroku_specific_gems

data/lib/suspenders/generators/app_generator.rb

@@ -185,10 +185,6 @@ 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
@@ -198,13 +194,5 @@ module Suspenders
     def using_active_record?
       !options[:skip_active_record]
     end
-
-    def patch_level
-      if RUBY_VERSION >= '2.1.0'
-        ''
-      else
-        "-p#{RUBY_PATCHLEVEL}"
-      end
-    end
   end
 end

data/lib/suspenders/version.rb

@@ -1,3 +1,4 @@
 module Suspenders
-  VERSION = '1.10.2'
+  RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
+  VERSION = '1.11.0'
 end

data/spec/features/new_project_spec.rb

@@ -20,19 +20,17 @@ feature 'Suspend a new project with default configuration' do
     expect(staging_file).to match(/#{config_stub}/), staging_file
   end
 
-  if RUBY_VERSION >= '2.1.0'
-    scenario '.ruby-version does not include patchlevel for Ruby 2.1.0+' do
-      run_suspenders
+  scenario 'generated .ruby-version is pulled from Suspenders .ruby-version' do
+    run_suspenders
 
-      ruby_version_file = IO.read("#{project_path}/.ruby-version")
-      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
-      run_suspenders
+    ruby_version_file = IO.read("#{project_path}/.ruby-version")
+    expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
+  end
 
-      ruby_version_file = IO.read("#{project_path}/.ruby-version")
-      expect(ruby_version_file).to eq "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}\n"
-    end
+  scenario 'secrets.yml reads secret from env' do
+    run_suspenders
+
+    secrets_file = IO.read("#{project_path}/config/secrets.yml")
+    expect(secrets_file).to match(/secret_key_base: <%= ENV\['SECRET_KEY_BASE'\] %>/)
   end
 end

data/suspenders.gemspec

@@ -4,7 +4,7 @@ require 'suspenders/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = "~> #{Suspenders::RUBY_VERSION}"
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', '~> 4.1.0'
   s.add_development_dependency 'aruba', '~> 0.5.2'

data/templates/Brewfile

@@ -0,0 +1,2 @@
+install postgres --no-python
+install qt imagemagick

data/templates/Gemfile.erb

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '<%= RUBY_VERSION %>'
+ruby '<%= Suspenders::RUBY_VERSION %>'
 
 gem 'airbrake'
 gem 'bourbon', '~> 3.2.1'
@@ -39,7 +39,7 @@ group :test do
   gem 'capybara-webkit', '>= 1.0.0'
   gem 'database_cleaner'
   gem 'launchy'
-  gem 'shoulda-matchers'
+  gem 'shoulda-matchers', require: false
   gem 'simplecov', require: false
   gem 'timecop'
   gem 'webmock'

data/templates/postgresql_database.yml.erb

@@ -2,6 +2,7 @@ development: &default
   adapter: postgresql
   database: <%= app_name %>_development
   encoding: utf8
+  host: localhost
   min_messages: warning
   pool: 2
   timeout: 5000

data/templates/secrets.yml

@@ -1,5 +1,5 @@
 default: &default
-  secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
+  secret_key_base: <%%= ENV['SECRET_KEY_BASE'] %>
 
 development:
   <<: *default

data/templates/smtp.rb

@@ -1,11 +1,9 @@
-if Rails.env.staging? || Rails.env.production?
-  SMTP_SETTINGS = {
-    address: ENV.fetch('SMTP_ADDRESS'), # example: 'smtp.sendgrid.net'
-    authentication: :plain,
-    domain: ENV.fetch('SMTP_DOMAIN'), # example: 'this-app.com'
-    enable_starttls_auto: true,
-    password: ENV.fetch('SMTP_PASSWORD'),
-    port: '587',
-    user_name: ENV.fetch('SMTP_USERNAME')
-  }
-end
+SMTP_SETTINGS = {
+  address: ENV.fetch('SMTP_ADDRESS'), # example: 'smtp.sendgrid.net'
+  authentication: :plain,
+  domain: ENV.fetch('SMTP_DOMAIN'), # example: 'this-app.com'
+  enable_starttls_auto: true,
+  password: ENV.fetch('SMTP_PASSWORD'),
+  port: '587',
+  user_name: ENV.fetch('SMTP_USERNAME')
+}

data/templates/spec_helper.rb

@@ -6,6 +6,7 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../../config/environment', __FILE__)
 
 require 'rspec/rails'
+require 'shoulda/matchers'
 require 'webmock/rspec'
 
 Dir[Rails.root.join('spec/support/**/*.rb')].each { |file| require file }
@@ -26,5 +27,6 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 end
 
+ActiveRecord::Migration.maintain_test_schema!
 Capybara.javascript_driver = :webkit
 WebMock.disable_net_connect!(allow_localhost: true)

data/templates/travis.yml.erb

@@ -1,13 +1,29 @@
+before_install:
+  - "echo '--colour' > ~/.rspec"
+  - "echo 'gem: --no-document' > ~/.gemrc"
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 before_script:
-- cp .sample.env .env
+  - cp .sample.env .env
+  <% if options[:database] == 'postgresql' %>
+  - psql -c 'create database "<%= app_name %>_test";' -U postgres
+  <% end %>
 branches:
   only:
-  - master
-cache: bundler
-language: ruby
+    - 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 %>
+    on_failure:
+      - always
+    on_success:
+      - change
+    template:
+      - '(%{branch} - %{author}): %{message} - %{build_url}'
+  email:
+    - false
+rvm:
+  - <%= Suspenders::RUBY_VERSION %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -115,7 +116,9 @@ files:
 - NEWS.md
 - README.md
 - Rakefile
+- bin/rake
 - bin/rspec
+- bin/setup
 - bin/suspenders
 - lib/suspenders.rb
 - lib/suspenders/actions.rb
@@ -132,6 +135,7 @@ files:
 - spec/support/fake_heroku.rb
 - spec/support/suspenders.rb
 - suspenders.gemspec
+- templates/Brewfile
 - templates/Gemfile.erb
 - templates/Procfile
 - templates/README.md.erb
@@ -149,7 +153,6 @@ files:
 - templates/i18n.rb
 - templates/postgresql_database.yml.erb
 - templates/rack_timeout.rb
-- templates/ruby-version.erb
 - templates/sample.env
 - templates/secrets.yml
 - templates/smtp.rb
@@ -170,9 +173,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/templates/ruby-version.erb

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