squash_ruby 1.0.1 → 1.1.0

data/README.md

@@ -4,6 +4,8 @@ Squash Client Library: Ruby
 This client library reports exceptions to Squash, the Squarish exception
 reporting and management system.
 
+[![Build Status](https://travis-ci.org/SquareSquash/ruby.png)](https://travis-ci.org/SquareSquash/ruby)
+
 Documentation
 -------------
 
@@ -160,12 +162,13 @@ only one of the following configuration keys:
 
 * `revision_file`: The path to a file storing the SHA1 of the current Git
   revision. This is the revision of the code that is currently running.
+* `revision`: The 40-character SHA1 of the current deployed revision.
 * `repository_root`: The path to the working directory of the Git repository
   that is currently running. Use this option if your deployed code is a working
   Git repository.
 
-By default, `repository_root` is assumed and is set to `Dir.getwd`.
-`revision_file` overrides `repository_root`.
+By default, `repository_root` is assumed and is set to `Dir.getwd`. Other
+options override `repository_root`.
 
 ### Error Transmission
 

data/lib/squash/ruby.rb

@@ -382,7 +382,7 @@ module Squash
 
     def self.prepare_backtrace(bt)
       if defined?(JRuby)
-        bt.map do |element|
+        bt.map(&:strip).map do |element|
           if element =~ /^((?:[a-z0-9_$]+\.)*(?:[a-z0-9_$]+))\.(\w+)\((\w+.java):(\d+)\)$/i
             # special JRuby backtrace element of the form "org.jruby.RubyHash$27.visit(RubyHash.java:1646)"
             {
@@ -392,6 +392,35 @@ module Squash
                 'symbol' => $2,
                 'class'  => $1
             }
+          elsif element =~ /^(.+?)\.(\w+)\(Native Method\)$/
+            {
+                'type'   => 'java_native',
+                'symbol' => $2,
+                'class'  => $1
+            }
+          elsif element =~ /^rubyjit[$.](.+?)\$\$(\w+?[?!]?)_[0-9A-F]{40}.+?__(?:file|ensure)__\.call\(.+\)$/
+            {
+                'type'   => 'jruby_block',
+                'class'  => $1,
+                'symbol' => $2
+            }
+          elsif element =~ /^rubyjit[$.](.+?)\$\$(\w+?[?!]?)_[0-9A-F]{40}.+?__(?:file|ensure)__\((.+?):(\d+)\)$/
+            {
+                'file'   => $3,
+                'line'   => $4.to_i,
+                'symbol' => "#{$1}##{$2}"
+            }
+          elsif element =~ /^.+\.call\(.+?(\w+)\.gen\)$/
+            {
+                'type' => 'asm_invoker',
+                'file' => $1 + '.gen'
+            }
+          elsif element =~ /^rubyjit[$.](.+?)\$\$(\w+?[?!]?)_[0-9A-F]{40}.+?__(?:file|ensure)__\((.+?)\)$/
+            {
+                'file'   => $3,
+                'type'   => 'jruby_noline',
+                'symbol' => "#{$1}##{$2}"
+            }
           else
             if element.include?(' at ')
               method, fileline = element.split(' at ')
@@ -460,16 +489,19 @@ module Squash
       elsif instance.kind_of?(Array) && elements_only
         instance.map { |i| valueify(i) }
       else
-        filtered = value_filter(instance)
-        yaml = begin filtered.to_yaml; rescue Exception; nil end
-        json = begin filtered.to_json; rescue Exception; nil end
+        filtered       = value_filter(instance)
+        yaml           = begin filtered.to_yaml; rescue Exception; nil end
+        json           = begin filtered.to_json; rescue Exception; nil end
+        inspect_result = begin filtered.inspect; rescue Exception => e; "[#{e.class}: #{e} raised when calling #inspect]" end
+        to_s_result    = begin filtered.to_s; rescue Exception => e; "[#{e.class}: #{e} raised when calling #to_s]" end
+
         {
             'language'   => 'ruby',
             'class_name' => filtered.class.to_s,
-            'inspect'    => filtered.inspect,
+            'inspect'    => inspect_result,
             'yaml'       => yaml,
             'json'       => json,
-            'to_s'       => (filtered.to_s rescue nil)
+            'to_s'       => to_s_result
         }
       end
     end
@@ -530,7 +562,9 @@ module Squash
 
     # @private
     def self.current_revision
-      revision = if configuration(:revision_file)
+      revision = if configuration(:revision)
+                   configuration(:revision)
+                 elsif configuration(:revision_file)
                    File.read(configuration(:revision_file)).chomp.strip
                  else
                    head_file = File.join(configuration(:repository_root), '.git', 'HEAD')

data/lib/squash/ruby/exception_additions.rb

@@ -34,7 +34,6 @@ class Exception
                 else
                   {}
                 end
-    Squash::Ruby.check_user_data user_data
     super(*args).user_data(user_data)
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squash_ruby
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Tim Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-25 00:00:00 Z
+date: 2013-02-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement