suspenders 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f7d09cee5a10cf3cbe9b1aa85666f7d11085889
-  data.tar.gz: 1dfe58a3f0553599f33821571a5551883feebafc
+  metadata.gz: 4cfc568f170e1beb62a4c80760440fabb9783a86
+  data.tar.gz: e80514b54e2488eb94ce9c816b3f768e6197b3af
 SHA512:
-  metadata.gz: e9152f3b09f3c6b3613113faa1a78857b8dddd956af2e735fe3d953471bcca215fef056482cec2daacb8f0420047d25a18113ab6f8387aadeb447dbe84b1fb85
-  data.tar.gz: cd4d52db35d9e70931108c9a21f75f1dc66f2b38bab38ddb9891f03916dca84329997824af7315b6f2b3bd5c051dd39654273e1e5c62bb5693bccb681672bc55
+  metadata.gz: e1fa608458423954863c997253b4a84cec76cfbb32eb77b69b1e2b3128882c25c1021042d676c6063041b16370da69f22a25f054b89da225e7835bd9d0a825d4
+  data.tar.gz: d4ae9049fcc8e6ba5c908fef1f9550f78a80f76869fe09c9cd37e3381c1578f2c748c3f33ef232c2864f82dd04373ecd9b2da9a52caa3d1c11ea6966a58eb897

data/.gitignore

@@ -1,9 +1,4 @@
 *.gem
 *.swp
-.bundle
-.rake_tasks
-/bin/*
-!bin/suspenders
-pkg
-test_project
-tmp/aruba
+/.bundle
+/tmp/dummy

data/.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+before_install:
+  - git config --global user.name 'Travis CI'
+  - git config --global user.email 'travis-ci@example.com'
 install:
   - bundle install
 notifications:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    suspenders (1.7.0)
+    suspenders (1.8.0)
       bundler (~> 1.3)
       rails (= 4.0.0)
 
@@ -32,13 +32,19 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.1)
+    arel (4.0.2)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     atomic (1.1.14)
     builder (3.1.4)
+    capybara (2.2.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     cucumber (1.3.3)
@@ -61,10 +67,15 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
+    mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.7.7)
     multi_test (0.0.1)
-    polyglot (0.3.3)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.1-x86-mingw32)
+      mini_portile (~> 0.5.0)
+    polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -81,9 +92,15 @@ GEM
       activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -101,6 +118,8 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -108,5 +127,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 0.5.2)
+  capybara
   cucumber (~> 1.2)
+  rspec
   suspenders!

data/NEWS.md

@@ -1,3 +1,22 @@
+1.8.0 (February 18, 2014)
+
+* Make the .git/safe directory in bin/setup.
+* Require `rails_12factor` gem only on Heroku.
+* Require mailer config on staging and production.
+* Add rspec binstub.
+* Fix .ruby-version on Ruby 2.1.0.
+* Replace Flutie's `page_title` with `title` gem.
+* Don't run factory specs twice.
+* Inherit staging config from production.
+* Internal: convert tests from Cucumber to RSpec.
+* Don't include `prefilled_input.js`.
+* Fix Rack class name - Deflater instead of Timeout.
+* Add Pry Rails.
+* Add Spring.
+* Add Dotenv to development and test environments to load environment variables
+  from the `.env` file.
+* Reduce ActiveRecord connection pool from 5 to 2.
+
 1.7.0 (December 6, 2013)
 
 * Keep `db/schema.rb` under version control.

data/README.md

@@ -35,8 +35,8 @@ It includes application gems like:
   processing
 * [Email Validator](https://github.com/balexand/email_validator) for email
   validation
-* [Flutie](https://github.com/thoughtbot/flutie) for `page_title` and
-  `body_class` view helpers
+* [Flutie](https://github.com/thoughtbot/flutie) for and `body_class` view
+  helper
 * [High Voltage](https://github.com/thoughtbot/high_voltage) for static pages
 * [jQuery Rails](https://github.com/rails/jquery-rails) for jQuery
 * [Neat](https://github.com/thoughtbot/neat) for semantic grids
@@ -48,13 +48,22 @@ It includes application gems like:
 * [Simple Form](https://github.com/plataformatec/simple_form) for form markup
   and style
 * [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests
+* [Title](https://github.com/calebthompson/title) for storing titles in
+  translations
 
 And gems only for staging and production like:
 
 * [New Relic RPM](https://github.com/newrelic/rpm) for monitoring performance
-* [Rails 12 Factor](https://github.com/heroku/rails_12factor) to making running
+* [Rails 12 Factor](https://github.com/heroku/rails_12factor) to make running
   Rails 4 apps easier on Heroku
 
+And development gems like:
+
+* [Dotenv](https://github.com/bkeepers/dotenv) for loading environment variables
+* [Pry Rails](https://github.com/rweng/pry-rails) for debugging
+* [Spring](https://github.com/rails/spring) for fast Rails actions via
+  pre-loading
+
 And testing gems like:
 
 * [Capybara](https://github.com/jnicklas/capybara) and
@@ -75,12 +84,16 @@ Suspenders also comes with:
 * The [`./bin/setup`][bin] convention for new developer setup
 * Rails' flashes set up and in application layout
 * A few nice time formats set up for localization
-* `Rack::Timeout` to [compress responses with Gzip][compress]
+* `Rack::Deflater` to [compress responses with Gzip][compress]
 * [Fast-failing factories][fast]
+* A [low database connection pool limit][pool]
+* [Safe binstubs][binstub]
 
 [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
 
 Suspenders fixes several of Rails' [insecure defaults]:
 
@@ -172,5 +185,5 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-Suspenders is Copyright © 2008-2013 thoughtbot. It is free software, and may be
+Suspenders is Copyright © 2008-2014 thoughtbot. It is free software, and may be
 redistributed under the terms specified in the LICENSE file.

data/Rakefile

@@ -1,8 +1,8 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
-require 'cucumber/rake/task'
+require 'rspec/core/rake_task'
 
-Cucumber::Rake::Task.new
+RSpec::Core::RakeTask.new(:rspec)
 
 desc 'Run the test suite'
-task :default => ['cucumber']
+task :default => :rspec

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' 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('rspec-core', 'rspec')

data/bin/suspenders

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+require 'pathname'
 
-require File.expand_path(File.join('..', 'lib', 'suspenders', 'generators', 'app_generator'), File.dirname(__FILE__))
-require File.expand_path(File.join('..', 'lib', 'suspenders', 'actions'), File.dirname(__FILE__))
-require File.expand_path(File.join('..', 'lib', 'suspenders', 'app_builder'), File.dirname(__FILE__))
+source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
+$LOAD_PATH << source_path
+
+require 'suspenders'
 
 if ['create', '--create'].include? ARGV[0]
   ARGV.shift

data/lib/suspenders.rb

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

data/lib/suspenders/app_builder.rb

@@ -6,14 +6,6 @@ module Suspenders
       template 'README.md.erb', 'README.md'
     end
 
-    def remove_public_index
-      remove_file 'public/index.html'
-    end
-
-    def remove_rails_logo_image
-      remove_file 'app/assets/images/rails.png'
-    end
-
     def raise_on_delivery_errors
       replace_in_file 'config/environments/development.rb',
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
@@ -92,10 +84,17 @@ module Suspenders
     end
 
     def setup_staging_environment
-      run 'cp config/environments/production.rb config/environments/staging.rb'
+      staging_file = 'config/environments/staging.rb'
+      copy_file 'staging.rb', staging_file
+
+      config = <<-RUBY
 
-      prepend_file 'config/environments/staging.rb',
-        "Mail.register_interceptor RecipientInterceptor.new(ENV['EMAIL_RECIPIENTS'])\n"
+#{app_name.classify}::Application.configure do
+  # ...
+end
+      RUBY
+
+      append_file staging_file, config
     end
 
     def setup_secret_token
@@ -128,10 +127,6 @@ module Suspenders
         ''
     end
 
-    def create_common_javascripts
-      directory 'javascripts', 'app/assets/javascripts'
-    end
-
     def use_postgres_config_template
       template 'postgresql_database.yml.erb', 'config/database.yml',
         :force => true
@@ -149,7 +144,12 @@ module Suspenders
     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}-p#{RUBY_PATCHLEVEL}\n"
+      create_file '.ruby-version', "#{RUBY_VERSION}#{patchlevel}\n"
+    end
+
+    def setup_heroku_specific_gems
+      inject_into_file 'Gemfile', "\n\s\sgem 'rails_12factor'",
+        after: /group :staging, :production do/
     end
 
     def enable_database_cleaner
@@ -166,9 +166,8 @@ module Suspenders
       copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
     end
 
-    def use_rspec_binstub
-      run 'bundle binstub rspec-core'
-      run 'rm bin/autospec'
+    def use_spring_binstubs
+      run 'bundle exec spring binstub --all'
     end
 
     def configure_background_jobs_for_rspec
@@ -204,10 +203,6 @@ module Suspenders
       generate 'rspec:install'
     end
 
-    def generate_clearance
-      generate 'clearance:install'
-    end
-
     def configure_unicorn
       copy_file 'unicorn.rb', 'config/unicorn.rb'
     end
@@ -309,7 +304,7 @@ git remote add production git@heroku.com:#{app_name}-production.git
 
     def override_path_for_tests
       if ENV['TESTING']
-        support_bin = File.expand_path(File.join('..', '..', '..', 'features', 'support', 'bin'))
+        support_bin = File.expand_path(File.join('..', '..', 'spec', 'fakes', 'bin'))
         "PATH=#{support_bin}:$PATH"
       end
     end
@@ -321,5 +316,13 @@ 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

@@ -21,7 +21,6 @@ module Suspenders
     end
 
     def suspenders_customization
-      invoke :remove_files_we_dont_need
       invoke :customize_gemfile
       invoke :setup_development_environment
       invoke :setup_test_environment
@@ -42,14 +41,14 @@ module Suspenders
       invoke :outro
     end
 
-    def remove_files_we_dont_need
-      build :remove_public_index
-      build :remove_rails_logo_image
-    end
-
     def customize_gemfile
       build :replace_gemfile
       build :set_ruby_to_version_being_used
+
+      if options[:heroku]
+        build :setup_heroku_specific_gems
+      end
+
       bundle_command 'install'
     end
 
@@ -77,7 +76,7 @@ module Suspenders
       build :test_factories_first
       build :generate_rspec
       build :configure_rspec
-      build :use_rspec_binstub
+      build :use_spring_binstubs
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_spec_support_features
@@ -110,14 +109,11 @@ module Suspenders
     def setup_coffeescript
       say 'Setting up CoffeeScript defaults'
       build :remove_turbolinks
-      build :create_common_javascripts
     end
 
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
-      build :blacklist_active_record_attributes
-      build :configure_strong_parameters
       build :configure_time_zone
       build :configure_time_formats
       build :configure_rack_timeout
@@ -164,11 +160,6 @@ module Suspenders
       build :init_git
     end
 
-    def copy_libraries
-      say 'Copying libraries'
-      build :copy_libraries
-    end
-
     def copy_miscellaneous_files
       say 'Copying miscellaneous support files'
       build :copy_miscellaneous_files

data/lib/suspenders/version.rb

@@ -1,3 +1,3 @@
 module Suspenders
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

data/spec/features/github_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+feature 'GitHub' do
+  scenario 'Suspend a project with --github option' do
+    repo_name = 'test'
+    run_suspenders("--github=#{repo_name}")
+
+    expect(FakeGithub).to have_created_repo(repo_name)
+  end
+end

data/spec/features/heroku_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+feature 'Heroku' do
+  scenario 'Suspend a project with --heroku=true' do
+    run_suspenders('--heroku=true')
+
+    expect(FakeHeroku).to have_gem_included(project_path, 'rails_12factor')
+    expect(FakeHeroku).to have_created_app_for('staging')
+    expect(FakeHeroku).to have_created_app_for('production')
+    expect(FakeHeroku).to have_configured_vars('staging', 'SECRET_KEY_BASE')
+    expect(FakeHeroku).to have_configured_vars('production', 'SECRET_KEY_BASE')
+  end
+end

data/spec/features/new_project_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+feature 'Suspend a new project with default configuration' do
+  scenario 'specs pass' do
+    run_suspenders
+
+    Dir.chdir(project_path) do
+      Bundler.with_clean_env do
+        expect(`rake`).to include('0 failures')
+      end
+    end
+  end
+
+  scenario 'staging config is inherited from production' do
+    run_suspenders
+
+    staging_file = IO.read("#{project_path}/config/environments/staging.rb")
+    config_stub = "Dummy::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'
+    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"
+    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}-p#{RUBY_PATCHLEVEL}\n"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+require 'capybara/rspec'
+require 'bundler/setup'
+
+Bundler.require(:default, :test)
+
+require (Pathname.new(__FILE__).dirname + '../lib/suspenders').expand_path
+
+Dir['./spec/support/**/*.rb'].each { |file| require file }
+
+RSpec.configure do |config|
+  config.include SuspendersTestHelpers
+
+  config.before(:all) do
+    create_tmp_directory
+  end
+
+  config.before(:each) do
+    drop_dummy_database
+    remove_project_directory
+
+    FakeHeroku.clear!
+    FakeGithub.clear!
+  end
+end

data/{features → spec}/support/fake_github.rb

@@ -16,6 +16,6 @@ class FakeGithub
   end
 
   def self.has_created_repo?(repo_name)
-    File.open(RECORDER, 'r').read.include?("create #{repo_name}")
+    File.read(RECORDER) == "create #{repo_name}"
   end
 end

data/spec/support/fake_heroku.rb

@@ -0,0 +1,36 @@
+class FakeHeroku
+  RECORDER = File.expand_path(File.join('..', '..', 'tmp', 'heroku_commands'), File.dirname(__FILE__))
+
+  def initialize(args)
+    @args = args
+  end
+
+  def run!
+    File.open(RECORDER, 'a') do |file|
+      file.puts @args.join(' ')
+    end
+  end
+
+  def self.clear!
+    FileUtils.rm_rf RECORDER
+  end
+
+  def self.has_gem_included?(project_path, gem_name)
+    gemfile = File.open(File.join(project_path, 'Gemfile'), 'a')
+
+    File.foreach(gemfile).any?{ |line| line.match(/rails_12factor/) }
+  end
+
+  def self.has_created_app_for?(remote_name)
+    app_name = "#{SuspendersTestHelpers::APP_NAME}-#{remote_name}"
+    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$/
+    end
+  end
+end

data/spec/support/suspenders.rb

@@ -0,0 +1,50 @@
+module SuspendersTestHelpers
+  APP_NAME = 'dummy'
+
+  def remove_project_directory
+    FileUtils.rm_rf(project_path)
+  end
+
+  def create_tmp_directory
+    FileUtils.mkdir_p(tmp_path)
+  end
+
+  def run_suspenders(arguments = nil)
+    Dir.chdir(tmp_path) do
+      Bundler.with_clean_env do
+        ENV['TESTING'] = '1'
+        ENV['DISABLE_SPRING'] = '1'
+
+        %x(#{suspenders_bin} #{APP_NAME} #{arguments})
+      end
+    end
+  end
+
+  def drop_dummy_database
+    if File.exists?(project_path)
+      Dir.chdir(project_path) do
+        Bundler.with_clean_env do
+          `rake db:drop`
+        end
+      end
+    end
+  end
+
+  def project_path
+    @project_path ||= Pathname.new("#{tmp_path}/#{APP_NAME}")
+  end
+
+  private
+
+  def tmp_path
+    @tmp_path ||= Pathname.new("#{root_path}/tmp")
+  end
+
+  def suspenders_bin
+    File.join(root_path, 'bin', 'suspenders')
+  end
+
+  def root_path
+    File.expand_path('../../../', __FILE__)
+  end
+end

data/suspenders.gemspec

@@ -30,4 +30,6 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.summary = "Generate a Rails app using thoughtbot's best practices."
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'capybara'
 end

data/templates/Gemfile_clean

@@ -15,6 +15,7 @@ gem 'rails', '>= 4.0.0'
 gem 'recipient_interceptor'
 gem 'sass-rails'
 gem 'simple_form'
+gem 'title'
 gem 'uglifier'
 gem 'unicorn'
 
@@ -22,10 +23,14 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'foreman'
+  gem 'spring'
+  gem 'spring-commands-rspec'
 end
 
 group :development, :test do
+  gem 'dotenv-rails'
   gem 'factory_girl_rails'
+  gem 'pry-rails'
   gem 'rspec-rails', '>= 2.14'
 end
 
@@ -41,5 +46,4 @@ end
 
 group :staging, :production do
   gem 'newrelic_rpm', '>= 3.6.7'
-  gem 'rails_12factor'
 end

data/templates/README.md.erb

@@ -4,7 +4,7 @@
 Getting Started
 ---------------
 
-This repository comes equipped with a self-setup script!
+This repository comes equipped with a self-setup script:
 
     % ./bin/setup
 

data/templates/bin_setup

@@ -12,6 +12,9 @@ bundle install
 # Set up the database
 bundle exec rake db:setup
 
+# Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
+mkdir -p .git/safe
+
 # Set up configurable environment variables
 if [ ! -f .env ]; then
   cp .sample.env .env

data/templates/factories_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-FactoryGirl.factories.map(&:name).each do |factory_name|
-  describe "factory #{factory_name}" do
-    it 'is valid' do
+describe 'factories' do
+  FactoryGirl.factories.map(&:name).each do |factory_name|
+    specify "#{factory_name} factory is valid", :factory do
       factory = build(factory_name)
 
       if factory.respond_to?(:valid?)

data/templates/factories_spec_rake_task.rb

@@ -1,6 +1,12 @@
 if defined?(RSpec)
-  desc 'Run factory specs.'
+  task(:spec).clear
+
+  desc 'Run all specs'
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.rspec_opts = '--tag ~factory'
+  end
 
+  desc 'Run factory specs.'
   RSpec::Core::RakeTask.new(:factory_specs) do |t|
     t.pattern = './spec/models/factories_spec.rb'
   end

data/templates/postgresql_database.yml.erb

@@ -3,7 +3,7 @@ development: &default
   database: <%= app_name %>_development
   encoding: utf8
   min_messages: warning
-  pool: 5
+  pool: 2
   timeout: 5000
 
 test:

data/templates/smtp.rb

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

data/templates/staging.rb

@@ -0,0 +1,3 @@
+require_relative 'production'
+
+Mail.register_interceptor RecipientInterceptor.new(ENV['EMAIL_RECIPIENTS'])

data/templates/suspenders_gitignore

@@ -2,13 +2,12 @@
 *.DS_Store
 *.swo
 *.swp
-.bundle
-.sass-cache/
-coverage/*
-db/*.sqlite3
-log/*
-public/system
-rerun.txt
-tags
-tmp/*
-tmp/**/*
+/.bundle
+/.env
+/.foreman
+/coverage/*
+/db/*.sqlite3
+/log/*
+/public/system
+/tags
+/tmp/*

data/templates/suspenders_layout.html.erb.erb

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />
-  <title><%%= page_title %></title>
+  <title><%%= title %></title>
   <%%= stylesheet_link_tag :application, :media => 'all' %>
   <%%= csrf_meta_tags %>
 </head>

data/templates/unicorn.rb

@@ -21,6 +21,9 @@ after_fork do |server, worker|
   end
 
   if defined? ActiveRecord::Base
-    ActiveRecord::Base.establish_connection
+    config = 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)
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-02-18 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
@@ -42,44 +42,73 @@ dependencies:
   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: |
   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
   rush to build something amazing; don't use it if you like missing deadlines.
 email: support@thoughtbot.com
 executables:
+- rspec
 - suspenders
 extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -87,20 +116,22 @@ files:
 - NEWS.md
 - README.md
 - Rakefile
+- bin/rspec
 - bin/suspenders
-- features/github_repo.feature
-- features/heroku_true.feature
-- features/rake_clean.feature
-- features/step_definitions/suspenders_steps.rb
-- features/support/bin/heroku
-- features/support/bin/hub
-- features/support/env.rb
-- features/support/fake_github.rb
-- features/support/fake_heroku.rb
+- lib/suspenders.rb
 - lib/suspenders/actions.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
 - lib/suspenders/version.rb
+- spec/fakes/bin/heroku
+- spec/fakes/bin/hub
+- spec/features/github_spec.rb
+- spec/features/heroku_spec.rb
+- spec/features/new_project_spec.rb
+- spec/spec_helper.rb
+- spec/support/fake_github.rb
+- spec/support/fake_heroku.rb
+- spec/support/suspenders.rb
 - suspenders.gemspec
 - templates/Gemfile_clean
 - templates/Procfile
@@ -117,13 +148,13 @@ files:
 - templates/factories_spec.rb
 - templates/factories_spec_rake_task.rb
 - templates/factory_girl_syntax_rspec.rb
-- templates/javascripts/prefilled_input.js
 - templates/postgresql_database.yml.erb
 - templates/rack_timeout.rb
 - templates/sample.env
 - templates/secret_token.rb
 - templates/smtp.rb
 - templates/spec_helper.rb
+- templates/staging.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
 - templates/unicorn.rb
@@ -133,32 +164,32 @@ 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.1.10
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
 test_files:
-- features/github_repo.feature
-- features/heroku_true.feature
-- features/rake_clean.feature
-- features/step_definitions/suspenders_steps.rb
-- features/support/bin/heroku
-- features/support/bin/hub
-- features/support/env.rb
-- features/support/fake_github.rb
-- features/support/fake_heroku.rb
+- spec/fakes/bin/heroku
+- spec/fakes/bin/hub
+- spec/features/github_spec.rb
+- spec/features/heroku_spec.rb
+- spec/features/new_project_spec.rb
+- spec/spec_helper.rb
+- spec/support/fake_github.rb
+- spec/support/fake_heroku.rb
+- spec/support/suspenders.rb

data/features/github_repo.feature

@@ -1,8 +0,0 @@
-@disable-bundler
-Feature: Creating a Github repo
-
-  Scenario: --github=organization/project
-    When I suspend a project called "test_project" with:
-      | argument | value                |
-      | --github | organization/project |
-    Then the "organization/project" Github repo should exist

data/features/heroku_true.feature

@@ -1,11 +0,0 @@
-@disable-bundler
-Feature: Creating a Heroku app
-
-  Scenario: --heroku=true
-    When I suspend a project called "test_project" with:
-      | argument | value |
-      | --heroku | true  |
-    Then the "test_project-staging" Heroku app should exist
-    And the "test_project-production" Heroku app should exist
-    And the "staging" Heroku remote should have "SECRET_KEY_BASE" configured
-    And the "production" Heroku remote should have "SECRET_KEY_BASE" configured

data/features/rake_clean.feature

@@ -1,44 +0,0 @@
-@disable-bundler
-Feature: Rake works in the suspended project
-  Background:
-    Given I ensure no databases exist for "test_project"
-
-  Scenario: Running rake in the suspended project
-    When I suspend a project called "test_project"
-    And I cd to the "test_project" root
-    And I obtain a fresh checkout
-    And I setup the project
-    Then I can cleanly rake the project
-
-  Scenario: Making a model spec then running rake
-    When I suspend a project called "test_project"
-    And I cd to the "test_project" root
-    And I obtain a fresh checkout
-    And I setup the project
-    And I generate "model post title:string"
-    And I run migrations
-    Then I can cleanly rake the project
-
-  Scenario: Making a feature spec then running rake
-    When I suspend a project called "test_project"
-    And I cd to the "test_project" root
-    And I obtain a fresh checkout
-    And I setup the project
-    And I write to "spec/features/example_spec.rb" with:
-      """
-      require 'spec_helper'
-
-      feature 'Example feature spec' do
-        scenario 'using a method from the Features module' do
-          expect(example_method).to eq('Expected Value')
-        end
-      end
-      """
-    And I write to "spec/support/features/example.rb" with:
-      """
-      module Features
-        def example_method
-          'Expected Value'
-        end
-      end
-      """

data/features/step_definitions/suspenders_steps.rb

@@ -1,89 +0,0 @@
-require 'aruba/cucumber'
-
-When 'I run rake' do
-  in_current_dir do
-    run_simple 'bundle exec rake'
-  end
-end
-
-When 'I run migrations' do
-  in_current_dir do
-    run_simple 'bundle exec rake db:migrate'
-  end
-end
-
-When 'I obtain a fresh checkout' do
-  in_current_dir do
-    run_simple 'git clean --force -x -d'
-  end
-end
-
-When 'I run the rake task "$task_name"' do |task_name|
-  in_current_dir do
-    run_simple "bundle exec rake #{task_name}"
-  end
-end
-
-When 'I generate "$generator_with_args"' do |generator_with_args|
-  in_current_dir do
-    run_simple "bundle exec rails generate #{generator_with_args}"
-  end
-end
-
-When 'I ensure no databases exist for "$project_name"' do |project_name|
-  run "dropdb #{project_name}_development"
-  run "dropdb #{project_name}_test"
-end
-
-When 'I suspend a project called "$project_name"' do |project_name|
-  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
-  run_simple "#{suspenders_bin} #{project_name}"
-  cd project_name
-  run_simple 'git add -A'
-  run_simple 'git commit -m "Initial commit"'
-  cd '..'
-end
-
-When %r{I suspend a project called "([^"]*)" with:} do |project_name, arguments_table|
-  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
-  arguments = arguments_table.hashes.inject([]) do |accum, argument|
-    accum << "#{argument['argument']}=#{argument['value']}"
-  end.join
-  run_simple "#{suspenders_bin} #{project_name} #{arguments}"
-end
-
-When 'I cd to the "$test_project" root' do |dirname|
-  cd dirname
-end
-
-When 'I setup the project' do
-  run_simple 'bin/setup'
-end
-
-Then 'I can cleanly rake the project' do
-  steps %{
-    When I run rake
-  }
-end
-
-Then %r{"(.*)" should not be installed} do |gem_name|
-  in_current_dir do
-    system("bundle show #{gem_name} 2>&1 > /dev/null").should be_false
-  end
-end
-
-Then %r{"(.*)" should not be included in "(.*)"} do |content, file_path|
-  check_file_content file_path, content, false
-end
-
-Then %r{the "([^"]*)" Heroku app should exist} do |app_name|
-  FakeHeroku.should have_created_app(app_name)
-end
-
-Then %r{the "([^"]+)" Heroku remote should have "([^"]+)" configured} do |remote_name, config_name|
-  FakeHeroku.configured_vars_for(remote_name).should include(config_name)
-end
-
-Then %r{the "([^"]*)" Github repo should exist} do |repo_name|
-  FakeGithub.should have_created_repo(repo_name)
-end

data/features/support/env.rb

@@ -1,10 +0,0 @@
-Before do
-  ENV['TESTING'] = 'true'
-  @aruba_timeout_seconds = 560
-end
-
-After do
-  FakeHeroku.clear!
-  FakeGithub.clear!
-  FileUtils.rm_rf 'test_project'
-end

data/features/support/fake_heroku.rb

@@ -1,30 +0,0 @@
-class FakeHeroku
-  RECORDER = File.expand_path(File.join('..', '..', 'tmp', 'heroku_commands'), File.dirname(__FILE__))
-
-  def initialize(args)
-    @args = args
-  end
-
-  def run!
-    File.open(RECORDER, 'a') do |file|
-      file.puts @args.join(' ')
-    end
-  end
-
-  def self.clear!
-    FileUtils.rm_rf RECORDER
-  end
-
-  def self.has_created_app?(app_name)
-    File.open(RECORDER, 'r').read.include?("create #{app_name}")
-  end
-
-  def self.configured_vars_for(remote_name)
-    File.open(RECORDER, 'r').
-      each_line.
-      grep(/^config:add .* --remote=#{remote_name}/) { |line|
-        line.scan(/([A-Z_]+)=[^ ]*/)
-      }.
-      flatten
-  end
-end

data/templates/javascripts/prefilled_input.js

@@ -1,59 +0,0 @@
-// clear inputs with starter values
-new function($) {
-  $.fn.prefilledInput = function() {
-
-    var focus = function () {
-      $(this).removeClass('prefilled');
-      if (this.value == this.prefilledValue) {
-        this.value = '';
-      }
-    };
-
-    var blur = function () {
-      if (this.value == '') {
-        $(this).addClass('prefilled').val(this.prefilledValue);
-      } else if (this.value != this.prefilledValue) {
-        $(this).removeClass('prefilled');
-      }
-    };
-
-    var extractPrefilledValue = function () {
-      if (this.title) {
-        this.prefilledValue = this.title;
-        this.title = '';
-      } else if (this.id) {
-        this.prefilledValue = $('label[for=' + this.id + ']').hide().text();
-      }
-      if (this.prefilledValue) {
-        this.prefilledValue = this.prefilledValue.replace(/\*$/, '');
-      }
-    };
-
-    var initialize = function (index) {
-      if (!this.prefilledValue) {
-        this.extractPrefilledValue = extractPrefilledValue;
-        this.extractPrefilledValue();
-        $(this).trigger('blur');
-      }
-    };
-
-    return this.filter(":input").
-      focus(focus).
-      blur(blur).
-      each(initialize);
-  };
-
-  var clearPrefilledInputs = function () {
-    var form = this.form || this;
-    $(form).find("input.prefilled, textarea.prefilled").val("");
-  };
-
-  var prefilledSetup = function () {
-    $('input.prefilled, textarea.prefilled').prefilledInput();
-    $('form').submit(clearPrefilledInputs);
-    $('input:submit, button:submit').click(clearPrefilledInputs);
-  };
-
-  $(document).ready(prefilledSetup);
-  $(document).ajaxComplete(prefilledSetup);
-}(jQuery);