scrolls 0.0.2 → 0.0.3

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/scrolls.rb

@@ -17,6 +17,7 @@ module Scrolls
     extend self
 
     def start
+      $stdout.sync = $stderr.sync = true
       log(:log => true, :start => true)
     end
 
@@ -24,37 +25,28 @@ module Scrolls
       @mtx ||= Mutex.new
     end
 
-    def sync_stdout
-      $stdout.sync = true
-      $stdout
-    end
-
-    def sync_stderr
-      $stderr.sync = true
-      $stderr
-    end
-
-    def stdout
-      @stdout ||= sync_stdout
-    end
-
-    def stderr
-      @stderr ||= sync_stderr
+    def write(data)
+      msg = unparse(data)
+      mtx.synchronize do
+        $stdout.puts(msg)
+      end
     end
 
     def unparse(data)
       data.map do |(k, v)|
         if (v == true)
           k.to_s
-        elsif (v == false)
-          "#{k}=false"
-        elsif v.is_a?(String) # escape and quote v with ' or \ or multiple words
-          v = v.gsub(/\\|'/) { |c| "\\#{c}" }
-          "#{k}='#{v}'"
         elsif v.is_a?(Float)
           "#{k}=#{format("%.3f", v)}"
+        elsif v.nil?
+          nil
         else
-          "#{k}=#{v}"
+          v_str = v.to_s
+          if (v_str =~ /^[a-zA-Z0-9\:\.\-\_\/\@]+$/)
+            "#{k}=#{v_str}"
+          else
+            "#{k}=\"#{v_str.sub(/".*/, "...")}\""
+          end
         end
       end.compact.join(" ")
     end
@@ -100,15 +92,5 @@ module Scrolls
         ))
       end
     end
-
-    private
-
-    def write(data, output=stdout)
-      msg = unparse(data)
-      mtx.synchronize do
-        output.puts(msg)
-        output.flush
-      end
-    end
   end
 end

metadata

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