honeybadger 1.4.0 → 1.5.0

data/Appraisals

@@ -15,6 +15,6 @@ appraise 'rails3.1' do
 end
 
 appraise 'rails3.2' do
-  gem 'rails', '3.2.9'
+  gem 'rails', '3.2.11'
   gem 'honeybadger', :path => '../'
 end

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.4.0)
+    honeybadger (1.5.0)
       activesupport
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.5.1)
@@ -54,7 +54,7 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rack (1.1.3)
-    rake (10.0.2)
+    rake (10.0.3)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)

data/README.md

@@ -3,7 +3,7 @@ Honeybadger
 
 [![Build Status](https://secure.travis-ci.org/honeybadger-io/honeybadger-ruby.png?branch=master)](http://travis-ci.org/honeybadger-io/honeybadger-ruby)
 
-This is the notifier gem for integrating apps with :zap: [Honeybadger](http://honeybadger.io).
+This is the notifier gem for integrating apps with the :zap: [Honeybadger Rails Error Notifier](http://honeybadger.io).
 
 When an uncaught exception occurs, Honeybadger will POST the relevant data
 to the Honeybadger server specified in your environment.
@@ -132,8 +132,8 @@ Here's an example of sending some user-specific information in a Rails
 
     before_filter do
       Honeybadger.context({
-        user_id: current_user.id,
-        user_email: current_user.email
+        :user_id => current_user.id,
+        :user_email => current_user.email
       }) if current_user
     end
 
@@ -186,7 +186,7 @@ examples of notifying Honeybadger asynchronously:
 
     Honeybadger.configure do |config|
       config.async do |notice|
-        Resque.enqueue(WorkingBadger, notice)
+        Resque.enqueue(WorkingBadger, notice.to_json)
       end
     end
 
@@ -202,7 +202,7 @@ examples of notifying Honeybadger asynchronously:
 
     Honeybadger.configure do |config|
       config.async do |notice|
-        WorkingBadger.perform_async(notice)
+        WorkingBadger.perform_async(notice.to_json)
       end
     end
 

data/features/step_definitions/rails_steps.rb

@@ -140,32 +140,19 @@ When /^I configure the Heroku gem shim with "([^\"]*)"( and multiple app support
   heroku_script_bin = File.join(TEMP_DIR, "bin")
   FileUtils.mkdir_p(heroku_script_bin)
   heroku_script     = File.join(heroku_script_bin, "heroku")
-  heroku_env_vars = <<-VARS
-HONEYBADGER_API_KEY    => myapikey
-APP_NAME            => cold-moon-2929
-BUNDLE_WITHOUT      => development:test
-COMMIT_HASH         => lj32j42ss9332jfa2
-DATABASE_URL        => postgres://fchovwjcyb:QLPVWmBBbf4hCG_YMrtV@ec3-107-28-193-23.compute-1.amazonaws.com/fhcvojwwcyb
-LANG                => en_US.UTF-8
-LAST_GIT_BY         => kensa
-RACK_ENV            => production
-SHARED_DATABASE_URL => postgres://fchovwjcyb:QLPVwMbbbF8Hcg_yMrtV@ec2-94-29-181-224.compute-1.amazonaws.com/fhcvojcwwyb
-STACK               => bamboo-mri-1.9.2
-URL                 => cold-moon-2929.heroku.com
-  VARS
   single_app_script = <<-SINGLE
 #!/bin/bash
-if [ $1 == 'config' ]
+if [[ $1 == 'config:get' && $2 == 'HONEYBADGER_API_KEY' ]]
 then
-  echo "#{heroku_env_vars}"
+  echo "#{api_key}"
 fi
   SINGLE
 
   multi_app_script = <<-MULTI
 #!/bin/bash
-if [[ $1 == 'config' && $2 == '--app' ]]
+if [[ $1 == 'config:get' && $2 == 'HONEYBADGER_API_KEY' && $3 == '--app' ]]
 then
-  echo "#{heroku_env_vars}"
+  echo "#{api_key}"
 fi
   MULTI
 

data/features/support/rails.rb

@@ -82,6 +82,7 @@ module RailsHelpers
 
 
         response = response.last if response.last.is_a?(ActionDispatch::Response)
+        response = response.last.to_a if defined?(Rack::BodyProxy) && response.last.is_a?(Rack::BodyProxy)
 
         if response.is_a?(Array)
           puts response.join

data/gemfiles/rails2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.3.1)
+    honeybadger (1.5.0)
       activesupport
       json
 

data/gemfiles/rails3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.3.1)
+    honeybadger (1.4.0)
       activesupport
       json
 

data/gemfiles/rails3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.3.1)
+    honeybadger (1.4.0)
       activesupport
       json
 

data/gemfiles/rails3.2.gemfile

@@ -2,7 +2,7 @@
 
 source :rubygems
 
-gem "rails", "3.2.9"
+gem "rails", "3.2.11"
 gem "honeybadger", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/rails3.2.gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.3.1)
+    honeybadger (1.4.0)
       activesupport
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -21,18 +21,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.5.1)
@@ -43,10 +43,10 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
     builder (3.0.4)
-    capistrano (2.13.5)
+    capistrano (2.14.1)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -62,66 +62,66 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     fakeweb (1.3.0)
-    ffi (1.2.0)
+    ffi (1.3.1)
     gherkin (2.11.5)
       json (>= 1.4.6)
     highline (1.6.15)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.19)
-    mocha (0.10.5)
+    mocha (0.13.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.6.2)
+    net-ssh (2.6.3)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.2.0)
+    rack-protection (1.3.2)
       rack
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     sham_rack (1.3.4)
       rack
     shoulda (2.11.3)
@@ -152,7 +152,7 @@ DEPENDENCIES
   cucumber (~> 1.2.1)
   fakeweb (~> 1.3.0)
   honeybadger!
-  rails (= 3.2.9)
+  rails (= 3.2.11)
   rake
   rspec (~> 2.12.0)
   sham_rack (~> 1.3.0)

data/generators/honeybadger/honeybadger_generator.rb

@@ -53,6 +53,7 @@ class HoneybadgerGenerator < Rails::Generator::Base
       puts "... Failed."
       puts "WARNING: We were unable to detect the Honeybadger API Key from your Heroku environment."
       puts "Your Heroku application environment may not be configured correctly."
+      puts "Have you configured multiple Heroku apps? Try using the '--app [app name]' flag." unless options[:app]
       exit 1
     else
       puts "... Done."
@@ -60,13 +61,13 @@ class HoneybadgerGenerator < Rails::Generator::Base
     end
   end
 
-  def heroku_var(var,app_name = nil)
+  def heroku_var(var, app_name = nil)
     app = app_name ? "--app #{app_name}" : ''
-    `heroku config #{app} | grep -E "#{var.upcase}" | awk '{ print $3; }'`.strip
+    `heroku config:get #{var} #{app}`
   end
 
   def heroku_api_key
-    heroku_var("(honeybadger)_api_key",options[:app]).split.find {|x| x unless x.blank?}
+    heroku_var("HONEYBADGER_API_KEY",options[:app]).split.find {|x| x unless x.blank?}
   end
 
   def heroku?

data/generators/honeybadger/templates/honeybadger_tasks.rake

@@ -1,7 +1,7 @@
 # Don't load anything when running the gems:* tasks.
 # Otherwise, honeybadger will be considered a framework gem.
 # https://thoughtbot.lighthouseapp.com/projects/14221/tickets/629
-unless ARGV.any? {|a| a =~ /^gems/} 
+unless ARGV.any? {|a| a =~ /^gems/}
 
   Dir[File.join(Rails.root, 'vendor', 'gems', 'honeybadger-*')].each do |vendored_notifier|
     $: << File.join(vendored_notifier, 'lib')

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.4.0'
-  s.date              = '2012-12-14'
+  s.version           = '1.5.0'
+  s.date              = '2013-01-16'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'

data/lib/honeybadger.rb

@@ -19,7 +19,7 @@ require 'honeybadger/sender'
 require 'honeybadger/railtie' if defined?(Rails::Railtie)
 
 module Honeybadger
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {

data/lib/honeybadger/notice.rb

@@ -118,7 +118,7 @@ module Honeybadger
     #
     # Returns a reference to the error in Honeybadger
     def deliver
-      Honeybadger.sender.send_to_honeybadger(to_json)
+      Honeybadger.sender.send_to_honeybadger(self)
     end
 
     # Public: Template used to create JSON payload

data/lib/honeybadger/sender.rb

@@ -30,10 +30,12 @@ module Honeybadger
 
     # Public: Sends the notice data off to Honeybadger for processing.
     #
-    # data - The JSON notice to be sent off
+    # notice - The notice data to be sent (Hash or JSON string)
     #
     # Returns nothing
-    def send_to_honeybadger(data)
+    def send_to_honeybadger(notice)
+      data = notice.is_a?(String) ? notice : notice.to_json
+
       http     = setup_http_connection
       headers  = HEADERS
 

data/lib/honeybadger/shared_tasks.rb

@@ -29,16 +29,23 @@ namespace :honeybadger do
   namespace :heroku do
     desc "Install Heroku deploy notifications addon"
     task :add_deploy_notification => [:environment] do
-
-      def heroku_var(var)
-        `heroku config | grep -E "#{var.upcase}" | awk '{ print $3; }'`.strip
+      def heroku_var(var, app_name = nil)
+        app = app_name ? "--app #{app_name}" : ''
+        `heroku config:get #{var} #{app} 2> /dev/null`.strip
       end
 
-      heroku_rails_env = heroku_var("rails_env")
-      heroku_api_key = heroku_var("honeybadger_api_key").split.find {|x| x unless x.blank?} ||
+      heroku_rails_env = heroku_var('RAILS_ENV', ENV['APP'])
+      heroku_api_key = heroku_var('HONEYBADGER_API_KEY', ENV['APP']).split.find {|x| x unless x.blank?} ||
         Honeybadger.configuration.api_key
 
-      command = %Q(heroku addons:add deployhooks:http --url="https://api.honeybadger.io/v1/deploys?deploy[environment]=#{heroku_rails_env}&api_key=#{heroku_api_key}")
+      if heroku_api_key.blank? || heroku_rails_env.blank?
+        puts "WARNING: We were unable to detect the configuration from your Heroku environment."
+        puts "Your Heroku application environment may not be configured correctly."
+        puts "Have you configured multiple Heroku apps? Try using APP=[app name]'" unless ENV['APP']
+        exit
+      end
+
+      command = %Q(heroku addons:add deployhooks:http --url="https://api.honeybadger.io/v1/deploys?deploy[environment]=#{heroku_rails_env}&api_key=#{heroku_api_key}"#{ENV['APP'] ? " --app #{ENV['APP']}" : ''})
 
       puts "\nRunning:\n#{command}\n"
       puts `#{command}`

data/lib/rails/generators/honeybadger/honeybadger_generator.rb

@@ -63,6 +63,7 @@ class HoneybadgerGenerator < Rails::Generators::Base
       puts "... Failed."
       puts "WARNING: We were unable to detect the Honeybadger API Key from your Heroku environment."
       puts "Your Heroku application environment may not be configured correctly."
+      puts "Have you configured multiple Heroku apps? Try using the '--app [app name]' flag." unless options[:app]
       exit 1
     else
       puts "... Done."
@@ -70,13 +71,13 @@ class HoneybadgerGenerator < Rails::Generators::Base
     end
   end
 
-  def heroku_var(var,app_name = nil)
+  def heroku_var(var, app_name = nil)
     app = app_name ? "--app #{app_name}" : ''
-    `heroku config #{app} | grep -E "#{var.upcase}" | awk '{ print $3; }'`.strip
+    `heroku config:get #{var} #{app}`
   end
 
   def heroku_api_key
-    heroku_var("honeybadger_api_key",options[:app]).split.find {|x| x unless x.blank?}
+    heroku_var("HONEYBADGER_API_KEY", options[:app]).split.find {|x| x unless x.blank?}
   end
 
   def heroku?

data/test/test_helper.rb

@@ -46,7 +46,8 @@ class CollectingSender
     @collected = []
   end
 
-  def send_to_honeybadger(data)
+  def send_to_honeybadger(notice)
+    data = notice.respond_to?(:to_json) ? notice.to_json : notice
     @collected << data
   end
 end

data/test/unit/notice_test.rb

@@ -29,7 +29,7 @@ class NoticeTest < Test::Unit::TestCase
 
     notice.deliver
 
-    assert_received(sender, :send_to_honeybadger) { |expect| expect.with(notice.to_json) }
+    assert_received(sender, :send_to_honeybadger) { |expect| expect.with(notice) }
   end
 
   should "generate json from as_json template" do

data/test/unit/notifier_test.rb

@@ -14,7 +14,7 @@ class NotifierTest < Test::Unit::TestCase
 
   def assert_sent(notice, notice_args)
     assert_received(Honeybadger::Notice, :new) {|expect| expect.with(has_entries(notice_args)) }
-    assert_received(Honeybadger.sender, :send_to_honeybadger) {|expect| expect.with(notice.to_json) }
+    assert_received(Honeybadger.sender, :send_to_honeybadger) {|expect| expect.with(notice) }
   end
 
   def set_public_env

data/test/unit/rails/action_controller_catcher_test.rb

@@ -82,7 +82,7 @@ class ActionControllerCatcherTest < Test::Unit::TestCase
   end
 
   def last_sent_notice_payload
-    assert_not_nil xml = last_sent_notice_json, "No json was sent"
+    assert_not_nil last_sent_notice_json, "No json was sent"
     JSON.parse(last_sent_notice_json)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -312,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2390415498026321705
+      hash: -995086869038998837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: