rslog 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe3c82c0afa83c4af74c9ccceec1bf9072a8bbb9fa83844c61276bd2b2f6208
-  data.tar.gz: 9c09cb08d94d4a918b2c0f71aa221e9315f96f730fea88ca7eb483645480031a
+  metadata.gz: bbfdff7943771b6041ad63326ac885ea1f15734a9605d0b0ec9fc966e97cc2e5
+  data.tar.gz: 19a16f3c7b1e23f52b3ff2f4887c39cbe144470e92b95f9503ba71879c9ef147
 SHA512:
-  metadata.gz: 735f4ebe52584ef7c7fd39e7a7cc123f62bb21d73416e33c10e8089530caa4131c90d603342be6ae58e6cf8a11952473d3ddd23c15eb507d696c33def0f6ef61
-  data.tar.gz: 62aedf785f19079499e8eb7ed865eb890d98ce29346509cd795c900d3fcd999cb8106d085bd8b5da2446a879120dfd615827ffc9984451b16b41e9f696a8e8ec
+  metadata.gz: b7ac79824d646234ed125a91b5652a8974dec571d111eb343c499ef908f47128eba6b182182ab323b24064d06336781820d2dd17570828a35666ad8efee25682
+  data.tar.gz: ee1ee56ebb29461e55572b6404ce52c9c91b2dc1584c85115f4aaa9c0ddc7c37d1a891993a2b2946a4becdda4a85d8976e6b0c6d475ff1cf898dd02aa765bbe6

data/lib/rslog.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require_relative 'rslog/container'
+require_relative 'rslog/worker'
 require_relative 'rslog/input_parser'
 require_relative 'rslog/extractor'
 require_relative 'rslog/validator'
@@ -13,7 +14,7 @@ require_relative 'rslog/opts'
 # require 'pry'
 
 class RSlog
-  VERSION = '0.0.5'
+  VERSION = '0.0.10'
 
   def self.run
     Container.new.process_all

data/lib/rslog/container.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Class to hold data and implement processing
-
+#
 class Container
   attr_accessor(*%i[
                   argv file_name messages errors data options validator types result
@@ -25,13 +25,13 @@ class Container
   def no_errors?
     errors.empty?
   end
-  
+
   def add_message(str)
-    self.messages << str
+    messages << str
   end
 
   def add_error(str)
-    self.errors << str
+    errors << str
   end
 
   def talk

data/lib/rslog/data_parser.rb

@@ -2,24 +2,17 @@
 
 require_relative 'tools/array'
 require_relative 'tools/hash'
-require_relative 'validator'
-
-require 'pry'
 
 # Class to parse data from given array
 #
-class DataParser
+class DataParser < Worker
   # type = :count (default) -> just count in groups
   # type = :uniq -> uniq entries in groups
-  def initialize(container)
-    @container = container
-  end
-
   def execute(type)
     @container.result =
       @container.data
                 .group_by_index(0)
-                .send("count_by_groups_#{type.to_s}")
+                .send("count_by_groups_#{type}")
                 .to_a
                 .sort_by { |item| item[1] }
                 .reverse

data/lib/rslog/extractor.rb

@@ -1,16 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'container'
-
 # Class for extracting data from file
 #
-class Extractor
-  def initialize(container)
-    @container = container
-    @file_name = container.file_name
-  end
-
+class Extractor < Worker
   def execute
+    @file_name = @container.file_name
     check
     self
   end
@@ -24,7 +18,7 @@ class Extractor
       @container.data = File.open(@file_name, 'r').to_a
       @container.add_message 'Data in place'
     end
-  rescue StandardError => error
-    @container.add_error error
+  rescue StandardError => e
+    @container.add_error e
   end
 end

data/lib/rslog/input_parser.rb

@@ -5,15 +5,10 @@ require_relative 'opts'
 
 # Class to parse input filenames and args
 #
-class InputParser
+class InputParser < Worker
   include Opts
 
-  def initialize(container)
-    @container = container
-  end
-
   def execute
-    @opts = Opts.create_opts
     handle_opts
     handle_args
     self
@@ -24,9 +19,9 @@ class InputParser
   attr_accessor :opts
 
   def handle_opts
-    @opts.parse!(into: @container.options)
-  rescue OptionParser::InvalidOption => error
-    @container.add_error << error
+    Opts.create_opts.parse!(into: @container.options)
+  rescue OptionParser::InvalidOption => e
+    @container.add_error e
   end
 
   def handle_args

data/lib/rslog/opts.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Service module to give opts
+#
+module Opts
+  VERSION = {
+    descr:  ['-v', '--version', 'Show version and exit'],
+    action: proc do
+      puts "#{File.basename($PROGRAM_NAME)}: #{RSlog::VERSION}"
+      exit
+    end
+  }.freeze
+
+  HELP = {
+    descr:  ['-h', '--help', 'Prints this message and exit'],
+    action: proc do |opts|
+      puts opts
+      exit
+    end
+  }.freeze
+
+  def self.create_opts
+    OptionParser.new do |opts|
+      opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} FILENAME"
+      opts.on(*Opts::VERSION[:descr]) { Opts::VERSION[:action].call }
+      opts.on(*Opts::HELP[:descr]) { Opts::HELP[:action].call(opts) }
+    end
+  end
+end

data/lib/rslog/presenter.rb

@@ -5,7 +5,7 @@ require_relative 'tools/array'
 
 # Class to present result in needed format
 #
-class Presenter
+class Presenter < Worker
   DECORATORS = {
     all:  {
       title:
@@ -18,32 +18,26 @@ class Presenter
     }
   }.freeze
 
-  def initialize(container)
-    @container = container
-  end
-
   def execute(type, formatter)
     @type = type
-    @container.messages << send("format_as_#{formatter}")
+    @container.add_message send("format_as_#{formatter}")
     self
   end
 
   private
 
-  attr_reader :title, :suffix
-  
   def title
     decorator[:title]
   end
-  
+
   def suffix
     decorator[:suffix]
   end
-  
+
   def decorator
     DECORATORS[@type]
   end
-  
+
   def format_as_text
     [
       title,

data/lib/rslog/tools/array.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-# Monkey patch for Array class 
-#  
+# Monkey patch for Array class
+#
 class Array
   def group_by_index(index = 0)
     group_by { |str| str.split(' ')[index] }
   end
 
   def to_multiline_string(suffix = '')
-    self.map {|item| "#{item} #{suffix}"}.join("\n")
+    map { |item| "#{item} #{suffix}" }.join("\n")
   end
 end

data/lib/rslog/validator.rb

@@ -4,7 +4,7 @@ require_relative 'tools/array'
 
 # Class to validate if we have valid data in lines, for example well formatted IPs
 #
-class Validator
+class Validator < Worker
   TEMPLATES = {
     # IP address regex, source https://regexr.com/38odc
     ip: /\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b/
@@ -15,12 +15,8 @@ class Validator
     invalid: proc { |validator| "Some #{validator.upcase}s are NOT valid" }
   }.freeze
 
-  def initialize(container)
-    @container = container
-  end
-
   def execute
-    @container.messages << MESSAGES[validate].call(@container.validator)
+    @container.add_message MESSAGES[validate].call(@container.validator)
     self
   end
 

data/lib/rslog/worker.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Class to hold worker functionality
+#
+class Worker
+  def initialize(container)
+    @container = container
+  end
+
+  def execute
+    raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Andrey Eremeev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies: []
 description: Ruby script to get overall Statistic for weblog logs!
 email: a.eremeev@outlook.com
@@ -23,10 +23,12 @@ files:
 - lib/rslog/data_parser.rb
 - lib/rslog/extractor.rb
 - lib/rslog/input_parser.rb
+- lib/rslog/opts.rb
 - lib/rslog/presenter.rb
 - lib/rslog/tools/array.rb
 - lib/rslog/tools/hash.rb
 - lib/rslog/validator.rb
+- lib/rslog/worker.rb
 homepage: https://rubygems.org/gems/rslog
 licenses:
 - MIT