scrolls 0.0.8 → 0.0.9

data/Rakefile

@@ -1,2 +1,9 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.pattern = "test/test_*.rb"
+end
+
+task :default => :test

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/scrolls.rb

@@ -13,6 +13,10 @@ module Scrolls
     Log.log_exception(data, e)
   end
 
+  def context(data, &blk)
+    Log.set_context(data, &blk)
+  end
+
   module Log
     extend self
 
@@ -30,12 +34,13 @@ module Scrolls
       "debug"     => 7
     }
 
-    attr_accessor :stream
+    attr_accessor :stream, :context
 
     def start(out = nil)
       # This allows log_exceptions below to pick up the defined output,
       # otherwise stream out to STDERR
       @defined = out.nil? ? false : true
+
       sync_stream(out)
     end
 
@@ -53,7 +58,11 @@ module Scrolls
       if log_level_ok?(data[:level])
         msg = unparse(data)
         mtx.synchronize do
-          @stream.puts(msg)
+          begin
+            @stream.puts(msg)
+          rescue NoMethodError => e
+            puts "You need to start your logger, `Scrolls::Log.start`"
+          end
         end
       end
     end
@@ -78,16 +87,22 @@ module Scrolls
     end
 
     def log(data, &blk)
+      if @context
+        logdata = @context.merge(data)
+      else
+        logdata = data
+      end
+
       unless blk
-        write(data)
+        write(logdata)
       else
         start = Time.now
         res = nil
-        log(data.merge(:at => :start))
+        log(logdata.merge(:at => :start))
         begin
           res = yield
         rescue StandardError, Timeout::Error => e
-          log(data.merge(
+          log(logdata.merge(
             :at           => :exception,
             :reraise      => true,
             :class        => e.class,
@@ -97,7 +112,7 @@ module Scrolls
           ))
           raise(e)
         end
-        log(data.merge(:at => :finish, :elapsed => Time.now - start))
+        log(logdata.merge(:at => :finish, :elapsed => Time.now - start))
         res
       end
     end
@@ -130,5 +145,24 @@ module Scrolls
       end
     end
 
+    def set_context(prefix, &blk)
+      # Initialize an empty context if the variable doesn't exist
+      @context = {} unless @context
+      @stash = [] unless @stash
+      @stash << @context
+      # Why isn't this merging
+      @context = @context.merge(prefix)
+
+      if blk
+        yield
+        @context = @stash.pop
+      end
+    end
+
+    def clear_context
+      @stash = []
+      @context = {}
+    end
+
   end
 end

data/test/test_scrolls.rb

@@ -0,0 +1,31 @@
+require "stringio"
+require "minitest/autorun"
+
+$: << "../lib"
+require "scrolls"
+
+class TestScrollsParser < MiniTest::Unit::TestCase
+  def test_unparse_tags
+    data = {:test => true, :tag => true}
+    assert "test tag" == Scrolls::Log.unparse(data)
+  end
+
+  def test_unparse_strings
+    data = {:test => "strings"}
+    assert "test=strings" == Scrolls::Log.unparse(data)
+
+    data = {:s => "echo 'hello' \"world\""}
+    assert 's="echo \'hello\' ..."' == Scrolls::Log.unparse(data)
+
+    data = {:s => "hello world"}
+    assert 's="hello world"' == Scrolls::Log.unparse(data)
+
+    data = {:s => "hello world\\"}
+    assert 's="hello world\"' == Scrolls::Log.unparse(data)
+  end
+
+  def test_unparse_floats
+    data = {:test => 0.3}
+    assert "test=0.300" == Scrolls::Log.unparse(data)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrolls
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies: []
 description: Logging, easier, more consistent.
 email:
@@ -26,6 +26,7 @@ files:
 - lib/scrolls.rb
 - lib/scrolls/version.rb
 - scrolls.gemspec
+- test/test_scrolls.rb
 homepage: https://github.com/asenchi/scrolls
 licenses: []
 post_install_message: 
@@ -50,4 +51,5 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: When do we log? All the time.
-test_files: []
+test_files:
+- test/test_scrolls.rb