apache_log_report 0.9.0 → 0.9.1

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Adolfo Villafiorita
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: apache_log-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate a request report in OrgMode format from an Apache log file.
 email:
 - adolfo.villafiorita@ict4g.net
@@ -57,9 +85,6 @@ files:
 - bin/setup
 - exe/apache_log_report
 - lib/apache_log_report.rb
-- lib/apache_log_report/log_parser_hash.rb
-- lib/apache_log_report/log_parser_sqlite3.rb
-- lib/apache_log_report/option_parser.rb
 - lib/apache_log_report/version.rb
 homepage: https://www.ict4g.net/gitea/adolfo/apache_log_report
 licenses:

data/lib/apache_log_report/log_parser_hash.rb

@@ -1,49 +0,0 @@
-require 'date'
-require 'browser'
-
-class LogParserHash
-  # make a matchdata into a Hash.
-  # pure magic gotten from: http://zetcode.com/db/sqliteruby/connect/
-  # Used during parsing to simplify the generation of the hash.
-  class MatchData
-    def to_h
-      names.map(&:intern).zip(captures).to_h
-    end
-  end
-
-  def parse filename, options = {}
-    progressbar = ProgressBar.create(output: $stderr)  
-
-    content = filename ? File.readlines(filename) : ARGF.readlines
-    progressbar.total = content.size
-
-    # We parse combined log, which looks like:
-    #
-    # 66.249.70.16 - - [18/Aug/2020:23:03:00 +0200] "GET /eatc/assets/images/team/gunde.png HTTP/1.1" 200 61586 "-" "Googlebot-Image/1.0"
-    # 178.172.20.114 - - [25/Aug/2020:17:13:21 +0200] "GET /favicon.ico HTTP/1.1" 404 196 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:79.0) Gecko/20100101 Firefox/79.0"
-    # we do not parse entries such as:
-    combined_regexp = /^(?<ip>\S+) \S+ (?<remote_log_name>\S+) \[(?<timestamp>[^\]]+)\] "(?<method>[A-Z]+) (?<uri>.+)? HTTP\/[0-9.]+" (?<status>[0-9]{3}) (?<size>[0-9]+|-) "(?<referer>[^"]*)" "(?<user_agent_string>[^"]+)"/
-
-    content.collect { |line|
-      hashie = combined_regexp.match line
-      hash = hashie.to_h
-
-      progressbar.increment
-
-      if hash != {}
-        hash[:date_time] = DateTime.parse(hash[:timestamp].sub(":", " "))
-        hash[:size] = hash[:size].to_i
-        hash[:type] = hash[:uri] ? File.extname(hash[:uri]) : ""
-
-        ua = Browser.new(hash[:user_agent_string], accept_language: "en-us")
-        hash[:bot] = ua.bot?
-        hash[:browser] = ua.name || ""
-        hash[:browser_version] = ua.version || ""
-        hash[:platform] = ua.platform.name || ""
-        hash[:platform_version] = ua.platform.version || ""
-
-        hash
-      end
-    }.compact
-  end
-end

data/lib/apache_log_report/log_parser_sqlite3.rb

@@ -1,99 +0,0 @@
-#
-# SQLITE3
-#
-require 'sqlite3'
-
-class LogParser
-  def self.parse filename, options = {}
-    
-    progressbar = ProgressBar.create(output: $stderr)  
-
-    content = filename ? File.readlines(filename) : ARGF.readlines
-    progressbar.total = content.size
-
-    db = SQLite3::Database.new ":memory:"
-    db.execute "CREATE TABLE IF NOT EXISTS LogLine(
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      date_time TEXT,
-      ip TEXT,
-      remote_log_name TEXT,
-      method TEXT,
-      uri TEXT,
-      status TEXT,
-      size INTEGER,
-      referer TEXT,
-      user_agent_string TEXT,
-      bot INTEGER,
-      browser TEXT,
-      browser_version TEXT,
-      platform TEXT,
-      platform_version TEXT
-       )"
-    
-    ins = db.prepare('insert into LogLine (
-                date_time, 
-                ip,
-                remote_log_name,
-                method,
-                uri, 
-                status,
-                size,
-                referer,
-                user_agent_string,
-                bot,
-                browser,
-                browser_version,
-                platform,
-                platform_version)
-              values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
-
-    combined_regexp = /^(?<ip>\S+) \S+ (?<remote_log_name>\S+) \[(?<datetime>[^\]]+)\] "(?<method>[A-Z]+) (?<uri>.+)? HTTP\/[0-9.]+" (?<status>[0-9]{3}) (?<size>[0-9]+|-) "(?<referer>[^"]*)" "(?<user_agent_string>[^"]+)"/
-
-    content.collect { |line|
-      hashie = combined_regexp.match line
-
-      progressbar.increment
-
-      puts hashie
-      if hashie != {}
-        ua = Browser.new(hashie[:user_agent_string], accept_language: "en-us")
-        puts <<EOS
-         #{hashie[:datetime].sub(":", " ")},
-         #{hashie[:ip]},
-         #{hashie[:remote_log_name]},
-         #{hashie[:method]},
-         #{hashie[:uri]},
-         #{ hashie[:status]},
-         #{ hashie[:size].to_i},
-         #{ hashie[:referer]},
-         #{ hashie[:user_agent_string]},
-         #{ ua.bot? ? 1 : 0},
-         #{ ua.name || ""},
-         #{ ua.version || ""},
-         #{ ua.platform.name || ""},
-         #{ ua.platform.version || ""}
-EOS
-
-        ins.execute(
-          hashie[:datetime].sub(":", " "),
-          hashie[:ip],
-          hashie[:remote_log_name],
-          hashie[:method],
-          hashie[:uri],
-          hashie[:status],
-          hashie[:size].to_i,
-          hashie[:referer],
-          hashie[:user_agent_string],
-          ua.bot? ? 1 : 0,
-          (ua.name || ""),
-          (ua.version || ""),
-          (ua.platform.name || ""),
-          (ua.platform.version || "")
-        )
-      end
-    }
-
-    db
-  end
-end
-

data/lib/apache_log_report/option_parser.rb

@@ -1,63 +0,0 @@
-require 'optparse'
-require 'optparse/date'
-
-class OptionParser
-  def self.parse(options)
-    args = {} 
-
-    opt_parser = OptionParser.new do |opts|
-      opts.banner = "Usage: log-analyzer.rb [options] logfile"
-
-      opts.on("-lN", "--limit=N", Integer, "Number of entries to show (defaults to #{LIMIT})") do |n|
-        args[:limit] = n
-      end
-
-      opts.on("-bDATE", "--from-date=DATE", DateTime, "Consider entries after or on DATE") do |n|
-        args[:from_date] = n
-      end
-
-      opts.on("-eDATE", "--to-date=DATE", DateTime, "Consider entries before or on DATE") do |n|
-        args[:to_date] = n
-      end
-
-      opts.on("-i", "--ignore-crawlers", "Ignore crawlers") do |n|
-        args[:ignore_crawlers] = true
-      end
-
-      opts.on("-c", "--only-crawlers", "Perform analysis on crawlers only") do |n|
-        args[:only_crawlers] = true
-      end
-
-      opts.on("-t", "--distinguish-crawlers", "Print totals distinguishing crawlers from visitors") do |n|
-        args[:distinguish_crawlers] = true
-      end
-
-      opts.on("-p", "--ignore-selfpoll", "Ignore apaches self poll entries (from ::1)") do |n|
-        args[:no_selfpoll] = true
-      end
-
-      opts.on("-u", "--prefix=PREFIX", String, "Prefix to add to all plots (used to run multiple analyses in the same dir)") do |n|
-        args[:prefix] = n
-      end
-
-      opts.on("-w", "--suffix=SUFFIX", String, "Suffix to add to all plots (used to run multiple analyses in the same dir)") do |n|
-        args[:suffix] = n
-      end
-
-      opts.on("-h", "--help", "Prints this help") do
-        puts opts
-        exit
-      end
-    end
-
-    opt_parser.parse!(options)
-
-    args[:limit] ||= LIMIT
-    args[:ignore_crawlers] ||= false
-    args[:only_crawlers] ||= false
-    args[:distinguish_crawlers] ||= false
-    args[:no_selfpoll] ||= false
-
-    return args
-  end
-end