bin/request-log-analyzer in request-log-analyzer-1.3.7 vs bin/request-log-analyzer in request-log-analyzer-1.4.0

- old
+ new

@@ -1,6 +1,8 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby +# encoding: utf-8 + $:.unshift(File.dirname(__FILE__) + '/../lib') require 'request_log_analyzer' require 'cli/command_line_arguments' require 'cli/progressbar' require 'cli/tools' @@ -13,24 +15,23 @@ install.parameters = 1 end 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| strip.minimum_parameters = 1 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) command_line.option(:parse_strategy, :default => 'assume-correct') command_line.option(:dump) @@ -46,52 +47,54 @@ command_line.option(:after) command_line.option(:before) 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) command_line.minimum_parameters = 1 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 puts puts "Usage: request-log-analyzer [LOGFILES*] <OPTIONS>" puts 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." puts " --database <filename>, -d: Creates an SQLite3 database of all the parsed request information." 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 " puts " request-log-analyzer --format merb -d requests.db production.log" puts puts "To install rake tasks in your Rails application, " 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 when :install install_rake_tasks(arguments.parameters[0]) @@ -99,13 +102,13 @@ require 'cli/database_console' DatabaseConsole.new(arguments).run! 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