welaika-suspenders 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e515a2ae4181d07d0c7d6f8a70b1a7a7b12ce861
-  data.tar.gz: 4b194d1cf51111a88bc5cc5554a2a621dc02639f
+  metadata.gz: 474e77da8a3ca0f407d776e0aae8f56c85d4e03d
+  data.tar.gz: d5f260393643afb2a1adbe95a0d976c3545ae8b3
 SHA512:
-  metadata.gz: 96603f5bfc50773d45f19b01a098dfaab7e23d984bbf51a0371c735e1f2bf5bb7cb50360fed0f649c7177a33c9ad26a07f2c264c5d709d449aca8b9fc46ca759
-  data.tar.gz: bba6c405841e065de805c923ec72fcfc5a5de1acb3b8ea62a3e5b60392023aff104577f19b660175de0ba5b5ee8eb7dbe69da698f4ee68d6679c4a659f0e44cc
+  metadata.gz: d0a43ee683a85f1b524970babc13881348e7c4d81fa4200d490ba98e93a1d737709870eb43029561cc3959a249a59ceca7b91e561744ed89e8504816b9b9c864
+  data.tar.gz: 7986f28fdda7d51f2260372e93e67f4a94ad8c57b1189f49eb998bfde29838fa9f6593253f61aa7bf5e93823bd62d3860039b0b5996fb275f6fce5b2b53b46bc

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:
-    welaika-suspenders (2.4.0)
+    welaika-suspenders (2.5.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

@@ -18,6 +18,16 @@ Then run:
 
     welaika-suspenders projectname
 
+You can optionally specify alternate Heroku flags:
+
+    welaika-suspenders projectname \
+      --heroku true \
+      --heroku-flags "--region eu --addons newrelic,pgbackups,sendgrid,ssl"
+
+See all possible Heroku flags:
+
+    heroku help create
+
 This will create a rails app in `projectname`. This script creates a
 new git repository. It is not meant to be used against an existing repo.
 

data/lib/suspenders/app_builder.rb

@@ -254,10 +254,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 configure_available_locales
@@ -328,9 +328,9 @@ end
       run 'git init'
     end
 
-    def create_heroku_apps
-      run_heroku "create #{app_name}-production --region eu", "production"
-      run_heroku "create #{app_name}-staging --region eu", "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: "--region eu",
+      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
@@ -157,8 +160,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 = "2.4.0"
+  VERSION = "2.5.0"
 end

data/spec/features/heroku_spec.rb

@@ -1,13 +1,13 @@
 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).
       to have_gem_included(project_path, "rails_stdout_logging")
-    expect(FakeHeroku).to have_created_app_for("staging")
-    expect(FakeHeroku).to have_created_app_for("production")
+    expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
+    expect(FakeHeroku).to have_created_app_for("production", "--region eu")
     expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
     expect(FakeHeroku).to have_configured_vars("production", "SECRET_KEY_BASE")
 
@@ -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} --region eu --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

@@ -43,7 +43,7 @@ group :development, :test do
   gem "pry-bloodline"
   gem "pry-byebug"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters