sentry-raven 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69cb623c7ac9a07889b6ae03ec5444319e191f8f
-  data.tar.gz: 8369bebd8ccf68813e9b036efe138d8dfbde4bac
+  metadata.gz: dccadb5ecbfd08ce2f10b61d81cfde82d980751e
+  data.tar.gz: fa8760022edb8215192bc6d2a2317443dd0d5822
 SHA512:
-  metadata.gz: e1ba87c6185709d7933339e40688a0aa4eba22e9377dd37e97e480ead398102d3b058d6cc64af1dc3baeb4f1a5bfb1f630926a49a6030844981f2497888c4516
-  data.tar.gz: 389740e37e3f9e47f7ba50794278e1f656e68cc85f18cefdfd8f07fd4d4ddc15f1b775767d17655c978cc1a348ed3c646e12dc2047fb86f1cddd6e78fe7592d7
+  metadata.gz: 2a45c18169fbf7550dbad9e107b21299640731b4b97243aa7198659bfaa5f9a13cff02b28228c8db0ac03da47c93ba75e8c8adf939a457ba226c38190456e897
+  data.tar.gz: ab542dc0fbc59a729c3f4b95c0e206a1fc067378d4a99c92cf77603d40872f9aad0acb3c03b3b8c07f8485f36e2617f71422e2b89732ba584d08d9748b045916

data/README.md

@@ -47,7 +47,7 @@ end
 Full documentation and more information on advanced configuration, sending more information, scrubbing sensitive data, and more can be found on [the wiki](https://github.com/getsentry/raven-ruby/wiki).
 
 * [Documentation](https://github.com/getsentry/raven-ruby/wiki)
-* [Bug Tracker](http://github.com/getsentry/raven-ruby/issues>)
-* [Code](http://github.com/getsentry/raven-ruby>)
+* [Bug Tracker](https://github.com/getsentry/raven-ruby/issues>)
+* [Code](https://github.com/getsentry/raven-ruby>)
 * [Mailing List](https://groups.google.com/group/getsentry>)
 * [IRC](irc://irc.freenode.net/sentry>)  (irc.freenode.net, #sentry)

data/lib/raven/base.rb

@@ -21,6 +21,8 @@ if (major == 1 && minor < 9) || (major == 1 && minor == 9 && patch < 2)
 end
 
 module Raven
+  AVAILABLE_INTEGRATIONS = %w[delayed_job railties sidekiq rack rake]
+
   class << self
     # The client object is responsible for delivering formatted data to the Sentry server.
     # Must respond to #send. See Raven::Client.
@@ -169,8 +171,8 @@ module Raven
     #
     # @example
     #   Raven.user_context('id' => 1, 'email' => 'foo@example.com')
-    def user_context(options = {})
-      self.context.user = options
+    def user_context(options = nil)
+      self.context.user = options || {}
     end
 
     # Bind tags context. Merges with existing context (if any).
@@ -180,8 +182,8 @@ module Raven
     #
     # @example
     #   Raven.tags_context('my_custom_tag' => 'tag_value')
-    def tags_context(options = {})
-      self.context.tags.merge!(options)
+    def tags_context(options = nil)
+      self.context.tags.merge!(options || {})
     end
 
     # Bind extra context. Merges with existing context (if any).
@@ -190,8 +192,8 @@ module Raven
     #
     # @example
     #   Raven.extra_context('my_custom_data' => 'value')
-    def extra_context(options = {})
-      self.context.extra.merge!(options)
+    def extra_context(options = nil)
+      self.context.extra.merge!(options || {})
     end
 
     def rack_context(env)
@@ -201,23 +203,39 @@ module Raven
       self.context.rack_env = env
     end
 
-    # Injects various integrations
+    # Injects various integrations. Default behavior: inject all available integrations
     def inject
-      available_integrations = %w[delayed_job railties sidekiq rack rake]
-      integrations_to_load = available_integrations & Gem.loaded_specs.keys
+      inject_only(*Raven::AVAILABLE_INTEGRATIONS)
+    end
+
+    def inject_without(*exclude_integrations)
+      include_integrations = Raven::AVAILABLE_INTEGRATIONS - exclude_integrations.map(&:to_s)
+      inject_only(*include_integrations)
+    end
+
+    def inject_only(*only_integrations)
+      only_integrations = only_integrations.map(&:to_s)
+      integrations_to_load = Raven::AVAILABLE_INTEGRATIONS & only_integrations
+      not_found_integrations = only_integrations - integrations_to_load
+      if not_found_integrations.any?
+        self.logger.warn "Integrations do not exist: #{not_found_integrations.join ', '}"
+      end
+      integrations_to_load &= Gem.loaded_specs.keys
       # TODO(dcramer): integrations should have some additional checks baked-in
       # or we should break them out into their own repos. Specifically both the
       # rails and delayed_job checks are not always valid (i.e. Rails 2.3) and
       # https://github.com/getsentry/raven-ruby/issues/180
       integrations_to_load.each do |integration|
-        begin
-          require "raven/integrations/#{integration}"
-        rescue Exception => error
-          self.logger.warn "Unable to load raven/integrations/#{integration}: #{error}"
-        end
+        load_integration(integration)
       end
     end
 
+    def load_integration(integration)
+      require "raven/integrations/#{integration}"
+    rescue Exception => error
+      self.logger.warn "Unable to load raven/integrations/#{integration}: #{error}"
+    end
+
     # For cross-language compat
     alias :captureException :capture_exception
     alias :captureMessage :capture_message
@@ -228,9 +246,9 @@ module Raven
 
     def install_at_exit_hook(options)
       at_exit do
-        if $ERROR_INFO
-          logger.debug "Caught a post-mortem exception: #{$ERROR_INFO.inspect}"
-          capture_exception($ERROR_INFO, options)
+        if $!
+          logger.debug "Caught a post-mortem exception: #{$!.inspect}"
+          capture_exception($!, options)
         end
       end
     end

data/lib/raven/configuration.rb

@@ -1,4 +1,3 @@
-require 'certifi'
 require 'logger'
 require 'uri'
 
@@ -118,7 +117,6 @@ module Raven
       self.excluded_exceptions = IGNORE_DEFAULT
       self.processors = [Raven::Processor::RemoveCircularReferences, Raven::Processor::UTF8Conversion, Raven::Processor::SanitizeData]
       self.ssl_verification = true
-      self.ssl_ca_file = Certifi.where
       self.encoding = 'gzip'
       self.timeout = 1
       self.open_timeout = 1

data/lib/raven/event.rb

@@ -26,7 +26,7 @@ module Raven
     attr_reader :id
     attr_accessor :project, :message, :timestamp, :time_spent, :level, :logger,
       :culprit, :server_name, :release, :modules, :extra, :tags, :context, :configuration,
-      :checksum
+      :checksum, :fingerprint
 
     def initialize(init = {})
       @configuration = Raven.configuration
@@ -37,7 +37,7 @@ module Raven
       @timestamp     = Time.now.utc
       @time_spent    = nil
       @level         = :error
-      @logger        = 'root'
+      @logger        = ''
       @culprit       = nil
       @server_name   = @configuration.server_name || get_hostname
       @release       = @configuration.release
@@ -46,6 +46,7 @@ module Raven
       @extra         = {}
       @tags          = {}
       @checksum      = nil
+      @fingerprint   = nil
 
       yield self if block_given?
 
@@ -101,12 +102,13 @@ module Raven
         :time_spent => @time_spent,
         :level => @level,
         :project => @project,
-        :logger => @logger,
         :platform => PLATFORM,
       }
+      data[:logger] = @logger if @logger
       data[:culprit] = @culprit if @culprit
       data[:server_name] = @server_name if @server_name
       data[:release] = @release if @release
+      data[:fingerprint] = @fingerprint if @fingerprint
       data[:modules] = @modules if @modules
       data[:extra] = @extra if @extra
       data[:tags] = @tags if @tags
@@ -164,9 +166,15 @@ module Raven
     def self.add_exception_interface(evt, exc)
       evt.interface(:exception) do |exc_int|
         exceptions = [exc]
+        context = Set.new [exc.object_id]
         while exc.respond_to?(:cause) && exc.cause
           exceptions << exc.cause
           exc = exc.cause
+          # TODO(dcramer): ideally this would log to inform the user
+          if context.include?(exc.object_id)
+            break
+          end
+          context.add(exc.object_id)
         end
         exceptions.reverse!
 

data/lib/raven/integrations/rack.rb

@@ -23,8 +23,8 @@ module Raven
   class Rack
 
     def self.capture_type(exception, env, options = {})
-      if env['requested_at']
-        options[:time_spent] = Time.now - env['requested_at']
+      if env['raven.requested_at']
+        options[:time_spent] = Time.now - env['raven.requested_at']
       end
       Raven.capture_type(exception, options) do |evt|
         evt.interface :http do |int|
@@ -47,7 +47,7 @@ module Raven
 
       # store the current environment in our local context for arbitrary
       # callers
-      env['requested_at'] = Time.now
+      env['raven.requested_at'] = Time.now
       Raven.rack_context(env)
 
       begin
@@ -60,7 +60,7 @@ module Raven
         raise
       end
 
-      error = env['rack.exception'] || env['sinatra.error']
+      error = env['rack.exception'] || env['sinatra.error'] || env['action_dispatch.exception']
 
       Raven::Rack.capture_exception(error, env) if error
 

data/lib/raven/integrations/rails/active_job.rb

@@ -7,7 +7,14 @@ module Raven
             # Do not capture exceptions when using Sidekiq so we don't capture
             # The same exception twice.
             unless self.class.queue_adapter.to_s == 'ActiveJob::QueueAdapters::SidekiqAdapter'
-              Raven.capture_exception(exception, :extra => { :active_job => self.class.name })
+              Raven.capture_exception(exception, :extra => {
+                :active_job => self.class.name,
+                :arguments => arguments,
+                :scheduled_at => scheduled_at,
+                :job_id => job_id,
+                :provider_job_id => provider_job_id,
+                :locale => locale,
+              })
               raise exception
             end
           end

data/lib/raven/processor/sanitizedata.rb

@@ -5,6 +5,7 @@ module Raven
     INT_MASK = 0
     DEFAULT_FIELDS = %w(authorization password passwd secret ssn social(.*)?sec)
     CREDIT_CARD_RE = /^(?:\d[ -]*?){13,16}$/
+    REGEX_SPECIAL_CHARACTERS = %w(. $ ^ { [ ( | ) * + ?)
 
     attr_accessor :sanitize_fields, :sanitize_credit_cards
 
@@ -23,7 +24,7 @@ module Raven
         process(v)
       elsif v.is_a?(Array)
         v.map{|a| sanitize(k, a)}
-      elsif k == 'query_string'
+      elsif k.to_s == 'query_string'
         sanitize_query_string(v)
       elsif v.is_a?(Integer) && matches_regexes?(k,v)
         INT_MASK
@@ -55,7 +56,17 @@ module Raven
     end
 
     def fields_re
-      @fields_re ||= /(#{(DEFAULT_FIELDS | sanitize_fields).join("|")})/i
+      @fields_re ||= /#{(DEFAULT_FIELDS | sanitize_fields).map do |f|
+        use_boundary?(f) ? "\\b#{f}\\b" : f
+      end.join("|")}/i
+    end
+
+    def use_boundary?(string)
+      !DEFAULT_FIELDS.include?(string) && !special_characters?(string)
+    end
+
+    def special_characters?(string)
+      REGEX_SPECIAL_CHARACTERS.select { |r| string.include?(r) }.any?
     end
 
     def parse_json_or_nil(string)

data/lib/raven/version.rb

@@ -1,3 +1,3 @@
 module Raven
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/lib/sentry-raven-without-integrations.rb

@@ -0,0 +1 @@
+require 'raven/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-raven
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
-- !ruby/object:Gem::Dependency
-  name: certifi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -158,8 +144,9 @@ files:
 - lib/raven/transports/http.rb
 - lib/raven/transports/udp.rb
 - lib/raven/version.rb
+- lib/sentry-raven-without-integrations.rb
 - lib/sentry-raven.rb
-homepage: http://github.com/getsentry/raven-ruby
+homepage: https://github.com/getsentry/raven-ruby
 licenses:
 - Apache-2.0
 metadata: {}
@@ -179,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A gem that provides a client interface for the Sentry error logger