rslog 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6bdea7b2a57784e35b11b4ba26542288101df7e3ca4c6a0341663a584d66ae
-  data.tar.gz: 5063db15e2245369243465af2038ee4f12d582a2ae3a6009510250a011a22dea
+  metadata.gz: 843ae99c81000576196f8fb4b3cb3be0a6a529b430f02d4f205b58e9def8f61c
+  data.tar.gz: 0e642e1dbb538480f037e7ed33b2129b99d31441ea5c44a51a45289f2fbe4e7e
 SHA512:
-  metadata.gz: 1d1bcdec66de44c7a554ecb3d4a9ba73190055c87293b0a257886b129462012fcd89961b4712ed0fccd2672c0fad5bb975d923532109066fdb168b8a9437965d
-  data.tar.gz: 6277a462d27f2d771aa5b017a676409398c960b773728e5dfd8efc1e6bd03a7816fde053839a2f9129b84ab43589618bedb936c3266aa92cefb6fa7393faea2d
+  metadata.gz: ccce9aef8ab69e63c8162116aceb13500bd4e5cff99b318958313ab0897250e55b476cc467178ed70ff69b98d847f9593ee9f2f9d1e616403cf8e1ceb5e3ab35
+  data.tar.gz: 3065582ca9c1d32999faa78fc9675af66a83599222e39689b56875656cb69a715703a62e20f1910df622b776a8e6d18e730317398d2b7fd12f873739a53e9a5e

data/lib/rslog.rb

@@ -14,7 +14,7 @@ require_relative 'rslog/opts'
 # require 'pry'
 
 class RSlog
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 
   def self.run
     Container.new.process_all

data/lib/rslog/data_parser.rb

@@ -9,14 +9,14 @@ class DataParser < Worker
   # type = :count (default) -> just count in groups
   # type = :uniq -> uniq entries in groups
   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

@@ -4,21 +4,24 @@
 #
 class Extractor < Worker
   def execute
-    @file_name = @container.file_name
     check
     self
   end
 
   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

@@ -16,16 +16,14 @@ class InputParser < Worker
 
   private
 
-  attr_accessor :opts
-
   def handle_opts
-    Opts.create_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

@@ -20,7 +20,7 @@ class Presenter < Worker
 
   def execute(type, formatter)
     @type = type
-    @container.add_message send("format_as_#{formatter}")
+    container.add_message send("format_as_#{formatter}")
     self
   end
 
@@ -41,7 +41,7 @@ class Presenter < Worker
   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

@@ -16,14 +16,14 @@ class Validator < Worker
   }.freeze
 
   def execute
-    @container.add_message 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

@@ -3,6 +3,8 @@
 # Class to hold worker functionality
 #
 class Worker
+  attr_reader :container
+
   def initialize(container)
     @container = container
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rslog
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Andrey Eremeev