suspenders 1.2.2 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWY3NTk5YmU3NjUwMjUzYjNmNmMwZjdhYjM0NjdkNmY3MGQzN2E1ZA==
-  data.tar.gz: !binary |-
-    Y2ZjNzI4Y2U5YmZlOTY2YWU4NDM2ZmIxYzc1NGRlYzNiZGRkYmY0Ng==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YmMzZTBiNmU1MmQ5NzRjZTk5ZDdhNGUwMmM5YTkzZmE5NDZjYTc0MDBiY2Ni
-    ZTc5MjVjMmE1YjNjNWQ0MDdjNjYxZmJkNDc3OTNjOThjYTk1NTZjZTIxMjhk
-    NDI2Mzk0Njk0ODdmODVkMWExYmZjZmE3ODE2M2QyMTE4ZDIzNmM=
-  data.tar.gz: !binary |-
-    N2ZlYjRjZjA1ZTEyMjE3ZDBlMzQ1ZTFhYWQzYjQ1ZGRmZTcwMzEzMjNmZDY4
-    MzQwZDMzNGRlNjE5Y2UwMzg3YWZlZTBhYmI4ZWVmMzA2YTkwNzJjY2ZjOGIy
-    NWNmMTMxZGI1MjQ5ZGMyMDI3ZGQ1YmJkMWQ4M2Q0YTI1Nzg3M2E=
+SHA1:
+  metadata.gz: ccf239065a250f45823c0f9f23fa1295af9549e0
+  data.tar.gz: e806e2ee722a789d4bdf741dd9feaee3867771a3
+SHA512:
+  metadata.gz: deff8d09578f7515690f06823b8502f4ca253f579828e7f6fde1bd11c939f5222a45f8f372f86c281d9f604783342318ffcbacfc147ce1a4d7eaf5a004bfe663
+  data.tar.gz: 165e1e2db48cd56e4c6917588fe80967254b82621efc096e073e5263c4bed12e3fb41133b5bedba95bb061a39ef979d149ab70424b5f242a8cb1584f1e51769a

data/.gitignore

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

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+notifications:
+  email: false

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    suspenders (1.2.0)
-      bundler (>= 1.1)
-      hub (~> 1.10.2)
-      rails (= 3.2.12)
+    suspenders (1.3.0)
+      bundler (~> 1.3)
+      hub (~> 1.10)
+      rails (= 3.2.13)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -22,51 +22,49 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
+      rspec-expectations (>= 2.7.0)
     builder (3.0.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.1.9)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.2.3)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    diff-lcs (1.1.3)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
+    diff-lcs (1.2.2)
     erubis (2.7.0)
-    ffi (1.3.1)
-    gherkin (2.9.3)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    hub (1.10.4)
+    ffi (1.6.0)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
+    hike (1.2.2)
+    hub (1.10.6)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.6)
-    mail (2.4.4)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
-    multi_json (1.6.0)
+    mime-types (1.23)
+    multi_json (1.7.2)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -75,49 +73,42 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    thor (0.17.0)
-    tilt (1.3.3)
+    thor (0.18.1)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.4.11)
-  cucumber (~> 1.1.9)
+  aruba (~> 0.5)
+  cucumber (~> 1.2)
   suspenders!

data/NEWS.md

@@ -1,3 +1,12 @@
+1.3.0 (May 13, 2013)
+
+* Switch web server from Thin to Unicorn
+* Set up database before setting up RSpec so that the rspec:install task works
+* Add Delayed::Job
+* Clean up cruft from ActionMailer delivery configuration
+* strong_parameters now raises an error in development
+* Enforce Ruby 1.9.2+ in the gemspec
+
 1.2.2 (March 14, 2013)
 
 * Fix Syntax error in staging/production environment config files.

data/README.md

@@ -81,6 +81,8 @@ This has the same effect as running:
 Dependencies
 ------------
 
+Suspenders requires Ruby 1.9.2 or greater.
+
 Some gems included in Suspenders have native extensions. You should have GCC
 installed on your machine before generating an app with Suspenders.
 

data/lib/suspenders/actions.rb

@@ -15,10 +15,15 @@ module Suspenders
     end
 
     def action_mailer_host(rails_env, host)
+      host_config = "config.action_mailer.default_url_option = { host: '#{host}' }"
+      configure_environment(rails_env, host_config)
+    end
+
+    def configure_environment(rails_env, config)
       inject_into_file(
         "config/environments/#{rails_env}.rb",
-        "\n\n  config.action_mailer.default_url_options = { :host => '#{host}' }",
-        :before => "\nend"
+        "\n\n  #{config}",
+        before: "\nend"
       )
     end
 

data/lib/suspenders/app_builder.rb

@@ -14,11 +14,16 @@ module Suspenders
       remove_file 'app/assets/images/rails.png'
     end
 
-    def raise_delivery_errors
+    def raise_on_delivery_errors
       replace_in_file 'config/environments/development.rb',
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
+    def raise_on_unpermitted_parameters
+      configure_environment 'development',
+        'config.action_controller.action_on_unpermitted_parameters = :raise'
+    end
+
     def provide_setup_script
       copy_file 'bin_setup', 'bin/setup'
       run 'chmod a+x bin/setup'
@@ -40,6 +45,7 @@ module Suspenders
         "require Rails.root.join('config/initializers/smtp')\n"
 
       config = <<-RUBY
+
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = SMTP_SETTINGS
       RUBY
@@ -147,6 +153,11 @@ module Suspenders
       inject_into_class 'config/application.rb', 'Application', config
     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'
+    end
+
     def blacklist_active_record_attributes
       replace_in_file 'config/application.rb',
         'config.active_record.whitelist_attributes = true',
@@ -195,6 +206,10 @@ module Suspenders
       generate 'clearance:install'
     end
 
+    def configure_unicorn
+      copy_file 'unicorn.rb', 'config/unicorn.rb'
+    end
+
     def setup_foreman
       copy_file 'sample.env', '.sample.env'
       copy_file 'Procfile', 'Procfile'

data/lib/suspenders/generators/app_generator.rb

@@ -23,6 +23,7 @@ module Suspenders
     def suspenders_customization
       invoke :remove_files_we_dont_need
       invoke :customize_gemfile
+      invoke :setup_database
       invoke :setup_development_environment
       invoke :setup_test_environment
       invoke :setup_production_environment
@@ -30,7 +31,6 @@ module Suspenders
       invoke :create_suspenders_views
       invoke :create_common_javascripts
       invoke :add_jquery_ui
-      invoke :setup_database
       invoke :configure_app
       invoke :setup_stylesheets
       invoke :copy_miscellaneous_files
@@ -47,9 +47,26 @@ module Suspenders
       build :remove_rails_logo_image
     end
 
+    def customize_gemfile
+      build :replace_gemfile
+      build :set_ruby_to_version_being_used
+      bundle_command 'install --binstubs=bin/stubs'
+    end
+
+    def setup_database
+      say 'Setting up database'
+
+      if 'postgresql' == options[:database]
+        build :use_postgres_config_template
+      end
+
+      build :create_database
+    end
+
     def setup_development_environment
       say 'Setting up the development environment'
-      build :raise_delivery_errors
+      build :raise_on_delivery_errors
+      build :raise_on_unpermitted_parameters
       build :provide_setup_script
     end
 
@@ -59,6 +76,7 @@ module Suspenders
       build :test_factories_first
       build :generate_rspec
       build :configure_rspec
+      build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_capybara_webkit
       build :setup_guard_spork
@@ -93,22 +111,6 @@ module Suspenders
       build :add_jquery_ui
     end
 
-    def customize_gemfile
-      build :replace_gemfile
-      build :set_ruby_to_version_being_used
-      bundle_command 'install --binstubs=bin/stubs'
-    end
-
-    def setup_database
-      say 'Setting up database'
-
-      if 'postgresql' == options[:database]
-        build :use_postgres_config_template
-      end
-
-      build :create_database
-    end
-
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
@@ -120,6 +122,7 @@ module Suspenders
       build :disable_xml_params
       build :add_email_validator
       build :setup_default_rake_task
+      build :configure_unicorn
       build :setup_foreman
     end
 

data/lib/suspenders/version.rb

@@ -1,3 +1,3 @@
 module Suspenders
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/suspenders.gemspec

@@ -1,37 +1,33 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 require 'suspenders/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.name     = 'suspenders'
-  s.version  = Suspenders::VERSION
-  s.date     = Date.today.strftime('%Y-%m-%d')
-  s.authors  = ['thoughtbot']
-  s.email    = 'support@thoughtbot.com'
-  s.homepage = 'http://github.com/thoughtbot/suspenders'
+  s.required_ruby_version = '>= 1.9.2'
+  s.add_dependency 'bundler', '~> 1.3'
+  s.add_dependency 'hub', '~> 1.10'
+  s.add_dependency 'rails', '3.2.13'
+  s.add_development_dependency 'aruba', '~> 0.5'
+  s.add_development_dependency 'cucumber', '~> 1.2'
+  s.authors = ['thoughtbot']
+  s.date = Date.today.strftime('%Y-%m-%d')
 
-  s.summary     = "Generate a Rails app using thoughtbot's best practices."
   s.description = <<-HERE
 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.
   HERE
 
-  s.files = `git ls-files`.split("\n").
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.email = 'support@thoughtbot.com'
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |file| File.basename(file) }
   s.extra_rdoc_files = %w[README.md LICENSE]
-
-  s.add_dependency 'rails', '3.2.12'
-  s.add_dependency 'bundler', '>= 1.1'
-  s.add_dependency 'hub', '~> 1.10.2'
-
-  s.add_development_dependency 'cucumber', '~> 1.1.9'
-  s.add_development_dependency 'aruba', '~> 0.4.11'
+  s.files = `git ls-files`.split("\n")
+  s.homepage = 'http://github.com/thoughtbot/suspenders'
+  s.name = 'suspenders'
+  s.rdoc_options = ['--charset=UTF-8']
+  s.require_paths = ['lib']
+  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
 end

data/templates/Gemfile_clean

@@ -2,17 +2,17 @@ source 'https://rubygems.org'
 
 gem 'airbrake'
 gem 'bourbon'
+gem 'delayed_job_active_record', '>= 4.0.0.beta2'
 gem 'flutie'
 gem 'high_voltage'
 gem 'jquery-rails'
 gem 'pg'
-gem 'psych'
 gem 'rack-timeout'
 gem 'rails', '>= 3.2.11'
 gem 'recipient_interceptor'
 gem 'simple_form'
 gem 'strong_parameters'
-gem 'thin'
+gem 'unicorn'
 
 group :assets do
   gem 'coffee-rails'

data/templates/Procfile

@@ -1 +1,2 @@
-web: bundle exec rails server thin -p $PORT -e $RACK_ENV
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+worker: bundle exec rake jobs:work

data/templates/background_jobs_rspec.rb

@@ -0,0 +1,19 @@
+module BackgroundJobs
+  def run_background_jobs_immediately
+    delay_jobs = Delayed::Worker.delay_jobs
+    Delayed::Worker.delay_jobs = false
+    yield
+  ensure
+    Delayed::Worker.delay_jobs = delay_jobs
+  end
+end
+
+RSpec.configure do |config|
+  config.around(:each, type: :feature) do |example|
+    run_background_jobs_immediately do
+      example.run
+    end
+  end
+
+  config.include BackgroundJobs
+end

data/templates/unicorn.rb

@@ -0,0 +1,26 @@
+# https://devcenter.heroku.com/articles/rails-unicorn
+
+worker_processes (ENV['WEB_CONCURRENCY'] || 3).to_i
+timeout (ENV['WEB_TIMEOUT'] || 5).to_i
+preload_app true
+
+before_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
+    Process.kill 'QUIT', Process.pid
+  end
+
+  if defined? ActiveRecord::Base
+    ActiveRecord::Base.connection.disconnect!
+  end
+end
+
+after_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
+  end
+
+  if defined? ActiveRecord::Base
+    ActiveRecord::Base.establish_connection
+  end
+end

metadata

@@ -1,93 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: hub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: hub
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
-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.
-
-'
+        version: '1.2'
+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:
 - suspenders
@@ -96,6 +92,8 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- .gitignore
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -123,6 +121,7 @@ files:
 - templates/README.md.erb
 - templates/_flashes.html.erb
 - templates/_javascript.html.erb
+- templates/background_jobs_rspec.rb
 - templates/bin_setup
 - templates/config_locales_en.yml
 - templates/database_cleaner_rspec.rb
@@ -143,6 +142,7 @@ files:
 - templates/strong_parameters.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
+- templates/unicorn.rb
 homepage: http://github.com/thoughtbot/suspenders
 licenses: []
 metadata: {}
@@ -153,12 +153,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []