upgrade to airbrake latest; remove key from code

Luke Baker
1 parent f8026218
Showing 8 changed files with 34 additions and 33 deletions Show diff stats
Gemfile
Gemfile.lock
config/initializers/airbrake.rb
config/initializers/hoptoad.rb
lib/tasks/airbrake_tasks.rake
lib/tasks/hoptoad_notifier_tasks.rake
vendor/cache/airbrake-3.1.12.gem
vendor/cache/hoptoad_notifier-2.4.9.gem
@@ -4,7 +4,7 @@ source &quot;http://gems.github.com&quot;
 gem "rake", "~> 0.9.2.2"
 gem "rdoc", "~> 3.12"
 gem "rails", "2.3.18"
-gem "hoptoad_notifier", "2.4.9"
+gem "airbrake", :require => 'airbrake/rails'
 gem "libxml-ruby", "2.2.2", :require => "libxml"
 gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls"
 gem "paperclip", "2.3.1"
@@ -12,6 +12,10 @@ GEM
     activeresource (2.3.18)
       activesupport (= 2.3.18)
     activesupport (2.3.18)
+    airbrake (3.1.12)
+      activesupport
+      builder
+      json
     ambethia-smtp-tls (1.1.2)
     builder (3.0.0)
     cucumber (1.1.0)
@@ -36,9 +40,6 @@ GEM
     has_scope (0.4.2)
     hoe (3.6.0)
       rake (>= 0.8, < 11.0)
-    hoptoad_notifier (2.4.9)
-      activesupport
-      builder
     inherited_resources (1.0.4)
       has_scope (~> 0.4.2)
       responders (~> 0.4.3)
@@ -91,6 +92,7 @@ PLATFORMS
   ruby
 DEPENDENCIES
+  airbrake
   ambethia-smtp-tls (= 1.1.2)
   cucumber (= 1.1.0)
   cucumber-rails (= 0.3.2)
@@ -101,7 +103,6 @@ DEPENDENCIES
   fastercsv (= 1.5.1)
   formtastic (~> 0.2.2)
   has_scope (= 0.4.2)
-  hoptoad_notifier (= 2.4.9)
   inherited_resources (= 1.0.4)
   jferris-mocha (= 0.9.5.0.1241126838)
   json_pure (= 1.4.6)
@@ -0,0 +1,3 @@
+Airbrake.configure do |config|
+  config.api_key = ENV['PAIRWISE_AIRBRAKE_API_KEY']
+end
@@ -1,3 +0,0 @@
-HoptoadNotifier.configure do |config|
-  config.api_key = 'eb60e75f67c9a67558ec90b25e75dfaa'
-end
@@ -0,0 +1,25 @@
+# Don't load anything when running the gems:* tasks.
+# Otherwise, airbrake will be considered a framework gem.
+# https://thoughtbot.lighthouseapp.com/projects/14221/tickets/629
+unless ARGV.any? {|a| a =~ /^gems/}
+
+  Dir[File.join(Rails.root, 'vendor', 'gems', 'airbrake-*')].each do |vendored_notifier|
+    $: << File.join(vendored_notifier, 'lib')
+  end
+
+  begin
+    require 'airbrake/tasks'
+  rescue LoadError => exception
+    namespace :airbrake do
+      %w(deploy test log_stdout).each do |task_name|
+        desc "Missing dependency for airbrake:#{task_name}"
+        task task_name do
+          $stderr.puts "Failed to run airbrake:#{task_name} because of missing dependency."
+          $stderr.puts "You probably need to run `rake gems:install` to install the airbrake gem"
+          abort exception.inspect
+        end
+      end
+    end
+  end
+
+end
@@ -1,25 +0,0 @@
-# Don't load anything when running the gems:* tasks.
-# Otherwise, hoptoad_notifier will be considered a framework gem.
-# https://thoughtbot.lighthouseapp.com/projects/14221/tickets/629
-unless ARGV.any? {|a| a =~ /^gems/} 
-
-  Dir[File.join(RAILS_ROOT, 'vendor', 'gems', 'hoptoad_notifier-*')].each do |vendored_notifier|
-    $: << File.join(vendored_notifier, 'lib')
-  end
-
-  begin
-    require 'hoptoad_notifier/tasks'
-  rescue LoadError => exception
-    namespace :hoptoad do
-      %w(deploy test log_stdout).each do |task_name|
-        desc "Missing dependency for hoptoad:#{task_name}"
-        task task_name do
-          $stderr.puts "Failed to run hoptoad:#{task_name} because of missing dependency."
-          $stderr.puts "You probably need to run `rake gems:install` to install the hoptoad_notifier gem"
-          abort exception.inspect
-        end
-      end
-    end
-  end
-
-end
	@@ -4,7 +4,7 @@ source "http://gems.github.com"		@@ -4,7 +4,7 @@ source "http://gems.github.com"
4	gem "rake", "~> 0.9.2.2"	4	gem "rake", "~> 0.9.2.2"
5	gem "rdoc", "~> 3.12"	5	gem "rdoc", "~> 3.12"
6	gem "rails", "2.3.18"	6	gem "rails", "2.3.18"
7	-gem "hoptoad_notifier", "2.4.9"	7	+gem "airbrake", :require => 'airbrake/rails'
8	gem "libxml-ruby", "2.2.2", :require => "libxml"	8	gem "libxml-ruby", "2.2.2", :require => "libxml"
9	gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls"	9	gem "ambethia-smtp-tls", "1.1.2", :require => "smtp-tls"
10	gem "paperclip", "2.3.1"	10	gem "paperclip", "2.3.1"
	@@ -12,6 +12,10 @@ GEM		@@ -12,6 +12,10 @@ GEM
12	activeresource (2.3.18)	12	activeresource (2.3.18)
13	activesupport (= 2.3.18)	13	activesupport (= 2.3.18)
14	activesupport (2.3.18)	14	activesupport (2.3.18)
		15	+ airbrake (3.1.12)
		16	+ activesupport
		17	+ builder
		18	+ json
15	ambethia-smtp-tls (1.1.2)	19	ambethia-smtp-tls (1.1.2)
16	builder (3.0.0)	20	builder (3.0.0)
17	cucumber (1.1.0)	21	cucumber (1.1.0)
	@@ -36,9 +40,6 @@ GEM		@@ -36,9 +40,6 @@ GEM
36	has_scope (0.4.2)	40	has_scope (0.4.2)
37	hoe (3.6.0)	41	hoe (3.6.0)
38	rake (>= 0.8, < 11.0)	42	rake (>= 0.8, < 11.0)
39	- hoptoad_notifier (2.4.9)
40	- activesupport
41	- builder
42	inherited_resources (1.0.4)	43	inherited_resources (1.0.4)
43	has_scope (~> 0.4.2)	44	has_scope (~> 0.4.2)
44	responders (~> 0.4.3)	45	responders (~> 0.4.3)
	@@ -91,6 +92,7 @@ PLATFORMS		@@ -91,6 +92,7 @@ PLATFORMS
91	ruby	92	ruby
92		93
93	DEPENDENCIES	94	DEPENDENCIES
		95	+ airbrake
94	ambethia-smtp-tls (= 1.1.2)	96	ambethia-smtp-tls (= 1.1.2)
95	cucumber (= 1.1.0)	97	cucumber (= 1.1.0)
96	cucumber-rails (= 0.3.2)	98	cucumber-rails (= 0.3.2)
	@@ -101,7 +103,6 @@ DEPENDENCIES		@@ -101,7 +103,6 @@ DEPENDENCIES
101	fastercsv (= 1.5.1)	103	fastercsv (= 1.5.1)
102	formtastic (~> 0.2.2)	104	formtastic (~> 0.2.2)
103	has_scope (= 0.4.2)	105	has_scope (= 0.4.2)
104	- hoptoad_notifier (= 2.4.9)
105	inherited_resources (= 1.0.4)	106	inherited_resources (= 1.0.4)
106	jferris-mocha (= 0.9.5.0.1241126838)	107	jferris-mocha (= 0.9.5.0.1241126838)
107	json_pure (= 1.4.6)	108	json_pure (= 1.4.6)
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+Airbrake.configure do \|config\|
	2	+ config.api_key = ENV['PAIRWISE_AIRBRAKE_API_KEY']
	3	+end
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-HoptoadNotifier.configure do \|config\|
2	- config.api_key = 'eb60e75f67c9a67558ec90b25e75dfaa'
3	-end
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+# Don't load anything when running the gems:* tasks.
	2	+# Otherwise, airbrake will be considered a framework gem.
	3	+# https://thoughtbot.lighthouseapp.com/projects/14221/tickets/629
	4	+unless ARGV.any? {\|a\| a =~ /^gems/}
	5	+
	6	+ Dir[File.join(Rails.root, 'vendor', 'gems', 'airbrake-*')].each do \|vendored_notifier\|
	7	+ $: << File.join(vendored_notifier, 'lib')
	8	+ end
	9	+
	10	+ begin
	11	+ require 'airbrake/tasks'
	12	+ rescue LoadError => exception
	13	+ namespace :airbrake do
	14	+ %w(deploy test log_stdout).each do \|task_name\|
	15	+ desc "Missing dependency for airbrake:#{task_name}"
	16	+ task task_name do
	17	+ $stderr.puts "Failed to run airbrake:#{task_name} because of missing dependency."
	18	+ $stderr.puts "You probably need to run `rake gems:install` to install the airbrake gem"
	19	+ abort exception.inspect
	20	+ end
	21	+ end
	22	+ end
	23	+ end
	24	+
	25	+end
	@@ -1,25 +0,0 @@	@@ -1,25 +0,0 @@
1	-# Don't load anything when running the gems:* tasks.
2	-# Otherwise, hoptoad_notifier will be considered a framework gem.
3	-# https://thoughtbot.lighthouseapp.com/projects/14221/tickets/629
4	-unless ARGV.any? {\|a\| a =~ /^gems/}
5	-
6	- Dir[File.join(RAILS_ROOT, 'vendor', 'gems', 'hoptoad_notifier-*')].each do \|vendored_notifier\|
7	- $: << File.join(vendored_notifier, 'lib')
8	- end
9	-
10	- begin
11	- require 'hoptoad_notifier/tasks'
12	- rescue LoadError => exception
13	- namespace :hoptoad do
14	- %w(deploy test log_stdout).each do \|task_name\|
15	- desc "Missing dependency for hoptoad:#{task_name}"
16	- task task_name do
17	- $stderr.puts "Failed to run hoptoad:#{task_name} because of missing dependency."
18	- $stderr.puts "You probably need to run `rake gems:install` to install the hoptoad_notifier gem"
19	- abort exception.inspect
20	- end
21	- end
22	- end
23	- end
24	-
25	-end