apache_log_report 0.9.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca301cb770ac157383315a770b619d746c5381568bfb2b091942a965a702496f
-  data.tar.gz: 7fa3da83dcc3a9baab9c98ac180adadb7dab256ca7800f882f8f33f1457c3071
+  metadata.gz: 77ddb670e22eb7d75ebd658beecb96a452b9c65ace149f2a8376921271063d84
+  data.tar.gz: 33f6690db108ac0c4d9f8619f90add9ec5f9ac4d5414b38127413ea618b8e46f
 SHA512:
-  metadata.gz: be85ba24ecf36635f055465c5f131054d29032e47b9780031973274a1ebdf579ea30c816eac16f697f83c7a523bd3fe568e653167b8c1420018c160d37f789df
-  data.tar.gz: ba0aa6fbf8112bca663fa2b8df6563d87b02be35034a00c42c887a2b3a5556abdfd56a54560e79e65748c37b5319f23887fa167793dd7b30ce13d0b7fbb1a742
+  metadata.gz: f8074e3498f0b8f5e8769f5fccade340cb85f7bfa8dc5393197d216b1f22329bd14484c0ab45e5dcfa11f5dd26f007dbd44fa666273e1e50a14cbfdfa5c835ba
+  data.tar.gz: fda701c90b667b09d6a385ab23da6a10725624256cb92eb9521f53b119bf461a1a147db6fb6cb1b191dfcf874b920852fdb13c5f125f38f788657e8b9c8a6c9e

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    apache_log_report (0.9.7)
+      apache_log-parser
+      browser
+      sqlite3
+      terminal-table
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    apache_log-parser (3.1.2)
+    browser (5.0.0)
+    rake (12.3.3)
+    sqlite3 (1.4.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  apache_log_report!
+  rake (~> 12.0)
+
+BUNDLED WITH
+   2.1.4

data/README.org

@@ -12,6 +12,13 @@
 
 See the [[file:CHANGELOG.org][CHANGELOG]] file.
 
+* Todo
+
+** TODO Version information from command line and in reports
+** TODO Refactor code from one giant class to more manageable chunkes
+** TODO Move performance stats var to class (to isolate vars)
+** TODO Check total number of days (which is not working, now)
+
 * Compatibility
 
 

data/lib/apache_log_report.rb

@@ -5,13 +5,14 @@ module ApacheLogReport
   #
   require 'optparse'
   require 'optparse/date'
+  require 'apache_log_report/version'
 
   def self.options_parse options
     limit = 30
     args = {} 
 
     opt_parser = OptionParser.new do |opts|
-      opts.banner = "Usage: log-analyzer.rb [options] logfile"
+      opts.banner = "Usage: apache_log_report [options] [logfile]"
 
       opts.on("-lN", "--limit=N", Integer, "Number of entries to show (defaults to #{limit})") do |n|
         args[:limit] = n
@@ -25,32 +26,42 @@ module ApacheLogReport
         args[:to_date] = n
       end
 
-      opts.on("-i", "--ignore-crawlers", "Ignore crawlers") do |n|
+      opts.on("-i", "--ignore-crawlers", "Ignore crawlers") do
         args[:ignore_crawlers] = true
       end
 
-      opts.on("-p", "--ignore-selfpoll", "Ignore apaches self poll entries (from ::1)") do |n|
+      opts.on("-p", "--ignore-selfpoll", "Ignore apaches self poll entries (from ::1)") do
         args[:no_selfpoll] = true
       end
 
-      opts.on("-c", "--only-crawlers", "Perform analysis on crawlers only") do |n|
+      opts.on("-c", "--only-crawlers", "Perform analysis on crawlers only") do
         args[:only_crawlers] = 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|
+      opts.on("-uPREFIX", "--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|
+      opts.on("-wSUFFIX", "--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("-c", "--code-export=WHAT", String, "Control :export directive in code blocks (code, results, *both*, none)") do |n|
+      opts.on("-cWHAT", "--code-export=WHAT", String, "Control :export directive in code blocks (code, results, *both*, none)") do |n|
         args[:code_export] = n
       end
       
+      opts.on("-v", "--version", "Prints version information") do
+        puts "apache_log_report version #{ApacheLogReport::VERSION}"
+        puts "Copyright (C) 2020 Adolfo Villafiorita"
+        puts "Distributed under the terms of the MIT license"
+        puts ""
+        puts "Written by Adolfo Villafiorita"
+        exit
+      end
+
       opts.on("-h", "--help", "Prints this help") do
         puts opts
+        puts "This is version #{ApacheLogReport::VERSION}"
         exit
       end
     end
@@ -130,7 +141,7 @@ module ApacheLogReport
           hash[:datetime].iso8601,
           hash[:remote_host],
           hash[:user],
-          hash[:datetime].iso8601 + " " + hash[:remote_host] + " " + hash[:user_agent],
+          hash[:datetime].strftime("%Y-%m-%d") + " " + hash[:remote_host] + " " + hash[:user_agent],
           hash[:request][:method],
           hash[:request][:path],
           (hash[:request][:path] ? File.extname(hash[:request][:path]) : ""),
@@ -236,9 +247,9 @@ module ApacheLogReport
   end
   
   def self.emit options = {}, command, log_file, started_at, ended_at, duration
-    @prefx = options[:prefix]
+    @prefix = options[:prefix]
     @suffix = options[:suffix]
-    @export = option[:code_export]
+    @export = options[:code_export]
     
 <<EOS
 #+TITLE: Apache Log Analysis: #{log_file}
@@ -393,12 +404,12 @@ set boxwidth 0.6
 set style data histograms
 set style histogram clustered gap 1
 
-plot data using 2:xtic(1) lc rgb "#CC0000" title "4xx",     \\
+plot data using 2:xtic(1) lc rgb "#00AA00" title "2xx",     \\
 data using 3 lc rgb "#0000CC" title "3xx", \\
-data using 4 lc rgb "#00AA00" title "2xx", \\
-data using ($0 - 1. / 4):($2 + 0.5):2 with labels title "" textcolor rgb("#CC0000"), \\
+data using 4 lc rgb "#AA0000" title "4xx", \\
+data using ($0 - 1. / 4):($2 + 0.5):2 with labels title "" textcolor rgb("#00AA00"), \\
 data using ($0):($3 + 0.5):3 with labels title "" textcolor rgb("#0000CC"), \\
-data using ($0 + 1. / 4):($4 + 0.5):4 with labels title "" textcolor rgb("#00AA00")
+data using ($0 + 1. / 4):($4 + 0.5):4 with labels title "" textcolor rgb("#AA0000")
 #+END_SRC
 
 * Browsers

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "0.9.3"
+  VERSION = "0.9.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.8
 platform: ruby
 authors:
 - Adolfo Villafiorita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apache_log-parser
@@ -77,6 +77,7 @@ files:
 - ".gitignore"
 - CHANGELOG.org
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.org
 - Rakefile
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Generate a request report in OrgMode format from an Apache log file.