suspenders 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91d5e12afab40037b308b168125a44e3d8f447e
-  data.tar.gz: 3b61d62c10c86a8c7d6287de1f38f78962bcddf8
+  metadata.gz: e08b8a40281d4be707f011d5df7476f0a2d29062
+  data.tar.gz: 4efce742445971ad34c0be3623b057696504a213
 SHA512:
-  metadata.gz: d12faf4cf825d7691647cb4b744c41624f698e11ec07701112eed749e16f9c9fbdcb81b812141627585032de3a7ab6c42ebdde1834cf232b0a5980ed60e52792
-  data.tar.gz: 9fa487b16c3ea508e44bb4a3071ea19566cc5755c15268ffb9d60fd63a8da23df3509f1d4a0fad369d67bf12acd477654e774c048fec284898c6ba0acabaa7dc
+  metadata.gz: b794148c43e189cbecaf7d10dff74e448477c4a2c02838b17eae0ef81f5726b28f3416d0efc02505d0d33cd228b75f91cd8fadde0b8943ca101d59e4191daef9
+  data.tar.gz: 9733402b9cac2f4ddf7bbfc6a66f5fb9f79b14141d5c7fd39d0c69761695d4c9f473153760fa26dd9e591fddcb4669dbfd862eacc81afa60fad0bbb95e8a917c

data/.travis.yml

@@ -9,3 +9,4 @@ install:
   - bundle install
 notifications:
   email: false
+sudo: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    suspenders (1.21.0)
+    suspenders (1.22.0)
       bitters (~> 0.10.0)
       bundler (~> 1.3)
       rails (= 4.2.0)
@@ -53,7 +53,7 @@ GEM
       bourbon (>= 3.2)
       sass (>= 3.2)
       thor
-    bourbon (4.0.2)
+    bourbon (4.1.0)
       sass (~> 3.3)
       thor
     builder (3.2.2)

data/NEWS.md

@@ -1,3 +1,13 @@
+1.22.0 (January 11, 2015)
+
+* Allow additional
+  [Heroku flags](https://github.com/thoughtbot/suspenders#heroku)
+  such as `--addons` and `--region`.
+* Use RSpec 3.1.0.
+* Use Travis' new Docker container infrastructure
+  for builds that start sooner and run faster.
+* Improve SMTP and ActionMailer default settings.
+
 1.21.0 (January 4, 2015)
 
 * Use Ruby 2.2.0.

data/README.md

@@ -125,6 +125,16 @@ This:
 [logging-gem]: https://github.com/heroku/rails_stdout_logging
 [heroku-logging]: https://devcenter.heroku.com/articles/logging#writing-to-your-log
 
+You can optionally specify alternate Heroku flags:
+
+    suspenders app \
+      --heroku true \
+      --heroku-flags "--region eu --addons newrelic,pgbackups,sendgrid,ssl"
+
+See all possible Heroku flags:
+
+    heroku help create
+
 ## Git
 
 This will initialize a new git repository for your Rails app. You can

data/lib/suspenders/app_builder.rb

@@ -233,10 +233,10 @@ end
     end
 
     def configure_action_mailer
-      action_mailer_host 'development', "localhost:#{port}"
-      action_mailer_host 'test', 'www.example.com'
-      action_mailer_host 'staging', "staging.#{app_name}.com"
-      action_mailer_host 'production', "#{app_name}.com"
+      action_mailer_host "development", "localhost:#{port}"
+      action_mailer_host "test", "www.example.com"
+      action_mailer_host "staging", %{ENV.fetch("HOST")}
+      action_mailer_host "production", %{ENV.fetch("HOST")}
     end
 
     def fix_i18n_deprecation_warning
@@ -295,9 +295,9 @@ end
       run 'git init'
     end
 
-    def create_heroku_apps
-      run_heroku "create #{app_name}-production", "production"
-      run_heroku "create #{app_name}-staging", "staging"
+    def create_heroku_apps(flags)
+      run_heroku "create #{app_name}-production #{flags}", "production"
+      run_heroku "create #{app_name}-staging #{flags}", "staging"
       run_heroku "config:add RACK_ENV=staging RAILS_ENV=staging", "staging"
     end
 

data/lib/suspenders/generators/app_generator.rb

@@ -3,17 +3,20 @@ require 'rails/generators/rails/app/app_generator'
 
 module Suspenders
   class AppGenerator < Rails::Generators::AppGenerator
-    class_option :database, :type => :string, :aliases => '-d', :default => 'postgresql',
-      :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+    class_option :database, type: :string, aliases: "-d", default: "postgresql",
+      desc: "Configure for selected database (options: #{DATABASES.join("/")})"
 
-    class_option :heroku, :type => :boolean, :aliases => '-H', :default => false,
-      :desc => 'Create staging and production Heroku apps'
+    class_option :heroku, type: :boolean, aliases: "-H", default: false,
+      desc: "Create staging and production Heroku apps"
 
-    class_option :github, :type => :string, :aliases => '-G', :default => nil,
-      :desc => 'Create Github repository and add remote origin pointed to repo'
+    class_option :heroku_flags, type: :string, default: "",
+      desc: "Set extra Heroku flags"
 
-    class_option :skip_test_unit, :type => :boolean, :aliases => '-T', :default => true,
-      :desc => 'Skip Test::Unit files'
+    class_option :github, type: :string, aliases: "-G", default: nil,
+      desc: "Create Github repository and add remote origin pointed to repo"
+
+    class_option :skip_test_unit, type: :boolean, aliases: "-T", default: true,
+      desc: "Skip Test::Unit files"
 
     def finish_template
       invoke :suspenders_customization
@@ -160,8 +163,8 @@ module Suspenders
 
     def create_heroku_apps
       if options[:heroku]
-        say 'Creating Heroku apps'
-        build :create_heroku_apps
+        say "Creating Heroku apps"
+        build :create_heroku_apps, options[:heroku_flags]
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :set_memory_management_variable

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 = "1.21.0"
+  VERSION = "1.22.0"
 end

data/spec/features/heroku_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 feature "Heroku" do
-  scenario "Suspend a project with --heroku=true" do
+  scenario "Suspend a project for Heroku" do
     run_suspenders("--heroku=true")
 
     expect(FakeHeroku).
@@ -26,4 +26,11 @@ feature "Heroku" do
     expect(readme).to include("./bin/deploy staging")
     expect(readme).to include("./bin/deploy production")
   end
+
+  scenario "Suspend a project with extra Heroku flags" do
+    run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
+
+    expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
+    expect(FakeHeroku).to have_created_app_for("production", "--region eu")
+  end
 end

data/spec/support/fake_heroku.rb

@@ -23,9 +23,14 @@ class FakeHeroku
     end
   end
 
-  def self.has_created_app_for?(remote_name)
+  def self.has_created_app_for?(remote_name, flags = nil)
     app_name = "#{SuspendersTestHelpers::APP_NAME}-#{remote_name}"
-    expected_line = "create #{app_name} --remote #{remote_name}\n"
+
+    expected_line = if flags
+      "create #{app_name} #{flags} --remote #{remote_name}\n"
+    else
+      "create #{app_name} --remote #{remote_name}\n"
+    end
 
     File.foreach(RECORDER).any? { |line| line == expected_line }
   end

data/templates/Gemfile.erb

@@ -38,7 +38,7 @@ group :development, :test do
   gem "dotenv-rails"
   gem "factory_girl_rails"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.0.0"
+  gem "rspec-rails", "~> 3.1.0"
 end
 
 group :test do

data/templates/smtp.rb

@@ -1,7 +1,7 @@
 SMTP_SETTINGS = {
   address: ENV.fetch("SMTP_ADDRESS"), # example: "smtp.sendgrid.net"
   authentication: :plain,
-  domain: ENV.fetch("SMTP_DOMAIN"), # example: "this-app.com"
+  domain: ENV.fetch("SMTP_DOMAIN"), # example: "heroku.com"
   enable_starttls_auto: true,
   password: ENV.fetch("SMTP_PASSWORD"),
   port: "587",

data/templates/travis.yml.erb

@@ -19,3 +19,4 @@ rvm:
   - <%= Suspenders::RUBY_VERSION %>
 addons:
   postgresql: "9.3"
+sudo: false

data/templates/unicorn.rb

@@ -4,9 +4,9 @@ worker_processes (ENV["UNICORN_WORKERS"] || 3).to_i
 timeout (ENV["UNICORN_TIMEOUT"] || 15).to_i
 preload_app true
 
-before_fork do |server, worker|
+before_fork do |_server, _worker|
   Signal.trap "TERM" do
-    puts "Unicorn master intercepting TERM and sending myself QUIT instead"
+    puts "Unicorn master intercepting TERM, sending myself QUIT instead"
     Process.kill "QUIT", Process.pid
   end
 
@@ -15,9 +15,9 @@ before_fork do |server, worker|
   end
 end
 
-after_fork do |server, worker|
+after_fork do |_server, _worker|
   Signal.trap "TERM" do
-    puts "Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT"
+    puts "Unicorn worker intercepting TERM, waiting for master to send QUIT"
   end
 
   if defined? ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters