welaika-suspenders 2.13.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac22a7bbd38867f30c5e695686d98682b3cd2140
-  data.tar.gz: 8c5cc31fc81ecc9425691a4648287eb1c13afda7
+  metadata.gz: 32b1ee32dac41983cbb70817bf429c893f136674
+  data.tar.gz: 8224c27cb278bb1049ddf2ae2ccb6c806a49ed7d
 SHA512:
-  metadata.gz: b898729e4b701684bf1bcfa2a3d945cbd3636cef787adb1878c3f798888d8bf51b91096c42e3193e733dae0b5e0a679b938bf7a3ec19b6914c483323bd414788
-  data.tar.gz: 2a01b7445381e3fe0b707207ff5aeee1955ae7816bf2149aaad9b7e05bb3a772558bbbce0a7e01f615e1c8616e1dfdd91ea916b89a998eb8f6be21a85c52e9ec
+  metadata.gz: 8b582b01e1360810da4674157134bea4e826eedde48b786ca5ea88fbbbd9dba4dec435882caa71632c679d4dba7faf28a356452a5f35e6306214b654b10e6257
+  data.tar.gz: 7792bf665153ca578d702db6051be4ab853a0ac7faaa52330c38b8cce6d6f552b1554465464a2ac039e483599233ba57b6c062b535819fec1c27b28cde0499ae

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 *.swp
+Gemfile.lock
 /.bundle
 /tmp

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.2.3

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.2.2
+rvm: 2.2.3
 cache: bundler
 sudo: false
 before_install:

data/NEWS.md

@@ -1,3 +1,16 @@
+1.31.0 (unreleased)
+
+* Update to Ruby 2.2.3
+
+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

@@ -9,7 +9,7 @@ First install the suspenders gem:
 
     gem install welaika-suspenders
 
-If you are using RVM, please create a new gemset named like `projectname`:
+If you are using RVM, please before create a new gemset named like `projectname`:
 
     rvm gemset create projectname
     rvm gemset use projectname
@@ -83,4 +83,3 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - drop support for IE 9 in AutoPrefixer
 - removed [hound](https://houndci.com) configuration
 - add [bullet](https://github.com/flyerhzm/bullet)
-- set `unicorn` workers to 1 for `webconsole`

data/lib/suspenders/app_builder.rb

@@ -46,7 +46,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
@@ -101,7 +101,7 @@ module Suspenders
       RUBY
 
       inject_into_file 'config/environments/production.rb', config,
-        :after => 'config.action_mailer.raise_delivery_errors = false'
+        after: "config.action_mailer.raise_delivery_errors = false"
     end
 
     def enable_rack_canonical_host
@@ -135,7 +135,7 @@ module Suspenders
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
         "# config.action_controller.asset_host = 'http://assets.example.com'",
-        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("HOST"))'
+        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("APPLICATION_HOST"))'
 
       replace_in_file 'config/initializers/assets.rb',
         "config.assets.version = '1.0'",
@@ -236,8 +236,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
@@ -325,8 +325,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
@@ -376,6 +376,10 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       end
     end
 
+    def copy_dotfiles
+      directory("dotfiles", ".")
+    end
+
     def init_git
       run 'git init'
     end
@@ -484,7 +488,7 @@ you can deploy to staging and production with:
       EOS
 
       %w(500 404 422).each do |page|
-        inject_into_file "public/#{page}.html", meta_tags, :after => "<head>\n"
+        inject_into_file "public/#{page}.html", meta_tags, after: "<head>\n"
         replace_in_file "public/#{page}.html", /<!--.+-->\n/, ''
       end
     end

data/lib/suspenders/generators/app_generator.rb

@@ -44,6 +44,7 @@ module Suspenders
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
+      invoke :setup_dotfiles
       invoke :setup_git
       invoke :setup_database
       invoke :create_heroku_apps
@@ -98,7 +99,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
@@ -146,7 +147,7 @@ module Suspenders
       build :configure_available_locales
       build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
-      build :configure_unicorn
+      build :configure_puma
       build :setup_foreman
     end
 
@@ -191,6 +192,10 @@ module Suspenders
       end
     end
 
+    def setup_dotfiles
+      build :copy_dotfiles
+    end
+
     def setup_gitignore
       build :gitignore_files
     end

data/lib/suspenders/version.rb

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

data/spec/features/new_project_spec.rb

@@ -35,6 +35,10 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(ruby_gemset_file).to eq "#{SuspendersTestHelpers::APP_NAME}\n"
   end
 
+  it "copies dotfiles" do
+    expect(File).to exist("#{project_path}/.ctags")
+  end
+
   it "loads secret_key_base from env" do
     secrets_file = IO.read("#{project_path}/config/secrets.yml")
 

data/templates/Gemfile.erb

@@ -16,6 +16,7 @@ gem "neat", "~> 1.7.0"
 gem "newrelic_rpm", ">= 3.9.8"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
+gem "puma"
 gem "rack-canonical-host"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "rails-i18n"
@@ -26,7 +27,6 @@ gem "slim-rails"
 gem "simple_form"
 gem "title"
 gem "uglifier"
-gem "unicorn"
 
 group :development do
   gem "letter_opener"
@@ -38,7 +38,7 @@ end
 
 group :development, :test do
   gem "awesome_print"
-  gem "brakeman", require:false
+  gem "brakeman", require: false
   gem "bullet"
   gem "bundler-audit", require: false
   gem "dotenv-rails"

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/dotfiles/.ctags

@@ -0,0 +1,2 @@
+--recurse=yes
+--exclude=vendor

data/templates/postgresql_database.yml.erb

@@ -3,9 +3,19 @@ development: &default
   database: <%= app_name %>_development
   encoding: utf8
   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/sample.env

@@ -1,6 +1,6 @@
 # http://ddollar.github.com/foreman/
 ASSET_HOST=localhost:3000
-HOST=localhost:3000
+APPLICATION_HOST=localhost:3000
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret
 EXECJS_RUNTIME=Node

data/templates/slim.rb

@@ -1 +1 @@
-Slim::Engine.set_options({ js_wrapper: :cdata })
+Slim::Engine.set_options(js_wrapper: :cdata)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.15.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -97,7 +97,6 @@ files:
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS.md
 - README.md
@@ -133,11 +132,13 @@ files:
 - templates/browserslist
 - templates/bundler_audit.rake
 - templates/capybara_rspec.rb.erb
+- templates/circle.yml.erb
 - templates/config_i18n_tasks.yml
 - templates/config_locales_it.yml.erb
 - templates/database_cleaner_rspec.rb
-- templates/development_seeds.rb
+- templates/dev.rake
 - templates/disable_xml_params.rb
+- templates/dotfiles/.ctags
 - templates/errors.rb
 - templates/factory_girl_rspec.rb
 - templates/faker_rspec.rb
@@ -147,6 +148,7 @@ files:
 - templates/json_encoding.rb
 - templates/newrelic.yml.erb
 - templates/postgresql_database.yml.erb
+- templates/puma.rb
 - templates/queries_helper_rspec.rb
 - templates/rails_helper.rb
 - templates/sample.env
@@ -157,8 +159,6 @@ files:
 - templates/staging.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.slim
-- templates/travis.yml.erb
-- templates/unicorn.rb
 homepage: http://github.com/welaika/welaika-suspenders
 licenses:
 - MIT
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

data/Gemfile.lock

@@ -1,146 +0,0 @@
-PATH
-  remote: .
-  specs:
-    welaika-suspenders (2.13.0)
-      bitters (~> 1.0.0)
-      bundler (~> 1.3)
-      rails (~> 4.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
-      globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
-      arel (~> 6.0)
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.2)
-    bitters (1.0.0)
-      bourbon (>= 3.2)
-      sass (>= 3.2)
-      thor
-    bourbon (4.2.3)
-      sass (~> 3.4)
-      thor
-    builder (3.2.2)
-    byebug (4.0.5)
-      columnize (= 0.9.0)
-    coderay (1.1.0)
-    columnize (0.9.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.5)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
-      pry (~> 0.10)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    sass (3.4.16)
-    slop (3.6.0)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  pry-byebug
-  rspec (~> 3.2)
-  welaika-suspenders!
-
-BUNDLED WITH
-   1.10.5

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