chainsaw 0.0.9 → 0.0.10

data/lib/chainsaw/detector.rb

@@ -55,25 +55,19 @@ module Chainsaw
       }
     }
 
-    def self.detect(log)
-      type = nil
-
-      log.each_line do |line|
-        type = get_type(line)
-        break unless type.nil?
-      end
+    def self.detect(line)
+      type = get_type(line)
+      type.nil? ? nil : Format.new(type, PATTERNS[type])
+    end
 
-      if type.nil?
-        puts "\033[31mUnable to determine log format :(\033[0m"
-        exit
-      else
-        Format.new(type, PATTERNS[type])
-      end
+    def self.undetectable!
+      puts "\033[31mUnable to determine log format :(\033[0m"
+      exit
     end
 
     def self.get_type(line)
       type = nil
-      
+
       PATTERNS.each do |key, value|
         if line.match(value[:pattern])
           type = key

data/lib/chainsaw/filter.rb

@@ -15,19 +15,24 @@ module Chainsaw
       @range      = range
       @options    = options
       @log        = File.open(@logfile)
-      @format     = Detector.detect(@log)
       @line_count = 0
 
-      @log.rewind
-
       self
     end
 
     # Start iterating through the log lines and filtering them accordingly.
     def start
-      @log.each_line do |line|
-        filter    = @options.filter
-        match     = line.match(@format.pattern)
+      @ofilter = @options.filter
+
+      File.open(@logfile).each do |line|
+        if !@detected && @format = Detector.detect(line)
+          @detected = true
+          @log.rewind
+        elsif @format.nil?
+          next
+        end
+
+        match = line.match(@format.pattern)
 
         if match
           timestamp = match[1]
@@ -37,7 +42,7 @@ module Chainsaw
         end
 
         # a match was found if we are filtering additional text, check that too
-        if match && @range.cover?(time) && ( !filter || filter && line.include?(filter) )
+        if match && @range.cover?(time) && ( !@ofilter || @ofilter && line.include?(@ofilter) )
           found(line, timestamp)
         # a match was found and we are outputting non-timestamped lines
         elsif match && @outputting

data/lib/chainsaw/version.rb

@@ -1,3 +1,3 @@
 module Chainsaw
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chainsaw
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic