ntail 0.0.12 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.1.0

data/lib/ntail/application.rb

@@ -10,7 +10,7 @@ module NginxTail
     DEFAULT_OPTIONS = {
       :interrupted => false,
       :running => true,
-      :nginx => true,
+      :pattern => :nginx,
       :exit => 0,
     }
 
@@ -31,7 +31,7 @@ module NginxTail
 
     def run!
 
-      LogLine.set_log_pattern(@options.nginx)
+      LogLine.set_pattern(@options.pattern)
 
       ['TERM', 'INT'].each do |signal|
         Signal.trap(signal) do

data/lib/ntail/http_referer.rb

@@ -43,18 +43,18 @@ module NginxTail
           !self.unknown_referer?(http_referer) && !self.internal_referer?(http_referer)
         end
 
-         def self.to_referer_s(http_referer)
-           if self.unknown_referer? http_referer
-             http_referer
-           else begin
-               # try to parse it as a URI, but with default value if un-parsable
-               URI.parse(http_referer).host || http_referer
+        def self.to_referer_s(http_referer)
+          if self.unknown_referer? http_referer
+            http_referer
+          else begin
+              # try to parse it as a URI, but with default value if un-parsable
+              URI.parse(http_referer).host || http_referer
             rescue URI::InvalidURIError
-               http_referer
+              http_referer
             end
           end
         end
-        
+
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'http_referer'" unless base.instance_methods.map(&:to_s).include? 'http_referer'
 

data/lib/ntail/log_line.rb

@@ -83,8 +83,11 @@ module NginxTail
 
     @@log_pattern = NGINX_LOG_PATTERN
 
-    def self.set_log_pattern(nginx_format)
-      @@log_pattern = nginx_format ? NGINX_LOG_PATTERN : APACHE_LOG_PATTERN
+    def self.set_pattern(pattern)
+      @@log_pattern = case pattern
+        when :nginx then NGINX_LOG_PATTERN
+        when :apache then APACHE_LOG_PATTERN
+      end
     end
 
     NGINX_REQUEST_PATTERN = Regexp.compile(/\A(\S+) (.*?) (\S+)\Z/)
@@ -97,6 +100,7 @@ module NginxTail
           @remote_addr, @remote_user, @time_local, @request, @status, @body_bytes_sent, @http_referer, @http_user_agent, @proxy_addresses = $~.captures
         elsif @@log_pattern == APACHE_LOG_PATTERN
           @server_name, @remote_addr, @remote_log_name, @remote_user, @time_local, @request, @status, @body_bytes_sent, @http_referer, @http_user_agent, @http_cookie, @time_taken = $~.captures
+          @proxy_addresses = nil
         end
         if NGINX_REQUEST_PATTERN.match(@request)
           # counter example (ie. HTTP request that cannot by parsed)

data/lib/ntail/options.rb

@@ -40,7 +40,7 @@ module NginxTail
         end
 
         opts.on '--apache', "Try to match lines using the Apache log format instead of nginx (the default)" do |value|
-          options.nginx = false
+          options.pattern = :apache
         end
 
         opts.on '--sleep [SECONDS]', '-s', Float, "Sleeps for the given number of seconds before processing the next line (--raw only)" do |value|

data/ntail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ntail}
-  s.version = "0.0.12"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Vandenberk"]
-  s.date = %q{2011-08-08}
+  s.date = %q{2011-08-09}
   s.default_executable = %q{ntail}
   s.description = %q{A tail(1)-like utility for nginx log files. It supports parsing, filtering and formatting individual log lines.}
   s.email = %q{pvandenberk@mac.com}
@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/pvdb/ntail}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{A tail(1)-like utility for nginx log files}
   s.test_files = [
     "spec/application_spec.rb",

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ntail
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 12
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors: 
 - Peter Vandenberk
@@ -15,200 +10,152 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 +01:00
+date: 2011-08-09 00:00:00 +01:00
 default_executable: ntail
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rainbow
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rainbow
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: user-agent
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: user-agent
-  version_requirements: *id002
+  type: :runtime
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: treetop
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 4
-        - 9
         version: 1.4.9
-  name: treetop
-  version_requirements: *id003
+  type: :runtime
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: sequel
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: sequel
-  version_requirements: *id004
+  type: :runtime
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: mongoid
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: mongoid
-  version_requirements: *id005
+  type: :runtime
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: sqlite3-ruby
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: sqlite3-ruby
-  version_requirements: *id006
+  type: :runtime
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rake
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
         version: 0.9.2
-  name: rake
-  version_requirements: *id007
+  type: :development
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: shoulda
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: shoulda
-  version_requirements: *id008
+  type: :development
   prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: bundler
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id009
+  type: :development
   prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: jeweler
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
         version: 1.5.1
-  name: jeweler
-  version_requirements: *id010
+  type: :development
   prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rcov
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rcov
-  version_requirements: *id011
+  type: :development
   prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: geoip
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: geoip
-  version_requirements: *id012
+  type: :development
   prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
-  name: rspec
-  version_requirements: *id013
+  type: :development
   prerelease: false
+  version_requirements: *id013
 description: A tail(1)-like utility for nginx log files. It supports parsing, filtering and formatting individual log lines.
 email: pvandenberk@mac.com
 executables: 
@@ -281,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3911562482535553206
       segments: 
       - 0
       version: "0"
@@ -290,14 +237,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A tail(1)-like utility for nginx log files