suspenders 1.37.0 → 1.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 968be501f2d79ae35eebc0e702fd06fdeb9520fd
-  data.tar.gz: 0f499e1c7069a7b726d6c44c3b60b2c8b2051a30
+  metadata.gz: 39d94edf60f71093f91ed7a93fd48593d2f11c3f
+  data.tar.gz: 3ac3fe49c1570a2bc73512b044f7e8ca0c16e636
 SHA512:
-  metadata.gz: 1b5d767fdd1e1c98aac56ad7b25d0c61fcbd4b54a867f3cecd42c85b455ec00c304a1f5f3f3209e8c87dcef41eb6ae518a572de619b80c920f2b3bb5c2e2dbc4
-  data.tar.gz: f1093c609e429105deffd20e8b82c4a9beaf865f04de54bb6f5d0fd489b251b07e7577268d2f27ef47093ea5ce03267c0638c5249bdf4d513b6d06e334a46e5a
+  metadata.gz: c5e6d94dea4937ff82ed514950ecd9c399caf923f8013dcbe14d9f6fd017c070f5d0d09e5b2d39830a9acca9df18538cfe54c16f68221ffb8436f038ff87ab49
+  data.tar.gz: 3fbcf388da90d8aa42d520e911c839b8c2349a3fa4d8ad5d73e8a4ec17c190ba400dd12ec96972702c9aa8645cdc75dfaf5230800eddc1c00812c88113ef88ba

data/NEWS.md

@@ -1,3 +1,9 @@
+1.38.0 (April 15, 2016)
+
+* Update bourbon to `v5.0.0.beta.5`
+* Drops staging environment in favor of configuration through env variables
+* Bugfix: failing migrations were not making Heroku deploys fail
+
 1.37.0 (March 13, 2016)
 
 * Remove `RAILS_ENV` definitions

data/bin/suspenders

@@ -6,7 +6,12 @@ $LOAD_PATH << source_path
 
 require 'suspenders'
 
-if ['-v', '--version'].include? ARGV[0]
+if ARGV.empty?
+  puts "Please provide a path for the new application"
+  puts
+  puts "See --help for more info"
+  exit 0
+elsif ['-v', '--version'].include? ARGV[0]
   puts Suspenders::VERSION
   exit 0
 end

data/lib/suspenders/adapters/heroku.rb

@@ -25,11 +25,9 @@ module Suspenders
       end
 
       def create_staging_heroku_app(flags)
-        rack_env = "RACK_ENV=staging"
         app_name = heroku_app_name_for("staging")
 
         run_toolbelt_command "create #{app_name} #{flags}", "staging"
-        run_toolbelt_command "config:add #{rack_env}", "staging"
       end
 
       def create_production_heroku_app(flags)

data/lib/suspenders/app_builder.rb

@@ -196,20 +196,6 @@ module Suspenders
       )
     end
 
-    def setup_staging_environment
-      staging_file = 'config/environments/staging.rb'
-      copy_file 'staging.rb', staging_file
-
-      config = <<-RUBY
-
-Rails.application.configure do
-  # ...
-end
-      RUBY
-
-      append_file staging_file, config
-    end
-
     def setup_secret_token
       template 'secrets.yml', 'config/secrets.yml', force: true
     end

data/lib/suspenders/generators/app_generator.rb

@@ -34,7 +34,6 @@ module Suspenders
       invoke :setup_development_environment
       invoke :setup_test_environment
       invoke :setup_production_environment
-      invoke :setup_staging_environment
       invoke :setup_secret_token
       invoke :create_suspenders_views
       invoke :configure_app
@@ -118,11 +117,6 @@ module Suspenders
       build :setup_asset_host
     end
 
-    def setup_staging_environment
-      say 'Setting up the staging environment'
-      build :setup_staging_environment
-    end
-
     def setup_secret_token
       say 'Moving secret token out of version control'
       build :setup_secret_token

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.37.0"
+  VERSION = "1.38.0"
 end

data/spec/features/github_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe "GitHub" do
   it "suspends a project with --github option" do
     repo_name = 'test'
     run_suspenders("--github=#{repo_name}")
+    setup_app_dependencies
 
     expect(FakeGithub).to have_created_repo(repo_name)
   end

data/spec/features/heroku_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe "Heroku" do
     before(:all) do
       clean_up
       run_suspenders("--heroku=true")
+      setup_app_dependencies
     end
 
     it "suspends a project for Heroku" do
@@ -33,7 +34,7 @@ RSpec.describe "Heroku" do
       bin_setup_path = "#{project_path}/bin/setup_review_app"
       bin_setup = IO.read(bin_setup_path)
 
-      expect(bin_setup).to include("heroku run rake db:migrate --app #{app_name}-staging-pr-$1")
+      expect(bin_setup).to include("heroku run rake db:migrate --exit-code --app #{app_name}-staging-pr-$1")
       expect(bin_setup).to include("heroku ps:scale worker=1 --app #{app_name}-staging-pr-$1")
       expect(bin_setup).to include("heroku restart --app #{app_name}-staging-pr-$1")
       expect(File.stat(bin_setup_path)).to be_executable
@@ -41,7 +42,7 @@ RSpec.describe "Heroku" do
       bin_deploy_path = "#{project_path}/bin/deploy"
       bin_deploy = IO.read(bin_deploy_path)
 
-      expect(bin_deploy).to include("heroku run rake db:migrate")
+      expect(bin_deploy).to include("heroku run rake db:migrate --exit-code")
       expect(File.stat(bin_deploy_path)).to be_executable
 
       readme = IO.read("#{project_path}/README.md")
@@ -77,6 +78,7 @@ RSpec.describe "Heroku" do
     before(:all) do
       clean_up
       run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
+      setup_app_dependencies
     end
 
     it "suspends a project with extra Heroku flags" do

data/spec/features/new_project_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe "Suspend a new project with default configuration" do
     drop_dummy_database
     remove_project_directory
     run_suspenders
+    setup_app_dependencies
   end
 
   it "uses custom Gemfile" do
@@ -28,14 +29,6 @@ RSpec.describe "Suspend a new project with default configuration" do
     end
   end
 
-  it "inherits staging config from production" do
-    staging_file = IO.read("#{project_path}/config/environments/staging.rb")
-    config_stub = "Rails.application.configure do"
-
-    expect(staging_file).to match(/^require_relative "production"/)
-    expect(staging_file).to match(/#{config_stub}/), staging_file
-  end
-
   it "creates .ruby-version from Suspenders .ruby-version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 
@@ -162,6 +155,12 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(prod_env_file).not_to match(/"HOST"/)
   end
 
+  it "configures email interceptor in smtp config" do
+    smtp_file = IO.read("#{project_path}/config/smtp.rb")
+    expect(smtp_file).
+      to match(/RecipientInterceptor.new\(ENV\["EMAIL_RECIPIENTS"\]\)/)
+  end
+
   it "configures language in html element" do
     layout_path = "/app/views/layouts/application.html.erb"
     layout_file = IO.read("#{project_path}#{layout_path}")

data/spec/support/suspenders.rb

@@ -20,6 +20,16 @@ module SuspendersTestHelpers
     end
   end
 
+  def setup_app_dependencies
+    if File.exist?(project_path)
+      Dir.chdir(project_path) do
+        Bundler.with_clean_env do
+          `bundle check || bundle install`
+        end
+      end
+    end
+  end
+
   def drop_dummy_database
     if File.exist?(project_path)
       Dir.chdir(project_path) do

data/suspenders.gemspec

@@ -31,9 +31,4 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.2'
-  s.add_development_dependency 'bitters', '~> 1.3'
-  s.add_development_dependency 'simple_form', '~> 3.2'
-  s.add_development_dependency 'title', '~> 0.0'
-  s.add_development_dependency 'quiet_assets', '~> 1.1'
-  s.add_development_dependency 'capybara-webkit', '~> 1.8'
 end

data/templates/Gemfile.erb

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "autoprefixer-rails"
-gem "bourbon", "5.0.0.beta.3"
+gem "bourbon", "5.0.0.beta.5"
 gem "delayed_job_active_record"
 gem "flutie"
 gem "high_voltage"

data/templates/_css_overrides.html.erb

@@ -2,7 +2,6 @@
   <style type="text/css">
     * {
       transition-property: none !important;
-      -webkit-transition-property: none !important;
     }
   </style>
 <% end %>

data/templates/bin_deploy

@@ -8,5 +8,5 @@ branch="$(git symbolic-ref HEAD --short)"
 target="${1:-staging}"
 
 git push "$target" "$branch:master"
-heroku run rake db:migrate --remote "$target"
+heroku run rake db:migrate --exit-code --remote "$target"
 heroku restart --remote "$target"

data/templates/bin_setup_review_app.erb

@@ -14,6 +14,6 @@ heroku pg:backups restore \
   DATABASE_URL \
   --confirm <%= app_name.dasherize %>-staging-pr-$1 \
   --app <%= app_name.dasherize %>-staging-pr-$1
-heroku run rake db:migrate --app <%= app_name.dasherize %>-staging-pr-$1
+heroku run rake db:migrate --exit-code --app <%= app_name.dasherize %>-staging-pr-$1
 heroku ps:scale worker=1 --app <%= app_name.dasherize %>-staging-pr-$1
 heroku restart --app <%= app_name.dasherize %>-staging-pr-$1

data/templates/smtp.rb

@@ -7,3 +7,7 @@ SMTP_SETTINGS = {
   port: "587",
   user_name: ENV.fetch("SMTP_USERNAME")
 }
+
+if ENV["EMAIL_RECIPIENTS"].present?
+  Mail.register_interceptor RecipientInterceptor.new(ENV["EMAIL_RECIPIENTS"])
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.37.0
+  version: 1.38.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,76 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: bitters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: title
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: quiet_assets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: capybara-webkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 description: |
   Suspenders is a base Rails project that you can upgrade. It is used by
   thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
@@ -204,7 +134,6 @@ files:
 - templates/shoulda_matchers_config_rspec.rb
 - templates/smtp.rb
 - templates/spec_helper.rb
-- templates/staging.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
 homepage: http://github.com/thoughtbot/suspenders
@@ -228,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

data/templates/staging.rb

@@ -1,5 +0,0 @@
-require_relative "production"
-
-Mail.register_interceptor(
-  RecipientInterceptor.new(ENV.fetch("EMAIL_RECIPIENTS"))
-)