Merge branch '2688-airbreak' of https://github.com/fred/diaspora

Conflicts:
	config/application.yml.example

Gemfile

@@ -28,7 +28,7 @@ gem 'messagebus_ruby_api', '1.0.1'
 
 group :production do # we don't install these on travis to speed up test runs
   # reporting
-  gem 'hoptoad_notifier'
+  gem 'airbrake'
   gem 'newrelic_rpm'
   gem 'rack-google-analytics', :require => 'rack/google-analytics'
   gem 'rack-piwik', :require => 'rack/piwik'

Gemfile.lock

@@ -90,6 +90,9 @@ GEM
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
     addressable (2.2.4)
+    airbrake (3.0.9)
+      activesupport
+      builder
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (2.1.4)
@@ -199,9 +202,6 @@ GEM
       heroku (>= 2)
       rails (>= 2)
     highline (1.6.9)
-    hoptoad_notifier (2.4.11)
-      activesupport
-      builder
     i18n (0.5.0)
     i18n-inflector (2.6.3)
       i18n (>= 0.4.1)
@@ -424,6 +424,7 @@ DEPENDENCIES
   acts-as-taggable-on!
   acts_as_api
   addressable (= 2.2.4)
+  airbrake
   bundler (>= 1.0.0)
   capistrano (~> 2.9.0)
   capistrano-ext (= 1.2.1)
@@ -450,7 +451,6 @@ DEPENDENCIES
   haml
   heroku
   heroku_san
-  hoptoad_notifier
   http_accept_language!
   i18n-inflector-rails (~> 1.0)
   jammit (= 0.6.5)

config/application.yml.example

@@ -98,8 +98,8 @@ defaults: &defaults
   # Enable extensive logging to log/{development,test,production}.log
   debug: false
 
-  # Hoptoad api key, send failures to Hoptoad
-  hoptoad_api_key: ''
+  # Airbrake api key, send failures to http://projectname.airbrake.io/ (Former Hoptoad)
+  airbrake_api_key: ''
 
   #social media setup
   facebook_app_id:  ''

config/deploy.rb

@@ -7,7 +7,7 @@ set :config_yaml, YAML.load_file(File.dirname(__FILE__) + '/deploy_config.yml')
 require './config/cap_colors'
 require 'bundler/capistrano'
 require './config/boot'
-require 'hoptoad_notifier/capistrano'
+require 'airbrake/capistrano'
 set :bundle_dir, ''
 
 set :stages, ['production', 'staging']

config/initializers/airbreak.rb

@@ -0,0 +1,13 @@
+# if old key still there, use it for new API,
+# update application.yml to use airbrake_api_key instead
+# (Former Hoptoad)
+if AppConfig[:airbrake_api_key].present?
+  Airbrake.configure do |config|
+    config.api_key = AppConfig[:airbrake_api_key]
+  end
+elsif AppConfig[:hoptoad_api_key].present?
+  puts "You're using old hoptoad_api_key, please update application.yml to use airbrake_api_key instead."
+  Airbrake.configure do |config|
+    config.api_key = AppConfig[:hoptoad_api_key]
+  end
+end

config/initializers/hoptoad.rb

@@ -1,5 +0,0 @@
-if AppConfig[:hoptoad_api_key].present?
-  HoptoadNotifier.configure do |config|
-    config.api_key = AppConfig[:hoptoad_api_key]
-  end
-end