suspenders 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73d9dd152a7c46d51d98d0855f6d9386be74344
-  data.tar.gz: 17e0abffef3c289c9554a22a7faa896f30cb4b58
+  metadata.gz: b5ae0ed5179635c5fa49f27586042a26a82a02e1
+  data.tar.gz: ed728df580f72a76f0f5a686481f3c37df9cb491
 SHA512:
-  metadata.gz: 3545288487aafdea1f0a80f4ec51bca609962b5e69bf59a3096c9e8516bf5d640aa6bc9d3b9d033927e58fc0dc719107a3f378b1a13b7fb25fa2c156db5df678
-  data.tar.gz: add7e9af12cab579a0e9a7f638e0f3d99125348484a709003957031132c6c8b98095854e4199df130bb4b858fe61ff2ca65cc7e4683b4ddc94c7695a68d6a359
+  metadata.gz: 35be178ed3056e2f25af279292ef5b62bb5998e101acc9e657ce67b95c3cd8751a4a3d47dc16775048f28fc9d72a9dc7c22ef81a480e9d1de8f9546628ebaedb
+  data.tar.gz: 57cafa13f02ee9a92fc10e7c52b4ead9565564c0021ddabad67b9e8b7dc56daec65cf4f20adf5825ec183c980c9f3319493ca801261aff294563f2cc1c93ea5e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    suspenders (1.12.0)
+    suspenders (1.13.0)
       bundler (~> 1.3)
       rails (~> 4.1.0)
 
@@ -115,7 +115,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot

data/NEWS.md

@@ -1,3 +1,9 @@
+1.13.0 (May 29, 2014)
+
+* Remove `FactoryGirl.lint` in `before(:suite)` in order to avoid paying and
+  estimated extra ~300ms load time on a typical thoughtbot app.
+* Automatically join Heroku app in `bin/setup` if using Heroku organizations.
+
 1.12.0 (May 26, 2014)
 
 * Fix `rake dev:prime` now that Suspenders-generated apps require some `ENV`

data/lib/suspenders/app_builder.rb

@@ -276,19 +276,31 @@ end
     end
 
     def set_heroku_remotes
-      remotes = <<-RUBY
+      remotes = <<-SHELL
 
-# Set up staging and production git remotes
-git remote add staging git@heroku.com:#{app_name}-staging.git
-heroku join --app #{app_name}-staging
+# Set up staging and production git remotes.
+git remote add staging git@heroku.com:#{app_name}-staging.git || true
+git remote add production git@heroku.com:#{app_name}-production.git || true
 
-git remote add production git@heroku.com:#{app_name}-production.git
-heroku join --app #{app_name}-production
-      RUBY
+# Join the staging and production apps.
+#{join_heroku_app('staging')}
+#{join_heroku_app('production')}
+      SHELL
 
       append_file 'bin/setup', remotes
     end
 
+    def join_heroku_app(environment)
+      heroku_app_name = "#{app_name}-#{environment}"
+      <<-SHELL
+if heroku join --app #{heroku_app_name} &> /dev/null; then
+  echo 'You are a collaborator on the "#{heroku_app_name}" Heroku app'
+else
+  echo 'Ask for access to the "#{heroku_app_name}" Heroku app'
+fi
+      SHELL
+    end
+
     def set_heroku_rails_secrets
       path_addition = override_path_for_tests
       run "#{path_addition} heroku config:add SECRET_KEY_BASE=#{generate_secret} --remote=staging"

data/lib/suspenders/version.rb

@@ -1,4 +1,4 @@
 module Suspenders
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.12.0'
+  VERSION = '1.13.0'
 end

data/spec/features/heroku_spec.rb

@@ -9,5 +9,11 @@ feature 'Heroku' do
     expect(FakeHeroku).to have_created_app_for('production')
     expect(FakeHeroku).to have_configured_vars('staging', 'SECRET_KEY_BASE')
     expect(FakeHeroku).to have_configured_vars('production', 'SECRET_KEY_BASE')
+
+    bin_setup = IO.read("#{project_path}/bin/setup")
+    app_name = SuspendersTestHelpers::APP_NAME
+
+    expect(bin_setup).to include("heroku join --app #{app_name}-staging")
+    expect(bin_setup).to include("heroku join --app #{app_name}-production")
   end
 end

data/spec/features/new_project_spec.rb

@@ -37,7 +37,6 @@ feature 'Suspend a new project with default configuration' do
     expect(secrets_file).to match(/secret_key_base: <%= ENV\['SECRET_KEY_BASE'\] %>/)
   end
 
-
   scenario 'action mailer support file is added' do
     run_suspenders
 

data/templates/factory_girl_rspec.rb

@@ -1,12 +1,3 @@
 RSpec.configure do |config|
-  config.before(:suite) do
-    begin
-      DatabaseCleaner.start
-      FactoryGirl.lint
-    ensure
-      DatabaseCleaner.clean
-    end
-  end
-
   config.include FactoryGirl::Syntax::Methods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler