rslog 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76f7a375fca0f34c34cbf794f94aef6673ca9c9e5de06881cce494ffee728eff
-  data.tar.gz: e5d35abb7b40dce5e89489ddb360d1e41e7cffc76692fa28ebe323b123619cdd
+  metadata.gz: 6ce0368ae8830da116ff45bb102f0156e0ff0c320f57ddb0ba133efa019b7460
+  data.tar.gz: b12a734d292403f0dfabe560e22e170ec1f4e72d9a07227f80291d5aeb72c51b
 SHA512:
-  metadata.gz: 9aea32ac29dc370ac5a5d741eaf59cfea3fc13d9cfbcca026e98369eece8d0f81cb3fd20ee1a0aaac1284769c64bbeed5b18cecb4e5d1701d7ac1d20472e7296
-  data.tar.gz: 55d8b0782e7b26495d5190458c60606439047d2c7a484356cbc1cb345b80f97e3f6f6e8f26dfeaa9c408ae2b2643a14adced0dc7d3992aab83e84b059c3c7552
+  metadata.gz: 277bec231152641cbd79ad42f7737f7bccf69e2abb5d804d0a976c42d6a4f353fac5761555e7a662bb7767eb6c7ad7499e2716ea9305e343b2c7b542178a3540
+  data.tar.gz: 8b245fc399ac058b0cad266fd1684cbfa76136d8b2c02e6bc1c088441482758b54e8a5a25d00f2de50ce9889ad42a3ba02ba92ba85594ab1aaa32680e1e59896

data/lib/rslog.rb

@@ -7,12 +7,13 @@ require_relative 'rslog/extractor'
 require_relative 'rslog/validator'
 require_relative 'rslog/data_parser'
 require_relative 'rslog/presenter'
+require_relative 'rslog/opts'
 
 # For development
 # require 'pry'
 
 class RSlog
-  VERSION = '0.0.4'
+  VERSION = '0.0.9'
 
   def self.run
     Container.new.process_all

data/lib/rslog/container.rb

@@ -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,19 @@
 
 require_relative 'tools/array'
 require_relative 'tools/hash'
+require_relative 'worker'
 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,12 @@
 # frozen_string_literal: true
 
-require_relative 'container'
+require_relative 'worker'
 
 # 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 +20,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

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require_relative 'worker'
 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 +20,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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
+require_relative 'worker'
 require_relative 'tools/hash'
 require_relative 'tools/array'
 
 # Class to present result in needed format
 #
-class Presenter
+class Presenter < Worker
   DECORATORS = {
     all:  {
       title:
@@ -18,32 +19,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.4
+  version: 0.0.9
 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