cabin 0.4.1 → 0.4.2

data/lib/cabin/channel.rb

@@ -3,6 +3,7 @@ require "cabin/namespace"
 require "cabin/timer"
 require "cabin/context"
 require "cabin/outputs/stdlib-logger"
+require "cabin/outputs/io"
 require "cabin/metrics"
 require "logger"
 
@@ -80,6 +81,8 @@ class Cabin::Channel
     # Wrap ruby stdlib Logger if given.
     if output.is_a?(::Logger)
       output = Cabin::Outputs::StdlibLogger.new(output)
+    elsif output.is_a?(::IO)
+      output = Cabin::Outputs::IO.new(output)
     end
     @outputs << output
     # TODO(sissel): Return a method or object that allows you to easily

data/lib/cabin/outputs/io.rb

@@ -0,0 +1,37 @@
+require "cabin"
+require "json"
+
+# Wrap IO objects with a reasonable log output. 
+#
+# If the IO instance is attached to a TTY, the output will try to be a bit more
+# human-friendly in this format:
+#
+#     message {json data}
+#
+# If the IO instance is not attached to a TTY, the output will be the JSON
+# representation of the event:
+#
+#     { "timestamp": ..., "message": message, ... }
+class Cabin::Outputs::IO
+  public
+  def initialize(io)
+    @io = io
+  end # def initialize
+
+  # Receive an event
+  public
+  def <<(event)
+    if @io.tty?
+      data = event.clone
+      # delete things from the 'data' portion that's not really data.
+      data.delete(:message)
+      data.delete(:timestamp)
+      message = "#{event[:message]} #{data.to_json}"
+
+      @io.puts(message)
+      @io.flush if @io.tty?
+    else
+      @io.puts(event.to_json)
+    end
+  end # def <<
+end # class Cabin::Outputs::StdlibLogger

data/test/test_logging.rb

@@ -139,4 +139,15 @@ describe Cabin::Channel do
       @logger.info("foo", { "foo" => "bar" }, "bar")
     end
   end
+
+  test "output to queue" do
+    require "thread"
+    queue = Queue.new
+    @logger.subscribe(queue)
+
+    @logger.info("Hello world")
+    event = queue.pop
+    assert_equal("Hello world", event[:message])
+    assert_equal(:info, event[:level])
+  end
 end # describe Cabin::Channel do

data/test/test_metrics.rb

@@ -56,7 +56,7 @@ describe Cabin::Metrics do
     30.times do |i|
       assert_equal(i, timer.value)
       assert_equal(i, timer.to_hash[:count])
-      timer.time { true }
+      timer.time { sleep(0.01) }
       assert(timer.to_hash[:total] > 0, "total should be nonzero")
       assert(timer.to_hash[:mean] > 0, "mean should be nonzero")
       assert(timer.to_hash[:max] > 0, "max should be nonzero")
@@ -69,6 +69,7 @@ describe Cabin::Metrics do
       assert_equal(i, timer.value)
       assert_equal(i, timer.to_hash[:count])
       t = timer.time
+      sleep(0.01)
       t.stop
       assert(timer.to_hash[:total] > 0, "total should be nonzero")
       assert(timer.to_hash[:mean] > 0, "mean should be nonzero")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cabin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &5144860 !ruby/object:Gem::Requirement
+  requirement: &17771920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5144860
+  version_requirements: *17771920
 description: This is an experiment to try and make logging more flexible and more
   consumable. Plain text logs are bullshit, let's emit structured and contextual logs.
   Metrics, too!
@@ -32,32 +32,33 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cabin/inspectable.rb
-- lib/cabin/context.rb
-- lib/cabin/metric.rb
-- lib/cabin/timer.rb
-- lib/cabin/outputs/stdlib-logger.rb
-- lib/cabin/outputs/em/stdlib-logger.rb
-- lib/cabin/mixins/logger.rb
-- lib/cabin/mixins/dragons.rb
-- lib/cabin/mixins/CAPSLOCK.rb
-- lib/cabin/namespace.rb
-- lib/cabin/metrics/gauge.rb
 - lib/cabin/metrics/histogram.rb
 - lib/cabin/metrics/timer.rb
+- lib/cabin/metrics/gauge.rb
 - lib/cabin/metrics/meter.rb
 - lib/cabin/metrics/counter.rb
-- lib/cabin/metrics.rb
 - lib/cabin/publisher.rb
 - lib/cabin/channel.rb
+- lib/cabin/mixins/logger.rb
+- lib/cabin/mixins/dragons.rb
+- lib/cabin/mixins/CAPSLOCK.rb
+- lib/cabin/timer.rb
+- lib/cabin/metric.rb
+- lib/cabin/metrics.rb
+- lib/cabin/namespace.rb
+- lib/cabin/inspectable.rb
+- lib/cabin/outputs/io.rb
+- lib/cabin/outputs/stdlib-logger.rb
+- lib/cabin/outputs/em/stdlib-logger.rb
+- lib/cabin/context.rb
 - lib/cabin.rb
 - examples/fibonacci-timing.rb
 - examples/sinatra-logging.rb
 - examples/sample.rb
 - examples/metrics.rb
 - test/test_logging.rb
-- test/minitest-patch.rb
 - test/test_metrics.rb
+- test/minitest-patch.rb
 - test/all.rb
 - LICENSE
 - CHANGELIST
@@ -84,8 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Experiments in structured and contextual logging
 test_files: []
+has_rdoc: