request-log-analyzer 1.3.7 → 1.4.0

data/LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2008 Willem van Bergen / Bart ten Brinke
- 
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@ without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
- 
+
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/README.rdoc

@@ -21,7 +21,7 @@ Alternatively, use the gem from the GitHub gem server:
 
   $ sudo gem install wvanbergen-request-log-analyzer --source http://gems.github.com
 
-To get the best results out of request-log-analyzer, make sure to 
+To get the best results out of request-log-analyzer, make sure to
 set up logging correctly: http://wiki.github.com/wvanbergen/request-log-analyzer/configure-logging
 for your application.
 

data/bin/request-log-analyzer

@@ -1,4 +1,6 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
+# encoding: utf-8
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'request_log_analyzer'
 require 'cli/command_line_arguments'
@@ -15,8 +17,6 @@ begin
 
     command_line.command(:console) do |cons|
       cons.option(:database, :alias => :d, :required => true)
-      cons.option(:format, :alias => :f, :default => 'rails')
-      cons.option(:apache_format)
     end
 
     command_line.command(:strip) do |strip|
@@ -24,11 +24,12 @@ begin
       strip.option(:format, :alias => :f, :default => 'rails')
       strip.option(:output, :alias => :o)
       strip.switch(:discard_teaser_lines, :t)
-      strip.switch(:keep_junk_lines, :j) 
+      strip.switch(:keep_junk_lines, :j)
     end
 
     command_line.option(:format, :alias => :f, :default => 'rails')
     command_line.option(:apache_format)
+    command_line.option(:rails_format)
 
     command_line.option(:file, :alias => :e)
     command_line.option(:mail, :alias => :m)
@@ -48,7 +49,9 @@ begin
 
     command_line.switch(:boring, :b)
     command_line.option(:output, :alias => :o, :default => 'FixedWidth')
-    command_line.option(:report_width, :default => terminal_width - 1)
+    command_line.option(:report_width,  :default => terminal_width - 1)
+    command_line.option(:report_amount, :default => 20)
+    command_line.option(:report_sort,   :default => 'sum,mean')
 
     command_line.switch(:debug)
     command_line.switch(:no_progress)
@@ -57,7 +60,7 @@ begin
   end
 
 rescue CommandLine::Error => e
-  puts "Request-log-analyzer, by Willem van Bergen and Bart ten Brinke - version #{RequestLogAnalyzer::VERSION}"  
+  puts "Request-log-analyzer, by Willem van Bergen and Bart ten Brinke - version #{RequestLogAnalyzer::VERSION}"
   puts "Website: http://railsdoctors.com"
   puts
   puts "ARGUMENT ERROR: " + e.message if e.message
@@ -67,9 +70,9 @@ rescue CommandLine::Error => e
   puts "Input options:"
   puts "  --format <format>, -f:     Uses the specified log file format. Defaults to rails."
   puts "  --after <date>             Only consider requests from <date> or later."
-  puts "  --before <date>            Only consider requests before <date>."  
-  puts "  --select <field> <value>   Only consider requests where <field> matches <value>."        
-  puts "  --reject <field> <value>   Only consider requests where <field> does not match <value>."    
+  puts "  --before <date>            Only consider requests before <date>."
+  puts "  --select <field> <value>   Only consider requests where <field> matches <value>."
+  puts "  --reject <field> <value>   Only consider requests where <field> does not match <value>."
   puts
   puts "Output options:"
   puts "  --boring, -b               Output reports without ASCII colors."
@@ -77,9 +80,9 @@ rescue CommandLine::Error => e
   puts "  --debug                    Print debug information while parsing."
   puts "  --file <filename>          Output to file."
   puts "  --mail <emailaddress>      Send report to an email address."
-  puts "  --output <format>          Output format. Supports 'HTML' and 'FixedWidth' (default)"  
+  puts "  --output <format>          Output format. Supports 'HTML' and 'FixedWidth' (default)"
   puts "  --dump <filename>          Dump the YAML formatted results in the given file"
-  puts 
+  puts
   puts "Examples:"
   puts "  request-log-analyzer development.log"
   puts "  request-log-analyzer -b mongrel.0.log mongrel.1.log mongrel.2.log "
@@ -89,7 +92,7 @@ rescue CommandLine::Error => e
   puts "run the following command in your application's root directory:"
   puts
   puts "  request-log-analyzer install rails"
-  exit(0) 
+  exit(0)
 end
 
 case arguments.command
@@ -101,11 +104,11 @@ when :console
 when :strip
   require File.dirname(__FILE__) + '/../lib/request_log_analyzer/log_processor'
   RequestLogAnalyzer::LogProcessor.build(:strip, arguments).run!
-else 
+else
   puts "Request-log-analyzer, by Willem van Bergen and Bart ten Brinke - version #{RequestLogAnalyzer::VERSION}"
   puts "Website: http://railsdoctors.com"
   puts
 
   # Run the request_log_analyzer!
-  RequestLogAnalyzer::Controller.build(arguments).run!
+  RequestLogAnalyzer::Controller.build_from_arguments(arguments).run!
 end

data/lib/cli/command_line_arguments.rb

@@ -71,7 +71,7 @@ module CommandLine
     def required?
       @required
     end
-    
+
     # Check if flag is optional
     def optional?
       !@required
@@ -85,22 +85,22 @@ module CommandLine
       !@default_value.nil?
     end
   end
-  
+
   class Arguments
 
     class Definition
-      
+
       ENDLESS_PARAMETERS = 99999
-      
+
       attr_reader :commands, :options, :parameters
-      
+
       def initialize(parent)
         @parent = parent
         @options  = {}
         @commands = {}
         @parameters = nil
       end
-      
+
       def [](option_name)
         option_symbol = CommandLine::Option.rewrite(option_name)
         if the_option = @options.detect { |(name, odef)| odef =~ option_symbol }
@@ -109,22 +109,22 @@ module CommandLine
           raise CommandLine::UnknownOption, option_name
         end
       end
-      
+
       def minimum_parameters=(count_specifier)
         @parameters = count_specifier..ENDLESS_PARAMETERS
       end
-            
+
       def parameters=(count_specifier)
         @parameters = count_specifier
       end
-      
-      alias :files= :parameters= 
-      
+
+      alias :files= :parameters=
+
       def option(name, options = {})
         clo = CommandLine::Option.new(name, options)
         @options[clo.name] = clo
       end
-      
+
       def switch(name, switch_alias = nil)
         option(name, :alias => switch_alias, :parameters => 0)
       end
@@ -134,35 +134,35 @@ module CommandLine
         yield(command_definition) if block_given?
         @commands[CommandLine::Option.rewrite(name)] = command_definition
       end
-      
+
       def has_command?(command)
         @commands[CommandLine::Option.rewrite(command)]
       end
     end
-    
+
     OPTION_REGEXP  = /^\-\-([A-Za-z0-9-]+)$/;
     ALIASES_REGEXP = /^\-([A-Aa-z0-9]+)$/
-    
+
     attr_reader :definition
     attr_reader :tokens
     attr_reader :command, :options, :parameters
-    
+
     def self.parse(tokens = $*, &block)
       cla = Arguments.new
       cla.define(&block)
-      return cla.parse!(tokens)   
+      return cla.parse!(tokens)
     end
-    
+
     def initialize
       @tokens = []
-      @definition = Definition.new(self)    
-      @current_definition = @definition        
+      @definition = Definition.new(self)
+      @current_definition = @definition
     end
-    
+
     def define(&block)
       yield(@definition)
     end
-    
+
     def [](option)
       if the_option = @options.detect { |(key, value)| key =~ option }
         the_option[1]
@@ -170,31 +170,31 @@ module CommandLine
         @current_definition[option].default_value
       end
     end
-        
+
     def next_token
       @current_token = @tokens.shift
       return @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
     end
-    
+
     def parse!(tokens)
-      @current_definition = @definition         
+      @current_definition = @definition
       @first_token = true
       @tokens      = tokens.clone
-      
+
       @options = {}
       @parameters   = []
       @command = nil
-      
+
       prepare_result!
-      
+
       while next_token
-        
+
         if @first_token && command_definition = @definition.has_command?(@current_token)
           @current_definition = command_definition
           @command = CommandLine::Option.rewrite(@current_token)
@@ -204,34 +204,34 @@ module CommandLine
             when OPTION_REGEXP;  handle_option($1)
             else;                handle_other_parameter(@current_token)
           end
-          @first_token = false          
+          @first_token = false
         end
-          
+
       end
-      
+
       validate_arguments!
-      
-      return self     
+
+      return 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] = [] }
     end
-    
+
     def validate_arguments!
       if @current_definition.parameters && !(@current_definition.parameters === @parameters.length)
         raise CommandLine::ParametersOutOfRange.new(@current_definition.parameters, @parameters.length)
       end
-      
+
       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] 
+        raise CommandLine::RequiredOptionMissing, definition unless self[name]
       end
     end
-    
+
     def handle_alias_expansion(aliases)
       aliases.reverse.scan(/./) do |alias_char|
         if option_definition = @current_definition[alias_char]
@@ -241,24 +241,24 @@ module CommandLine
         end
       end
     end
-    
+
     def handle_other_parameter(parameter)
       @parameters << parameter
     end
-    
+
     def handle_option(option_name)
       option_definition = @current_definition[option_name]
       raise CommandLine::UnknownOption, option_name if option_definition.nil?
-      
+
       if option_definition.multiple?
-        @options[option_definition] << option_definition.parse(self)        
+        @options[option_definition] << option_definition.parse(self)
       else
         @options[option_definition] = option_definition.parse(self)
       end
     end
-        
+
   end
-  
+
   # Commandline parsing errors and exceptions
   class Error < Exception
   end
@@ -267,7 +267,7 @@ module CommandLine
   class RequiredOptionMissing < CommandLine::Error
     def initialize(option)
       super("You have to provide the #{option.name} option!")
-    end    
+    end
   end
 
   # Missing a required file
@@ -282,14 +282,14 @@ module CommandLine
       else
         super("The command expected #{expected} parameters, but found #{actual}!")
       end
-    end    
+    end
   end
 
   # Missing a required flag argument
   class ParameterExpected < CommandLine::Error
     def initialize(option)
       super("The option #{option.inspect} expects a parameter!")
-    end    
+    end
   end
 
   # Encountered an unkown flag
@@ -297,5 +297,5 @@ module CommandLine
     def initialize(option_identifier)
       super("#{option_identifier.inspect} not recognized as a valid option!")
     end
-  end  
+  end
 end

data/lib/cli/database_console.rb

@@ -1,12 +1,12 @@
 
 class DatabaseConsole
-  
+
   IRB = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-  
+
   def initialize(arguments)
     @arguments = arguments
   end
-  
+
   def run!
     libraries = ['irb/completion', 'rubygems', './lib/request_log_analyzer', './lib/cli/database_console_init']
     libaries_string = libraries.map { |l| "-r #{l}" }.join(' ')

data/lib/cli/database_console_init.rb

@@ -23,7 +23,7 @@ class Request
   def inspect
     request_inspect = "Request[id: #{id}]"
     request_inspect << " <#{lines.first.source.filename}>" if lines.first.source
-    
+
     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?
@@ -32,7 +32,7 @@ class Request
       end
       inspect_line
     end
-    
+
     request_inspect << "\n" << inspected_lines.join("\n") << "\n\n"
   end
 end

data/lib/cli/progressbar.rb

@@ -37,8 +37,8 @@ module CommandLine
     private
     def fmt_bar
       bar_width = do_percentage * @terminal_width / 100
-      sprintf("[%s%s]", 
-              @bar_mark * bar_width, 
+      sprintf("[%s%s]",
+              @bar_mark * bar_width,
               " " *  (@terminal_width - bar_width))
     end
 
@@ -51,9 +51,9 @@ module CommandLine
     end
 
     def fmt_stat_for_file_transfer
-      if @finished_p then 
+      if @finished_p then
         sprintf("%s %s %s", bytes, transfer_rate, elapsed)
-      else 
+      else
         sprintf("%s %s %s", bytes, transfer_rate, eta)
       end
     end
@@ -106,7 +106,7 @@ module CommandLine
       elapsed = Time.now - @start_time
       sprintf("Time: %s", format_time(elapsed))
     end
-  
+
     def eol
       if @finished_p then "\n" else "\r" end
     end
@@ -120,14 +120,14 @@ module CommandLine
     end
 
     def show
-      arguments = @format_arguments.map {|method| 
+      arguments = @format_arguments.map {|method|
         method = sprintf("fmt_%s", method)
         send(method)
       }
       line = sprintf(@format, *arguments)
 
       width = terminal_width(80)
-      if line.length == width - 1 
+      if line.length == width - 1
         @out.print(line + eol)
         @out.flush
       elsif line.length >= width
@@ -150,7 +150,7 @@ module CommandLine
       end
 
       # Use "!=" instead of ">" to support negative changes
-      if cur_percentage != prev_percentage || 
+      if cur_percentage != prev_percentage ||
           Time.now - @previous_time >= 1 || @finished_p
         show
       end
@@ -198,9 +198,9 @@ module CommandLine
     end
 
     def set (count)
-      count = 0 if count < 0 
+      count = 0 if count < 0
       count = @total if count > @total
-    
+
       @current = count
       show_if_needed
       @previous = @current