request-log-analyzer 1.12.2 → 1.12.3

data/lib/cli/database_console.rb

@@ -1,4 +1,3 @@
-
 class DatabaseConsole
 
   IRB = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
@@ -8,7 +7,7 @@ class DatabaseConsole
   end
 
   def run!
-    libraries = ['irb/completion', 'rubygems','./lib/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]

data/lib/request_log_analyzer/controller.rb

@@ -97,7 +97,7 @@ module RequestLogAnalyzer
     #
     # Options
     # * <tt>:after</tt> Drop all requests after this date (Date, DateTime, Time, or a String in "YYYY-MM-DD hh:mm:ss" format)
-    # * <tt>:aggregator</tt> Array of aggregators (ATM: STRINGS OR SYMBOLS ONLY! - Defaults to [:summarizer]).
+    # * <tt>:aggregator</tt> Array of aggregators (Strings or Symbols for the builtin aggregators or a RequestLogAnalyzer::Aggregator class - Defaults to [:summarizer]).
     # * <tt>:boring</tt> Do not show color on STDOUT (Defaults to false).
     # * <tt>:before</tt> Drop all requests before this date (Date, DateTime, Time or a String in "YYYY-MM-DD hh:mm:ss" format)
     # * <tt>:database</tt> Database file to insert encountered requests to.
@@ -116,6 +116,7 @@ module RequestLogAnalyzer
     # * <tt>:source_files</tt> Source files to analyze. Provide either File, array of files or STDIN.
     # * <tt>:yaml</tt> Output to YAML file.
     # * <tt>:silent</tt> Minimal output automatically implies :no_progress
+    # * <tt>:source</tt> The class to instantiate to grab the requestes, must be a RequestLogAnalyzer::Source::Base descendant. (Defaults to RequestLogAnalyzer::Source::LogParser)
     #
     # === Example
     # RequestLogAnalyzer::Controller.build(
@@ -138,6 +139,7 @@ module RequestLogAnalyzer
       options[:report_sort]   ||= 'sum,mean'
       options[:boring]        ||= false
       options[:silent]        ||= false
+      options[:source]        ||= RequestLogAnalyzer::Source::LogParser
 
       options[:no_progress] = true if options[:silent]
 
@@ -182,9 +184,9 @@ module RequestLogAnalyzer
 
       # Kickstart the controller
       controller =
-        Controller.new(RequestLogAnalyzer::Source::LogParser.new(file_format,
-                                                                 :source_files => options[:source_files],
-                                                                 :parse_strategy => options[:parse_strategy]),
+        Controller.new(options[:source].new(file_format,
+                                            :source_files => options[:source_files],
+                                            :parse_strategy => options[:parse_strategy]),
                        { :output         => output_instance,
                          :database       => options[:database],                # FUGLY!
                          :yaml           => options[:yaml],
@@ -220,7 +222,7 @@ module RequestLogAnalyzer
       end
 
       # register aggregators
-      options[:aggregator].each { |agg| controller.add_aggregator(agg.to_sym) }
+      options[:aggregator].each { |agg| controller.add_aggregator(agg) }
       controller.add_aggregator(:summarizer)          if options[:aggregator].empty?
       controller.add_aggregator(:echo)                if options[:debug]
       controller.add_aggregator(:database_inserter)   if options[:database] && !options[:aggregator].include?('database')
@@ -284,7 +286,7 @@ module RequestLogAnalyzer
     # Adds an aggregator to the controller. The aggregator will be called for every request
     # that is parsed from the provided sources (see add_source)
     def add_aggregator(agg)
-      agg = RequestLogAnalyzer::Aggregator.const_get(RequestLogAnalyzer.to_camelcase(agg)) if agg.kind_of?(Symbol)
+      agg = RequestLogAnalyzer::Aggregator.const_get(RequestLogAnalyzer.to_camelcase(agg)) if agg.kind_of?(String) || agg.kind_of?(Symbol)
       @aggregators << agg.new(@source, @options)
     end
 

data/lib/request_log_analyzer/source/log_parser.rb

@@ -309,7 +309,7 @@ module RequestLogAnalyzer::Source
           end
         else
           @skipped_lines += 1
-          warn(:no_current_request, "Parsebale line (#{request_data[:line_definition].name.inspect}) found outside of a request!")
+          warn(:no_current_request, "Parseable line (#{request_data[:line_definition].name.inspect}) found outside of a request!")
         end
       end
     end

data/request-log-analyzer.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "1.12.2"
-  s.date    = "2012-02-29"
+  s.version = "1.12.3"
+  s.date    = "2012-07-09"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.requirements << "To use the database inserter, ActiveRecord and an appropriate database adapter are required."
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.0')
+  s.add_development_dependency('rspec', '= 2.8.0')
 
   s.add_development_dependency('activerecord')
 

metadata

@@ -2,7 +2,7 @@
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 +01:00
+date: 2012-07-09 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,9 +31,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 2.8.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency