Skip to content

Commit

Permalink
Replace squash with honeybadger
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeer committed Oct 1, 2016
1 parent 009fcd9 commit beb5c13
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 22 deletions.
3 changes: 2 additions & 1 deletion Capfile
Expand Up @@ -22,7 +22,8 @@ require 'capistrano/bundler'
require 'capistrano/rails'
require 'capistrano/passenger'
require 'dlss/capistrano'
require 'squash/rails/capistrano3'

# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

require 'capistrano/honeybadger'
6 changes: 1 addition & 5 deletions Gemfile
Expand Up @@ -91,11 +91,7 @@ group :deployment do
gem 'dlss-capistrano'
end

# Use Squash for exception reporting
gem 'squash_ruby', require: 'squash/ruby'

# Pinned to 1.3.3 until https://github.com/SquareSquash/rails/pull/15
gem 'squash_rails', '1.3.3', require: 'squash/rails'
gem 'honeybadger', '~> 2.0'

# Use is_it_working to monitor the application
gem 'is_it_working'
Expand Down
14 changes: 5 additions & 9 deletions Gemfile.lock
Expand Up @@ -47,7 +47,7 @@ GEM
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.0.5)
byebug (9.0.6)
capistrano (3.6.1)
airbrussh (>= 1.0.0)
capistrano-harrow
Expand All @@ -73,7 +73,7 @@ GEM
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (2.9.1)
capybara (2.9.2)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand Down Expand Up @@ -120,6 +120,7 @@ GEM
ffi (1.9.14)
globalid (0.3.7)
activesupport (>= 4.1.0)
honeybadger (2.6.1)
i18n (0.7.0)
is_it_working (1.1.0)
jasmine-jquery-rails (2.0.3)
Expand Down Expand Up @@ -252,18 +253,14 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
squash_rails (1.3.3)
squash_ruby
squash_ruby (2.0.1)
json
sshkit (1.11.3)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
teaspoon (1.1.5)
railties (>= 3.2.5, < 6)
teaspoon-jasmine (2.3.4)
teaspoon (>= 1.0.0)
term-ansicolor (1.3.2)
term-ansicolor (1.4.0)
tins (~> 1.0)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
Expand Down Expand Up @@ -309,6 +306,7 @@ DEPENDENCIES
dlss-capistrano
factory_girl_rails
faraday
honeybadger (~> 2.0)
is_it_working
jasmine-jquery-rails
jbuilder (~> 2.5)
Expand All @@ -328,8 +326,6 @@ DEPENDENCIES
spring
spring-watcher-listen (~> 2.0.0)
sqlite3
squash_rails (= 1.3.3)
squash_ruby
teaspoon-jasmine
therubyracer
turbolinks (~> 5)
Expand Down
3 changes: 0 additions & 3 deletions app/controllers/application_controller.rb
Expand Up @@ -2,7 +2,4 @@ class ApplicationController < ActionController::Base
# Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception

include Squash::Ruby::ControllerMethods
enable_squash_client
end
4 changes: 1 addition & 3 deletions config/deploy.rb
Expand Up @@ -24,7 +24,7 @@
# set :pty, true

# Default value for :linked_files is []
set :linked_files, fetch(:linked_files, []).push('config/secrets.yml', 'config/database.yml', 'config/initializers/squash.rb', 'public/.htaccess', 'public/robots.txt')
set :linked_files, fetch(:linked_files, []).push('config/secrets.yml', 'config/database.yml', 'config/honeybadger.yml', 'public/.htaccess', 'public/robots.txt')

# Default value for linked_dirs is []
set :linked_dirs, fetch(:linked_dirs, []).push('config/settings',
Expand All @@ -40,5 +40,3 @@

# Default value for keep_releases is 5
# set :keep_releases, 5

before 'deploy:publishing', 'squash:write_revision'
1 change: 0 additions & 1 deletion config/initializers/squash.rb

This file was deleted.

0 comments on commit beb5c13

Please sign in to comment.