chalk-log 0.1.2 → 0.1.3

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+script: rake test

data/chalk-log.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
+  gem.required_ruby_version = '>= 1.9.3'
   gem.add_dependency 'chalk-config'
   gem.add_dependency 'logging'
   gem.add_dependency 'lspace'

data/lib/chalk-log/layout.rb

@@ -58,13 +58,12 @@ class Chalk::Log::Layout < ::Logging::Layout
       raise Chalk::Log::InvalidArguments.new("Invalid leftover arguments: #{data.inspect}")
     end
 
-    id = action_id
     pid = Process.pid
 
     pretty_print(
       time: timestamp_prefix(time),
       level: Chalk::Log::LEVELS[level],
-      action_id: id,
+      span: span.to_s,
       message: message,
       error: error,
       info: (info && info.merge(contextual_info || {})) || contextual_info,
@@ -74,7 +73,7 @@ class Chalk::Log::Layout < ::Logging::Layout
 
   def pretty_print(spec)
     message = build_message(spec[:message], spec[:info], spec[:error])
-    message = tag(message, spec[:time], spec[:pid], spec[:action_id])
+    message = tag(message, spec[:time], spec[:pid], spec[:span])
     message
   end
 
@@ -153,23 +152,31 @@ class Chalk::Log::Layout < ::Logging::Layout
       dumped = JSON.generate(wrapped)
     end
 
-    dumped[1...-1] # strip off the brackets we added while array-ifying
-  end
+    res = dumped[1...-1] # strip off the brackets we added while array-ifying
+
+    # Bug 6566 in ruby 2.0 (but not 2.1) allows generate() to return an invalid
+    # string when given invalid unicode input. Manually check for it.
+    unless res.valid_encoding?
+      raise ArgumentError.new("invalid byte sequence in UTF-8")
+    end
 
-  def action_id
-    LSpace[:action_id]
+    res
   end
 
   def contextual_info
     LSpace[:'chalk.log.contextual_info']
   end
 
-  def tag(message, time, pid, action_id)
+  def span
+    LSpace[:span] || LSpace[:action_id]
+  end
+
+  def tag(message, time, pid, span)
     return message unless configatron.chalk.log.tagging
 
     metadata = []
     metadata << pid if configatron.chalk.log.pid
-    metadata << action_id if action_id
+    metadata << span if span.length > 0
     prefix = "[#{metadata.join('|')}] " if metadata.length > 0
 
     if configatron.chalk.log.timestamp

data/lib/chalk-log/version.rb

@@ -1,5 +1,5 @@
 module Chalk
   module Log
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/test/functional/formatting.rb

@@ -5,27 +5,40 @@ require 'chalk-log'
 module Critic::Functional
   class LogTest < Test
     def enable_timestamp
-      configatron.chalk.log.stubs(:timestamp).returns(true)
+      configatron.unlock! do
+        configatron.chalk.log.timestamp = true
+      end
     end
 
     def disable_timestamp
-      configatron.chalk.log.stubs(:timestamp).returns(false)
+      configatron.unlock! do
+        configatron.chalk.log.timestamp = false
+      end
     end
 
     def disable_pid
-      configatron.chalk.log.stubs(:pid).returns(false)
+      configatron.unlock! do
+        configatron.chalk.log.pid = false
+      end
     end
 
     def disable_tagging
-      configatron.chalk.log.stubs(:tagging).returns(false)
+      configatron.unlock! do
+        configatron.chalk.log.tagging = false
+      end
     end
 
     before do
       Chalk::Log.init
       Process.stubs(:pid).returns(9973)
+      configatron.temp_start
       disable_timestamp
     end
 
+    after do
+      configatron.temp_end
+    end
+
     class MyClass
       include Chalk::Log
     end
@@ -136,6 +149,34 @@ module Critic::Functional
         end
       end
 
+      it 'logs spans correctly' do
+        enable_timestamp
+        TestSpan = Struct.new(:action_id, :span_id, :parent_id) do
+          def to_s
+            sprintf("%s %s>%s",
+                    action_id,
+                    parent_id.to_s(16).rjust(16,'0'),
+                    span_id.to_s(16).rjust(16,'0'))
+          end
+        end
+        LSpace.with(span: TestSpan.new("action", 0, 0)) do
+          rendered = layout(data: ["llamas"])
+          assert_equal('[1979-04-09 00:00:00.000000] [9973|action 0000000000000000>0000000000000000] llamas', rendered)
+        end
+        LSpace.with(span: TestSpan.new("action", 2, 0)) do
+          rendered = layout(data: ["llamas"])
+          assert_equal('[1979-04-09 00:00:00.000000] [9973|action 0000000000000000>0000000000000002] llamas', rendered)
+        end
+        LSpace.with(span: TestSpan.new("action", 0, 123)) do
+          rendered = layout(data: ["llamas"])
+          assert_equal('[1979-04-09 00:00:00.000000] [9973|action 000000000000007b>0000000000000000] llamas', rendered)
+        end
+        LSpace.with(span: TestSpan.new("action", 2, 123)) do
+          rendered = layout(data: ["llamas"])
+          assert_equal('[1979-04-09 00:00:00.000000] [9973|action 000000000000007b>0000000000000002] llamas', rendered)
+        end
+      end
+
       describe 'faults' do
         it 'shows an appropriate error if the invalid arguments are provided' do
           rendered = layout(data: ['foo', nil])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chalk-log
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chalk-config
@@ -131,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - History.txt
 - LICENSE.txt
@@ -144,7 +145,6 @@ files:
 - lib/chalk-log/logger.rb
 - lib/chalk-log/utils.rb
 - lib/chalk-log/version.rb
-- tddium.yml
 - test/_lib.rb
 - test/_lib/fake.rb
 - test/_lib/fake/event.rb
@@ -164,10 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3360703599458620341
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,10 +173,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3360703599458620341
+      hash: 3516609577492555280
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Chalk::Log makes any class loggable. It provides a logger that can be used

data/tddium.yml

@@ -1,8 +0,0 @@
-:tddium:
-  :ruby_version: ruby-1.9.3-p194
-  :bundler_version: 1.3.5
-  :test_pattern:
-    - "test/wholesome/[^_]*.rb"
-    - "test/unit/[^_]*.rb"
-    - "test/integration/[^_]*.rb"
-    - "test/functional/[^_]*.rb"