rubiojr-apalo 0.0.102 → 0.0.104

data/Manifest.txt

@@ -16,3 +16,4 @@ lib/apalo/core.rb
 lib/apalo/core/log_line.rb
 lib/apalo/core/log_parser.rb
 lib/apalo/core/log_string.rb
+examples/simple.rb

data/examples/simple.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'apalo'
+
+Apalo::logfile = '/data/logs/httpd/access_log'
+Apalo.parser.each_line do |l|
+    puts l.ipaddr
+      puts l.user_agent
+end

data/lib/apalo.rb

@@ -1,10 +1,11 @@
 require 'time'
+require 'zlib'
 require File.dirname(__FILE__) + '/apalo/core'
 require File.dirname(__FILE__) + '/apalo/cli'
 
 module Apalo
 
-  VERSION = '0.0.102'
+  VERSION = '0.0.104'
 
   def self.logfile=(l)
     @logfile = l
@@ -15,7 +16,7 @@ module Apalo
   end
 
   def self.parser
-    @parser ||= LogParser.new
+    @parser ||= Apalo::Core::LogParser.new
   end
 
   def self.parsing_errors

data/lib/apalo/cli.rb

@@ -2,7 +2,7 @@ module Apalo
   module Cli
     def self.init(version)
       @cmd = CmdParse::CommandParser.new( true, true )
-      @cmd.program_name = "knocked"
+      @cmd.program_name = "apalo"
       @cmd.program_version = version.split('.')
       @cmd.options = CmdParse::OptionParserWrapper.new do |opt|
             opt.separator "Global options:"

data/lib/apalo/core/log_line.rb

@@ -4,6 +4,10 @@ module Apalo
       attr_accessor :ipaddr, :ident,  :userid, :time
       attr_accessor :request, :rcode, :rsize, :referer, :user_agent
       attr_accessor :vhost, :raw
+
+      def to_s
+        @raw
+      end
     end
   end
 end

data/lib/apalo/core/log_parser.rb

@@ -8,6 +8,7 @@ module Apalo
         @processed_lines = 0
         @filtered_lines = 0
         @errors = 0
+        @logline = LogLine.new
         if filter
           begin
             require 'oniguruma'
@@ -18,11 +19,7 @@ module Apalo
             @filter  = /#{filter}/
           end
         end
-      end
-
-      def each_line
         @regex = nil
-        @logline = LogLine.new
         r = [
         '(\d+\.\d+\.\d+\.\d+)',    # ip
         '(.*?)',                   # foo
@@ -45,10 +42,19 @@ module Apalo
             "WARNING: oniguruma gem not installed. Log analysis will be much slower."
           @regex  = /#{logr}/
         end
+      end
+
+      def each_line
         File.open(Apalo.logfile) do |f|
-          f.each_line do |line|
+          if Apalo.logfile =~ /\.gz/
+            handle = Zlib::GzipReader.new(f)
+          else
+            handle = f
+          end
+          handle.each_line do |line|
             @processed_lines += 1
             if @regex.match(line)
+              @logline.raw = line
               @logline.ipaddr      = $1
               @logline.ident       = $2
               @logline.userid      = $3
@@ -61,6 +67,8 @@ module Apalo
               @logline.vhost       = $10
               @logline.raw         = line
               yield @logline
+            else
+              Apalo.parsing_errors << line
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubiojr-apalo
 version: !ruby/object:Gem::Version 
-  version: 0.0.102
+  version: 0.0.104
 platform: ruby
 authors: 
 - Sergio RubioSergio Rubio
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 -08:00
+date: 2008-12-26 00:00:00 -08:00
 default_executable: atk
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - lib/apalo/core/log_line.rb
 - lib/apalo/core/log_parser.rb
 - lib/apalo/core/log_string.rb
+- examples/simple.rb
 has_rdoc: true
 homepage: http://github.com/rubiojr/apalo
 post_install_message: