request-log-analyzer 1.13.1 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c24635e41e1a2f3e4c11e6f4814cd9381b0d5073
-  data.tar.gz: 0b70d1e886d4a1ca41361023aee81d7d63acb1fa
+  metadata.gz: 91a5bda268facff9ef6d7ddb5ae9d4eec33a8d5c
+  data.tar.gz: f3683a5a70afba9f695016d304f91dfa7372b150
 SHA512:
-  metadata.gz: 605898a6b50c9e528c3807e92a3fa98effdd7ddbcb85391312e15f30e101612e10f0c6710891b1804d94aa25cc5a99cbd37fd90dcad7da0c91d400e89822b3da
-  data.tar.gz: e617b1756392fe884a0355e06281302d32c6899832482e4f750b237dae34e75763e702b1bc500d6a297a25591dabfa1a1859569ed417cab48ef008a37dc74776
+  metadata.gz: e582a48f76e38c28312077176975f7f83369b49152edbd741db1abc0636d518c520bd6471efe30e6a8a8313c3f7ab6b54cf9fadd240101345644bca804fba089
+  data.tar.gz: 3a9fb94f97e219dd3346d30d3da6361c329b5d4310f8e68eb8982d47a73093a9d729ed5b298fa00767b67aea38e4f65922f4a374f137b00e98717f67c3ee1b1f

data/.gitignore

@@ -13,3 +13,4 @@ Gemfile.lock
 /.bundle/
 *.rbc
 _site/
+.idea

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# -*- encoding : utf-8 -*-
+$LOAD_PATH.unshift(File.expand_path('./../lib', File.dirname(__FILE__)))
+#noinspection RubyResolve
+require 'request_log_analyzer'
+require 'irb'
+require 'pp'
+
+if __FILE__ == $0
+  IRB.start(__FILE__)
+else    # check -e option
+  if /\A-e\z/ =~ $0
+    IRB.start(__FILE__)
+  else
+    IRB.setup(__FILE__)
+  end
+end

data/lib/cli/command_line_arguments.rb

@@ -1,7 +1,5 @@
 module CommandLine
-
   class Option
-
     attr_reader :name, :alias
     attr_reader :parameter_count
     attr_reader :default_value
@@ -18,7 +16,7 @@ module CommandLine
     def initialize(name, definition = {})
       @name            = CommandLine::Option.rewrite(name)
       @alias           = definition[:alias] ? definition[:alias].to_sym : nil
-      @required        = definition.has_key?(:required) && definition[:required] == true
+      @required        = definition.key?(:required) && definition[:required] == true
       @parameter_count = definition[:parameters] || 1
       @multiple        = definition[:multiple]   || false
       @default_value   = definition[:default]    || false
@@ -29,7 +27,7 @@ module CommandLine
         return true
       elsif @parameter_count == 1
         parameter = arguments_parser.next_parameter
-        raise CommandLine::ParameterExpected, self if parameter.nil?
+        fail CommandLine::ParameterExpected, self if parameter.nil?
         return parameter
       elsif @parameter_count == :any
         parameters = []
@@ -39,9 +37,9 @@ module CommandLine
         return parameters
       else
         parameters = []
-        @parameter_count.times do |n|
+        @parameter_count.times do |_n|
           parameter = arguments_parser.next_parameter
-          raise CommandLine::ParameterExpected, self if parameter.nil?
+          fail CommandLine::ParameterExpected, self if parameter.nil?
           parameters << parameter
         end
         return parameters
@@ -87,10 +85,8 @@ module CommandLine
   end
 
   class Arguments
-
     class Definition
-
-      ENDLESS_PARAMETERS = 99999
+      ENDLESS_PARAMETERS = 99_999
 
       attr_reader :commands, :options, :parameters
 
@@ -103,10 +99,10 @@ module CommandLine
 
       def [](option_name)
         option_symbol = CommandLine::Option.rewrite(option_name)
-        if the_option = @options.detect { |(_, odef)| odef =~ option_symbol }
+        if the_option = @options.find { |(_, odef)| odef =~ option_symbol }
           the_option[1]
         else
-          raise CommandLine::UnknownOption, option_name
+          fail CommandLine::UnknownOption, option_name
         end
       end
 
@@ -114,11 +110,9 @@ module CommandLine
         @parameters = count_specifier..ENDLESS_PARAMETERS
       end
 
-      def parameters=(count_specifier)
-        @parameters = count_specifier
-      end
+      attr_writer :parameters
 
-      alias :files= :parameters=
+      alias_method :files=, :parameters=
 
       def option(name, options = {})
         clo = CommandLine::Option.new(name, options)
@@ -126,10 +120,10 @@ module CommandLine
       end
 
       def switch(name, switch_alias = nil)
-        option(name, :alias => switch_alias, :parameters => 0)
+        option(name, alias: switch_alias, parameters: 0)
       end
 
-      def command(name, &block)
+      def command(name, &_block)
         command_definition = Definition.new(self)
         yield(command_definition) if block_given?
         @commands[CommandLine::Option.rewrite(name)] = command_definition
@@ -140,7 +134,7 @@ module CommandLine
       end
     end
 
-    OPTION_REGEXP  = /^\-\-([A-Za-z0-9-]+)$/;
+    OPTION_REGEXP  = /^\-\-([A-Za-z0-9-]+)$/
     ALIASES_REGEXP = /^\-([A-Aa-z0-9]+)$/
 
     attr_reader :definition
@@ -150,7 +144,7 @@ module CommandLine
     def self.parse(tokens = $*, &block)
       cla = Arguments.new
       cla.define(&block)
-      return cla.parse!(tokens)
+      cla.parse!(tokens)
     end
 
     def initialize
@@ -159,12 +153,12 @@ module CommandLine
       @current_definition = @definition
     end
 
-    def define(&block)
+    def define(&_block)
       yield(@definition)
     end
 
     def [](option)
-      if the_option = @options.detect { |(key, _)| key =~ option }
+      if the_option = @options.find { |(key, _)| key =~ option }
         the_option[1]
       else
         @current_definition[option].default_value
@@ -173,13 +167,13 @@ module CommandLine
 
     def next_token
       @current_token = @tokens.shift
-      return @current_token
+      @current_token
     end
 
     def next_parameter
       parameter_candidate = @tokens.first
       parameter = (parameter_candidate.nil? || OPTION_REGEXP =~ parameter_candidate || ALIASES_REGEXP =~ parameter_candidate) ? nil : @tokens.shift
-      return parameter
+      parameter
     end
 
     def parse!(tokens)
@@ -200,8 +194,8 @@ module CommandLine
           @command = CommandLine::Option.rewrite(@current_token)
         else
           case @current_token
-            when ALIASES_REGEXP; handle_alias_expansion($1)
-            when OPTION_REGEXP;  handle_option($1)
+            when ALIASES_REGEXP then handle_alias_expansion(Regexp.last_match[1])
+            when OPTION_REGEXP then  handle_option(Regexp.last_match[1])
             else;                handle_other_parameter(@current_token)
           end
           @first_token = false
@@ -211,24 +205,24 @@ module CommandLine
 
       validate_arguments!
 
-      return self
+      self
     end
 
     protected
 
     def prepare_result!
-      multiple_options = Hash[*@current_definition.options.select { |name, o| o.multiple? }.flatten]
-      multiple_options.each { |name, definition| @options[definition] = [] }
+      multiple_options = Hash[*@current_definition.options.select { |_name, o| o.multiple? }.flatten]
+      multiple_options.each { |_name, definition| @options[definition] = [] }
     end
 
     def validate_arguments!
       if @current_definition.parameters && !(@current_definition.parameters === @parameters.length)
-        raise CommandLine::ParametersOutOfRange.new(@current_definition.parameters, @parameters.length)
+        fail CommandLine::ParametersOutOfRange.new(@current_definition.parameters, @parameters.length)
       end
 
-      required_options = Hash[*@current_definition.options.select { |name, o| o.required? }.flatten]
+      required_options = Hash[*@current_definition.options.select { |_name, o| o.required? }.flatten]
       required_options.each do |name, definition|
-        raise CommandLine::RequiredOptionMissing, definition unless self[name]
+        fail CommandLine::RequiredOptionMissing, definition unless self[name]
       end
     end
 
@@ -237,7 +231,7 @@ module CommandLine
         if option_definition = @current_definition[alias_char]
           @tokens.unshift(option_definition.to_option)
         else
-          raise CommandLine::UnknownOption, alias_char
+          fail CommandLine::UnknownOption, alias_char
         end
       end
     end
@@ -248,7 +242,7 @@ module CommandLine
 
     def handle_option(option_name)
       option_definition = @current_definition[option_name]
-      raise CommandLine::UnknownOption, option_name if option_definition.nil?
+      fail CommandLine::UnknownOption, option_name if option_definition.nil?
 
       if option_definition.multiple?
         @options[option_definition] << option_definition.parse(self)
@@ -256,7 +250,6 @@ module CommandLine
         @options[option_definition] = option_definition.parse(self)
       end
     end
-
   end
 
   # Commandline parsing errors and exceptions
@@ -273,7 +266,7 @@ module CommandLine
   # Missing a required file
   class ParametersOutOfRange < CommandLine::Error
     def initialize(expected, actual)
-      if expected.kind_of?(Range)
+      if expected.is_a?(Range)
         if expected.end == CommandLine::Arguments::Definition::ENDLESS_PARAMETERS
           super("The command expected at least #{expected.begin} parameters, but found #{actual}!")
         else
@@ -298,4 +291,4 @@ module CommandLine
       super("#{option_identifier.inspect} not recognized as a valid option!")
     end
   end
-end
+end

data/lib/cli/database_console.rb

@@ -1,5 +1,4 @@
 class DatabaseConsole
-
   IRB = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
 
   def initialize(arguments)
@@ -7,7 +6,7 @@ class DatabaseConsole
   end
 
   def run!
-    libraries = ['irb/completion', 'rubygems','cli/database_console_init']
+    libraries = ['irb/completion', 'rubygems', 'cli/database_console_init']
     libaries_string = libraries.map { |l| "-r #{l}" }.join(' ')
 
     ENV['RLA_DBCONSOLE_DATABASE'] = @arguments[:database]
@@ -22,4 +21,3 @@ class DatabaseConsole
     exec("#{IRB} #{libaries_string} --simple-prompt")
   end
 end
-

data/lib/cli/database_console_init.rb

@@ -1,5 +1,5 @@
 # Setup the include path
-$:.unshift(File.expand_path('..', File.dirname(__FILE__)))
+$LOAD_PATH.unshift(File.expand_path('..', File.dirname(__FILE__)))
 require 'request_log_analyzer'
 require 'request_log_analyzer/database'
 
@@ -9,9 +9,9 @@ $database.register_default_orm_classes!
 
 require 'cli/tools'
 
-def wordwrap(string, max = 80, indent = "")
-  strings = [""]
-  string.split(", ").each do |item|
+def wordwrap(string, max = 80, indent = '')
+  strings = ['']
+  string.split(', ').each do |item|
     if strings.last.length == 0 || strings.last.length + item.length <= max
       strings.last << item << ', '
     else
@@ -28,9 +28,9 @@ class Request
 
     inspected_lines = lines.map do |line|
       inspect_line = "   - #{line.line_type} (line #{line.lineno})"
-      if (inspect_attributes = line.attributes.reject { |(k, v)| [:id, :source_id, :request_id, :lineno].include?(k.to_sym) }).any?
-        inspect_attributes = inspect_attributes.map { |(k,v)| "#{k} = #{v.inspect}" }.join(', ')
-        inspect_line << "\n      " + wordwrap(inspect_attributes, CommandLine::Tools.terminal_width - 6, "      ")
+      if (inspect_attributes = line.attributes.reject { |(k, _v)| [:id, :source_id, :request_id, :lineno].include?(k.to_sym) }).any?
+        inspect_attributes = inspect_attributes.map { |(k, v)| "#{k} = #{v.inspect}" }.join(', ')
+        inspect_line << "\n      " + wordwrap(inspect_attributes, CommandLine::Tools.terminal_width - 6, '      ')
       end
       inspect_line
     end
@@ -39,7 +39,7 @@ class Request
   end
 end
 
-puts "request-log-analyzer database console"
-puts "-------------------------------------"
-puts "The following ActiveRecord classes are available:"
-puts $database.orm_classes.map { |k| k.name.split('::').last }.join(", ")
+puts 'request-log-analyzer database console'
+puts '-------------------------------------'
+puts 'The following ActiveRecord classes are available:'
+puts $database.orm_classes.map { |k| k.name.split('::').last }.join(', ')

data/lib/cli/progressbar.rb

@@ -10,9 +10,9 @@
 
 module CommandLine
   class ProgressBar
-    VERSION = "0.9"
+    VERSION = '0.9'
 
-    def initialize (title, total, out = STDERR)
+    def initialize(title, total, out = STDERR)
       @title = title
       @total = total
       @out = out
@@ -30,17 +30,18 @@ module CommandLine
       show
     end
 
-    attr_reader   :title
-    attr_reader   :current
-    attr_reader   :total
+    attr_reader :title
+    attr_reader :current
+    attr_reader :total
     attr_accessor :start_time
 
     private
+
     def fmt_bar
       bar_width = do_percentage * @terminal_width / 100
-      sprintf("[%s%s]",
+      sprintf('[%s%s]',
               @bar_mark * bar_width,
-              " " *  (@terminal_width - bar_width))
+              ' ' *  (@terminal_width - bar_width))
     end
 
     def fmt_percentage
@@ -53,59 +54,59 @@ module CommandLine
 
     def fmt_stat_for_file_transfer
       if @finished_p then
-        sprintf("%s %s %s", bytes, transfer_rate, elapsed)
+        sprintf('%s %s %s', bytes, transfer_rate, elapsed)
       else
-        sprintf("%s %s %s", bytes, transfer_rate, eta)
+        sprintf('%s %s %s', bytes, transfer_rate, eta)
       end
     end
 
     def fmt_title
-      @title[0,(@title_width - 1)] + ":"
+      @title[0, (@title_width - 1)] + ':'
     end
 
-    def convert_bytes (bytes)
+    def convert_bytes(bytes)
       if bytes < 1024
-        sprintf("%6dB", bytes)
+        sprintf('%6dB', bytes)
       elsif bytes < 1024 * 1000 # 1000kb
-        sprintf("%5.1fKB", bytes.to_f / 1024)
+        sprintf('%5.1fKB', bytes.to_f / 1024)
       elsif bytes < 1024 * 1024 * 1000  # 1000mb
-        sprintf("%5.1fMB", bytes.to_f / 1024 / 1024)
+        sprintf('%5.1fMB', bytes.to_f / 1024 / 1024)
       else
-        sprintf("%5.1fGB", bytes.to_f / 1024 / 1024 / 1024)
+        sprintf('%5.1fGB', bytes.to_f / 1024 / 1024 / 1024)
       end
     end
 
     def transfer_rate
       bytes_per_second = @current.to_f / (Time.now - @start_time)
-      sprintf("%s/s", convert_bytes(bytes_per_second))
+      sprintf('%s/s', convert_bytes(bytes_per_second))
     end
 
     def bytes
       convert_bytes(@current)
     end
 
-    def format_time (t)
+    def format_time(t)
       t = t.to_i
       sec = t % 60
       min  = (t / 60) % 60
       hour = t / 3600
-      sprintf("%02d:%02d:%02d", hour, min, sec);
+      sprintf('%02d:%02d:%02d', hour, min, sec)
     end
 
     # ETA stands for Estimated Time of Arrival.
     def eta
       if @current == 0
-        "ETA:  --:--:--"
+        'ETA:  --:--:--'
       else
         elapsed = Time.now - @start_time
-        eta = elapsed * @total / @current - elapsed;
-        sprintf("ETA:  %s", format_time(eta))
+        eta = elapsed * @total / @current - elapsed
+        sprintf('ETA:  %s', format_time(eta))
       end
     end
 
     def elapsed
       elapsed = Time.now - @start_time
-      sprintf("Time: %s", format_time(elapsed))
+      sprintf('Time: %s', format_time(elapsed))
     end
 
     def eol
@@ -122,7 +123,7 @@ module CommandLine
 
     def show
       arguments = @format_arguments.map do |method|
-        method = sprintf("fmt_%s", method)
+        method = sprintf('fmt_%s', method)
         send(method)
       end
       line = sprintf(@format, *arguments)
@@ -158,9 +159,10 @@ module CommandLine
     end
 
     public
+
     def clear
       @out.print "\r"
-      @out.print(" " * (CommandLine::Tools.terminal_width(80) - 1))
+      @out.print(' ' * (CommandLine::Tools.terminal_width(80) - 1))
       @out.print "\r"
     end
 
@@ -178,27 +180,23 @@ module CommandLine
       @format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]
     end
 
-    def format= (format)
-      @format = format
-    end
+    attr_writer :format
 
-    def format_arguments= (arguments)
-      @format_arguments = arguments
-    end
+    attr_writer :format_arguments
 
     def halt
       @finished_p = true
       show
     end
 
-    def inc (step = 1)
+    def inc(step = 1)
       @current += step
       @current = @total if @current > @total
       show_if_needed
       @previous = @current
     end
 
-    def set (count)
+    def set(count)
       count = 0 if count < 0
       count = @total if count > @total