suspenders 1.35.0 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6e0976e91ec4917e8119de4459892b4c11f6e8
-  data.tar.gz: f94cb991a1498ca9337f6c5b06c5445cd7ab9a47
+  metadata.gz: 5d921beddd38f9bd970eadbdcc901a3818eb23cc
+  data.tar.gz: 9714376afdfe4d02c41e56358d8aeb59e2ad7129
 SHA512:
-  metadata.gz: 83fae0c577a776372fce11421f90f7e30a2f6dec55302638f54af395ae23a777a521b4717f6fafbfb561df229162a19d6373ec998db33c0c4e074feac858838d
-  data.tar.gz: dc25306dcd657edbc7d300ce384fe50a97060a8b4d0848da6e09489462c39d9a9cad3bd1f27f4d14dd7576110fba3703c6653920e9ea1d29314b5252abf54f80
+  metadata.gz: a8e513fe32ce4e817d6e4524d1082d089e5eac7b936dd68b6ed96fadb1278bba2f25df88d7a466c00053d6693016d1821d63bc231a1c07f93d876e86d612b0b1
+  data.tar.gz: 63a34852741cea8ae655e6be0889967e15816605b455059f3da0ee565c4d1dec1426c4b7f68831aac827f9a17cf16b11d32d09ed00591f6fb6adf3653b0ba064

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008-2015 thoughtbot, inc.
+Copyright (c) 2008-2016 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,3 +1,12 @@
+1.36.0 (February 26, 2016)
+
+* Update Bitters to v1.2
+* Remove deprecated `fix_i18n_deprecation_warning` method
+* Switch from Airbrake to Honeybadger
+* Generate applications with `rack_mini_profiler` (disabled by default, enabled
+  by setting `RACK_MINI_PROFILER=1`)
+* Heroku Pipelines bug fixes
+
 1.35.0 (December 30, 2015)
 
 * Introduce Heroku Pipelines support

data/README.md

@@ -31,7 +31,6 @@ generated projectname/Gemfile.
 
 It includes application gems like:
 
-* [Airbrake](https://github.com/airbrake/airbrake) for exception notification
 * [Autoprefixer Rails](https://github.com/ai/autoprefixer-rails) for CSS vendor prefixes
 * [Bourbon](https://github.com/thoughtbot/bourbon) for Sass mixins
 * [Bitters](https://github.com/thoughtbot/bitters) for scaffold application styles
@@ -40,6 +39,7 @@ It includes application gems like:
 * [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
+* [Honeybadger](https://honeybadger.io) for exception notification
 * [jQuery Rails](https://github.com/rails/jquery-rails) for jQuery
 * [Neat](https://github.com/thoughtbot/neat) for semantic grids
 * [New Relic RPM](https://github.com/newrelic/rpm) for monitoring performance
@@ -212,7 +212,7 @@ Thank you, [contributors]!
 
 ## License
 
-Suspenders is Copyright © 2008-2015 thoughtbot.
+Suspenders is Copyright © 2008-2016 thoughtbot.
 It is free software,
 and may be redistributed under the terms specified in the [LICENSE] file.
 

data/lib/suspenders/adapters/heroku.rb

@@ -68,12 +68,17 @@ module Suspenders
         end
 
         heroku_app_name = app_builder.app_name.dasherize
-        %w(staging production).each do |environment|
-          run_toolbelt_command(
-            "pipelines:create #{heroku_app_name} -a #{heroku_app_name}-#{environment} --stage #{environment}",
-            environment,
-          )
-        end
+        run_toolbelt_command(
+          "pipelines:create #{heroku_app_name} \
+            -a #{heroku_app_name}-staging --stage staging",
+          "staging",
+        )
+
+        run_toolbelt_command(
+          "pipelines:add #{heroku_app_name} \
+            -a #{heroku_app_name}-production --stage production",
+          "production",
+        )
       end
 
       def set_heroku_serve_static_files

data/lib/suspenders/app_builder.rb

@@ -20,6 +20,21 @@ module Suspenders
       template 'README.md.erb', 'README.md'
     end
 
+    def gitignore
+      copy_file "suspenders_gitignore", ".gitignore"
+    end
+
+    def gemfile
+      template "Gemfile.erb", "Gemfile"
+    end
+
+    def setup_rack_mini_profiler
+      copy_file(
+        "rack_mini_profiler.rb",
+        "config/initializers/rack_mini_profiler.rb",
+      )
+    end
+
     def raise_on_missing_assets_in_test
       inject_into_file(
         "config/environments/test.rb",
@@ -231,11 +246,6 @@ end
       bundle_command 'exec rake db:create db:migrate'
     end
 
-    def replace_gemfile
-      remove_file 'Gemfile'
-      template 'Gemfile.erb', 'Gemfile'
-    end
-
     def set_ruby_to_version_being_used
       create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
     end
@@ -318,14 +328,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       configure_environment "test", "config.active_job.queue_adapter = :inline"
     end
 
-    def fix_i18n_deprecation_warning
-      config = <<-RUBY
-    config.i18n.enforce_available_locales = true
-      RUBY
-
-      inject_into_class 'config/application.rb', 'Application', config
-    end
-
     def generate_rspec
       generate 'rspec:install'
     end
@@ -345,18 +347,15 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
     end
 
     def install_refills
-      run "rails generate refills:import flashes"
-      run "rm app/views/refills/_flashes.html.erb"
-      run "rmdir app/views/refills"
+      generate "refills:import", "flashes"
+      remove_dir "app/views/refills"
     end
 
     def install_bitters
       run "bitters install --path app/assets/stylesheets"
     end
 
-    def gitignore_files
-      remove_file '.gitignore'
-      copy_file 'suspenders_gitignore', '.gitignore'
+    def setup_default_directories
       [
         'app/views/pages',
         'spec/lib',
@@ -366,8 +365,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
         'spec/support/mixins',
         'spec/support/shared_examples'
       ].each do |dir|
-        run "mkdir #{dir}"
-        run "touch #{dir}/.keep"
+        empty_directory_with_keep_file dir
       end
     end
 

data/lib/suspenders/generators/app_generator.rb

@@ -57,7 +57,6 @@ module Suspenders
     end
 
     def customize_gemfile
-      build :replace_gemfile
       build :set_ruby_to_version_being_used
 
       if options[:heroku]
@@ -143,10 +142,10 @@ module Suspenders
       build :configure_active_job
       build :configure_time_formats
       build :disable_xml_params
-      build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
       build :configure_puma
       build :set_up_forego
+      build :setup_rack_mini_profiler
     end
 
     def setup_stylesheets
@@ -166,8 +165,8 @@ module Suspenders
 
     def setup_git
       if !options[:skip_git]
-        say 'Initializing git'
-        invoke :setup_gitignore
+        say "Initializing git"
+        invoke :setup_default_directories
         invoke :init_git
       end
     end
@@ -203,8 +202,8 @@ module Suspenders
       build :copy_dotfiles
     end
 
-    def setup_gitignore
-      build :gitignore_files
+    def setup_default_directories
+      build :setup_default_directories
     end
 
     def setup_bundler_audit
@@ -241,7 +240,7 @@ module Suspenders
 
     def outro
       say 'Congratulations! You just pulled our suspenders.'
-      say "Remember to run 'rails generate airbrake' with your API key."
+      say honeybadger_outro
     end
 
     protected
@@ -253,5 +252,17 @@ module Suspenders
     def using_active_record?
       !options[:skip_active_record]
     end
+
+    private
+
+    def honeybadger_outro
+      "Run 'bundle exec honeybadger heroku install' with your API key#{honeybadger_message_suffix}."
+    end
+
+    def honeybadger_message_suffix
+      if options[:heroku]
+        " unless you're using the Heroku Honeybadger add-on"
+      end
+    end
   end
 end

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.35.0"
+  VERSION = "1.36.0"
 end

data/spec/features/new_project_spec.rb

@@ -7,6 +7,19 @@ RSpec.describe "Suspend a new project with default configuration" do
     run_suspenders
   end
 
+  it "uses custom Gemfile" do
+    gemfile_file = IO.read("#{project_path}/Gemfile")
+    expect(gemfile_file).to match(
+      /^ruby "#{Suspenders::RUBY_VERSION}"$/,
+    )
+    expect(gemfile_file).to match(
+      /^gem "autoprefixer-rails"$/,
+    )
+    expect(gemfile_file).to match(
+      /^gem "rails", "#{Suspenders::RAILS_VERSION}"$/,
+    )
+  end
+
   it "ensures project specs pass" do
     Dir.chdir(project_path) do
       Bundler.with_clean_env do
@@ -69,6 +82,23 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(hound_config_file).to include "enabled: true"
   end
 
+  it "ensures Gemfile contains `rack-mini-profiler`" do
+    gemfile = IO.read("#{project_path}/Gemfile")
+
+    expect(gemfile).to include %{gem "rack-mini-profiler", require: false}
+  end
+
+  it "ensures .sample.env defaults to RACK_MINI_PROFILER=0" do
+    env = IO.read("#{project_path}/.env")
+
+    expect(env).to include "RACK_MINI_PROFILER=0"
+  end
+
+  it "creates a rack-mini-profiler initializer" do
+    expect(File).
+      to exist("#{project_path}/config/initializers/rack_mini_profiler.rb")
+  end
+
   it "ensures newrelic.yml reads NewRelic license from env" do
     newrelic_file = IO.read("#{project_path}/config/newrelic.yml")
 

data/spec/support/fake_heroku.rb

@@ -44,7 +44,7 @@ class FakeHeroku
 
   def self.has_setup_pipeline_for?(app_name)
     commands_ran =~ /^pipelines:create #{app_name} -a #{app_name}-staging --stage staging/ &&
-      commands_ran =~ /^pipelines:create #{app_name} -a #{app_name}-production --stage production/
+      commands_ran =~ /^pipelines:add #{app_name} -a #{app_name}-production --stage production/
   end
 
   def self.commands_ran

data/suspenders.gemspec

@@ -27,7 +27,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bitters', '~> 1.1.0'
+  s.add_dependency 'bitters', '~> 1.2'
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 

data/templates/Gemfile.erb

@@ -2,13 +2,13 @@ source "https://rubygems.org"
 
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
-gem "airbrake"
 gem "autoprefixer-rails"
 gem "bourbon", "~> 4.2.0"
 gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "flutie"
 gem "high_voltage"
+gem "honeybadger"
 gem "jquery-rails"
 gem "neat", "~> 1.7.0"
 gem "newrelic_rpm", ">= 3.9.8"
@@ -42,6 +42,10 @@ group :development, :test do
   gem "rspec-rails", "~> 3.4.0"
 end
 
+group :development, :staging do
+  gem "rack-mini-profiler", require: false
+end
+
 group :test do
   gem "capybara-webkit"
   gem "database_cleaner"

data/templates/app.json.erb

@@ -2,12 +2,18 @@
   "name":"<%= app_name.dasherize %>",
   "scripts":{},
   "env":{
-    "AIRBRAKE_API_KEY":{
+    "APPLICATION_HOST":{
       "required":true
     },
     "EMAIL_RECIPIENTS":{
       "required":true
     },
+    "HEROKU_APP_NAME": {
+      "required":true
+    },
+    "HEROKU_PARENT_APP_NAME": {
+      "required":true
+    },
     "RACK_ENV":{
       "required":true
     },

data/templates/dotfiles/.env

@@ -3,6 +3,7 @@ ASSET_HOST=localhost:3000
 APPLICATION_HOST=localhost:3000
 PORT=3000
 RACK_ENV=development
+RACK_MINI_PROFILER=0
 SECRET_KEY_BASE=development_secret
 EXECJS_RUNTIME=Node
 SMTP_ADDRESS=smtp.example.com

data/templates/rack_mini_profiler.rb

@@ -0,0 +1,5 @@
+if ENV["RACK_MINI_PROFILER"].to_i > 0
+  require "rack-mini-profiler"
+
+  Rack::MiniProfilerRails.initialize!(Rails.application)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.35.0
+  version: 1.36.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,7 @@ files:
 - templates/newrelic.yml.erb
 - templates/postgresql_database.yml.erb
 - templates/puma.rb
+- templates/rack_mini_profiler.rb
 - templates/rails_helper.rb
 - templates/secrets.yml
 - templates/shoulda_matchers_config_rspec.rb