suspenders 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e9404c65c3c4824d2db3c7e102887e023e1692
-  data.tar.gz: b238f1099fbade65f4af8f56c2662c0e08aa0781
+  metadata.gz: 1e5b7ff219c02602303e763a6176f1b748402de9
+  data.tar.gz: fea4f4b9ebf8e9b6f7d4e8846603f36a702f9b09
 SHA512:
-  metadata.gz: fe08b5239f80727c9ce77dbf75a4267d23ced284224d60a2ac02a2059909105cc3e6d453560c8aba5cd780f6f8205c1b7ca98ca6eb849b72470d28b3296a4115
-  data.tar.gz: ad48f708d6073459abd9df2e88ddc0be91783f96f0aa8f0572b7d685e5c03cbeeb3a8e42cae98ade713cb51a12e2271f630b454959e132790185e0d2c2631762
+  metadata.gz: 37c7031f7dd62ca4edbf952da97f7be0cdf1a2e6842c729b0f02be89062096ef76e37edac4f2aa01f1d84a05f9c9269e0ded299e1090dff433292a29d75bc960
+  data.tar.gz: 038163505d91aa1b58fc258c5f77740b6f9f0eb04b3a5c647d6b052989e14e26c8089d0b114fe624dc354b5850241b9239c11d43a5e7c99f1b9a94f0cb47babb

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.2.1
 before_install:
   - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'

data/Gemfile.lock

@@ -45,10 +45,6 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.0)
-    aruba (0.5.4)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
     bitters (0.10.1)
       bourbon (>= 3.2)
       sass (>= 3.2)
@@ -63,19 +59,8 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.3)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.15)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.9.3)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
     hike (1.2.3)
@@ -89,7 +74,6 @@ GEM
     mini_portile (0.6.0)
     minitest (5.5.1)
     multi_json (1.10.1)
-    multi_test (0.1.1)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     rack (1.6.0)
@@ -150,8 +134,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.5)
   capybara (~> 2.2, >= 2.2.0)
-  cucumber (~> 1.2)
   rspec (~> 2.0)
   suspenders!

data/NEWS.md

@@ -1,3 +1,16 @@
+1.25.0 (March 7, 2015)
+
+* Configure Active Job queue adapter for test env
+* Use Ruby 2.2.1
+* Dasherize heroku app names
+* Update Bourbon to 4.2.0
+* Add ASSET_HOST to sample.env (defaults to HOST)
+* Set bin/deploy script as executable
+* Set email deliver method to :test for development
+* Include missing word in the Flutie description in README.
+* Remove unused dev gems: aruba & cucumber
+* Use skip_bundle class_option (rather than defining an empty run_bundle method)
+
 1.24.0 (February 3, 2015)
 
 * Remove things in Suspenders that Rails does for us now.

data/README.md

@@ -1,4 +1,4 @@
-# Suspenders [![Build Status](https://secure.travis-ci.org/thoughtbot/suspenders.png?branch=master)](http://travis-ci.org/thoughtbot/suspenders)
+# Suspenders [![Build Status](https://secure.travis-ci.org/thoughtbot/suspenders.svg?branch=master)](http://travis-ci.org/thoughtbot/suspenders)
 
 Suspenders is the base Rails application used at
 [thoughtbot](http://thoughtbot.com).
@@ -32,8 +32,8 @@ It includes application gems like:
   processing
 * [Email Validator](https://github.com/balexand/email_validator) for email
   validation
-* [Flutie](https://github.com/thoughtbot/flutie) for and `body_class` view
-  helper
+* [Flutie](https://github.com/thoughtbot/flutie) for `page_title` and `body_class` view
+  helpers
 * [High Voltage](https://github.com/thoughtbot/high_voltage) for static pages
 * [jQuery Rails](https://github.com/rails/jquery-rails) for jQuery
 * [Neat](https://github.com/thoughtbot/neat) for semantic grids

data/lib/suspenders/actions.rb

@@ -14,6 +14,14 @@ module Suspenders
       configure_environment(rails_env, config)
     end
 
+    def configure_application_file(config)
+      inject_into_file(
+        "config/application.rb",
+        "\n\n    #{config}",
+        before: "\n  end"
+      )
+    end
+
     def configure_environment(rails_env, config)
       inject_into_file(
         "config/environments/#{rails_env}.rb",

data/lib/suspenders/app_builder.rb

@@ -11,6 +11,14 @@ module Suspenders
         'raise_delivery_errors = false', 'raise_delivery_errors = true'
     end
 
+    def set_test_delivery_method
+      inject_into_file(
+        "config/environments/development.rb",
+        "\n  config.action_mailer.delivery_method = :test",
+        after: "config.action_mailer.raise_delivery_errors = true",
+      )
+    end
+
     def raise_on_unpermitted_parameters
       config = <<-RUBY
     config.action_controller.action_on_unpermitted_parameters = :raise
@@ -87,7 +95,7 @@ module Suspenders
     def setup_asset_host
       replace_in_file 'config/environments/production.rb',
         "# config.action_controller.asset_host = 'http://assets.example.com'",
-        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST")'
+        'config.action_controller.asset_host = ENV.fetch("ASSET_HOST", ENV.fetch("HOST"))'
 
       replace_in_file 'config/initializers/assets.rb',
         "config.assets.version = '1.0'",
@@ -201,7 +209,6 @@ end
     end
 
     def configure_background_jobs_for_rspec
-      copy_file 'background_jobs_rspec.rb', 'spec/support/background_jobs.rb'
       run 'rails g delayed_job:active_record'
     end
 
@@ -229,6 +236,13 @@ end
       action_mailer_host "production", %{ENV.fetch("HOST")}
     end
 
+    def configure_active_job
+      configure_application_file(
+        "config.active_job.queue_adapter = :delayed_job"
+      )
+      configure_environment "test", "config.active_job.queue_adapter = :inline"
+    end
+
     def fix_i18n_deprecation_warning
       config = <<-RUBY
     config.i18n.enforce_available_locales = true
@@ -285,14 +299,23 @@ end
       run 'git init'
     end
 
-    def create_heroku_apps(flags)
+    def create_staging_heroku_app(flags)
       rack_env = "RACK_ENV=staging RAILS_ENV=staging"
-      rails_serve_static_files = "RAILS_SERVE_STATIC_FILES=true"
-      staging_config = "#{rack_env} #{rails_serve_static_files}"
-      run_heroku "create #{app_name}-production #{flags}", "production"
-      run_heroku "create #{app_name}-staging #{flags}", "staging"
-      run_heroku "config:add #{staging_config}", "staging"
-      run_heroku "config:add #{rails_serve_static_files}", "production"
+      app_name = heroku_app_name_for("staging")
+
+      run_heroku "create #{app_name} #{flags}", "staging"
+      run_heroku "config:add #{rack_env}", "staging"
+    end
+
+    def create_production_heroku_app(flags)
+      app_name = heroku_app_name_for("production")
+
+      run_heroku "create #{app_name} #{flags}", "production"
+    end
+
+    def create_heroku_apps(flags)
+      create_staging_heroku_app(flags)
+      create_production_heroku_app(flags)
     end
 
     def set_heroku_remotes
@@ -307,7 +330,7 @@ end
     end
 
     def join_heroku_app(environment)
-      heroku_app_name = "#{app_name}-#{environment}"
+      heroku_app_name = heroku_app_name_for(environment)
       <<-SHELL
 if heroku join --app #{heroku_app_name} &> /dev/null; then
   git remote add #{environment} git@heroku.com:#{heroku_app_name}.git || true
@@ -324,12 +347,18 @@ fi
       end
     end
 
-    def set_memory_management_variable
+    def set_heroku_memory_management_variable
       %w(staging production).each do |environment|
         run_heroku "config:add NEW_RELIC_AGGRESSIVE_KEEPALIVE=1", environment
       end
     end
 
+    def set_heroku_serve_static_files
+      %w(staging production).each do |environment|
+        run_heroku "config:add RAILS_SERVE_STATIC_FILES=true", environment
+      end
+    end
+
     def provide_deploy_script
       copy_file "bin_deploy", "bin/deploy"
 
@@ -345,6 +374,7 @@ you can deploy to staging and production with:
       MARKDOWN
 
       append_file "README.md", instructions
+      run "chmod a+x bin/deploy"
     end
 
     def create_github_repo(repo_name)
@@ -437,5 +467,9 @@ end
     def serve_static_files_line
       "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
     end
+
+    def heroku_app_name_for(environment)
+      "#{app_name.dasherize}-#{environment}"
+    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -21,6 +21,9 @@ module Suspenders
     class_option :skip_turbolinks, type: :boolean, default: true,
       desc: "Skip turbolinks gem"
 
+    class_option :skip_bundle, type: :boolean, aliases: "-B", default: true,
+      desc: "Don't run bundle install"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -74,6 +77,7 @@ module Suspenders
     def setup_development_environment
       say 'Setting up the development environment'
       build :raise_on_delivery_errors
+      build :set_test_delivery_method
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
       build :provide_dev_prime_task
@@ -124,6 +128,7 @@ module Suspenders
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
+      build :configure_active_job
       build :configure_time_formats
       build :configure_rack_timeout
       build :configure_simple_form
@@ -161,9 +166,10 @@ module Suspenders
       if options[:heroku]
         say "Creating Heroku apps"
         build :create_heroku_apps, options[:heroku_flags]
+        build :set_heroku_serve_static_files
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
-        build :set_memory_management_variable
+        build :set_heroku_memory_management_variable
         build :provide_deploy_script
       end
     end
@@ -212,10 +218,6 @@ module Suspenders
       say "Remember to run 'rails generate airbrake' with your API key."
     end
 
-    def run_bundle
-      # Let's not: We'll bundle manually at the right spot
-    end
-
     protected
 
     def get_builder_class

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.24.0"
+  VERSION = "1.25.0"
 end

data/spec/features/heroku_spec.rb

@@ -4,22 +4,27 @@ feature "Heroku" 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_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_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
+    bin_setup_path = "#{project_path}/bin/setup"
+    bin_setup = IO.read(bin_setup_path)
+    app_name = SuspendersTestHelpers::APP_NAME.dasherize
 
-    expect(bin_setup).to include("heroku join --app #{app_name}-staging")
     expect(bin_setup).to include("heroku join --app #{app_name}-production")
+    expect(bin_setup).to include("heroku join --app #{app_name}-staging")
+    expect(File.stat(bin_setup_path)).to be_executable
 
-    bin_deploy = IO.read("#{project_path}/bin/deploy")
+    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(File.stat(bin_deploy_path)).to be_executable
 
     readme = IO.read("#{project_path}/README.md")
 

data/spec/features/new_project_spec.rb

@@ -117,6 +117,28 @@ feature 'Suspend a new project with default configuration' do
     expect(File).to exist("#{project_path}/config/initializers/simple_form.rb")
   end
 
+  scenario "config :test email delivery method for development" do
+    run_suspenders
+
+    dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
+    expect(dev_env_file).
+      to match(/^ +config.action_mailer.delivery_method = :test$/)
+  end
+
+  scenario "config active job queue adapter" do
+    run_suspenders
+
+    application_config = IO.read("#{project_path}/config/application.rb")
+    test_config = IO.read("#{project_path}/config/environments/test.rb")
+
+    expect(application_config).to match(
+      /^ +config.active_job.queue_adapter = :delayed_job$/
+    )
+    expect(test_config).to match(
+      /^ +config.active_job.queue_adapter = :inline$/
+    )
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/spec/support/fake_heroku.rb

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

data/spec/support/suspenders.rb

@@ -1,5 +1,5 @@
 module SuspendersTestHelpers
-  APP_NAME = 'dummy'
+  APP_NAME = "dummy_app"
 
   def remove_project_directory
     FileUtils.rm_rf(project_path)

data/suspenders.gemspec

@@ -31,8 +31,6 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
-  s.add_development_dependency 'aruba', '~> 0.5'
-  s.add_development_dependency 'cucumber', '~> 1.2'
   s.add_development_dependency 'rspec', '~> 2.0'
   s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.0'
 end

data/templates/Gemfile.erb

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "airbrake"
-gem "bourbon", "~> 4.1.0"
+gem "bourbon", "~> 4.2.0"
 gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "email_validator"

data/templates/database_cleaner_rspec.rb

@@ -7,7 +7,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, :js => true) do
+  config.before(:each, js: true) do
     DatabaseCleaner.strategy = :deletion
   end
 

data/templates/sample.env

@@ -1,3 +1,5 @@
 # http://ddollar.github.com/foreman/
+ASSET_HOST=localhost:3000
+HOST=localhost:3000
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -52,34 +52,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +135,6 @@ files:
 - templates/_javascript.html.erb
 - templates/action_mailer.rb
 - templates/application.css.scss
-- templates/background_jobs_rspec.rb
 - templates/bin_deploy
 - templates/bin_setup.erb
 - templates/bundler_audit.rake
@@ -224,3 +195,4 @@ test_files:
 - spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
 - spec/support/suspenders.rb
+has_rdoc: 

data/templates/background_jobs_rspec.rb

@@ -1,19 +0,0 @@
-module BackgroundJobs
-  def run_background_jobs_immediately
-    delay_jobs = Delayed::Worker.delay_jobs
-    Delayed::Worker.delay_jobs = false
-    yield
-  ensure
-    Delayed::Worker.delay_jobs = delay_jobs
-  end
-end
-
-RSpec.configure do |config|
-  config.around(:each, type: :feature) do |example|
-    run_background_jobs_immediately do
-      example.run
-    end
-  end
-
-  config.include BackgroundJobs
-end