ntail 0.0.8 → 0.0.9

data/Gemfile

@@ -13,4 +13,5 @@ group :development do
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
   gem "geoip", ">= 0"
+  gem "treetop", "~> 1.4.9"
 end

data/Gemfile.lock

@@ -7,10 +7,13 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    polyglot (0.3.1)
     rainbow (1.1)
     rake (0.8.7)
     rcov (0.9.9)
     shoulda (2.11.3)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
     user-agent (1.0.0)
 
 PLATFORMS
@@ -23,4 +26,5 @@ DEPENDENCIES
   rainbow
   rcov
   shoulda
+  treetop (~> 1.4.9)
   user-agent

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/ntail.rb

@@ -21,6 +21,10 @@ require 'ntail/http_version'
 require 'ntail/known_ip_addresses'
 require 'ntail/local_ip_addresses'
 
+# the formatting classes...
+require 'ntail/node.rb'
+require 'ntail/formatting.rb'
+
 # the core classes...
 require 'ntail/log_line'
 require 'ntail/application'

data/lib/ntail/formatting.rb

@@ -0,0 +1,330 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Formatting
+  include Treetop::Runtime
+
+  def root
+    @root ||= :format_string
+  end
+
+  def _nt_format_string
+    start_index = index
+    if node_cache[:format_string].has_key?(index)
+      cached = node_cache[:format_string][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      i1 = index
+      r2 = _nt_token
+      if r2
+        r1 = r2
+      else
+        r3 = _nt_literal
+        if r3
+          r1 = r3
+        else
+          @index = i1
+          r1 = nil
+        end
+      end
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    if s0.empty?
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    end
+
+    node_cache[:format_string][start_index] = r0
+
+    r0
+  end
+
+  module Literal0
+    def value(log_line, color)
+      # context-independent...
+      self.text_value
+    end
+  end
+
+  def _nt_literal
+    start_index = index
+    if node_cache[:literal].has_key?(index)
+      cached = node_cache[:literal][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if index < input_length
+      r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      r0.extend(Literal0)
+      @index += 1
+    else
+      terminal_parse_failure("any character")
+      r0 = nil
+    end
+
+    node_cache[:literal][start_index] = r0
+
+    r0
+  end
+
+  def _nt_token
+    start_index = index
+    if node_cache[:token].has_key?(index)
+      cached = node_cache[:token][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_date
+    if r1
+      r0 = r1
+    else
+      r2 = _nt_referer
+      if r2
+        r0 = r2
+      else
+        r3 = _nt_remote_address
+        if r3
+          r0 = r3
+        else
+          r4 = _nt_request
+          if r4
+            r0 = r4
+          else
+            r5 = _nt_status
+            if r5
+              r0 = r5
+            else
+              r6 = _nt_user_agent
+              if r6
+                r0 = r6
+              else
+                @index = i0
+                r0 = nil
+              end
+            end
+          end
+        end
+      end
+    end
+
+    node_cache[:token][start_index] = r0
+
+    r0
+  end
+
+  module Date0
+    def value(log_line, color)
+      log_line.to_date_s.foreground(color)
+    end
+  end
+
+  def _nt_date
+    start_index = index
+    if node_cache[:date].has_key?(index)
+      cached = node_cache[:date][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%d', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(Date0)
+      @index += 2
+    else
+      terminal_parse_failure('%d')
+      r0 = nil
+    end
+
+    node_cache[:date][start_index] = r0
+
+    r0
+  end
+
+  module Referer0
+    def value(log_line, color)
+      log_line.to_referer_s.foreground(color).inverse
+    end
+  end
+
+  def _nt_referer
+    start_index = index
+    if node_cache[:referer].has_key?(index)
+      cached = node_cache[:referer][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%f', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(Referer0)
+      @index += 2
+    else
+      terminal_parse_failure('%f')
+      r0 = nil
+    end
+
+    node_cache[:referer][start_index] = r0
+
+    r0
+  end
+
+  module RemoteAddress0
+    def value(log_line, color)
+  		"%#{Sickill::Rainbow.enabled ? 15 + 9 : 15}s" % log_line.remote_address.foreground(color)
+    end
+  end
+
+  def _nt_remote_address
+    start_index = index
+    if node_cache[:remote_address].has_key?(index)
+      cached = node_cache[:remote_address][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%a', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(RemoteAddress0)
+      @index += 2
+    else
+      terminal_parse_failure('%a')
+      r0 = nil
+    end
+
+    node_cache[:remote_address][start_index] = r0
+
+    r0
+  end
+
+  module Request0
+    def value(log_line, color)
+  		log_line.to_request_s.foreground(color)
+    end
+  end
+
+  def _nt_request
+    start_index = index
+    if node_cache[:request].has_key?(index)
+      cached = node_cache[:request][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%r', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(Request0)
+      @index += 2
+    else
+      terminal_parse_failure('%r')
+      r0 = nil
+    end
+
+    node_cache[:request][start_index] = r0
+
+    r0
+  end
+
+  module Status0
+    def value(log_line, color)
+      log_line.status.foreground(color)
+    end
+  end
+
+  def _nt_status
+    start_index = index
+    if node_cache[:status].has_key?(index)
+      cached = node_cache[:status][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%s', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(Status0)
+      @index += 2
+    else
+      terminal_parse_failure('%s')
+      r0 = nil
+    end
+
+    node_cache[:status][start_index] = r0
+
+    r0
+  end
+
+  module UserAgent0
+    def value(log_line, color)
+      log_line.to_agent_s.foreground(color)
+    end
+  end
+
+  def _nt_user_agent
+    start_index = index
+    if node_cache[:user_agent].has_key?(index)
+      cached = node_cache[:user_agent][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    if has_terminal?('%u', false, index)
+      r0 = instantiate_node(Node,input, index...(index + 2))
+      r0.extend(UserAgent0)
+      @index += 2
+    else
+      terminal_parse_failure('%u')
+      r0 = nil
+    end
+
+    node_cache[:user_agent][start_index] = r0
+
+    r0
+  end
+
+end
+
+class FormattingParser < Treetop::Runtime::CompiledParser
+  include Formatting
+end
+
+
+# vim:syntax=ruby

data/lib/ntail/formatting.treetop

@@ -0,0 +1,70 @@
+grammar Formatting
+
+  rule format_string
+    (token / literal)+
+  end
+
+  rule literal
+    . {
+      def value(log_line, color)
+        # context-independent...
+        self.text_value
+      end
+    }
+  end
+
+  rule token
+    date / referer / remote_address / request / status / user_agent
+  end
+
+  rule date
+    '%d' <Node> {
+      def value(log_line, color)
+        log_line.to_date_s.foreground(color)
+      end
+    }
+  end
+
+  rule referer
+    '%f' <Node> {
+      def value(log_line, color)
+        log_line.to_referer_s.foreground(color).inverse
+      end
+    }
+  end
+
+  rule remote_address
+    '%a' <Node> {
+      def value(log_line, color)
+    		"%#{Sickill::Rainbow.enabled ? 15 + 9 : 15}s" % log_line.remote_address.foreground(color)
+      end
+    }
+  end
+
+  rule request
+    '%r' <Node> {
+      def value(log_line, color)
+    		log_line.to_request_s.foreground(color)
+      end
+    }
+  end
+
+  rule status
+    '%s' <Node> {
+      def value(log_line, color)
+        log_line.status.foreground(color)
+      end
+    }
+  end
+
+  rule user_agent
+    '%u' <Node> {
+      def value(log_line, color)
+        log_line.to_agent_s.foreground(color)
+      end
+    }
+  end
+
+end
+
+# vim:syntax=ruby

data/lib/ntail/log_line.rb

@@ -82,6 +82,8 @@ module NginxTail
       raw_line.send method, *params
     end
     
+    @@parser = FormattingParser.new
+    
     def to_s()
       # simple but boring:
       # raw_line.to_s
@@ -92,14 +94,14 @@ module NginxTail
       else
         :default
       end
-      "%s - %#{Sickill::Rainbow.enabled ? 15 + 9 : 15}s - %s - %s - %s - %s" % [
-        to_date_s.foreground(color),
-        remote_address.foreground(color),
-        status.foreground(color),
-        to_request_s.foreground(color),
-        to_agent_s.foreground(color),
-        to_referer_s.foreground(color).inverse
-      ]
+      unless result = @@parser.parse("%d - %a - %s - %r - %u - %f")
+        raise @@parser.terminal_failures.join("\n")
+      else
+        def result.value(log_line, color)
+          elements.map { |element| element.value(log_line, color) }.join
+        end
+      end
+      result.value(self, color) 
     end
   
   end # class LogLine

data/lib/ntail/node.rb

@@ -0,0 +1,9 @@
+require 'treetop'
+
+module Formatting
+  class Node < Treetop::Runtime::SyntaxNode
+    def value(log_line, color)
+      raise "SubclassResponsibility" # override in node "subclasses"...
+    end
+  end
+end

data/ntail.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ntail}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Vandenberk"]
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
     "lib/ntail.rb",
     "lib/ntail/application.rb",
     "lib/ntail/body_bytes_sent.rb",
+    "lib/ntail/formatting.rb",
+    "lib/ntail/formatting.treetop",
     "lib/ntail/http_method.rb",
     "lib/ntail/http_referer.rb",
     "lib/ntail/http_user_agent.rb",
@@ -37,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/ntail/known_ip_addresses.rb",
     "lib/ntail/local_ip_addresses.rb",
     "lib/ntail/log_line.rb",
+    "lib/ntail/node.rb",
     "lib/ntail/proxy_addresses.rb",
     "lib/ntail/remote_addr.rb",
     "lib/ntail/remote_user.rb",
@@ -93,6 +96,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<geoip>, [">= 0"])
+      s.add_development_dependency(%q<treetop>, ["~> 1.4.9"])
     else
       s.add_dependency(%q<rainbow>, [">= 0"])
       s.add_dependency(%q<user-agent>, [">= 0"])
@@ -101,6 +105,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<geoip>, [">= 0"])
+      s.add_dependency(%q<treetop>, ["~> 1.4.9"])
     end
   else
     s.add_dependency(%q<rainbow>, [">= 0"])
@@ -110,6 +115,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<geoip>, [">= 0"])
+    s.add_dependency(%q<treetop>, ["~> 1.4.9"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ntail
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Peter Vandenberk
@@ -120,6 +120,22 @@ dependencies:
   requirement: *id007
   prerelease: false
   name: geoip
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 4
+        - 9
+        version: 1.4.9
+  requirement: *id008
+  prerelease: false
+  name: treetop
 description: A tail(1)-like utility for nginx log files. It supports parsing, filtering and formatting individual log lines.
 email: pvandenberk@mac.com
 executables: 
@@ -141,6 +157,8 @@ files:
 - lib/ntail.rb
 - lib/ntail/application.rb
 - lib/ntail/body_bytes_sent.rb
+- lib/ntail/formatting.rb
+- lib/ntail/formatting.treetop
 - lib/ntail/http_method.rb
 - lib/ntail/http_referer.rb
 - lib/ntail/http_user_agent.rb
@@ -148,6 +166,7 @@ files:
 - lib/ntail/known_ip_addresses.rb
 - lib/ntail/local_ip_addresses.rb
 - lib/ntail/log_line.rb
+- lib/ntail/node.rb
 - lib/ntail/proxy_addresses.rb
 - lib/ntail/remote_addr.rb
 - lib/ntail/remote_user.rb