airbrake 3.0.4 → 3.0.5

data/CHANGELOG

@@ -1,3 +1,78 @@
+Version 3.0.5 - 2011-11-08 23:02:07 -0800
+===============================================================================
+
+Benjamin Quorning (1):
+      README updated to reflect name change from Hoptoad to Airbrake
+
+Darcy Laycock (1):
+      Explicitly scope calls to Rails.env and such to prevent loading issues when manually requiring parts of airbrake.
+
+David Czarnecki (6):
+      Using the Capistrano logger for great justice
+      Using the Capistrano logger for great justice
+      Re-organized capistrano task to allow for testing
+      Fixing conflict
+      Fixed the name of the capistrano task in the test to be correct. Updated the cucumber feature to look for the right task name.
+      Change airbrake:notify to airbrake:deploy to be more clear that it is a deploy notification
+
+Florent Guilleux (1):
+      Change Hoptoad references to Airbrake.
+
+Gabe Berke-Williams (1):
+      Merge pull request #10 from Florent2/patch-1
+
+Harold Giménez (10):
+      Heroku is still using HOPTOAD_API_KEY, so expect that for now
+      Bumping to version 3.0
+      Bumping to version 3.0.1
+      Fix bug in defining the Airbrake javascript object
+      Bumping to version 3.0.2
+      Ensure a valid configuration object is always available on Airbrake.configuration
+      Merge remote-tracking branch 'agoragames/master'
+      Bumping to version 3.0.3
+      Minor fix to Gemfile instructions on README
+      Bumping to version 3.0.4
+
+Jonathan Siegel (15):
+      Removed class-level caching per jkraemer: Hi,
+      Integrated pulls and updated tests.
+      Integrated: https://github.com/thoughtbot/hoptoad_notifier/pull/37
+      Corrected test.
+      Consistent operation.
+      Consistent callout during test generation.
+      Fixed typo.
+      Refreshed supported.
+      Resolved: http://help.airbrakeapp.com/discussions/questions/587-airbrake_javascript_notifier-is-escaped-rails-31-haml
+      Now running airbrake deploy notifications on the REMOTE machine.
+      Added first rev of PEER cert resolution.
+      Bumped 3.0.5
+      Updated README, fixed JS rescue template missed HT reference.
+      Crosslinked docs...
+      Fixes for tests.
+
+Leonid Shevtsov (1):
+      fixed rake handler failing when exception happens before Airbrake has been configured (for example, when running an unknown Rake task)
+
+Matt Fawcett (1):
+      Call #close on the old body after building the new body to prevent thread joining errors
+
+Roman Shterenzon (1):
+      Use either Airbrake or Hoptoad object.
+
+Stuart Chaney (1):
+      point towards airbrake.io
+
+Thomas Jachmann (1):
+      handles exceptions with #to_hash properly
+
+usiegj00 (4):
+      Merge pull request #21 from mattfawcett/master
+      Merge pull request #12 from leonid-shevtsov/master
+      Merge pull request #14 from thomasjachmann/master
+      Merge pull request #28 from Sutto/patch-1
+
+
+
 Version 3.0.4 - Mon Sep 12 08:25:04 -0400 2011
 ===============================================================================
 David Czarnecki(1):
@@ -445,41 +520,3 @@ Nick Quaranto (3):
       Adding rake changeling:push
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/INSTALL

@@ -1,25 +1,25 @@
 === Configuration
 
-You should have something like this in config/initializers/hoptoad.rb.
+You should have something like this in config/initializers/airbrake.rb.
 
-  HoptoadNotifier.configure do |config|
+  Airbrake.configure do |config|
     config.api_key = '1234567890abcdef'
   end
 
 (Please note that this configuration should be in a global configuration, and
-is *not* environment-specific. Hoptoad is smart enough to know what errors are
+is *not* environment-specific. Airbrake is smart enough to know what errors are
 caused by what environments, so your staging errors don't get mixed in with
 your production errors.)
 
-You can test that Hoptoad is working in your production environment by using 
+You can test that Airbrake is working in your production environment by using 
 this rake task (from RAILS_ROOT):
 
-  rake hoptoad:test
+  rake airbrake:test
 
-If everything is configured properly, that task will send a notice to Hoptoad 
+If everything is configured properly, that task will send a notice to Airbrake 
 which will be visible immediately.
 
 NOTE FOR RAILS 1.2.* USERS:
 
-You will need to copy the hoptoad_notifier_tasks.rake file into your
-RAILS_ROOT/lib/tasks directory in order for the rake hoptoad:test task to work.
+You will need to copy the airbrake_tasks.rb file into your
+RAILS_ROOT/lib/tasks directory in order for the rake airbrake:test task to work.

data/README.md

@@ -1,7 +1,7 @@
 Airbrake
 ========
 
-This is the notifier gem for integrating apps with [Airbrake](http://airbrakeapp.com).
+This is the notifier gem for integrating apps with [Airbrake](http://airbrake.io).
 
 When an uncaught exception occurs, Airbrake will POST the relevant data
 to the Airbrake server specified in your environment.
@@ -9,22 +9,24 @@ to the Airbrake server specified in your environment.
 Help
 ----
 
-For help with using Airbrake and this notifier visit [our support site](http://help.airbrakeapp.com)
+For help with using Airbrake and this notifier visit [our support site](http://help.airbrake.io).
 
-For discussion of Airbrake development check out the [mailing list](http://groups.google.com/group/hoptoad-notifier-dev)
+For discussion of Airbrake development check out the [mailing list](http://groups.google.com/group/hoptoad-notifier-dev).
+
+For SSL verification see the [Resources](resources/README.md).
 
 Rails Installation
 ------------------
 
-### Remove exception_notifier
+### Remove hoptoad_notifier
 
 in your ApplicationController, REMOVE this line:
 
-    include ExceptionNotifiable
+    include HoptoadNotifiable
 
-In your config/environment* files, remove all references to ExceptionNotifier
+In your config/environment* files, remove all references to HoptoadNotifier
 
-Remove the vendor/plugins/exception_notifier directory.
+Remove the vendor/plugins/hoptoad_notifier directory.
 
 ### Remove hoptoad_notifier plugin
 
@@ -86,7 +88,7 @@ If it does, remove it.  The new catcher is automatically included by the gem
 version of Airbrake.
 
 Before running the airbrake generator, you need to find your project's API key.
-Log in to your account at airbrakeapp.com, and click on the "Projects" button.
+Log in to your account at airbrake.io, and click on the "Projects" button.
 Then, find your project in the list, and click on its name. In the left-hand
 column, you'll see an "Edit this project" button. Click on that to get your
 project's API key. If you accidentally use your personal API auth_token,
@@ -203,7 +205,7 @@ Informing the User
 ------------------
 
 The airbrake gem is capable of telling the user information about the error that just happened
-via the user_information option. They can give this error number in bug resports, for example.
+via the user_information option. They can give this error number in bug reports, for example.
 By default, if your 500.html contains the text
 
     <!-- AIRBRAKE ERROR -->
@@ -382,7 +384,7 @@ Supported Rails versions
 See SUPPORTED_RAILS_VERSIONS for a list of official supported versions of
 Rails.
 
-Please open up a support ticket ( http://help.airbrakeapp.com ) if
+Please open up a support ticket ( http://help.airbrake.io ) if
 you're using a version of Rails that is listed above and the notifier is
 not working properly.
 

data/Rakefile

@@ -48,7 +48,7 @@ namespace :changeling do
 
     version = [major, minor, patch, build].compact.join('.')
 
-    File.open(File.join("lib", "airbrake", "notifier", "version.rb"), "w") do |f|
+    File.open(File.join("lib", "airbrake", "version.rb"), "w") do |f|
       f.write <<EOF
 module Airbrake
   VERSION = "#{version}".freeze

data/SUPPORTED_RAILS_VERSIONS

@@ -1,9 +1,5 @@
-2.3.2
-2.3.4
-2.3.5
-2.3.8
-2.3.9
-2.3.10
+2.3.12
+2.3.14
 3.0.0
 3.0.1
 3.0.2

data/TESTING.md

@@ -19,7 +19,7 @@ Note: do NOT use 'bundle exec rake'.
 For Maintainers
 ================
 
-When developing the Hoptoad Notifier, be sure to use the integration test against an existing project on staging before pushing to master.
+When developing the Airbrake Notifier, be sure to use the integration test against an existing project on staging before pushing to master.
 
     ./script/integration_test.rb <test project's api key> <staging server hostname>
 

data/airbrake.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency("capistrano",    "~> 2.8.0")
 
   s.authors = ["thoughtbot, inc"]
-  s.email   = %q{support@airbrakeapp.com}
-  s.homepage = "http://www.airbrakeapp.com"
+  s.email   = %q{support@airbrake.io}
+  s.homepage = "http://www.airbrake.io"
 
   s.platform = Gem::Platform::RUBY
 end

data/features/rails_with_js_notifier.feature

@@ -19,7 +19,7 @@ Feature: Install the Gem in a Rails application and enable the JavaScript notifi
     And I perform a request to "http://example.com:123/test/index"
     Then I should see the notifier JavaScript for the following:
       | api_key  | environment | host           |
-      | myapikey | production  | airbrakeapp.com |
+      | myapikey | production  | airbrake.io |
     And the notifier JavaScript should provide the following errorDefaults:
       | url                           | component | action |
       | http://example.com:123/test/index | test      | index  |

data/features/rake.feature

@@ -6,6 +6,10 @@ Feature: Use the Gem to catch errors in a Rake application
     When I run rake with airbrake
     Then Airbrake should catch the exception
 
+  Scenario: Falling back to default handler before Airbrake is configured
+    When I run rake with airbrake not yet configured
+    Then Airbrake should not catch the exception
+
   Scenario: Disabling Rake exception catcher
     When I run rake with airbrake disabled
     Then Airbrake should not catch the exception

data/features/step_definitions/airbrake_shim.rb.template

@@ -1,13 +1,13 @@
 require 'sham_rack'
 
-ShamRack.at("airbrakeapp.com") do |env|
+ShamRack.at("airbrake.io") do |env|
   xml = env['rack.input'].read
   puts "Recieved the following exception:\n#{xml}"
   response = <<-end_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <notice>
   <error-id type="integer">3799307</error-id>
-  <url>http://sample.airbrakeapp.com/errors/3799307/notices/643732254</url>
+  <url>http://sample.airbrake.io/errors/3799307/notices/643732254</url>
   <id type="integer">643732254</id>
 </notice>
   end_xml

data/features/step_definitions/rails_application_steps.rb

@@ -31,9 +31,9 @@ end
 
 When /^I run the airbrake generator with "([^\"]*)"$/ do |generator_args|
   if rails3?
-    When %{I run "script/rails generate airbrake #{generator_args}"}
+    When %{I run "./script/rails generate airbrake #{generator_args}"}
   else
-    When %{I run "script/generate airbrake #{generator_args}"}
+    When %{I run "./script/generate airbrake #{generator_args}"}
   end
 end
 
@@ -363,7 +363,7 @@ end
 
 Then /^I should see the notifier JavaScript for the following:$/ do |table|
   hash = table.hashes.first
-  host        = hash['host']        || 'airbrakeapp.com'
+  host        = hash['host']        || 'airbrake.io'
   secure      = hash['secure']      || false
   api_key     = hash['api_key']
   environment = hash['environment'] || 'production'

data/features/support/airbrake_shim.rb.template

@@ -1,13 +1,13 @@
 require 'sham_rack'
 
-ShamRack.at("airbrakeapp.com") do |env|
+ShamRack.at("airbrake.io") do |env|
   xml = env['rack.input'].read
   puts "Recieved the following exception:\n#{xml}"
   response = <<-end_xml
 <?xml version="1.0" encoding="UTF-8"?>
 <notice>
   <error-id type="integer">3799307</error-id>
-  <url>http://sample.airbrakeapp.com/errors/3799307/notices/643732254</url>
+  <url>http://sample.airbrake.io/errors/3799307/notices/643732254</url>
   <id type="integer">643732254</id>
 </notice>
   end_xml

data/features/support/rake/Rakefile

@@ -36,6 +36,13 @@ task :airbrake_autodetect_not_from_terminal do
   raise_exception 
 end
 
+task :airbrake_not_yet_configured do
+  Airbrake.configuration.rescue_rake_exceptions = true
+  stub_tty_output(true)
+  stub_empty_sender
+  raise_exception
+end
+
 module Airbrake
   def self.notify(*args)
     # TODO if you need to check more params, you'll have to use json.dump or something
@@ -43,6 +50,10 @@ module Airbrake
   end
 end
 
+def stub_empty_sender
+  Airbrake.sender = nil
+end
+
 def stub_tty_output(value)
   Rake.application.instance_eval do
     @tty_output_stub = value

data/lib/airbrake.rb

@@ -137,11 +137,8 @@ module Airbrake
 
     def build_notice_for(exception, opts = {})
       exception = unwrap_exception(exception)
-      if exception.respond_to?(:to_hash)
-        opts = opts.merge(exception.to_hash)
-      else
-        opts = opts.merge(:exception => exception)
-      end
+      opts = opts.merge(:exception => exception)
+      opts = opts.merge(exception.to_hash) if exception.respond_to?(:to_hash)
       Notice.new(configuration.merge(opts))
     end
 

data/lib/airbrake/capistrano.rb

@@ -9,16 +9,26 @@ module Airbrake
         after "deploy:migrations", "airbrake:deploy"
 
         namespace :airbrake do
-          desc "Notify Airbrake of the deployment"
+          desc <<-DESC
+            Notify Airbrake of the deployment by running the notification on the REMOTE machine.
+              - Run remotely so we use remote API keys, environment, etc.
+          DESC
           task :deploy, :except => { :no_release => true } do
             rails_env = fetch(:airbrake_env, fetch(:rails_env, "production"))
             local_user = ENV['USER'] || ENV['USERNAME']
             executable = RUBY_PLATFORM.downcase.include?('mswin') ? fetch(:rake, 'rake.bat') : fetch(:rake, 'rake')
-            notify_command = "#{executable} airbrake:deploy TO=#{rails_env} REVISION=#{current_revision} REPO=#{repository} USER=#{local_user}"
+            directory = configuration.current_release
+            notify_command = "cd #{directory}; #{executable} RAILS_ENV=#{rails_env} airbrake:deploy TO=#{rails_env} REVISION=#{current_revision} REPO=#{repository} USER=#{local_user}"
             notify_command << " DRY_RUN=true" if dry_run
             notify_command << " API_KEY=#{ENV['API_KEY']}" if ENV['API_KEY']
             logger.info "Notifying Airbrake of Deploy (#{notify_command})"
-            `#{notify_command}` if !configuration.dry_run
+            if configuration.dry_run
+              logger.info "DRY RUN: Notification not actually run."
+            else
+              result = ""
+              run(notify_command, :once => true) { |ch, stream, data| result << data }
+              # TODO: Check if SSL is active on account via result content.
+            end
             logger.info "Airbrake Notification Complete."
           end
         end
@@ -30,3 +40,4 @@ end
 if Capistrano::Configuration.instance
   Airbrake::Capistrano.load_into(Capistrano::Configuration.instance)
 end
+

data/lib/airbrake/configuration.rb

@@ -13,7 +13,7 @@ module Airbrake
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
 
-    # The host to connect to (defaults to airbrakeapp.com).
+    # The host to connect to (defaults to airbrake.io).
     attr_accessor :host
 
     # The port on which your Airbrake server runs (defaults to 443 for secure
@@ -123,7 +123,7 @@ module Airbrake
 
     def initialize
       @secure                   = false
-      @host                     = 'airbrakeapp.com'
+      @host                     = 'airbrake.io'
       @http_open_timeout        = 2
       @http_read_timeout        = 5
       @params_filters           = DEFAULT_PARAMS_FILTERS.dup
@@ -135,7 +135,7 @@ module Airbrake
       @development_lookup       = true
       @notifier_name            = 'Airbrake Notifier'
       @notifier_version         = VERSION
-      @notifier_url             = 'http://airbrakeapp.com'
+      @notifier_url             = 'http://airbrake.io'
       @framework                = 'Standalone'
       @user_information         = 'Airbrake Error {{error_id}}'
       @rescue_rake_exceptions   = nil

data/lib/airbrake/notice.rb

@@ -241,7 +241,7 @@ module Airbrake
           result.merge(key => clean_unserializable_data(value, stack + [data.object_id]))
         end
       elsif data.respond_to?(:to_ary)
-        data.collect do |value|
+        data.to_ary.collect do |value|
           clean_unserializable_data(value, stack + [data.object_id])
         end
       else