bixby-common 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89822f2ea4d08e7cbb1ae43e46f272c4d2604de2
-  data.tar.gz: 3ac4db2fee93fd1047a3d24512d31b5fdc211648
+  metadata.gz: 986c24c212251c5f8f48d025925f3cbf16066c83
+  data.tar.gz: d61e2f50e64278e4cab3d38f2a113bcab4d9d08c
 SHA512:
-  metadata.gz: c23a2ef1014f94b75f235180ab0bd5c266370e23f453d7ec4cb6263022e338271432bb3b60ee043d5164b1fb1c7e4eb92f56de56d3390203f599a4a93567339c
-  data.tar.gz: 4aedbf8ff1db64ac4f2011c4229b99b8b4e348ecb41e2438ff3dc704e1d3a2e1886e1fe2c1ff5d8dda67b13ee90d520fceaa5530e20e7e4589e98d602d21aec9
+  metadata.gz: d09ab68cbad6dfd2e9dce62c39c0739dabf0f19bcb44c75b69bb024e77fac257a321dd319ca965fad60aa3fedbd08a5939513e8b0eb0300129cdf1e9ea5d766a
+  data.tar.gz: 3f26eabf6378d1cc9f1a21609b65b19b19a404d5b33310ae485032cb7c46dc710ea8e1257db53141a7f5adcde164e631c9b0d6865ef1b769b8f959df5ec2e7a2

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/bixby-common.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-common 0.7.0 ruby lib
+# stub: bixby-common 0.7.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/bixby-common/util/log.rb

@@ -15,9 +15,14 @@ module Bixby
       def gems_regex
         return @gems_regex if @gems_regex
         gems_paths = (Gem.path | [Gem.default_dir]).map { |p| Regexp.escape(p) }
+        gems_paths << "#{Gem.path.first}/bundler" # include path for gems installed via git repo
         @gems_regex = %r{(#{gems_paths.join('|')})/gems/([^/]+)-([\w.]+)/(.*)}
       end
 
+      def bin_regex
+        @bin_regex ||= %r{#{Gem.path.first}/(bin/.*)$}
+      end
+
       def ruby_regex
         @ruby_regex ||= %r{^#{ENV["MY_RUBY_HOME"]}/lib(/.*?)?/ruby/[\d.]+/(.*)$}
       end
@@ -34,7 +39,7 @@ module Bixby
           end
         end
 
-        if logger.parent then
+        if logger.respond_to?(:parent) && logger.parent then
           return console_appender?(logger.parent)
         end
 
@@ -76,6 +81,11 @@ module Bixby
             end
             last_gem = gem_name
 
+          elsif e =~ Log.bin_regex then
+            next if exclude_gems
+            rel_path = $1
+            s << "    #{rel_path}"
+
           elsif e =~ Log.ruby_regex then
             next if exclude_gems
             last_gem = nil

data/test/util/log_test.rb

@@ -46,6 +46,31 @@ class TestLog < TestCase
     end
   end
 
+  def test_console?
+    Logging::Logger.root.clear_appenders
+    refute Bixby::Log.console?(Logging::Logger.root)
+  end
+
+  def test_cleanup_ex
+    ex = nil
+    begin
+      raise "foobar had a problem"
+    rescue Exception => ex
+    end
+
+    assert ex
+
+    Logging::Logger.root.clear_appenders
+    assert_kind_of Exception, Bixby::Log.clean_ex_for_console(ex, Logging::Logger.root)
+
+    str = Bixby::Log.clean_ex(ex)
+    assert str
+    assert_kind_of String, str
+
+    assert str.split(/\n/).first =~ /foobar had a problem/
+    refute str.include? "/gems/"
+  end
+
 end # TestLog
 
 end # Test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bixby-common
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chetan Sarva