generators/airbrake/airbrake_generator.rb in airbrake-3.1.12 vs generators/airbrake/airbrake_generator.rb in airbrake-3.1.13

- old
+ new

@@ -47,27 +47,27 @@ end def determine_api_key puts "Attempting to determine your API Key from Heroku..." ENV['HOPTOAD_API_KEY'] = heroku_api_key - if ENV['HOPTOAD_API_KEY'].blank? + if ENV['HOPTOAD_API_KEY'] =~ /\S/ + puts "... Done." + puts "Heroku's Airbrake API Key is '#{ENV['HOPTOAD_API_KEY']}'" + else puts "... Failed." puts "WARNING: We were unable to detect the Airbrake API Key from your Heroku environment." puts "Your Heroku application environment may not be configured correctly." exit 1 - else - puts "... Done." - puts "Heroku's Airbrake API Key is '#{ENV['HOPTOAD_API_KEY']}'" end end def heroku_var(var,app_name = nil) app = app_name ? "--app #{app_name}" : '' `heroku config #{app} | grep -E "#{var.upcase}" | awk '{ print $3; }'`.strip end def heroku_api_key - heroku_var("(hoptoad|airbrake)_api_key",options[:app]).split.find {|x| x unless x.blank?} + heroku_var("(hoptoad|airbrake)_api_key",options[:app]).split.find {|x| x =~ /\S/ } end def heroku? options[:heroku] || system("grep HOPTOAD_API_KEY config/initializers/airbrake.rb") ||