rslog 0.0.7 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63ad3e3f8a8083ffde75f4d5ac3be44e17c82ed52ffb19868405b0255813f71d
-  data.tar.gz: f1d640feaac7ce8b2d8246dba170b972803f7a8a33f3e93ae5341742c441eab2
+  metadata.gz: 843ae99c81000576196f8fb4b3cb3be0a6a529b430f02d4f205b58e9def8f61c
+  data.tar.gz: 0e642e1dbb538480f037e7ed33b2129b99d31441ea5c44a51a45289f2fbe4e7e
 SHA512:
-  metadata.gz: 67d906c289b5917196f73f0cf2b4689587e3227a48b1b0d1ca1b520346d8361b75dace5e94ab298ac05877cd540f99719e27dd82bb02d577fc67ab82f93460a3
-  data.tar.gz: a04cba77c9309ebf5222f5876103c71be22245ffe6fc80e3cb3c35df6957b9722673eb017af22f58a469c8613f4c4ff7c4b1fc81ec5e16ef395fbc6cf5c33a85
+  metadata.gz: ccce9aef8ab69e63c8162116aceb13500bd4e5cff99b318958313ab0897250e55b476cc467178ed70ff69b98d847f9593ee9f2f9d1e616403cf8e1ceb5e3ab35
+  data.tar.gz: 3065582ca9c1d32999faa78fc9675af66a83599222e39689b56875656cb69a715703a62e20f1910df622b776a8e6d18e730317398d2b7fd12f873739a53e9a5e

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.7'
+  VERSION = '0.0.12'
 
   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

data/lib/rslog/data_parser.rb

@@ -2,28 +2,21 @@
 
 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_a
-                .sort_by { |item| item[1] }
-                .reverse
-                .map { |elem_arr| elem_arr.map(&:to_s).join(' ') }
+    container.result =
+      container.data
+               .group_by_index(0)
+               .send("count_by_groups_#{type}")
+               .to_a
+               .sort_by { |item| item[1] }
+               .reverse
+               .map { |elem_arr| elem_arr.map(&:to_s).join(' ') }
     self
   end
 end

data/lib/rslog/extractor.rb

@@ -1,15 +1,8 @@
 # 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
     check
     self
@@ -17,14 +10,18 @@ class Extractor
 
   private
 
+  def file_name
+    container.file_name
+  end
+
   def check
-    if File.zero?(@file_name)
-      @container.add_message 'Empty file'
+    if File.zero?(file_name)
+      container.add_message 'Empty file'
     else
-      @container.data = File.open(@file_name, 'r').to_a
-      @container.add_message 'Data in place'
+      container.data = File.open(file_name, 'r').to_a
+      container.add_message 'Data in place'
     end
   rescue StandardError => e
-    @container.add_error 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
@@ -21,16 +16,14 @@ class InputParser
 
   private
 
-  attr_accessor :opts
-
   def handle_opts
-    @opts.parse!(into: @container.options)
+    Opts.create_opts.parse!(into: container.options)
   rescue OptionParser::InvalidOption => e
-    @container.add_error << e
+    container.add_error e
   end
 
   def handle_args
-    @container.file_name = ARGV.select { |str| str =~ /.\.log|.\.txt/ }[0] || ''
-    @container.add_error 'No file_name provided' if @container.file_name.empty?
+    container.file_name = ARGV.select { |str| str =~ /.\.log|.\.txt/ }[0] || ''
+    container.add_error 'No file_name provided' if container.file_name.empty?
   end
 end

data/lib/rslog/opts.rb

@@ -7,7 +7,6 @@ module Opts
     descr:  ['-v', '--version', 'Show version and exit'],
     action: proc do
       puts "#{File.basename($PROGRAM_NAME)}: #{RSlog::VERSION}"
-      exit
     end
   }.freeze
 
@@ -15,15 +14,24 @@ module Opts
     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) }
+      help(opts)
+      opts.on(*Opts::HELP[:descr]) do
+        Opts::HELP[:action].call(opts)
+        exit
+      end
+    end
+  end
+
+  def self.help(opts)
+    opts.on(*Opts::VERSION[:descr]) do
+      Opts::VERSION[:action].call
+      exit
     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,13 +18,9 @@ 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
 
@@ -45,7 +41,7 @@ class Presenter
   def format_as_text
     [
       title,
-      @container.result.to_multiline_string(suffix),
+      container.result.to_multiline_string(suffix),
       separator
     ].join("\n")
   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,19 +15,15 @@ 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
 
   private
 
   def validate
-    return :valid if @container.data.all? TEMPLATES[@container.validator]
+    return :valid if container.data.all? TEMPLATES[container.validator]
 
     :invalid
   end

data/lib/rslog/worker.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Class to hold worker functionality
+#
+class Worker
+  attr_reader :container
+
+  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.7
+  version: 0.0.12
 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
@@ -28,6 +28,7 @@ files:
 - 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