scrolls 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c754c2a68b431572505ef7952e6be9c75fcd75
-  data.tar.gz: 36c1c30b50e7782370bb52ae8dda662776e3788c
+  metadata.gz: d28b354cb4e72276125072ef90d2e3805c113f4e
+  data.tar.gz: 5c298b15aa7c13b3f331b8e21fb5449bba573378
 SHA512:
-  metadata.gz: f2b0754716f62af7b741473ad61167c8f9517f5c71e6b5a2968a2e2dfa3cca5cdd399d855ba1e993c35fe423458cc7d883293ea6b67c0b0647b995fb1660710d
-  data.tar.gz: 5320c43a79599e2e0c48de9e2c465a12b43f61bbfb57552205a36e6a3959382735a31322d3b2b69e8682df3f81a4f1e8196ec1162697252f60210962ee9ed398
+  metadata.gz: 6c33ba3926c85e139e5557a056fa3633513cad1be910d6ee509cd8691311a859f1c4ca622135e7d1e3508f8dcb0cecd3f425f2efa15fb64267caf00dce69548f
+  data.tar.gz: 870a0b7e8d4c980e6e750b1ad2dfaf03d7acd2c199aead992c0b1a2f16691ee0e5c3701b5421f7048117b70b47d9d5186ac525def68bf74ff072123e6ad5b301

data/lib/scrolls/log.rb

@@ -86,15 +86,22 @@ module Scrolls
     end
 
     def log(data, &blk)
+      # If we get a string lets bring it into our structure.
+      if data.kind_of? String
+        rawhash = { "log_message" => data }
+      else
+        rawhash = data
+      end
+
       if gc = get_global_context
         ctx = gc.merge(context)
-        logdata = ctx.merge(data)
+        logdata = ctx.merge(rawhash)
       end
 
       # By merging the logdata into the timestamp, rather than vice-versa, we
       # ensure that the timestamp comes first in the Hash, and is placed first
       # on the output, which helps with readability.
-      logdata = { :now => Time.now }.merge(logdata) if add_timestamp
+      logdata = { :now => Time.now.utc }.merge(logdata) if add_timestamp
 
       unless blk
         write(logdata)
@@ -123,8 +130,15 @@ module Scrolls
     def log_exception(data, e)
       sync_stream(STDERR) unless @defined
 
+      # If we get a string lets bring it into our structure.
+      if data.kind_of? String
+        rawhash = { "log_message" => data }
+      else
+        rawhash = data
+      end
+
       if gc = get_global_context
-        logdata = gc.merge(data)
+        logdata = gc.merge(rawhash)
       end
 
       log(logdata.merge(

data/lib/scrolls/parser.rb

@@ -29,7 +29,13 @@ module Scrolls
               v = '"' + v.gsub('\\', '\\\\\\') + '"'
             end
           elsif v =~ /=/
-            v = '"' + 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

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/test_parser.rb

@@ -29,6 +29,14 @@ class TestScrollsParser < Test::Unit::TestCase
     assert_equal 's="hello world"', unparse(data)
     assert_equal data.inspect, parse(unparse(data)).inspect
 
+    data = { s: "hello world".inspect }
+    assert_equal "s='\"hello world\"'", unparse(data)
+    assert_equal data.inspect, parse(unparse(data)).inspect
+
+    data = { s: "hello=world".inspect }
+    assert_equal "s='\"hello=world\"'", unparse(data)
+    assert_equal data.inspect, parse(unparse(data)).inspect
+
     data = { s: "slasher \\" }
     assert_equal 's="slasher \\\\"', unparse(data)
     assert_equal data.inspect, parse(unparse(data)).inspect

data/test/test_scrolls.rb

@@ -160,4 +160,9 @@ class TestScrolls < Test::Unit::TestCase
     iso8601_regexp = "(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])?"
     assert_match(/^now=#{iso8601_regexp} test=foo$/, @out.string)
   end
+
+  def test_logging_strings
+    Scrolls.log("string")
+    assert_equal "log_message=string\n", @out.string
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrolls
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Curt Micol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Logging, easier, more consistent.
 email: