sawmill 0.1.15 → 0.1.16

data/lib/sawmill/util/queue.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Sawmill queue utility
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2009 Daniel Azuma
-# 
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,17 +35,17 @@
 
 
 module Sawmill
-  
+
   module Util
-    
-    
+
+
     # A simple queue that optionally provides an upper size limit.
-    
+
     class Queue
-      
-      
+
+
       # Recognized options include:
-      # 
+      #
       # [<tt>:limit</tt>]
       #   Size limit for the queue. If not specified, the queue can grow
       #   arbitrarily large.
@@ -53,7 +53,7 @@ module Sawmill
       #   If set to true, then when an item is added to a full queue, the
       #   oldest item is dropped. If set to false or not specified, then
       #   the new item is not added.
-      
+
       def initialize(opts_={})
         limit_ = opts_[:limit]
         @buffer = limit_ ? ::Array.new(limit_) : []
@@ -61,16 +61,16 @@ module Sawmill
         @pop_ptr = nil
         @drop_oldest = limit_ && opts_[:drop_oldest]
       end
-      
-      
+
+
       # Attempt to push an item on the queue.
-      # 
+      #
       # If the queue is full, then the behavior is determined by the
       # :drop_oldest setting provided to the constructor.
-      # 
+      #
       # Returns true if the object was pushed on the queue, or false if the
       # queue was full.
-      
+
       def enqueue(object_)
         result_ = true
         if @push_ptr
@@ -93,10 +93,10 @@ module Sawmill
         end
         result_
       end
-      
-      
+
+
       # Return the oldest item in the queue, or nil if the queue is empty.
-      
+
       def dequeue
         if @push_ptr
           if @pop_ptr
@@ -113,10 +113,10 @@ module Sawmill
           @buffer.shift
         end
       end
-      
-      
+
+
       # Return an array of the contents of the queue, in order.
-      
+
       def dequeue_all
         if @push_ptr
           if @pop_ptr
@@ -138,10 +138,10 @@ module Sawmill
           ret_
         end
       end
-      
-      
+
+
       # Return the size of the queue, which is 0 if the queue is empty.
-      
+
       def size
         if @push_ptr
           if @pop_ptr
@@ -154,11 +154,11 @@ module Sawmill
           @buffer.size
         end
       end
-      
-      
+
+
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/sawmill/version.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Sawmill version
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2009 Daniel Azuma
-# 
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,12 +41,12 @@ end
 
 
 module Sawmill
-  
+
   # Current gem version, as a frozen string.
   VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../Version').strip.freeze
-  
+
   # Current gem version, as a Versionomy::Value if the versionomy library
   # is available, or as a frozen string if not.
   VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING, :standard) : VERSION_STRING
-  
+
 end

data/test/tc_entry_processors.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Sawmill: tests on entry processors
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2009 Daniel Azuma
-# 
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,18 +40,18 @@ require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/sawmill.rb")
 
 module Sawmill
   module Tests  # :nodoc:
-    
+
     class TestEntryProcessors < ::Test::Unit::TestCase  # :nodoc:
-      
-      
+
+
       def setup
         @entries = ::Sawmill::EntryProcessor::SimpleQueue.new
         @levels = ::Sawmill::STANDARD_LEVELS
       end
-      
-      
+
+
       # Test a basic filter that checks the level
-      
+
       def test_basic_level_filter
         processor_ = ::Sawmill::EntryProcessor::build do
           If(FilterByBasicFields(:level => :WARN), @entries)
@@ -64,10 +64,10 @@ module Sawmill
         assert_equal('Hello 3', @entries.dequeue.message)
         assert_equal(0, @entries.size)
       end
-      
-      
+
+
       # Test a basic filter that checks the progname
-      
+
       def test_basic_progname_filter
         processor_ = ::Sawmill::EntryProcessor::build do
           If(FilterByBasicFields(:progname => 'rails'), @entries)
@@ -79,10 +79,10 @@ module Sawmill
         assert_equal('Hello 2', @entries.dequeue.message)
         assert_equal(0, @entries.size)
       end
-      
-      
+
+
       # Test an "AND" filter
-      
+
       def test_conjunction_and
         processor_ = ::Sawmill::EntryProcessor::build do
           If(And(FilterByBasicFields(:progname => 'rails'),
@@ -96,10 +96,10 @@ module Sawmill
         assert_equal('Hello 2', @entries.dequeue.message)
         assert_equal(0, @entries.size)
       end
-      
-      
+
+
       # Test an "OR" filter
-      
+
       def test_conjunction_or
         processor_ = ::Sawmill::EntryProcessor::build do
           If(Or(FilterByBasicFields(:progname => 'rails'),
@@ -115,10 +115,10 @@ module Sawmill
         assert_equal('Hello 3', @entries.dequeue.message)
         assert_equal(0, @entries.size)
       end
-      
-      
+
+
       # Test a "NOT" filter
-      
+
       def test_boolean_not
         processor_ = ::Sawmill::EntryProcessor::build do
           If(Not(FilterByBasicFields(:progname => 'rails')), @entries)
@@ -131,9 +131,9 @@ module Sawmill
         assert_equal('Hello 3', @entries.dequeue.message)
         assert_equal(0, @entries.size)
       end
-      
-      
+
+
     end
-    
+
   end
 end

data/test/tc_formatter_parser.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Sawmill: tests log file formatting and parsing
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2009 Daniel Azuma
-# 
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,16 +41,16 @@ require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/sawmill.rb")
 
 module Sawmill
   module Tests  # :nodoc:
-    
+
     class TestFormatterParser < ::Test::Unit::TestCase  # :nodoc:
-      
-      
+
+
       def setup
         @entries = []
         @levels = ::Sawmill::STANDARD_LEVELS
       end
-      
-      
+
+
       def _run_test(expected_, opts_={})
         stringio_ = ::StringIO.new
         formatter_ = ::Sawmill::EntryClassifier.new(::Sawmill::Formatter.new(stringio_, opts_))
@@ -61,58 +61,58 @@ module Sawmill
         assert_equal(expected_, formatted_string_)
         stringio_ = ::StringIO.new(formatted_string_)
         parser_ = ::Sawmill::Parser.new(stringio_, nil)
-        @entries.each do |expected_|
-          assert_equal(expected_, parser_.parse_one_entry)
+        @entries.each do |entry_|
+          assert_equal(entry_, parser_.parse_one_entry)
         end
       end
-      
-      
+
+
       # Test message entry
-      
+
       def test_basic_message
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 120000), 'rails', nil, 'Hello')
         _run_test("[INFO 2009-10-20 08:30:45.12 rails .] Hello\n")
       end
-      
-      
+
+
       # Test message with no fractional seconds
-      
+
       def test_message_with_whole_seconds
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 0), 'rails', nil, 'Hello')
         _run_test("[INFO 2009-10-20 08:30:45.00 rails .] Hello\n")
       end
-      
-      
+
+
       # Test multiple message entry
-      
+
       def test_multiple_messages
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 120000), 'rails', nil, 'Hello')
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:ERROR), Time.utc(2009, 10, 20, 8, 30, 46, 980000), 'rails', nil, 'Something bad happened!')
         _run_test("[INFO 2009-10-20 08:30:45.12 rails .] Hello\n[ERROR 2009-10-20 08:30:46.98 rails .] Something bad happened!\n")
       end
-      
-      
+
+
       # Test multi-line message entries
-      
+
       def test_multi_line_messages
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 120000), 'rails', nil, "Multiple\nLines\n")
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:ERROR), Time.utc(2009, 10, 20, 8, 30, 46, 980000), 'rails', nil, "Multiple Lines\\\nwith trailing backslashes\\\\\n")
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:ERROR), Time.utc(2009, 10, 20, 8, 30, 47, 0), 'rails', nil, "More trailing\\\nbackslashes\\\\")
         _run_test("[INFO 2009-10-20 08:30:45.12 rails .] Multiple\\\nLines\\\n\n[ERROR 2009-10-20 08:30:46.98 rails .] Multiple Lines\\\\\\\nwith trailing backslashes\\\\\\\\\\\n\n[ERROR 2009-10-20 08:30:47.00 rails .] More trailing\\\\\\\nbackslashes\\\\\\\\\n")
       end
-      
-      
+
+
       # Test record delimiter entries
-      
+
       def test_record_delimiters
         @entries << ::Sawmill::Entry::BeginRecord.new(@levels.get(:ANY), Time.utc(2009, 10, 20, 8, 30, 45, 120000), 'rails', 'abcdefg')
         @entries << ::Sawmill::Entry::EndRecord.new(@levels.get(:ANY), Time.utc(2009, 10, 20, 8, 30, 46, 980000), 'rails', 'abcdefg')
         _run_test("[ANY 2009-10-20 08:30:45.12 rails ^] BEGIN abcdefg\n[ANY 2009-10-20 08:30:46.98 rails $] END abcdefg\n")
       end
-      
-      
+
+
       # Test attribute entries
-      
+
       def test_attributes
         @entries << ::Sawmill::Entry::BeginRecord.new(@levels.get(:ANY), Time.utc(2009, 10, 20, 8, 30, 45, 110000), 'rails', 'abcdefg')
         @entries << ::Sawmill::Entry::Attribute.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 120000), 'rails', 'abcdefg', 'SIZE', 'small')
@@ -120,26 +120,26 @@ module Sawmill
         @entries << ::Sawmill::Entry::EndRecord.new(@levels.get(:ANY), Time.utc(2009, 10, 20, 8, 30, 46, 990000), 'rails', 'abcdefg')
         _run_test("[ANY 2009-10-20 08:30:45.11 rails ^] BEGIN abcdefg\n[INFO 2009-10-20 08:30:45.12 rails =] SIZE = small\n[INFO 2009-10-20 08:30:46.98 rails =] COLOR + red\\\nand\\\nblue\n[ANY 2009-10-20 08:30:46.99 rails $] END abcdefg\n")
       end
-      
-      
+
+
       # Test message with include_id
-      
+
       def test_message_with_include_id
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 0), 'rails', 'abcdefg', 'Hello 1')
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 100000), 'rails', nil, 'Hello 2')
         _run_test("[INFO 2009-10-20 08:30:45.00 rails abcdefg .] Hello 1\n[INFO 2009-10-20 08:30:45.10 rails .] Hello 2\n", :include_id => true)
       end
-      
-      
+
+
       # Test message where fractional seconds are turned off
-      
+
       def test_message_without_fractional_seconds
         @entries << ::Sawmill::Entry::Message.new(@levels.get(:INFO), Time.utc(2009, 10, 20, 8, 30, 45, 0), 'rails', nil, 'Hello 1')
         _run_test("[INFO 2009-10-20 08:30:45 rails .] Hello 1\n", :fractional_second_digits => 0)
       end
-      
-      
+
+
     end
-    
+
   end
 end