philosophies-suspenders 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d6c7f9c63ca8ae28fdc7a6b1e28a33287b6de1
-  data.tar.gz: 4a0c56e3cfce4a914bd73769803beafcf1243174
+  metadata.gz: 9ea97f05b374f6e5bda09ac000f8100e478f4b9a
+  data.tar.gz: 15e7f0f8b029e605ba1a97930020c66b45027187
 SHA512:
-  metadata.gz: 898984d912915fd1662a85593a03ef0afa38ffcfe26c39223269f2cd692edf43c3da7eda5062c51500e55fa1ef69cdc9303a65e6155c9b5995d696c80f0248c6
-  data.tar.gz: aa1e575faabc660d67541b2c4593a6ea5f1eedab69fc42520df73afac57ef286d61b4ea270257585984232b5d3db8a83b52a5f3906c5f280dc86140f19146c98
+  metadata.gz: 0013e462459fe3e24abafa35e44d623ef50c838dd9c16943a4286f684451b491098c9fc80ab3e9bbc1d9c0cbb73a2d486e729da9c365201ac98ffd291ab2752c
+  data.tar.gz: 10d0ae355965573ab712e3b8d18877df5dc2b17e5f10e988480ce56b94e895cce473d9852d77536d16a1cdde0c1788f05142307ee4c891a354cdd8524a3bfea3

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.3.0

data/Gemfile.lock

@@ -1,43 +1,43 @@
 PATH
   remote: .
   specs:
-    philosophies-suspenders (2.0.2)
+    philosophies-suspenders (2.1.0)
       bundler (~> 1.3)
-      rails (= 4.2.3)
+      rails (= 4.2.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
       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)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       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)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       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)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -49,6 +49,7 @@ GEM
       columnize (= 0.9.0)
     coderay (1.1.0)
     columnize (0.9.0)
+    concurrent-ruby (1.0.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     globalid (0.3.6)
@@ -60,11 +61,11 @@ GEM
     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.8.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -75,16 +76,16 @@ GEM
     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)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.5.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -92,14 +93,14 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -114,12 +115,13 @@ GEM
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     slop (3.6.0)
-    sprockets (3.3.2)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
@@ -135,4 +137,4 @@ DEPENDENCIES
   rspec (~> 3.2)
 
 BUNDLED WITH
-   1.10.5
+   1.11.2

data/README.md

@@ -53,6 +53,8 @@ It includes application gems like:
 * [Title](https://github.com/calebthompson/title) for storing titles in
   translations
 * [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests
+* [rails_12factor](https://github.com/heroku/rails_12factor) for easier Heroku
+  deploys
 
 And development gems like:
 
@@ -121,7 +123,7 @@ By default, suspenders will:
 * Configures staging with `RACK_ENV` and `RAILS_ENV` environment variables set
   to `staging`
 * Adds the [Rails 12factor][rails-12factor] gem
-* Adds free Mandrill add-on and configure SMTP settings to use it
+* Adds free Sendgrid add-on and configure SMTP settings to use it
 * Adds free Airbrake add-on
 * Adds free Papertrail add-on
 
@@ -197,6 +199,14 @@ installing QT are
 
 PostgreSQL needs to be installed and running for the `db:create` rake task.
 
+## Contributing / Feature requests
+
+Philosophie's Suspenders is meant to support the core functionality of a new rails project. Many nice to have features are therefore not appropriate. If you have an idea for a new feature, here are the steps for having it added:
+
+- please bring your idea up in the #nerds channel first to gauge it's popularity
+- if you are able to, create a PR for the new functionality
+- if you need help creating a PR find someone to pair with
+
 ## License
 
 Suspenders is Copyright © 2008-2015 thoughtbot.

data/lib/suspenders/app_builder.rb

@@ -87,6 +87,20 @@ module Suspenders
       )
     end
 
+    def configure_production_log_level
+      replace_in_file(
+        'config/environments/production.rb',
+        "  # Use the lowest log level to ensure availability of diagnostic information\n  # when problems arise.",
+        ''
+      )
+
+      replace_in_file(
+        'config/environments/production.rb',
+        '  config.log_level = :debug',
+        '  config.log_level = :info'
+      )
+    end
+
     def enable_rack_deflater
       config = <<-RUBY
 
@@ -218,10 +232,11 @@ end
     end
 
     def configure_rspec
-      remove_file "spec/rails_helper.rb"
-      remove_file "spec/spec_helper.rb"
-      copy_file "rails_helper.rb", "spec/rails_helper.rb"
-      copy_file "spec_helper.rb", "spec/spec_helper.rb"
+      remove_file '.rspec'
+      remove_file 'spec/rails_helper.rb'
+      remove_file 'spec/spec_helper.rb'
+      copy_file 'rails_helper.rb', 'spec/rails_helper.rb'
+      copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
     end
 
     def configure_i18n_for_test_environment
@@ -247,20 +262,12 @@ end
       template "config_locales_en.yml.erb", "config/locales/en.yml"
     end
 
-    def configure_rack_timeout
-      rack_timeout_config = <<-RUBY
-Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
-      RUBY
-
-      append_file "config/environments/production.rb", rack_timeout_config
-    end
-
     def configure_simple_form
       bundle_command "exec rails generate simple_form:install"
     end
 
     def configure_action_mailer
-      action_mailer_host "development", %{"localhost:#{port}"}
+      action_mailer_host "development", %{ENV["HOST"] || "localhost:3000"}
       action_mailer_host "test", %{"www.example.com"}
       action_mailer_host "staging", %{ENV.fetch("HOST")}
       action_mailer_host "production", %{ENV.fetch("HOST")}
@@ -448,7 +455,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
     end
 
     def configure_heroku_app(environment)
-      run_heroku "addons:create mandrill", environment
+      run_heroku "addons:create sendgrid", environment
       run_heroku "addons:create airbrake:free_heroku", environment
       run_heroku "addons:create papertrail", environment
 
@@ -456,10 +463,10 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
 
       env_vars = [
         'SMTP_DOMAIN=heroku.com',
-        'SMTP_ADDRESS=smtp.mandrillapp.com',
-        'SMTP_PROVIDER=mandrill',
+        'SMTP_ADDRESS=smtp.sendgrid.net',
+        'SMTP_PROVIDER=sendgrid',
         "HOST=#{domain}",
-        "ASSET_HOST=#{domain}"
+        "ASSET_HOST=//#{domain}"
       ]
 
       run_heroku "config:add #{env_vars.join(' ')}", environment
@@ -577,10 +584,6 @@ end
       SecureRandom.hex(64)
     end
 
-    def port
-      @port ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
-    end
-
     def serve_static_files_line
       "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
     end

data/lib/suspenders/generators/app_generator.rb

@@ -117,8 +117,8 @@ module Suspenders
       say 'Setting up the production environment'
       build :configure_newrelic
       build :configure_smtp
-      build :configure_rack_timeout
       build :enable_rack_canonical_host
+      build :configure_production_log_level
       build :enable_rack_deflater
       build :setup_asset_host
     end

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
-  RAILS_VERSION = "4.2.3"
+  RAILS_VERSION = "4.2.5.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/templates/Gemfile.erb

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 ruby "<%= Suspenders::RUBY_VERSION %>"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 
-gem "airbrake"
+gem "airbrake", require: false
 gem "autoprefixer-rails"
 gem "bundler", ">= 1.8.4"
 gem "coffee-rails", "~> 4.1.0"
@@ -13,7 +13,6 @@ gem "newrelic_rpm", ">= 3.9.8"
 gem "pg"
 gem "quiet_assets"
 gem "rack-canonical-host"
-gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
 gem "sidekiq"
@@ -55,5 +54,5 @@ group :test do
 end
 
 group :staging, :production do
-  gem "rack-timeout"
+  gem "rails_12factor"
 end

data/templates/airbrake.rb

@@ -1,5 +1,50 @@
 if ENV.include?('AIRBRAKE_API_KEY')
-  Airbrake.configure do |config|
-    config.api_key = ENV.fetch('AIRBRAKE_API_KEY')
+  require 'airbrake'
+  # Airbrake is an online tool that provides robust exception tracking in your Rails
+  # applications. In doing so, it allows you to easily review errors, tie an error
+  # to an individual piece of code, and trace the cause back to recent
+  # changes. Airbrake enables for easy categorization, searching, and prioritization
+  # of exceptions so that when errors occur, your team can quickly determine the
+  # root cause.
+  #
+  # Configuration details:
+  # https://github.com/airbrake/airbrake-ruby#configuration
+  Airbrake.configure do |c|
+    # You must set both project_id & project_key. To find your project_id and
+    # project_key navigate to your project's General Settings and copy the values
+    # from the right sidebar.
+    # https://github.com/airbrake/airbrake-ruby#project_id--project_key
+    c.project_id = ENV.fetch('AIRBRAKE_PROJECT_ID')
+    c.project_key = ENV.fetch('AIRBRAKE_API_KEY')
+
+    # Configures the root directory of your project. Expects a String or a
+    # Pathname, which represents the path to your project. Providing this option
+    # helps us to filter out repetitive data from backtrace frames and link to
+    # GitHub files from our dashboard.
+    # https://github.com/airbrake/airbrake-ruby#root_directory
+    c.root_directory = Rails.root
+
+    # By default, Airbrake Ruby outputs to STDOUT. In Rails apps it makes sense to
+    # use the Rails' logger.
+    # https://github.com/airbrake/airbrake-ruby#logger
+    c.logger = Rails.logger
+
+    # Configures the environment the application is running in. Helps the Airbrake
+    # dashboard to distinguish between exceptions occurring in different
+    # environments. By default, it's not set.
+    # https://github.com/airbrake/airbrake-ruby#environment
+    c.environment = Rails.env
+
+    # Setting this option allows Airbrake to filter exceptions occurring in
+    # unwanted environments such as :test. By default, it is equal to an empty
+    # Array, which means Airbrake Ruby sends exceptions occurring in all
+    # environments.
+    # https://github.com/airbrake/airbrake-ruby#ignore_environments
+    c.ignore_environments = %w(test)
   end
+
+  # If Airbrake doesn't send any expected exceptions, we suggest to uncomment the
+  # line below. It might simplify debugging of background Airbrake workers, which
+  # can silently die.
+  # Thread.abort_on_exception = ['test', 'development'].include?(Rails.env)
 end

data/templates/rails_helper.rb

@@ -1,5 +1,7 @@
 ENV['RAILS_ENV'] = 'test'
 
+require 'spec_helper'
+
 require File.expand_path('../../config/environment', __FILE__)
 
 require 'rspec/rails'
@@ -8,6 +10,7 @@ require 'shoulda/matchers'
 Dir[Rails.root.join('spec/support/**/*.rb')].sort.each { |file| require file }
 
 RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
   config.infer_base_class_for_anonymous_controllers = false
   config.infer_spec_type_from_file_location!
   config.use_transactional_fixtures = false

data/templates/setup.rb

@@ -1,5 +1,5 @@
 setup :secret_key_base
 env 'HOST', provide('Host', default: 'localhost:3000')
-env 'ASSET_HOST', provide('Asset host', default: 'localhost:3000')
+env 'ASSET_HOST', provide('Asset host', default: '//localhost:3000')
 
 rake 'db:setup'

data/templates/smtp.rb

@@ -1,17 +1,20 @@
 if ENV['SMTP_PROVIDER'] == 'mandrill'
-  SMTP_USERNAME = ENV.fetch('MANDRILL_USERNAME')
-  SMTP_PASSWORD = ENV.fetch('MANDRILL_APIKEY')
+  SMTP_USERNAME = ENV.fetch 'MANDRILL_USERNAME'
+  SMTP_PASSWORD = ENV.fetch 'MANDRILL_APIKEY'
+elsif ENV['SMTP_PROVIDER'] == 'sendgrid'
+  SMTP_USERNAME = ENV.fetch 'SENDGRID_USERNAME'
+  SMTP_PASSWORD = ENV.fetch 'SENDGRID_PASSWORD'
 else
-  SMTP_USERNAME = ENV.fetch('SMTP_USERNAME')
-  SMTP_PASSWORD = ENV.fetch("SMTP_PASSWORD")
+  SMTP_USERNAME = ENV.fetch 'SMTP_USERNAME'
+  SMTP_PASSWORD = ENV.fetch 'SMTP_PASSWORD'
 end
 
 SMTP_SETTINGS = {
-  address: ENV.fetch("SMTP_ADDRESS"), # example: "smtp.mandrillapp.com"
+  address: ENV.fetch('SMTP_ADDRESS'), # example: "smtp.mandrillapp.com"
   authentication: :plain,
-  domain: ENV.fetch("SMTP_DOMAIN"), # example: "heroku.com"
+  domain: ENV.fetch('SMTP_DOMAIN'), # example: "heroku.com"
   enable_starttls_auto: true,
   password: SMTP_PASSWORD,
-  port: "587",
+  port: '587',
   user_name: SMTP_USERNAME
 }

data/templates/spec_helper.rb

@@ -10,4 +10,5 @@ RSpec.configure do |config|
   end
 
   config.order = :random
+  config.color = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philosophies-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Philosophie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.5.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using Philosophie's best practices.