chainsaw 0.0.5 → 0.0.6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 ljfauscett
+Copyright (c) 2012 the fucking authors
 
 MIT License
 

data/README.md

@@ -1,6 +1,6 @@
 # Chainsaw
 
-Parses a log file and returns lines matching the time period provided.
+Parses a log file and returns lines matching the time period provided. Chainsaw tries to be smart about determining the log format and parsing it accordingly. See the list of currently supported formats below.
 
 Chronic is used to parse the time strings, so any format chronic
 supports, chainsaw supports. A list of supported formats can
@@ -47,6 +47,21 @@ If you want to print a line and wait for input (press return) before moving to t
 Chainsaw will output the found log lines to a file on the system if you specify with `-o FILENAME`.
 
     > chainsaw access.log yesterday -o yesterday.log
+    
+## Supported log formats (we think)
+
+* syslog
+* apache/nginx access (CLF)
+* apache error
+* nginx error
+* rack
+* rails
+* django
+* mongodb
+* redis
+* puppet
+* python logger
+* ruby logger
 
 ## Contributing
 

data/Rakefile

@@ -6,3 +6,5 @@ Rake::TestTask.new do |t|
     t.libs << 'test'
     t.test_files = FileList['test/*_test.rb']
 end
+
+task :default => :test

data/lib/chainsaw/core_extensions.rb

@@ -0,0 +1,9 @@
+Range.class_eval do
+
+  unless method_defined?(:cover?)
+    def cover?(elem)
+      include?(elem)
+    end
+  end
+
+end

data/lib/chainsaw/detector.rb

@@ -1,90 +1,83 @@
 module Chainsaw
   class Detector
-
-    CLF_PATTERN          = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} (?:-|[^ ]+) (?:-|[^ ]+) \[(\d{2}\/[a-z]{3}\/\d{4}:\d{2}:\d{2}:\d{2} -\d{4})\]/i
-    APACHE_ERROR_PATTERN = /^\[([a-z]{3} [a-z]{3} \d{2} \d{2}:\d{2}:\d{2} \d{4})\]/i
-    NGINX_ERROR_PATTERN  = /^(\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2})/i
-    RUBY_LOGGER_PATTERN  = /^[a-z]{1}, \[(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})\.\d+ #\d+\]/i
-    RAILS_PATTERN        = /^started [a-z]+ "[^"]+" for \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} at (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} -\d{4})/i
-    SYSLOG_PATTERN       = /^([a-z]{3}  ?\d{1,2} \d{2}:\d{2}:\d{2})/i
-    REDIS_PATTERN        = /^\[\d+\]  ?(\d{1,2} [a-z]{3} \d{2}:\d{2}:\d{2})/i
-    PUPPET_PATTERN       = /^\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\]/i
-    MONGODB_PATTERN      = /^(\w{3} \w{3} \d{2} \d{2}:\d{2}:\d{2})/i
-    RACK_PATTERN         = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} (?:-|[^ ]+) (?:-|[^ ]+) \[(\d{2}\/[a-z]{3}\/\d{4} \d{2}:\d{2}:\d{2})\]/i
-    PYTHON_PATTERN       = /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/i
-    DJANGO_PATTERN       = /^\[(\d{2}\/[a-z]{3}\/\d{4} \d{2}:\d{2}:\d{2})\]/i
+    PATTERNS = {
+      :clf =>  {
+        :pattern     => /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} (?:-|[^ ]+) (?:-|[^ ]+) \[(\d{2}\/[a-z]{3}\/\d{4}:\d{2}:\d{2}:\d{2} -\d{4})\]/i,
+        :time_format => '%d/%b/%Y:%H:%M:%S %z'
+      },
+      :apache_error => {
+        :pattern     => /^\[([a-z]{3} [a-z]{3} \d{2} \d{2}:\d{2}:\d{2} \d{4})\]/i,
+        :time_format => '%a %b %d %H:%M:%S %Y'
+      },
+      :nginx_error => {
+        :pattern     => /^(\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2})/i,
+        :time_format => '%Y/%m/%d %H:%M:%S'
+      },
+      :ruby_logger => {
+        :pattern     => /^[a-z]{1}, \[(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})\.\d+ #\d+\]/i,
+        :time_format => '%Y-%m-%dT%H:%M:%S'
+      },
+      :rails => {
+        :pattern     => /^started [a-z]+ "[^"]+" for \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} at (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} -\d{4})/i,
+        :time_format => '%Y-%m-%d %H:%M:%S %z'
+      },
+      :syslog => {
+        :pattern     => /^([a-z]{3}  ?\d{1,2} \d{2}:\d{2}:\d{2})/i,
+        :time_format => '%b %e %H:%M:%S'
+      },
+      :redis => {
+        :pattern     => /^\[\d+\]  ?(\d{1,2} [a-z]{3} \d{2}:\d{2}:\d{2})/i,
+        :time_format => '%e %b %H:%M:%S'
+      },
+      :puppet => {
+        :pattern     => /^\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\]/i,
+        :time_format => '%Y-%m-%d %H:%M:%S'
+      },
+      :mongodb => {
+        :pattern     => /^(\w{3} \w{3} \d{2} \d{2}:\d{2}:\d{2})/i,
+        :time_format => '%a %b %d %H:%M:%S'
+      },
+      :rack => {
+        :pattern     => /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} (?:-|[^ ]+) (?:-|[^ ]+) \[(\d{2}\/[a-z]{3}\/\d{4} \d{2}:\d{2}:\d{2})\]/i,
+        :time_format => '%d/%b/%Y %H:%M:%S'
+      },
+      :python => {
+        :pattern     => /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/i,
+        :time_format => '%Y-%m-%d %H:%M:%S'
+      },
+      :django => {
+        :pattern     => /^\[(\d{2}\/[a-z]{3}\/\d{4} \d{2}:\d{2}:\d{2})\]/i,
+        :time_format => '%d/%b/%Y %H:%M:%S'
+      }
+    }
 
     def self.detect(log)
-      format = nil
+      type = nil
 
       log.each_line do |line|
-        format = _detect(line)
-        break unless format.type.nil?
+        type = _detect(line)
+        break unless type.nil?
       end
 
-      if format.nil?
+      if type.nil?
         puts "\033[31mUnable to determine log format :(\033[0m"
         exit
       else
-        format
+        Format.new(type, PATTERNS[type])
       end
     end
 
     def self._detect(line)
-      format = Format.new
-
-      case line
-      when CLF_PATTERN
-        format.type        = 'clf'
-        format.time_format = '%d/%b/%Y:%H:%M:%S %z'
-        format.pattern     = CLF_PATTERN
-      when APACHE_ERROR_PATTERN
-        format.type        = 'apache_error'
-        format.time_format = '%a %b %d %H:%M:%S %Y'
-        format.pattern     = APACHE_ERROR_PATTERN
-      when NGINX_ERROR_PATTERN
-        format.type        = 'nginx_error'
-        format.time_format = '%Y/%m/%d %H:%M:%S'
-        format.pattern     = NGINX_ERROR_PATTERN
-      when RUBY_LOGGER_PATTERN
-        format.type        = 'ruby_logger'
-        format.time_format = '%Y-%m-%dT%H:%M:%S'
-        format.pattern     = RUBY_LOGGER_PATTERN
-      when RAILS_PATTERN
-        format.type        = 'rails'
-        format.time_format = '%Y-%m-%d %H:%M:%S %z'
-        format.pattern     = RAILS_PATTERN
-      when SYSLOG_PATTERN
-        format.type        = 'syslog'
-        format.time_format = '%b %e %H:%M:%S'
-        format.pattern     = SYSLOG_PATTERN
-      when REDIS_PATTERN
-        format.type        = 'redis'
-        format.time_format = '%e %b %H:%M:%S'
-        format.pattern     = REDIS_PATTERN
-      when PUPPET_PATTERN
-        format.type        = 'puppet'
-        format.time_format = '%Y-%m-%d %H:%M:%S'
-        format.pattern     = PUPPET_PATTERN
-      when MONGODB_PATTERN
-        format.type        = 'mongodb'
-        format.time_format = '%a %b %d %H:%M:%S'
-        format.pattern     = MONGODB_PATTERN
-      when RACK_PATTERN
-        format.type        = 'rack'
-        format.time_format = '%d/%b/%Y %H:%M:%S'
-        format.pattern     = RACK_PATTERN
-      when PYTHON_PATTERN
-        format.type        = 'python'
-        format.time_format = '%Y-%m-%d %H:%M:%S'
-        format.pattern     = PYTHON_PATTERN
-      when DJANGO_PATTERN
-        format.type        = 'django'
-        format.time_format = '%d/%b/%Y %H:%M:%S'
-        format.pattern     = DJANGO_PATTERN
+      type = nil
+      
+      PATTERNS.each do |key, value|
+        if line.match(value[:pattern])
+          type = key
+          break
+        end
       end
 
-      format
+      type
     end
 
   end

data/lib/chainsaw/format.rb

@@ -4,7 +4,11 @@ module Chainsaw
     attr_accessor :time_format
     attr_accessor :pattern
 
-    def initialize
+    def initialize(type, attributes = {})
+      @type = type
+      attributes.each do |key, value|
+        send(:"#{key}=", value)
+      end
     end
 
   end

data/lib/chainsaw/version.rb

@@ -1,3 +1,3 @@
 module Chainsaw
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/chainsaw.rb

@@ -5,6 +5,7 @@ require 'optparse'
 require 'chronic'
 
 require 'chainsaw/cli'
+require 'chainsaw/core_extensions'
 require 'chainsaw/format'
 require 'chainsaw/detector'
 require 'chainsaw/filter'

data/test/detector_test.rb

@@ -8,7 +8,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'clf'
+    format.type.must_equal :clf
     time.must_equal Time.local(2012, 8, 26, 7, 42, 20)
   end
 
@@ -17,7 +17,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'apache_error'
+    format.type.must_equal :apache_error
 
     time.must_equal Time.local(2012, 8, 26, 7, 42, 20)
   end
@@ -27,7 +27,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'nginx_error'
+    format.type.must_equal :nginx_error
     time.must_equal Time.local(2012, 8, 29, 7, 48, 59)
   end
 
@@ -36,7 +36,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'ruby_logger'
+    format.type.must_equal :ruby_logger
     time.must_equal Time.local(2012, 9, 1, 11, 21, 26)
   end
 
@@ -45,7 +45,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'rails'
+    format.type.must_equal :rails
     time.must_equal Time.local(2012, 9, 1, 9, 34, 35)
   end
 
@@ -55,7 +55,7 @@ describe Chainsaw::Detector do
     time   = get_time(line, format)
     year = Time.now.year
 
-    format.type.must_equal 'syslog'
+    format.type.must_equal :syslog
     time.must_equal Time.local(2012, 8, 1, 17, 36, 55)
   end
 
@@ -64,7 +64,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'redis'
+    format.type.must_equal :redis
     time.must_equal Time.local(2012, 4, 12, 18, 43, 33)
   end
 
@@ -73,7 +73,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'puppet'
+    format.type.must_equal :puppet
     time.must_equal Time.local(2012, 02, 04, 04, 8, 52)
   end
 
@@ -82,7 +82,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'mongodb'
+    format.type.must_equal :mongodb
     time.must_equal Time.local(2012, 8, 26, 7, 43, 54)
   end
 
@@ -91,7 +91,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'rack'
+    format.type.must_equal :rack
     time.must_equal Time.local(2012, 9, 03, 22, 51, 16)
   end
 
@@ -100,7 +100,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'python'
+    format.type.must_equal :python
     time.must_equal Time.local(2010, 12, 12, 11, 41, 42)
   end
 
@@ -109,7 +109,7 @@ describe Chainsaw::Detector do
     format = Detector.detect(line)
     time   = get_time(line, format)
 
-    format.type.must_equal 'django'
+    format.type.must_equal :django
     time.must_equal Time.local(2012, 9, 03, 21, 49, 47)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chainsaw
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70223282814380 !ruby/object:Gem::Requirement
+  requirement: &70185022060360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223282814380
+  version_requirements: *70185022060360
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70223282813220 !ruby/object:Gem::Requirement
+  requirement: &70185022059220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70223282813220
+  version_requirements: *70185022059220
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70223282812280 !ruby/object:Gem::Requirement
+  requirement: &70185022058220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 0.11.4
   type: :development
   prerelease: false
-  version_requirements: *70223282812280
+  version_requirements: *70185022058220
 description: Filter logfiles based on a time range
 email:
 - tdunn13@gmail.com
@@ -62,6 +62,7 @@ files:
 - chainsaw.gemspec
 - lib/chainsaw.rb
 - lib/chainsaw/cli.rb
+- lib/chainsaw/core_extensions.rb
 - lib/chainsaw/detector.rb
 - lib/chainsaw/filter.rb
 - lib/chainsaw/format.rb