scrolls 0.2.4 → 0.2.5

data/lib/scrolls/log.rb

@@ -101,8 +101,7 @@ module Scrolls
           :exception_id => e.object_id.abs
       ))
       if e.backtrace
-        bt = e.backtrace.reverse
-        bt[0, bt.size-6].each do |line|
+        e.backtrace.each do |line|
           log(logdata.merge(
               :at => "exception",
               :class => e.message,
@@ -118,6 +117,7 @@ module Scrolls
       old = context
       self.context = old.merge(prefix)
       res = yield if block_given?
+    ensure
       self.context = old
       res
     end

data/lib/scrolls/parser.rb

@@ -14,10 +14,19 @@ module Scrolls
           "#{k}=nil"
         elsif v.is_a?(Time)
           "#{k}=#{Time.at(v).strftime("%FT%H:%M:%S%z")}"
-        elsif v.is_a?(String) && v =~ /\\|\"| /
-          v = v.gsub(/\\|"/) { |c| "\\#{c}" }
-          "#{k}=\"#{v}\""
         else
+          v = v.to_s
+          has_single_quote = v.index("'")
+          has_double_quote = v.index('"')
+          if v =~ / /
+            if has_single_quote && has_double_quote
+              v = '"' + v.gsub(/\\|"/) { |c| "\\#{c}" } + '"'
+            elsif has_double_quote
+              v = "'" + v.gsub('\\', '\\\\\\') + "'"
+            else
+              v = '"' + v.gsub('\\', '\\\\\\') + '"'
+            end
+          end
           "#{k}=#{v}"
         end
       end.compact.join(" ")
@@ -28,8 +37,9 @@ module Scrolls
       str = data.dup if data.is_a?(String)
 
       patterns = [
-        /([^= ]+)="([^"\\]*(\\.[^"\\]*)*)"/, # key="\"literal\" escaped val"
-        /([^= ]+)=([^ =]+)/                  # key=value
+        /([^= ]+)="((?:\\.|[^"\\])*)"/, # key="\"literal\" escaped val"
+        /([^= ]+)='((?:\\.|[^'\\])*)'/, # key='\'literal\' escaped val'
+        /([^= ]+)=([^ =]+)/             # key=value
       ]
 
       patterns.each do |pattern|

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/test/test_parser.rb

@@ -21,12 +21,16 @@ class TestScrollsParser < Test::Unit::TestCase
     assert_equal 's="echo \'hello\' \\"world\\""', unparse(data)
     assert_equal data.inspect, parse(unparse(data)).inspect
 
+    data = { s: 'echo "hello"' }
+    assert_equal "s='echo \"hello\"'", unparse(data)
+    assert_equal data.inspect, parse(unparse(data)).inspect
+
     data = { s: "hello world" }
     assert_equal 's="hello world"', unparse(data)
     assert_equal data.inspect, parse(unparse(data)).inspect
 
-    data = { s: "slasher\\" }
-    assert_equal 's="slasher\\\\"', unparse(data)
+    data = { s: "slasher \\" }
+    assert_equal 's="slasher \\\\"', unparse(data)
     assert_equal data.inspect, parse(unparse(data)).inspect
 
     # simple value is unquoted

data/test/test_scrolls.rb

@@ -72,6 +72,18 @@ class TestScrolls < Test::Unit::TestCase
     assert_equal output, @out.string
   end
 
+  def test_context_after_exception
+    begin
+      Scrolls.context(c: 'c') do
+        raise "Error from inside of context"
+      end
+      fail "Exception did not escape context block"
+    rescue => e
+      Scrolls.log(o: 'o')
+      assert_equal "o=o\n", @out.string
+    end
+  end
+
   def test_default_time_unit
     assert_equal "seconds", Scrolls.time_unit
   end
@@ -104,7 +116,10 @@ class TestScrolls < Test::Unit::TestCase
     rescue Exception => e
       Scrolls.log_exception({test: "exception"}, e)
     end
-    @out.truncate(27)
-    assert_equal "test=exception at=exception", @out.string
+
+    oneline_backtrace = @out.string.gsub("\n", 'XX')
+
+    assert_match /test=exception at=exception.*test_log_exception.*XX.*minitest/,
+      oneline_backtrace
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrolls
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies: []
 description: Logging, easier, more consistent.
 email: