suspenders 1.29.0 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1c5bbaee1a756025cd9d7682c0d3f2e0cd7681a
-  data.tar.gz: c01b10195b95bbcda715f73bb10e4e55311f6ec2
+  metadata.gz: d05003d3e1588c15c4291ed296d2c9c936ccb959
+  data.tar.gz: 4f3a7b17134b11d774f02b827cceb9b07f214e07
 SHA512:
-  metadata.gz: 9678004a0610ec1aa35d4829870da67dbe3d64c69a90822223c11faa1cd5b1fa9c8ee75b77b0a927313752bb13286aa72d098817f335568ccdab6712e2e6f925
-  data.tar.gz: 626aaecb11ce0f0f02ed50add9d214f41af8ef5b6c1885b8d2b7d4eeec3d2958bd1780bdf41837dd5eb812816148e62252b06ba8398889b0032ad38cfdd69f8f
+  metadata.gz: 5743803276b70bf047a8481b5bbdc34bb1b1143e352624309ca941d1aded2f139a284990a4f517f50abc35408eb89b17d5b15f799e7327e7919b815829a09748
+  data.tar.gz: 9f5980411e60b3646b54d4424918df79592519beb010541f3878c9eb8d421f3c55e81c53a9cf0ffdd4cbb05c984b22c93b965bd1f22e9350e9420c2731ece04a

data/Gemfile.lock

@@ -4,41 +4,41 @@ PATH
     suspenders (1.29.0)
       bitters (~> 1.0.0)
       bundler (~> 1.3)
-      rails (= 4.2.1)
+      rails (~> 4.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.2)
+      actionview (= 4.2.2)
+      activesupport (= 4.2.2)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+    actionview (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+    activejob (4.2.2)
+      activesupport (= 4.2.2)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.2)
+      activemodel (= 4.2.2)
+      activesupport (= 4.2.2)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -68,19 +68,19 @@ GEM
     minitest (5.7.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    rack (1.6.1)
+    rack (1.6.2)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.2)
+      actionmailer (= 4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
+      activemodel (= 4.2.2)
+      activerecord (= 4.2.2)
+      activesupport (= 4.2.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.2)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -90,9 +90,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.2)
+      actionpack (= 4.2.2)
+      activesupport (= 4.2.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)

data/NEWS.md

@@ -1,3 +1,12 @@
+1.30.0 (July 30, 2015)
+
+* Update to RSpec 3.3
+* Replace TravisCI with CircleCI
+* Rename development data concept to avoid confusion with db/seeds
+* Remove Unicorn in favor of Puma, as [recommended by Heroku]
+
+[recommended by Heroku]: https://devcenter.heroku.com/changelog-items/594
+
 1.29.0 (June 16, 2015)
 
 * Generate rake, rails and rspec binstubs with Spring

data/README.md

@@ -53,7 +53,7 @@ It includes application gems like:
   and style
 * [Title](https://github.com/calebthompson/title) for storing titles in
   translations
-* [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests
+* [Puma](https://github.com/puma/puma) to serve HTTP requests
 
 And development gems like:
 
@@ -97,7 +97,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][travis] Continuous Integration (tests)
+* Configuration for [CircleCI][circle] Continuous Integration (tests)
 * Configuration for [Hound][hound] Continuous Integration (style)
 * The analytics adapter [Segment][segment] (and therefore config for Google
   Analytics, Intercom, Facebook Ads, Twitter Ads, etc.)
@@ -107,7 +107,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/
+[circle]: https://circleci.com/docs
 [hound]: https://houndci.com
 [segment]: https://segment.com
 
@@ -134,7 +134,7 @@ You can optionally specify alternate Heroku flags:
 
     suspenders app \
       --heroku true \
-      --heroku-flags "--region eu --addons newrelic,pgbackups,sendgrid,ssl"
+      --heroku-flags "--region eu --addons newrelic,sendgrid,ssl"
 
 See all possible Heroku flags:
 

data/lib/suspenders/app_builder.rb

@@ -33,7 +33,7 @@ module Suspenders
     end
 
     def provide_dev_prime_task
-      copy_file 'development_seeds.rb', 'lib/tasks/development_seeds.rake'
+      copy_file 'dev.rake', 'lib/tasks/dev.rake'
     end
 
     def configure_generators
@@ -209,8 +209,8 @@ end
       copy_file "spec_helper.rb", "spec/spec_helper.rb"
     end
 
-    def configure_travis
-      template 'travis.yml.erb', '.travis.yml'
+    def configure_ci
+      template "circle.yml.erb", "circle.yml"
     end
 
     def configure_i18n_for_test_environment
@@ -278,8 +278,8 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       generate 'rspec:install'
     end
 
-    def configure_unicorn
-      copy_file 'unicorn.rb', 'config/unicorn.rb'
+    def configure_puma
+      copy_file "puma.rb", "config/puma.rb"
     end
 
     def setup_foreman

data/lib/suspenders/generators/app_generator.rb

@@ -95,7 +95,7 @@ module Suspenders
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_spec_support_features
-      build :configure_travis
+      build :configure_ci
       build :configure_i18n_for_test_environment
       build :configure_i18n_tasks
       build :configure_action_mailer_in_specs
@@ -138,7 +138,7 @@ module Suspenders
       build :disable_xml_params
       build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
-      build :configure_unicorn
+      build :configure_puma
       build :setup_foreman
     end
 

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
-  RAILS_VERSION = "4.2.1"
+  RAILS_VERSION = "~> 4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.29.0"
+  VERSION = "1.30.0"
 end

data/templates/Gemfile.erb

@@ -17,6 +17,7 @@ gem "newrelic_rpm", ">= 3.9.8"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "rack-canonical-host"
+gem "puma"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "refills"
@@ -24,7 +25,6 @@ gem "sass-rails", "~> 5.0"
 gem "simple_form"
 gem "title"
 gem "uglifier"
-gem "unicorn"
 
 group :development do
   gem "spring"
@@ -39,7 +39,7 @@ group :development, :test do
   gem "dotenv-rails"
   gem "factory_girl_rails"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.1.0"
+  gem "rspec-rails", "~> 3.3.0"
 end
 
 group :test do

data/templates/Procfile

@@ -1,2 +1,2 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec puma -p $PORT -C ./config/puma.rb
 worker: bundle exec rake jobs:work

data/templates/circle.yml.erb

@@ -0,0 +1,8 @@
+test:
+  override:
+    - bundle exec rake
+deployment:
+  staging:
+    branch: master
+    commands:
+      - bin/deploy staging

data/templates/{development_seeds.rb → dev.rake}

@@ -2,7 +2,7 @@ if Rails.env.development? || Rails.env.test?
   require "factory_girl"
 
   namespace :dev do
-    desc "Seed data for development environment"
+    desc "Sample data for local development environment"
     task prime: "db:setup" do
       include FactoryGirl::Syntax::Methods
 

data/templates/postgresql_database.yml.erb

@@ -4,9 +4,19 @@ development: &default
   encoding: utf8
   host: localhost
   min_messages: warning
-  pool: 2
+  pool: <%%= ENV.fetch("DB_POOL", 5) %>
+  reaping_frequency: <%%= ENV.fetch("DB_REAPING_FREQUENCY", 10) %>
   timeout: 5000
 
 test:
   <<: *default
   database: <%= app_name %>_test
+
+production: &deploy
+  encoding: utf8
+  min_messages: warning
+  pool: <%%= [ENV.fetch("MAX_THREADS", 5), ENV.fetch("DB_POOL", 5)].max %>
+  timeout: 5000
+  url:  <%%= ENV.fetch("DATABASE_URL", "") %>
+
+staging: *deploy

data/templates/puma.rb

@@ -0,0 +1,19 @@
+# https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server
+
+# The environment variable WEB_CONCURRENCY may be set to a default value based
+# on dyno size. To manually configure this value use heroku config:set
+# WEB_CONCURRENCY.
+workers Integer(ENV.fetch("WEB_CONCURRENCY", 3))
+threads_count = Integer(ENV.fetch("MAX_THREADS", 5))
+threads(threads_count, threads_count)
+
+preload_app!
+
+rackup DefaultRackup
+environment ENV.fetch("RACK_ENV", "development")
+
+on_worker_boot do
+  # Worker specific setup for Rails 4.1+
+  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
+  ActiveRecord::Base.establish_connection
+end

data/templates/spec_helper.rb

@@ -16,6 +16,7 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  config.example_status_persistence_file_path = "tmp/rspec_examples.txt"
   config.order = :random
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -42,16 +42,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,10 +119,11 @@ files:
 - templates/bin_setup.erb
 - templates/browserslist
 - templates/bundler_audit.rake
+- templates/circle.yml.erb
 - templates/config_i18n_tasks.yml
 - templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
-- templates/development_seeds.rb
+- templates/dev.rake
 - templates/disable_xml_params.rb
 - templates/errors.rb
 - templates/factory_girl_rspec.rb
@@ -132,6 +133,7 @@ files:
 - templates/json_encoding.rb
 - templates/newrelic.yml.erb
 - templates/postgresql_database.yml.erb
+- templates/puma.rb
 - templates/rails_helper.rb
 - templates/sample.env
 - templates/secrets.yml
@@ -140,8 +142,6 @@ 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:
 - MIT

data/templates/travis.yml.erb

@@ -1,21 +0,0 @@
-before_install:
-  - "echo '--colour' > ~/.rspec"
-  - "echo 'gem: --no-document' > ~/.gemrc"
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-install:
-  - bin/setup
-branches:
-  only:
-    - master
-cache:
-  - bundler
-language:
-  - ruby
-notifications:
-  email: false
-rvm:
-  - <%= Suspenders::RUBY_VERSION %>
-addons:
-  postgresql: "9.3"
-sudo: false

data/templates/unicorn.rb

@@ -1,30 +0,0 @@
-# https://devcenter.heroku.com/articles/rails-unicorn
-
-worker_processes (ENV["UNICORN_WORKERS"] || 3).to_i
-timeout (ENV["UNICORN_TIMEOUT"] || 15).to_i
-preload_app true
-
-before_fork do |_server, _worker|
-  Signal.trap "TERM" do
-    puts "Unicorn master intercepting TERM, 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, waiting for master to send QUIT"
-  end
-
-  if defined? ActiveRecord::Base
-    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)
-  end
-end