honeybadger 2.0.0.beta.11 → 2.0.0.beta.12

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 047e06b2f9c1ad1178f0acec89a80c7a4a6ac51c
-  data.tar.gz: 48949791254cdaf720f012fa3e516f269edb3533
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2NjM2Y4Yzg0ODBmNmVjZTBkYWEzNDgxNzc3MDlmMWFmMTlmODRhMQ==
+  data.tar.gz: !binary |-
+    Njc3ZjA5YTRjZGExMjVlMmY1NmUxMmEwZjU1YjI5ZGNlNmQyNDA2MQ==
 SHA512:
-  metadata.gz: a975c34dcdb43f187251696ac68af8cf29290faca1c18e55a85e99b9d5e1a10dd1e2a326933c5916ddd876a0233fd075f59a39f35d903bb75fdb10d9a2d112ad
-  data.tar.gz: ce873c45c9e52d2658861851dae85457154e072d561f9a2e20f3691e1c7a5d2beecf354a9583b5c7c29b9bbe5c07039f1934211c72c48e0e7daac396c1bb53e0
+  metadata.gz: !binary |-
+    ZTg5NWI3ZmE0NTc3N2E4ZTZhZmQwZWQyMjY2ODQ5ZTJkYTVkMzBkN2U0OTZk
+    MWQ2MzFmMDE4ZDk0Y2Q4MjI0MjJjOTRkMzAxNzQ0MDMzMzBmZWY3YzQ2NThj
+    YjYzM2I3NWZmMGNiZjA0N2Q3ODZmMjMyNDAyNzUzZWE1N2JmMWU=
+  data.tar.gz: !binary |-
+    OTZmZTg0MjBhMmY0N2M3NWQ2YWJhMmNjZGI0NWFjOWJiYjFlNTE4ZjFhYWRh
+    MmZkZDZmMTlmZTIwMzcyMzRmYWVmZDk2NzFkODFjNmM5MjJkYzdiODljMDQ2
+    MzY4N2I4MGEzYmEzNjQxNWQzOGFmZjdiYzEzZmMxYTVkYzFlOTQ=

data/lib/honeybadger/agent.rb

@@ -63,9 +63,10 @@ module Honeybadger
       elsif !config.valid?
         config.logger.warn('Unable to start Honeybadger -- api_key is missing or invalid.')
         return false
-      elsif !config.ping
-        config.logger.warn('Unable to start Honeybadger -- failed to connect to server.')
-        return false
+      end
+
+      unless config.ping
+        config.logger.warn('Failed to connect to Honeybadger service -- please verify that api.honeybadger.io is reachable (connection will be retried).')
       end
 
       config.logger.info("Starting Honeybadger version #{VERSION}")
@@ -147,8 +148,15 @@ module Honeybadger
       init_metrics
 
       at_exit do
-        stop
+        # Fix for https://bugs.ruby-lang.org/issues/5218
+        if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION =~ /1\.9/
+          exit_status = $!.status if $!.is_a?(SystemExit)
+        end
+
+        stop if config[:'send_data_at_exit']
         self.class.at_exit.call if self.class.at_exit
+
+        exit(exit_status) if exit_status
       end
     end
 

data/lib/honeybadger/agent/null_worker.rb

@@ -6,7 +6,7 @@ module Honeybadger
         true
       end
 
-      def shutdown(timeout = nil)
+      def shutdown
         true
       end
 

data/lib/honeybadger/agent/worker.rb

@@ -48,12 +48,10 @@ module Honeybadger
         end
       end
 
-      # Internal: Shutdown the worker.
+      # Internal: Shutdown the worker after sending remaining data.
       #
-      # timeout - The Integer timeout to wait before killing thread.
-      #
-      # Returns false if timeout reached, otherwise true.
-      def shutdown(timeout = 3)
+      # Returns true.
+      def shutdown
         mutex.synchronize do
           @shutdown = true
           @pid = nil
@@ -65,7 +63,7 @@ module Honeybadger
         r = true
         unless Thread.current.eql?(thread)
           begin
-            r = !!thread.join(timeout)
+            r = !!thread.join
           ensure
             shutdown! unless r
           end

data/lib/honeybadger/cli/helpers.rb

@@ -141,10 +141,10 @@ module Honeybadger
           begin
             r.disable_clear_and_finalize = true
             r.clear!
-            ::Rails.application.routes_reloader.paths.each{ |path| load(path) }
             r.draw do
               match 'verify' => 'honeybadger/test#verify', :as => 'verify', :via => :get
             end
+            ::Rails.application.routes_reloader.paths.each{ |path| load(path) }
             ::ActiveSupport.on_load(:action_controller) { r.finalize! }
           ensure
             r.disable_clear_and_finalize = d

data/lib/honeybadger/cli/heroku.rb

@@ -29,10 +29,10 @@ module Honeybadger
           exit(1)
         end
 
-        command = %Q(heroku addons:add deployhooks:http --url="https://api.honeybadger.io/v1/deploys?deploy[environment]=#{rails_env}&deploy[local_username]={{user}}&deploy[revision]={{head}}&api_key=#{api_key}"#{app ? " --app #{app}" : ''})
+        cmd = %Q(heroku addons:add deployhooks:http --url="https://api.honeybadger.io/v1/deploys?deploy[environment]=#{rails_env}&deploy[local_username]={{user}}&deploy[revision]={{head}}&api_key=#{api_key}"#{app ? " --app #{app}" : ''})
 
-        say("Running: `#{command}`")
-        say(`#{command}`)
+        say("Running: `#{cmd}`")
+        say(run(cmd))
       end
 
       desc 'install API_KEY', 'Install Honeybadger on Heroku using API_KEY'
@@ -115,16 +115,20 @@ module Honeybadger
         end
       end
 
+      def run(cmd)
+        Bundler.with_clean_env { `#{cmd}` }
+      end
+
       def heroku_var(var, app_name, default = nil)
         app = app_name ? "--app #{app_name}" : ''
-        result = Bundler.with_clean_env { `heroku config:get #{var} #{app} 2> /dev/null`.strip }
+        result = run("heroku config:get #{var} #{app} 2> /dev/null").strip
         result.split.find(lambda { default }) {|x| x =~ /\S/ }
       end
 
       def read_heroku_env(app = nil)
         cmd = ['heroku config']
         cmd << "--app #{app}" if app
-        output = Bundler.with_clean_env { `#{cmd.join("\s")}` }
+        output = run(cmd.join("\s"))
         return false unless $?.to_i == 0
         Hash[output.scan(/(HONEYBADGER_[^:]+):\s*(\S.*)\s*$/)]
       end
@@ -140,7 +144,7 @@ module Honeybadger
         cmd = ["heroku config:set"]
         Hash(env).each_pair {|k,v| cmd << "#{k}=#{v}" }
         cmd << "--app #{app}" if app
-        Bundler.with_clean_env { `#{cmd.join("\s")}` }
+        run(cmd.join("\s"))
         $?.to_i == 0
       end
     end

data/lib/honeybadger/cli/main.rb

@@ -123,7 +123,7 @@ module Honeybadger
         ENV['HONEYBADGER_REPORT_DATA']       = 'true'
 
         config = Config.new(rails_framework_opts)
-        config[:api_key] = api_key
+        config[:api_key] = api_key.to_s
 
         if (path = config.config_path).exist?
           say("You're already on Honeybadger, so you're all set.", :yellow)

data/lib/honeybadger/config.rb

@@ -98,7 +98,7 @@ module Honeybadger
     end
 
     def valid?
-      self[:api_key] =~ /\S/
+      self[:api_key].to_s =~ /\S/
     end
 
     def debug?
@@ -204,7 +204,7 @@ module Honeybadger
       File.open(path, 'w+') do |file|
         file.write(<<-CONFIG)
 ---
-api_key: #{self[:api_key]}
+api_key: '#{self[:api_key]}'
                    CONFIG
       end
     end

data/lib/honeybadger/config/defaults.rb

@@ -49,6 +49,10 @@ module Honeybadger
         description: 'Environments which will not report data by default (use report_data to enable/disable explicitly).',
         default: ['development'.freeze, 'test'.freeze, 'cucumber'.freeze].freeze
       },
+      :'send_data_at_exit' => {
+        description: 'Send remaining data when Ruby exits.',
+        default: true
+      },
       plugins: {
         description: 'An optional list of plugins to load. Default is to load all plugins.',
         default: nil

data/lib/honeybadger/util/http.rb

@@ -42,7 +42,7 @@ module Honeybadger
       def http_headers(headers = nil)
         {}.tap do |hash|
           hash.merge!(HEADERS)
-          hash.merge!({'X-API-Key' => config[:api_key]})
+          hash.merge!({'X-API-Key' => config[:api_key].to_s})
           hash.merge!(headers) if headers
         end
       end

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # Public: The current String Honeybadger version.
-  VERSION = '2.0.0.beta.11'.freeze
+  VERSION = '2.0.0.beta.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.11
+  version: 2.0.0.beta.12
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies: []
 description: Make managing application errors a more pleasant experience.
 email:
@@ -117,33 +117,28 @@ homepage: https://github.com/honeybadger-io/honeybadger-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-    Thanks for installing honeybadger version 2.0! If you're upgrading from 1.x,
-    please note that there may be a few configuration changes required. Read the
-    upgrade instructions at:
-
-    https://www.honeybadger.io/s/gem-upgrade
-
+post_install_message: ! "\n  Thanks for installing honeybadger version 2.0! If you're
+  upgrading from 1.x,\n  please note that there may be a few configuration changes
+  required. Read the\n  upgrade instructions at:\n\n  https://www.honeybadger.io/s/gem-upgrade\n\n"
 rdoc_options:
-- "--markup=tomdoc"
-- "--main=README.md"
+- --markup=tomdoc
+- --main=README.md
 require_paths:
 - lib
 - vendor/capistrano-honeybadger/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Error reports you can be happy about.