honeybadger 3.0.0.beta4 → 3.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4f9a7c10b39fcdadf65441f1ba5cbba9b5d3e6
-  data.tar.gz: 397e6c4ecc0456afe8b097b45eff87d512688277
+  metadata.gz: 024a03997f1e5a8f37ba751c32c6adb21e7cc3ea
+  data.tar.gz: f33bea69c33344b3bdc8c2d351cdf616063f7e1d
 SHA512:
-  metadata.gz: fe2f9fb1c7806a528f9927e127ce33d1931c78bbe0285c80e5993cada0bb646f3bda858e6b178bd370bb98698ac86e238d96683ccc80105817b2f8daa0da3d58
-  data.tar.gz: 62ed1567abeb8b94002efdfd3b355851021635d34e7c2ef728c2a15bf7c984ab3e36f2bb853eb1a34f6c39c473ab48645ef406eba16c512076634428c660752a
+  metadata.gz: 398c8575b8c3098e82d8a607ca039579af21bed972f5332df0de82d358613b83af4c6a1a4966ef947558374bc3d66051d71bb923ea6b08d4144120e6f8235aae
+  data.tar.gz: 438d726976ec17fa2de5e41faac98cd366ced5ef61183b262816bbe09a999647c0a7ee1f10e337864929c66edd4ee80d2d644a433671bdc87c6b786b712c0416

data/CHANGELOG.md

@@ -28,6 +28,8 @@ adheres to [Semantic Versioning](http://semver.org/).
 - `Honeybadger.notify` now converts arguments which are not `Exception` or
   `Hash` types to strings and assigns them as the error message. Example:
   `Honeybadger.notify("Something went wrong")`.
+- The currently deployed git revision is now detected automatically and sent
+  with error reports.
 
 ### Changed
 - `Honeybadger.start` has been deprecated and has no effect.

data/lib/honeybadger/backend/server.rb

@@ -10,7 +10,6 @@ module Honeybadger
   module Backend
     class Server < Base
       ENDPOINTS = {
-        ping: '/v1/ping'.freeze,
         notices: '/v1/notices'.freeze,
         deploys: '/v1/deploys'.freeze
       }.freeze

data/lib/honeybadger/cli/main.rb

@@ -109,10 +109,15 @@ WELCOME
       project_options
       option :quiet, required: false, type: :boolean, aliases: :'-q', default: false, desc: 'Suppress all output unless notification fails.'
       def exec(*args)
+        if args.size == 0
+          say("honeybadger: exec needs a command to run", :red)
+          exit(1)
+        end
+
         config = build_config(options)
 
         if config.get(:api_key).to_s =~ BLANK
-          say("No value provided for required options '--api-key'")
+          say("No value provided for required options '--api-key'", :red)
           exit(1)
         end
 

data/lib/honeybadger/config.rb

@@ -9,9 +9,11 @@ require 'honeybadger/logging'
 require 'honeybadger/backend'
 require 'honeybadger/config/defaults'
 require 'honeybadger/util/http'
+require 'honeybadger/util/revision'
 require 'honeybadger/logging'
 
 module Honeybadger
+  # Internal
   class Config
     extend Forwardable
 
@@ -42,17 +44,18 @@ module Honeybadger
 
     attr_accessor :ruby, :env, :yaml, :framework
 
+    # Called by framework (see lib/honeybadger/init/) at the point of
+    # initialization. This is not required for the notifier to work (i.e. with
+    # `require 'honeybadger/ruby'`).
     def init!(opts = {}, env = ENV)
       self.framework = opts.freeze
       self.env = Env.new(env).freeze
       load_config_from_disk {|yaml| self.yaml = yaml.freeze }
+      detect_revision!
       init_logging!
       init_backend!
       logger.info(sprintf('Initializing Honeybadger Error Tracker for Ruby. Ship it! version=%s framework=%s', Honeybadger::VERSION, detected_framework))
       logger.warn('Entering development mode: data will not be reported.') if dev? && backend.kind_of?(Backend::Null)
-      if valid? && !ping
-        logger.warn('Failed to connect to Honeybadger service -- please verify that api.honeybadger.io is reachable (connection will be retried).')
-      end
       self
     end
 
@@ -139,10 +142,6 @@ module Honeybadger
       !self[:env] || !dev?
     end
 
-    def valid?
-      self[:api_key].to_s =~ /\S/
-    end
-
     def debug?
       !!self[:debug]
     end
@@ -239,14 +238,6 @@ module Honeybadger
       @root_regexp = Regexp.new("^#{ Regexp.escape(root) }")
     end
 
-    def ping
-      if result = send_ping
-        return true
-      end
-
-      false
-    end
-
     def detected_framework
       if self[:framework] =~ NOT_BLANK
         self[:framework].to_sym
@@ -273,6 +264,11 @@ module Honeybadger
 
     private
 
+    def detect_revision!
+      return if self[:revision]
+      set(:revision, Util::Revision.detect(self[:root]))
+    end
+
     # Internal: Optional path to honeybadger.log log file.
     #
     # Returns the Pathname log path if a log path was specified.
@@ -369,33 +365,6 @@ module Honeybadger
       obj.map(&:to_sym).include?(value.to_sym)
     end
 
-    def ping_payload
-      {
-        version: VERSION,
-        framework: framework_name,
-        environment: self[:env],
-        hostname: self[:hostname],
-        config: to_hash
-      }
-    end
-
-    def send_ping
-      payload = ping_payload
-      debug { sprintf('ping payload=%s', payload.to_json.dump) }
-      response = backend.notify(:ping, payload)
-      if response.success?
-        debug { sprintf('ping response=%s', response.body.dump) }
-        JSON.parse(response.body)
-      else
-        warn do
-          msg = sprintf('ping failure code=%s', response.code)
-          msg << sprintf(' message=%s', response.message.dump) if response.message =~ NOT_BLANK
-          msg
-        end
-        nil
-      end
-    end
-
     def locate_absolute_path(path, root)
       path = Pathname.new(path.to_s)
       if path.absolute?

data/lib/honeybadger/config/defaults.rb

@@ -46,6 +46,11 @@ module Honeybadger
         default: Dir.pwd,
         type: String
       },
+      revision: {
+        description: 'The git revision of the project.',
+        default: nil,
+        type: String
+      },
       hostname: {
         description: 'The hostname of the current box.',
         default: Socket.gethostname,

data/lib/honeybadger/notice.rb

@@ -185,6 +185,7 @@ module Honeybadger
         request: @request,
         server: {
           project_root: s(config[:root]),
+          revision: s(config[:revision]),
           environment_name: s(config[:env]),
           hostname: s(config[:hostname]),
           stats: stats,

data/lib/honeybadger/util/revision.rb

@@ -0,0 +1,34 @@
+module Honeybadger
+  module Util
+    class Revision
+      class << self
+        def detect(root = Dir.pwd)
+          from_heroku ||
+            from_capistrano(root) ||
+            from_git
+        end
+
+        private
+
+        # Requires (currently) alpha platform feature
+        # `heroku labs:enable runtime-dyno-metadata`
+        #
+        # See https://devcenter.heroku.com/articles/dyno-metadata
+        def from_heroku
+          ENV['HEROKU_SLUG_COMMIT']
+        end
+
+        def from_capistrano(root)
+          file = File.join(root, 'REVISION')
+          return nil unless File.file?(file)
+          File.read(file).strip rescue nil
+        end
+
+        def from_git
+          return nil unless File.directory?('.git')
+          `git rev-parse HEAD`.strip rescue nil
+        end
+      end
+    end
+  end
+end

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # Public: The current String Honeybadger version.
-  VERSION = '3.0.0.beta4'.freeze
+  VERSION = '3.0.0.beta5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta4
+  version: 3.0.0.beta5
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies: []
 description: Make managing application errors a more pleasant experience.
 email:
@@ -75,6 +75,7 @@ files:
 - lib/honeybadger/util/http.rb
 - lib/honeybadger/util/request_hash.rb
 - lib/honeybadger/util/request_payload.rb
+- lib/honeybadger/util/revision.rb
 - lib/honeybadger/util/sanitizer.rb
 - lib/honeybadger/util/stats.rb
 - lib/honeybadger/version.rb