airbrake 3.0.rc2 → 3.0
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +6 -0
- data/features/rails.feature +2 -2
- data/features/step_definitions/rails_application_steps.rb +2 -2
- data/generators/airbrake/airbrake_generator.rb +7 -7
- data/lib/airbrake/shared_tasks.rb +1 -1
- data/lib/airbrake/version.rb +1 -1
- data/lib/rails/generators/airbrake/airbrake_generator.rb +7 -7
- metadata +9 -15
data/CHANGELOG
CHANGED
@@ -1,3 +1,8 @@
|
|
1
|
+
Version 3.0 - Fri Aug 26 08:55:47 -0400 2011
|
2
|
+
===============================================================================
|
3
|
+
Harold Gimenez:
|
4
|
+
Continue to use HOPTOAD_API_KEY for heroku users' API key env variable
|
5
|
+
|
1
6
|
Version 3.0.rc2 - Wed Aug 24 15:03:46 -0400 2011
|
2
7
|
===============================================================================
|
3
8
|
|
@@ -446,5 +451,6 @@ Nick Quaranto (3):
|
|
446
451
|
|
447
452
|
|
448
453
|
|
454
|
+
|
449
455
|
|
450
456
|
|
data/features/rails.feature
CHANGED
@@ -140,7 +140,7 @@ Feature: Install the Gem in a Rails application
|
|
140
140
|
And I should see the Rails version
|
141
141
|
And my Airbrake configuration should contain the following line:
|
142
142
|
"""
|
143
|
-
config.api_key = ENV['
|
143
|
+
config.api_key = ENV['HOPTOAD_API_KEY']
|
144
144
|
"""
|
145
145
|
|
146
146
|
Scenario: Support the --app option for the Heroku addon in the generator
|
@@ -155,7 +155,7 @@ Feature: Install the Gem in a Rails application
|
|
155
155
|
And I should see the Rails version
|
156
156
|
And my Airbrake configuration should contain the following line:
|
157
157
|
"""
|
158
|
-
config.api_key = ENV['
|
158
|
+
config.api_key = ENV['HOPTOAD_API_KEY']
|
159
159
|
"""
|
160
160
|
|
161
161
|
Scenario: Filtering parameters in a controller
|
@@ -308,14 +308,14 @@ When /^I configure the Heroku gem shim with "([^\"]*)"( and multiple app support
|
|
308
308
|
heroku_script = File.join(heroku_script_bin, "heroku")
|
309
309
|
single_app_script = <<-SINGLE
|
310
310
|
#!/bin/bash
|
311
|
-
if [[ $1 == 'console' && $2 == 'puts ENV[%{
|
311
|
+
if [[ $1 == 'console' && $2 == 'puts ENV[%{HOPTOAD_API_KEY}]' ]]; then
|
312
312
|
echo #{api_key}
|
313
313
|
fi
|
314
314
|
SINGLE
|
315
315
|
|
316
316
|
multi_app_script = <<-MULTI
|
317
317
|
#!/bin/bash
|
318
|
-
if [[ $1 == 'console' && $2 == '--app' && $4 == 'puts ENV[%{
|
318
|
+
if [[ $1 == 'console' && $2 == '--app' && $4 == 'puts ENV[%{HOPTOAD_API_KEY}]' ]]; then
|
319
319
|
echo #{api_key}
|
320
320
|
fi
|
321
321
|
MULTI
|
@@ -42,33 +42,33 @@ class AirbrakeGenerator < Rails::Generator::Base
|
|
42
42
|
s = if options[:api_key]
|
43
43
|
"'#{options[:api_key]}'"
|
44
44
|
elsif options[:heroku]
|
45
|
-
"ENV['
|
45
|
+
"ENV['HOPTOAD_API_KEY']"
|
46
46
|
end
|
47
47
|
end
|
48
48
|
|
49
49
|
def determine_api_key
|
50
50
|
puts "Attempting to determine your API Key from Heroku..."
|
51
|
-
ENV['
|
52
|
-
if ENV['
|
51
|
+
ENV['HOPTOAD_API_KEY'] = heroku_api_key
|
52
|
+
if ENV['HOPTOAD_API_KEY'].blank?
|
53
53
|
puts "... Failed."
|
54
54
|
puts "WARNING: We were unable to detect the Airbrake API Key from your Heroku environment."
|
55
55
|
puts "Your Heroku application environment may not be configured correctly."
|
56
56
|
exit 1
|
57
57
|
else
|
58
58
|
puts "... Done."
|
59
|
-
puts "Heroku's Airbrake API Key is '#{ENV['
|
59
|
+
puts "Heroku's Airbrake API Key is '#{ENV['HOPTOAD_API_KEY']}'"
|
60
60
|
end
|
61
61
|
end
|
62
62
|
|
63
63
|
def heroku_api_key
|
64
64
|
app = options[:app] ? " --app #{options[:app]}" : ''
|
65
|
-
`heroku console#{app} 'puts ENV[%{
|
65
|
+
`heroku console#{app} 'puts ENV[%{HOPTOAD_API_KEY}]'`.split("\n").first
|
66
66
|
end
|
67
67
|
|
68
68
|
def heroku?
|
69
69
|
options[:heroku] ||
|
70
|
-
system("grep
|
71
|
-
system("grep
|
70
|
+
system("grep HOPTOAD_API_KEY config/initializers/airbrake.rb") ||
|
71
|
+
system("grep HOPTOAD_API_KEY config/environment.rb")
|
72
72
|
end
|
73
73
|
|
74
74
|
def use_initializer?
|
@@ -18,7 +18,7 @@ namespace :airbrake do
|
|
18
18
|
namespace :heroku do
|
19
19
|
desc "Install Heroku deploy notifications addon"
|
20
20
|
task :add_deploy_notification => [:environment] do
|
21
|
-
heroku_api_key = `heroku console 'puts ENV[%{
|
21
|
+
heroku_api_key = `heroku console 'puts ENV[%{HOPTOAD_API_KEY}]' | head -n 1`.strip
|
22
22
|
heroku_rails_env = `heroku console 'puts RAILS_ENV' | head -n 1`.strip
|
23
23
|
|
24
24
|
command = %Q(heroku addons:add deployhooks:http url="http://airbrakeapp.com/deploys.txt?deploy[rails_env]=#{heroku_rails_env}&api_key=#{heroku_api_key}")
|
data/lib/airbrake/version.rb
CHANGED
@@ -49,7 +49,7 @@ class AirbrakeGenerator < Rails::Generators::Base
|
|
49
49
|
s = if options[:api_key]
|
50
50
|
"'#{options[:api_key]}'"
|
51
51
|
elsif options[:heroku]
|
52
|
-
"ENV['
|
52
|
+
"ENV['HOPTOAD_API_KEY']"
|
53
53
|
end
|
54
54
|
end
|
55
55
|
|
@@ -59,27 +59,27 @@ class AirbrakeGenerator < Rails::Generators::Base
|
|
59
59
|
|
60
60
|
def determine_api_key
|
61
61
|
puts "Attempting to determine your API Key from Heroku..."
|
62
|
-
ENV['
|
63
|
-
if ENV['
|
62
|
+
ENV['HOPTOAD_API_KEY'] = heroku_api_key
|
63
|
+
if ENV['HOPTOAD_API_KEY'].blank?
|
64
64
|
puts "... Failed."
|
65
65
|
puts "WARNING: We were unable to detect the Airbrake API Key from your Heroku environment."
|
66
66
|
puts "Your Heroku application environment may not be configured correctly."
|
67
67
|
exit 1
|
68
68
|
else
|
69
69
|
puts "... Done."
|
70
|
-
puts "Heroku's Airbrake API Key is '#{ENV['
|
70
|
+
puts "Heroku's Airbrake API Key is '#{ENV['HOPTOAD_API_KEY']}'"
|
71
71
|
end
|
72
72
|
end
|
73
73
|
|
74
74
|
def heroku_api_key
|
75
75
|
app = options[:app] ? " --app #{options[:app]}" : ''
|
76
|
-
`heroku console#{app} 'puts ENV[%{
|
76
|
+
`heroku console#{app} 'puts ENV[%{HOPTOAD_API_KEY}]'`.split("\n").first
|
77
77
|
end
|
78
78
|
|
79
79
|
def heroku?
|
80
80
|
options[:heroku] ||
|
81
|
-
system("grep
|
82
|
-
system("grep
|
81
|
+
system("grep HOPTOAD_API_KEY config/initializers/airbrake.rb") ||
|
82
|
+
system("grep HOPTOAD_API_KEY config/environment.rb")
|
83
83
|
end
|
84
84
|
|
85
85
|
def api_key_configured?
|
metadata
CHANGED
@@ -1,14 +1,12 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: airbrake
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 7
|
5
|
+
prerelease:
|
6
6
|
segments:
|
7
7
|
- 3
|
8
8
|
- 0
|
9
|
-
|
10
|
-
- 2
|
11
|
-
version: 3.0.rc2
|
9
|
+
version: "3.0"
|
12
10
|
platform: ruby
|
13
11
|
authors:
|
14
12
|
- thoughtbot, inc
|
@@ -16,8 +14,7 @@ autorequire:
|
|
16
14
|
bindir: bin
|
17
15
|
cert_chain: []
|
18
16
|
|
19
|
-
date: 2011-08-
|
20
|
-
default_executable:
|
17
|
+
date: 2011-08-26 00:00:00 Z
|
21
18
|
dependencies:
|
22
19
|
- !ruby/object:Gem::Dependency
|
23
20
|
name: builder
|
@@ -294,7 +291,6 @@ files:
|
|
294
291
|
- test/recursion_test.rb
|
295
292
|
- test/sender_test.rb
|
296
293
|
- test/user_informer_test.rb
|
297
|
-
has_rdoc: true
|
298
294
|
homepage: http://www.airbrakeapp.com
|
299
295
|
licenses: []
|
300
296
|
|
@@ -315,18 +311,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
315
311
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
316
312
|
none: false
|
317
313
|
requirements:
|
318
|
-
- - "
|
314
|
+
- - ">="
|
319
315
|
- !ruby/object:Gem::Version
|
320
|
-
hash:
|
316
|
+
hash: 3
|
321
317
|
segments:
|
322
|
-
-
|
323
|
-
|
324
|
-
- 1
|
325
|
-
version: 1.3.1
|
318
|
+
- 0
|
319
|
+
version: "0"
|
326
320
|
requirements: []
|
327
321
|
|
328
322
|
rubyforge_project:
|
329
|
-
rubygems_version: 1.
|
323
|
+
rubygems_version: 1.8.6
|
330
324
|
signing_key:
|
331
325
|
specification_version: 3
|
332
326
|
summary: Send your application errors to our hosted service and reclaim your inbox.
|