sidekiq_log_analyser 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a036b6772fc546a4a801308218311359568ebe
-  data.tar.gz: 45a43301a978ce126ab49a0f1cf8bfba8ab2efa5
+  metadata.gz: ef60b02fa7759404e20513cc3c8237e52607b9e0
+  data.tar.gz: 3cb0b0eb267a3caa5b15df0b17e577ca0dc62b4b
 SHA512:
-  metadata.gz: b42b0cb77d124462e3401e52c5f466056904cb25a1c46c6c0f2d4493948436d7bf677e131f9fc9a7be4793a1a78826c024c7279c32f090f64328e61b10f3b4ee
-  data.tar.gz: 0b981740d105bd1ea54afe6687e47263612d940c0f635e3f80ce7f73c3a8c3e6653f8bed7d496803eb93172d00598ddb1c21fa4da4cf956bfba6eafa0dbfcbb8
+  metadata.gz: f17d5acebf327ddf225e4427ba4784ca7d3a8cb103864dae5fdff59b27e612e76c6b5cfc3da04ebd02d075db48237f4c04536f3325d8d0c0ec3484b6707da3a0
+  data.tar.gz: fe070fee1bd1659766dbb2f7bb79293e12ca381c94f38a5592b64789b59291d3e39ba67586034de9cf2309329986a71a9285b1fedf7ab32bc91255894b6aba3b

data/Gemfile.lock

@@ -2,13 +2,15 @@ PATH
   remote: .
   specs:
     sidekiq_log_analyser (0.1)
+      activesupport
       colorize
       groupdate
+      terminal-table
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -19,27 +21,27 @@ GEM
     diff-lcs (1.3)
     groupdate (4.0.1)
       activesupport (>= 4.2)
-    i18n (1.1.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     method_source (0.9.0)
     minitest (5.11.3)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rake (10.4.2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
@@ -59,4 +61,4 @@ DEPENDENCIES
   terminal-table
 
 BUNDLED WITH
-   1.16.1
+   1.13.6

data/lib/sidekiq_log_analyser.rb

@@ -2,14 +2,17 @@ require 'time'
 require 'groupdate'
 require 'colorize'
 require 'terminal-table'
-require "sidekiq_log_analyser/version"
-require "sidekiq_log_analyser/row"
-require "sidekiq_log_analyser/pretty_print"
-require "sidekiq_log_analyser/collection"
-require "sidekiq_log_analyser/log_file"
-require "sidekiq_log_analyser/simple_stat"
-require "sidekiq_log_analyser/timeline"
-require "sidekiq_log_analyser/app"
+require 'active_support'
+require 'active_support/core_ext'
+
+require_relative "sidekiq_log_analyser/version"
+require_relative "sidekiq_log_analyser/row"
+require_relative "sidekiq_log_analyser/pretty_print"
+require_relative "sidekiq_log_analyser/collection"
+require_relative "sidekiq_log_analyser/log_file"
+require_relative "sidekiq_log_analyser/statistics"
+require_relative "sidekiq_log_analyser/timeline"
+require_relative "sidekiq_log_analyser/app"
 
 module SidekiqLogAnalyser
 end

data/lib/sidekiq_log_analyser/app.rb

@@ -3,10 +3,20 @@ module SidekiqLogAnalyser
     def App.run(filename)
       log_file    = LogFile.new(filename)
       collection  = Collection.new(log_file.lines)
-      statistics  = SimpleStat.new(collection)
+      statistics  = Statistics.new(collection)
+
+      print "\nSidekiq log analyser report (30 days) ".colorize(:cyan)
+      3.times do
+        print '.'.colorize(:yellow)
+        sleep(0.5)
+      end
+      puts
+      puts
 
       PrettyPrint.print_summary_report(statistics.total)
+
       PrettyPrint.print_avg_report(statistics.avg)
+
       PrettyPrint.print_timeline_report(statistics.timeline)
 
       nil

data/lib/sidekiq_log_analyser/collection.rb

@@ -4,6 +4,7 @@ module SidekiqLogAnalyser
     attr_reader :start_collection, :end_collection
 
     def initialize(lines)
+      @from_date = 1.month.ago
       populate(lines)
     end
 
@@ -12,15 +13,23 @@ module SidekiqLogAnalyser
       lines.each do |line|
         row = Row.new(line)
         if row.valid?
-          @collection << row.metadata
+          metadata = row.metadata
+          @collection << metadata if in_range?(metadata[:datetime])
         end
       end
       @start_collection ||= collection(:start).group_by{|metadata| metadata[:worker]}
       @end_collection   ||= collection(:end).group_by{|metadata| metadata[:worker]}
+      @collection         = []
     end
 
     private
 
+    def in_range?(datetime)
+      return false if datetime.blank?
+
+      @from_date < datetime
+    end
+
     def collection(type)
       @collection.select{|metadata| metadata[:type] == type}
     end

data/lib/sidekiq_log_analyser/pretty_print.rb

@@ -11,6 +11,7 @@ module SidekiqLogAnalyser
       end
       puts(table)
       puts
+      puts
     end
 
     def PrettyPrint.print_avg_report(report)
@@ -21,6 +22,7 @@ module SidekiqLogAnalyser
       end
       puts(table)
       puts
+      puts
     end
 
     def PrettyPrint.print_timeline_report(report)
@@ -32,6 +34,7 @@ module SidekiqLogAnalyser
         end
         puts(table)
         puts
+        puts
       end
     end
 

data/lib/sidekiq_log_analyser/row.rb

@@ -21,23 +21,25 @@ module SidekiqLogAnalyser
     end
 
     def metadata
-      if start?
-        {
-          datetime: Time.parse(start_match[1]),
-          worker: start_match[3].split(' ').last,
-          job_id: start_match[4],
-          type: :start
-        }
-      elsif end?
-        {
-          datetime:  Time.parse(end_match[1]),
-          worker: end_match[3].split(' ').last,
-          job_id: end_match[4],
-          duration: end_match[5].to_f,
-          type: :end
-        }
-      else
-        {}
+      @metadata ||= begin
+        if start?
+          {
+            datetime: Time.parse(start_match[1]),
+            worker: start_match[3].split(' ').last,
+            job_id: start_match[4],
+            type: :start
+          }
+        elsif end?
+          {
+            datetime:  Time.parse(end_match[1]),
+            worker: end_match[3].split(' ').last,
+            job_id: end_match[4],
+            duration: end_match[5].to_f,
+            type: :end
+          }
+        else
+          {}
+        end
       end
     end
 

data/lib/sidekiq_log_analyser/statistics.rb

@@ -0,0 +1,38 @@
+module SidekiqLogAnalyser
+  class Statistics
+    attr_reader :collection
+
+    def initialize(collection)
+      @collection = collection
+    end
+
+    def total
+      with_collection { |worker, data| data.count }
+    end
+
+    def avg
+      with_collection do |worker, data|
+        data.sum{|metadata| metadata[:duration]}.to_f / data.length
+      end
+    end
+
+    def timeline
+      with_collection { |worker, data| Timeline.timeline(data) }
+    end
+
+    private
+
+    def with_collection
+      result = {}
+      raw    = end_collection
+      raw.each do |worker, data|
+        result[worker] = yield(worker, data)
+      end
+      result
+    end
+
+    def start_collection; collection.start_collection; end
+    def end_collection; collection.end_collection; end
+
+  end
+end

data/lib/sidekiq_log_analyser/version.rb

@@ -1,3 +1,3 @@
 module SidekiqLogAnalyser
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_log_analyser
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groupdate
@@ -38,6 +38,34 @@ 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'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +157,7 @@ files:
 - lib/sidekiq_log_analyser/log_file.rb
 - lib/sidekiq_log_analyser/pretty_print.rb
 - lib/sidekiq_log_analyser/row.rb
-- lib/sidekiq_log_analyser/simple_stat.rb
+- lib/sidekiq_log_analyser/statistics.rb
 - lib/sidekiq_log_analyser/timeline.rb
 - lib/sidekiq_log_analyser/version.rb
 - spec/row_spec.rb
@@ -156,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple sidekiq log analyzer.

data/lib/sidekiq_log_analyser/simple_stat.rb

@@ -1,41 +0,0 @@
-module SidekiqLogAnalyser
-  class SimpleStat
-    extend Forwardable
-
-    attr_reader :collection
-
-    def_delegator :collection, :start_collection
-    def_delegator :collection, :end_collection
-
-    def initialize(collection)
-      @collection = collection
-    end
-
-    def total
-      result = {}
-      raw    = end_collection
-      raw.each do |worker, data|
-        result[worker] = data.count
-      end
-      result
-    end
-
-    def avg
-      result = {}
-      raw    = end_collection
-      raw.each do |worker, data|
-        result[worker] = data.sum{|metadata| metadata[:duration]}.to_f / data.length
-      end
-      result
-    end
-
-    def timeline
-      result = {}
-      raw    = end_collection
-      raw.each do |worker, data|
-        result[worker] = Timeline.timeline(data)
-      end
-      result
-    end
-  end
-end