request-log-analyzer 1.12.8 → 1.12.9

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
+before_script:
+  - mysql -e 'create database rla_test;'
+  - psql -c 'create database rla_test;' -U postgres
 script: bundle exec rake
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head
   - ree
   - jruby-18mode
@@ -13,8 +16,6 @@ rvm:
   - rbx-19mode
 matrix:
   allow_failures:
-    - rvm: jruby-19mode
-    - rvm: rbx-19mode
     - rvm: jruby-head
     - rvm: ruby-head
 notifications:

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Rakefile

@@ -1,8 +1,11 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
 Dir[File.dirname(__FILE__) + "/tasks/*.rake"].each { |file| load(file) }
 
-# Create rake tasks for a gem manages by github. The tasks are created in the
-# gem namespace
-GithubGem::RakeTasks.new(:gem)
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.pattern = "./spec/**/*_spec.rb"
+  task.rspec_opts = ['--color']
+end
 
-# Set the RSpec runner with specdoc output as default task.
-task :default => "spec:specdoc"
+task :default => :spec

data/lib/request_log_analyzer.rb

@@ -8,10 +8,6 @@ require 'other/ordered_hash'
 # The {RequestLogAnalyzer::VERSION} constant can be used to determine what version of request-log-analyzer
 # is running.
 module RequestLogAnalyzer
-  
-  # The current version of request-log-analyzer.
-  # Do not change the value by hand; it will be updated automatically by the gem release script.
-  VERSION = "1.12.8"
 
   # Convert a string/symbol in camelcase ({RequestLogAnalyzer::Controller}) to underscores 
   # (<tt>request_log_analyzer/controller</tt>). This function can be used to load the file (using 
@@ -34,6 +30,7 @@ module RequestLogAnalyzer
   end
 end
 
+require 'request_log_analyzer/version'
 require 'request_log_analyzer/controller'
 require 'request_log_analyzer/aggregator'
 require 'request_log_analyzer/file_format'

data/lib/request_log_analyzer/database/base.rb

@@ -106,11 +106,11 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
     when :hash;      :text
     when :text;      :text
     when :string;    :string
-    when :sec;       :double
-    when :msec;      :double
-    when :duration;  :double
-    when :float;     :double
-    when :double;    :double
+    when :sec;       :float
+    when :msec;      :float
+    when :duration;  :float
+    when :float;     :float
+    when :double;    :float
     when :integer;   :integer
     when :int;       :int
     when :timestamp; :datetime

data/lib/request_log_analyzer/file_format.rb

@@ -1,3 +1,5 @@
+require 'request_log_analyzer/request'
+
 module RequestLogAnalyzer::FileFormat
 
   autoload :Rails,            'request_log_analyzer/file_format/rails'
@@ -204,36 +206,9 @@ module RequestLogAnalyzer::FileFormat
     # CLASS METHODS for format definition
     ####################################################################################
 
-    # Registers the line definer instance for a subclass.
-    def self.inherited(subclass)
-      if subclass.superclass == RequestLogAnalyzer::FileFormat::Base
-
-        # Create aline and report definer for this class
-        subclass.class_eval do
-          instance_variable_set(:@line_definer, RequestLogAnalyzer::LineDefinition::Definer.new)
-          instance_variable_set(:@report_definer, RequestLogAnalyzer::Aggregator::Summarizer::Definer.new)
-          class << self; attr_accessor :line_definer, :report_definer; end
-        end
-
-        # Create a custom Request class for this file format
-        subclass.const_set('Request', Class.new(RequestLogAnalyzer::Request)) unless subclass.const_defined?('Request')
-      else
-
-        # Copy the line and report definer from the parent class.
-        subclass.class_eval do
-          instance_variable_set(:@line_definer, superclass.line_definer.clone)
-          instance_variable_set(:@report_definer, superclass.report_definer.clone)
-          class << self; attr_accessor :line_definer, :report_definer; end
-        end
-
-        # Create a custom Request class based on the superclass's Request class
-        subclass.const_set('Request', Class.new(subclass.superclass::Request)) unless subclass.const_defined?('Request')
-      end
-    end
-
     # Specifies a single line defintions.
     def self.line_definition(name, &block)
-      @line_definer.define_line(name, &block)
+      line_definer.define_line(name, &block)
     end
 
     # Specifies multiple line definitions at once using a block
@@ -251,6 +226,19 @@ module RequestLogAnalyzer::FileFormat
       yield(self.report_definer)
     end
 
+    # Setup the default line definer.
+    def self.line_definer
+      @line_definer ||= ::RequestLogAnalyzer::LineDefinition::Definer.new
+    end
+
+    # Setup the default report definer.
+    def self.report_definer
+      @report_definer ||= ::RequestLogAnalyzer::Aggregator::Summarizer::Definer.new
+    end
+
+    # Setup the default Request class.
+    Request = ::RequestLogAnalyzer::Request
+
     ####################################################################################
     # Instantiation
     ####################################################################################

data/lib/request_log_analyzer/file_format/nginx.rb

@@ -3,7 +3,7 @@ module RequestLogAnalyzer::FileFormat
   class Nginx < Apache
 
     def self.create(*args)
-      super(:nginx, *args)
+      super(:combined, *args)
     end
   end
 end

data/lib/request_log_analyzer/file_format/rails3.rb

@@ -32,8 +32,8 @@ module RequestLogAnalyzer::FileFormat
 
     # Parameters: {"action"=>"cached", "controller"=>"cached"}
     line_definition :parameters do |line|
-      line.teaser = / Parameters:/
-      line.regexp = / Parameters:\s+(\{.*\})/
+      line.teaser = /\bParameters:/
+      line.regexp = /\bParameters:\s+(\{.*\})/
       line.capture(:params).as(:eval)
     end
 
@@ -73,8 +73,8 @@ module RequestLogAnalyzer::FileFormat
     # Rendered queries/index.html.erb (0.6ms)
     line_definition :rendered do |line|
       line.compound = [:partial_duration]
-      line.teaser = / Rendered /
-      line.regexp = / Rendered ([a-zA-Z0-9_\-\/.]+(?:\/[a-zA-Z0-9_\-.]+)+)(?:\ within\ .*?)? \((\d+(?:\.\d+)?)ms\)/
+      line.teaser = /\bRendered /
+      line.regexp = /\bRendered ([a-zA-Z0-9_\-\/.]+(?:\/[a-zA-Z0-9_\-.]+)+)(?:\ within\ .*?)? \((\d+(?:\.\d+)?)ms\)/
       line.capture(:rendered_file)
       line.capture(:partial_duration).as(:duration, :unit => :msec)
     end
@@ -133,4 +133,4 @@ module RequestLogAnalyzer::FileFormat
     end
 
   end
-end
+end

data/lib/request_log_analyzer/version.rb

@@ -0,0 +1,3 @@
+module RequestLogAnalyzer
+  VERSION = "1.12.9"
+end

data/request-log-analyzer.gemspec

@@ -1,18 +1,20 @@
-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.8"
-  s.date    = "2013-01-22"
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'request_log_analyzer/version'
+
+Gem::Specification.new do |gem|
+  gem.name    = "request-log-analyzer"
+  gem.rubyforge_project = 'r-l-a'
 
-  s.rubyforge_project = 'r-l-a'
+  gem.version = RequestLogAnalyzer::VERSION
 
-  s.bindir             = 'bin'
-  s.executables        = ['request-log-analyzer']
-  s.default_executable = 'request-log-analyzer'
+  gem.authors  = ['Willem van Bergen', 'Bart ten Brinke']
+  gem.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']
+  gem.homepage = 'http://railsdoctors.com'
 
-  s.summary     = "A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers"
-  s.description = <<-eos
+  gem.summary     = "A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers"
+  gem.description = <<-eos
     Request log analyzer's purpose is to find out how your web application is being used, how it performs and to
     focus your optimization efforts. This tool will parse all requests in the application's log file and aggregate the 
     information. Once it is finished parsing the log file(s), it will show the requests that take op most server time 
@@ -22,29 +24,31 @@ Gem::Specification.new do |s|
     easy to write log file format definition.
   eos
 
-  s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
-  s.extra_rdoc_files = ['README.rdoc']
-
-  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.8')
-
-  s.add_development_dependency('activerecord')
+  gem.rdoc_options << '--title' << gem.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
+  gem.extra_rdoc_files = ['README.rdoc']
 
+  gem.requirements << "To use the database inserter, ActiveRecord and an appropriate database adapter are required."
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('rspec', '~> 2.13')
+  gem.add_development_dependency('activerecord')
   if defined?(JRUBY_VERSION)
-    s.add_development_dependency('jdbc-sqlite3')
-    s.add_development_dependency('activerecord-jdbcsqlite3-adapter')
+    gem.add_development_dependency('jdbc-sqlite3')
+    gem.add_development_dependency('jdbc-mysql')
+    gem.add_development_dependency('jdbc-postgres')
+    gem.add_development_dependency('activerecord-jdbcsqlite3-adapter')
+    gem.add_development_dependency('activerecord-jdbcmysql-adapter')
+    gem.add_development_dependency('activerecord-jdbcpostgresql-adapter')
   else
-    s.add_development_dependency('sqlite3')
+    gem.add_development_dependency('sqlite3')
+    gem.add_development_dependency('mysql2')
+    gem.add_development_dependency('pg')
   end
   
-  s.authors  = ['Willem van Bergen', 'Bart ten Brinke']
-  s.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']
-  s.homepage = 'http://railsdoctors.com'
+  gem.files = `git ls-files`.split($/)
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
 
-  # The files and test_files directives are set automatically by the release script.
-  # Do not change them by hand, but make sure to add the files to the git repository.
-  s.files      = %w(.gitignore .infinity_test .travis.yml DESIGN.rdoc Gemfile LICENSE README.rdoc Rakefile bin/request-log-analyzer lib/cli/command_line_arguments.rb lib/cli/database_console.rb lib/cli/database_console_init.rb lib/cli/progressbar.rb lib/cli/tools.rb lib/other/ordered_hash.rb lib/request_log_analyzer.rb lib/request_log_analyzer/aggregator.rb lib/request_log_analyzer/aggregator/database_inserter.rb lib/request_log_analyzer/aggregator/echo.rb lib/request_log_analyzer/aggregator/summarizer.rb lib/request_log_analyzer/controller.rb lib/request_log_analyzer/database.rb lib/request_log_analyzer/database/base.rb lib/request_log_analyzer/database/connection.rb lib/request_log_analyzer/database/request.rb lib/request_log_analyzer/database/source.rb lib/request_log_analyzer/database/warning.rb lib/request_log_analyzer/file_format.rb lib/request_log_analyzer/file_format/amazon_s3.rb lib/request_log_analyzer/file_format/apache.rb lib/request_log_analyzer/file_format/delayed_job.rb lib/request_log_analyzer/file_format/delayed_job2.rb lib/request_log_analyzer/file_format/delayed_job21.rb lib/request_log_analyzer/file_format/delayed_job3.rb lib/request_log_analyzer/file_format/haproxy.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/file_format/mysql.rb lib/request_log_analyzer/file_format/nginx.rb lib/request_log_analyzer/file_format/oink.rb lib/request_log_analyzer/file_format/postgresql.rb lib/request_log_analyzer/file_format/rack.rb lib/request_log_analyzer/file_format/rails.rb lib/request_log_analyzer/file_format/rails3.rb lib/request_log_analyzer/file_format/rails_development.rb lib/request_log_analyzer/file_format/w3c.rb lib/request_log_analyzer/filter.rb lib/request_log_analyzer/filter/anonymize.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/filter/timespan.rb lib/request_log_analyzer/line_definition.rb lib/request_log_analyzer/log_processor.rb lib/request_log_analyzer/mailer.rb lib/request_log_analyzer/output.rb lib/request_log_analyzer/output/fixed_width.rb lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/request.rb lib/request_log_analyzer/source.rb lib/request_log_analyzer/source/log_parser.rb lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/tracker/duration.rb lib/request_log_analyzer/tracker/frequency.rb lib/request_log_analyzer/tracker/hourly_spread.rb lib/request_log_analyzer/tracker/numeric_value.rb lib/request_log_analyzer/tracker/timespan.rb lib/request_log_analyzer/tracker/traffic.rb request-log-analyzer.gemspec spec/database.yml spec/fixtures/apache_combined.log spec/fixtures/apache_common.log spec/fixtures/decompression.log spec/fixtures/decompression.log.bz2 spec/fixtures/decompression.log.gz spec/fixtures/decompression.log.zip spec/fixtures/decompression.tar.gz spec/fixtures/decompression.tgz spec/fixtures/header_and_footer.log spec/fixtures/merb.log spec/fixtures/merb_prefixed.log spec/fixtures/multiple_files_1.log spec/fixtures/multiple_files_2.log spec/fixtures/mysql_slow_query.log spec/fixtures/oink_22.log spec/fixtures/oink_22_failure.log spec/fixtures/postgresql.log spec/fixtures/rails.db spec/fixtures/rails_1x.log spec/fixtures/rails_22.log spec/fixtures/rails_22_cached.log spec/fixtures/rails_3_partials.log spec/fixtures/rails_unordered.log spec/fixtures/s3_logs/2012-10-05-16-18-11-F9AAC5D1A55AEBAD spec/fixtures/s3_logs/2012-10-05-16-26-06-15314AF7F0651839 spec/fixtures/sinatra.log spec/fixtures/syslog_1x.log spec/fixtures/test_file_format.log spec/fixtures/test_language_combined.log spec/fixtures/test_order.log spec/integration/command_line_usage_spec.rb spec/integration/mailer_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/integration/scout_spec.rb spec/lib/helpers.rb spec/lib/macros.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/lib/testing_format.rb spec/spec_helper.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/controller/controller_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/database/base_class_spec.rb spec/unit/database/connection_spec.rb spec/unit/database/database_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/file_format/apache_format_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/delayed_job21_format_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/delayed_job3_format_spec.rb spec/unit/file_format/delayed_job_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/file_format/haproxy_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/file_format/rails_format_spec.rb spec/unit/file_format/w3c_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/mailer_spec.rb spec/unit/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/traffic_tracker_spec.rb tasks/github-gem.rake tasks/request_log_analyzer.rake)
-  s.test_files = %w(spec/integration/command_line_usage_spec.rb spec/integration/mailer_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/integration/scout_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/controller/controller_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/database/base_class_spec.rb spec/unit/database/connection_spec.rb spec/unit/database/database_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/file_format/apache_format_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/delayed_job21_format_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/delayed_job3_format_spec.rb spec/unit/file_format/delayed_job_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/file_format/haproxy_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/file_format/rails_format_spec.rb spec/unit/file_format/w3c_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/mailer_spec.rb spec/unit/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/traffic_tracker_spec.rb)
+  gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.default_executable = 'request-log-analyzer'
+  gem.bindir = 'bin'
+  gem.require_paths = ["lib"]
 end

data/spec/database.yml

@@ -8,16 +8,12 @@ sqlite3:
   adapter: "sqlite3"
   database: ":memory:"
 
-# mysql:
-#   adapter: "mysql"
-#   host: "localhost"
-#   username: "root"
-#   password:
-#   database: "rla_test"
+mysql:
+  adapter: "mysql2"
+  username: "root"
+  database: "rla_test"
 
-# postgresql:
-#   adapter: "postgresql"
-#   host: "localhost"
-#   username: "rla"
-#   password: "rla"
-#   database: "rla_test"
+postgresql:
+  adapter: "postgresql"
+  username: "postgres"
+  database: "rla_test"

data/spec/unit/database/base_class_spec.rb

@@ -167,7 +167,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should create a field of the correct type for every provided field" do
-      @database.connection.table_creator.should_receive(:column).with(:evaluated_field, :double)
+      @database.connection.table_creator.should_receive(:column).with(:evaluated_field, :float)
       @klass.create_table!
     end
   end

data/spec/unit/file_format/rails3_format_spec.rb

@@ -56,6 +56,11 @@ describe RequestLogAnalyzer::FileFormat::Rails3 do
       subject.should parse_line(line).as(:parameters).and_capture(:params => {:action => 'cached', :controller => 'cached'})
     end
 
+    it "should parse a :parameters line with no indentation correctly" do
+      line = 'Parameters: {"action"=>"cached", "controller"=>"cached"}'
+      subject.should parse_line(line).as(:parameters).and_capture(:params => {:action => 'cached', :controller => 'cached'})
+    end
+
     it "should parse :completed lines correctly" do
       line = 'Completed 200 OK in 170ms (Views: 78.0ms | ActiveRecord: 48.2ms)'
       subject.should parse_line(line).as(:completed).and_capture(
@@ -91,6 +96,11 @@ describe RequestLogAnalyzer::FileFormat::Rails3 do
       line = " Rendered queries/index.html.erb (0.6ms)"
       subject.should parse_line(line).as(:rendered).and_capture(:partial_duration => [0.0006])
     end
+
+    it "should parse :rendered lines with no identation as an array" do
+      line = "Rendered queries/index.html.erb (0.6ms)"
+      subject.should parse_line(line).as(:rendered).and_capture(:partial_duration => [0.0006])
+    end
   end
 
   describe '#parse_io' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request-log-analyzer
 version: !ruby/object:Gem::Version
-  version: 1.12.8
+  version: 1.12.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "    Request log analyzer's purpose is to find out how your web application
   is being used, how it performs and to\n    focus your optimization efforts. This
   tool will parse all requests in the application's log file and aggregate the \n
@@ -96,7 +128,6 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .gitignore
-- .infinity_test
 - .travis.yml
 - DESIGN.rdoc
 - Gemfile
@@ -160,6 +191,7 @@ files:
 - lib/request_log_analyzer/tracker/numeric_value.rb
 - lib/request_log_analyzer/tracker/timespan.rb
 - lib/request_log_analyzer/tracker/traffic.rb
+- lib/request_log_analyzer/version.rb
 - request-log-analyzer.gemspec
 - spec/database.yml
 - spec/fixtures/apache_combined.log
@@ -242,7 +274,6 @@ files:
 - spec/unit/tracker/timespan_tracker_spec.rb
 - spec/unit/tracker/tracker_api_spec.rb
 - spec/unit/tracker/traffic_tracker_spec.rb
-- tasks/github-gem.rake
 - tasks/request_log_analyzer.rake
 homepage: http://railsdoctors.com
 licenses: []
@@ -262,12 +293,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4176554289530285347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4176554289530285347
 requirements:
 - To use the database inserter, ActiveRecord and an appropriate database adapter are
   required.
@@ -278,10 +315,47 @@ specification_version: 3
 summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
   and other web application servers
 test_files:
+- spec/database.yml
+- spec/fixtures/apache_combined.log
+- spec/fixtures/apache_common.log
+- spec/fixtures/decompression.log
+- spec/fixtures/decompression.log.bz2
+- spec/fixtures/decompression.log.gz
+- spec/fixtures/decompression.log.zip
+- spec/fixtures/decompression.tar.gz
+- spec/fixtures/decompression.tgz
+- spec/fixtures/header_and_footer.log
+- spec/fixtures/merb.log
+- spec/fixtures/merb_prefixed.log
+- spec/fixtures/multiple_files_1.log
+- spec/fixtures/multiple_files_2.log
+- spec/fixtures/mysql_slow_query.log
+- spec/fixtures/oink_22.log
+- spec/fixtures/oink_22_failure.log
+- spec/fixtures/postgresql.log
+- spec/fixtures/rails.db
+- spec/fixtures/rails_1x.log
+- spec/fixtures/rails_22.log
+- spec/fixtures/rails_22_cached.log
+- spec/fixtures/rails_3_partials.log
+- spec/fixtures/rails_unordered.log
+- spec/fixtures/s3_logs/2012-10-05-16-18-11-F9AAC5D1A55AEBAD
+- spec/fixtures/s3_logs/2012-10-05-16-26-06-15314AF7F0651839
+- spec/fixtures/sinatra.log
+- spec/fixtures/syslog_1x.log
+- spec/fixtures/test_file_format.log
+- spec/fixtures/test_language_combined.log
+- spec/fixtures/test_order.log
 - spec/integration/command_line_usage_spec.rb
 - spec/integration/mailer_spec.rb
 - spec/integration/munin_plugins_rails_spec.rb
 - spec/integration/scout_spec.rb
+- spec/lib/helpers.rb
+- spec/lib/macros.rb
+- spec/lib/matchers.rb
+- spec/lib/mocks.rb
+- spec/lib/testing_format.rb
+- spec/spec_helper.rb
 - spec/unit/aggregator/database_inserter_spec.rb
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/controller/controller_spec.rb

data/.infinity_test

@@ -1,8 +0,0 @@
-infinity_test do
-  
-  use :rubies => %w(1.8.7 1.9.2 ree), :test_framework => :rspec   # jruby rbx
-  
-  before(:each_ruby) do |environment|
-    environment.system('bundle install')
-  end
-end

data/tasks/github-gem.rake

@@ -1,367 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/tasklib'
-require 'date'
-require 'set'
-
-module GithubGem
-
-  # Detects the gemspc file of this project using heuristics.
-  def self.detect_gemspec_file
-    FileList['*.gemspec'].first
-  end
-
-  # Detects the main include file of this project using heuristics
-  def self.detect_main_include
-    if File.exist?(File.expand_path("../lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb", detect_gemspec_file))
-      "lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb"
-    elsif FileList['lib/*.rb'].length == 1
-      FileList['lib/*.rb'].first
-    else
-      nil
-    end
-  end
-
-  class RakeTasks
-
-    include Rake::DSL if Rake.const_defined?('DSL')
-
-    attr_reader   :gemspec, :modified_files
-    attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
-
-    # Initializes the settings, yields itself for configuration
-    # and defines the rake tasks based on the gemspec file.
-    def initialize(task_namespace = :gem)
-      @gemspec_file   = GithubGem.detect_gemspec_file
-      @task_namespace = task_namespace
-      @main_include   = GithubGem.detect_main_include
-      @modified_files = Set.new
-      @root_dir       = Dir.pwd
-      @test_pattern   = 'test/**/*_test.rb'
-      @spec_pattern   = 'spec/**/*_spec.rb'
-      @local_branch   = 'master'
-      @remote         = 'origin'
-      @remote_branch  = 'master'
-
-      yield(self) if block_given?
-
-      load_gemspec!
-      define_tasks!
-    end
-
-    protected
-
-    def git
-      @git ||= ENV['GIT'] || 'git'
-    end
-
-    # Define Unit test tasks
-    def define_test_tasks!
-      require 'rake/testtask'
-
-      namespace(:test) do
-        Rake::TestTask.new(:basic) do |t|
-          t.pattern = test_pattern
-          t.verbose = true
-          t.libs << 'test'
-        end
-      end
-
-      desc "Run all unit tests for #{gemspec.name}"
-      task(:test => ['test:basic'])
-    end
-
-    # Defines RSpec tasks
-    def define_rspec_tasks!
-      require 'rspec/core/rake_task'
-
-      namespace(:spec) do
-        desc "Verify all RSpec examples for #{gemspec.name}"
-        RSpec::Core::RakeTask.new(:basic) do |t|
-          t.pattern = spec_pattern
-        end
-
-        desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        RSpec::Core::RakeTask.new(:specdoc) do |t|
-          t.pattern = spec_pattern
-          t.rspec_opts = ['--format', 'documentation', '--color']
-        end
-
-        desc "Run RCov on specs for #{gemspec.name}"
-        RSpec::Core::RakeTask.new(:rcov) do |t|
-          t.pattern = spec_pattern
-          t.rcov = true
-          t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
-        end
-      end
-
-      desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-      task(:spec => ['spec:specdoc'])
-    end
-
-    # Defines the rake tasks
-    def define_tasks!
-
-      define_test_tasks!  if has_tests?
-      define_rspec_tasks! if has_specs?
-
-      namespace(@task_namespace) do
-        desc "Updates the filelist in the gemspec file"
-        task(:manifest) { manifest_task }
-
-        desc "Builds the .gem package"
-        task(:build => :manifest) { build_task }
-
-        desc "Sets the version of the gem in the gemspec"
-        task(:set_version => [:check_version, :check_current_branch]) { version_task }
-        task(:check_version => :fetch_origin) { check_version_task }
-
-        task(:fetch_origin) { fetch_origin_task }
-        task(:check_current_branch) { check_current_branch_task }
-        task(:check_clean_status) { check_clean_status_task }
-        task(:check_not_diverged => :fetch_origin) { check_not_diverged_task }
-
-        checks = [:check_current_branch, :check_clean_status, :check_not_diverged, :check_version]
-        checks.unshift('spec:basic') if has_specs?
-        checks.unshift('test:basic') if has_tests?
-        # checks.push << [:check_rubyforge] if gemspec.rubyforge_project
-
-        desc "Perform all checks that would occur before a release"
-        task(:release_checks => checks)
-
-        release_tasks = [:release_checks, :set_version, :build, :github_release, :gemcutter_release]
-        # release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
-
-        desc "Release a new version of the gem using the VERSION environment variable"
-        task(:release => release_tasks) { release_task }
-        
-        namespace(:release) do
-          desc "Release the next version of the gem, by incrementing the last version segment by 1"
-          task(:next => [:next_version] + release_tasks) { release_task }
-
-          desc "Release the next version of the gem, using a patch increment (0.0.1)"
-          task(:patch => [:next_patch_version] + release_tasks) { release_task }
-
-          desc "Release the next version of the gem, using a minor increment (0.1.0)"
-          task(:minor => [:next_minor_version] + release_tasks) { release_task }
-
-          desc "Release the next version of the gem, using a major increment (1.0.0)"
-          task(:major => [:next_major_version] + release_tasks) { release_task }
-        end
-
-        # task(:check_rubyforge)   { check_rubyforge_task }
-        # task(:rubyforge_release) { rubyforge_release_task }
-        task(:gemcutter_release) { gemcutter_release_task }
-        task(:github_release => [:commit_modified_files, :tag_version]) { github_release_task }
-        task(:tag_version) { tag_version_task }
-        task(:commit_modified_files) { commit_modified_files_task }
-
-        task(:next_version)       { next_version_task }
-        task(:next_patch_version)  { next_version_task(:patch) }
-        task(:next_minor_version) { next_version_task(:minor) }
-        task(:next_major_version) { next_version_task(:major) }
-        
-        desc "Updates the gem release tasks with the latest version on Github"
-        task(:update_tasks) { update_tasks_task }
-      end
-    end
-
-    # Updates the files list and test_files list in the gemspec file using the list of files
-    # in the repository and the spec/test file pattern.
-    def manifest_task
-      # Load all the gem's files using "git ls-files"
-      repository_files = `#{git} ls-files`.split("\n")
-      test_files       = Dir[test_pattern] + Dir[spec_pattern]
-
-      update_gemspec(:files, repository_files)
-      update_gemspec(:test_files, repository_files & test_files)
-    end
-
-    # Builds the gem
-    def build_task
-      sh "gem build -q #{gemspec_file}"
-      Dir.mkdir('pkg') unless File.exist?('pkg')
-      sh "mv #{gemspec.name}-#{gemspec.version}.gem pkg/#{gemspec.name}-#{gemspec.version}.gem"
-    end
-
-    def newest_version
-      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
-    end
-
-    def next_version(increment = nil)
-      next_version = newest_version.segments
-      increment_index = case increment
-        when :micro then 3
-        when :patch then 2
-        when :minor then 1
-        when :major then 0
-        else next_version.length - 1
-      end
-      
-      next_version[increment_index] ||= 0
-      next_version[increment_index] = next_version[increment_index].succ
-      ((increment_index + 1)...next_version.length).each { |i| next_version[i] = 0 }
-      
-      Gem::Version.new(next_version.join('.'))
-    end
-
-    def next_version_task(increment = nil)
-      ENV['VERSION'] = next_version(increment).version
-      puts "Releasing version #{ENV['VERSION']}..."
-    end
-
-    # Updates the version number in the gemspec file, the VERSION constant in the main
-    # include file and the contents of the VERSION file.
-    def version_task
-      update_gemspec(:version, ENV['VERSION']) if ENV['VERSION']
-      update_gemspec(:date, Date.today)
-
-      update_version_file(gemspec.version)
-      update_version_constant(gemspec.version)
-    end
-
-    def check_version_task
-      raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new((ENV['VERSION'] || gemspec.version).dup)
-      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
-    end
-
-    # Checks whether the current branch is not diverged from the remote branch
-    def check_not_diverged_task
-      raise "The current branch is diverged from the remote branch!" if `#{git} rev-list HEAD..#{remote}/#{remote_branch}`.split("\n").any?
-    end
-
-    # Checks whether the repository status ic clean
-    def check_clean_status_task
-      raise "The current working copy contains modifications" if `#{git} ls-files -m`.split("\n").any?
-    end
-
-    # Checks whether the current branch is correct
-    def check_current_branch_task
-      raise "Currently not on #{local_branch} branch!" unless `#{git} branch`.split("\n").detect { |b| /^\* / =~ b } == "* #{local_branch}"
-    end
-
-    # Fetches the latest updates from Github
-    def fetch_origin_task
-      sh git, 'fetch', remote
-    end
-
-    # Commits every file that has been changed by the release task.
-    def commit_modified_files_task
-      really_modified = `#{git} ls-files -m #{modified_files.entries.join(' ')}`.split("\n")
-      if really_modified.any?
-        really_modified.each { |file| sh git, 'add', file }
-        sh git, 'commit', '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
-      end
-    end
-
-    # Adds a tag for the released version
-    def tag_version_task
-      sh git, 'tag', '-a', "#{gemspec.name}-#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
-    end
-
-    # Pushes the changes and tag to github
-    def github_release_task
-      sh git, 'push', '--tags', remote, remote_branch
-    end
-
-    def gemcutter_release_task
-      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
-    end
-
-    # Gem release task.
-    # All work is done by the task's dependencies, so just display a release completed message.
-    def release_task
-      puts
-      puts "Release successful."
-    end
-
-    private
-
-    # Checks whether this project has any RSpec files
-    def has_specs?
-      FileList[spec_pattern].any?
-    end
-
-    # Checks whether this project has any unit test files
-    def has_tests?
-      FileList[test_pattern].any?
-    end
-
-    # Loads the gemspec file
-    def load_gemspec!
-      @gemspec = eval(File.read(@gemspec_file))
-    end
-
-    # Updates the VERSION file with the new version
-    def update_version_file(version)
-      if File.exists?('VERSION')
-        File.open('VERSION', 'w') { |f| f << version.to_s }
-        modified_files << 'VERSION'
-      end
-    end
-
-    # Updates the VERSION constant in the main include file if it exists
-    def update_version_constant(version)
-      if main_include && File.exist?(main_include)
-        file_contents = File.read(main_include)
-        if file_contents.sub!(/^(\s+VERSION\s*=\s*)[^\s].*$/) { $1 + version.to_s.inspect }
-          File.open(main_include, 'w') { |f| f << file_contents }
-          modified_files << main_include
-        end
-      end
-    end
-
-    # Updates an attribute of the gemspec file.
-    # This function will open the file, and search/replace the attribute using a regular expression.
-    def update_gemspec(attribute, new_value, literal = false)
-
-      unless literal
-        new_value = case new_value
-          when Array        then "%w(#{new_value.join(' ')})"
-          when Hash, String then new_value.inspect
-          when Date         then new_value.strftime('%Y-%m-%d').inspect
-          else              raise "Cannot write value #{new_value.inspect} to gemspec file!"
-        end
-      end
-
-      spec   = File.read(gemspec_file)
-      regexp = Regexp.new('^(\s+\w+\.' + Regexp.quote(attribute.to_s) + '\s*=\s*)[^\s].*$')
-      if spec.sub!(regexp) { $1 + new_value }
-        File.open(gemspec_file, 'w') { |f| f << spec }
-        modified_files << gemspec_file
-
-        # Reload the gemspec so the changes are incorporated
-        load_gemspec!
-        
-        # Also mark the Gemfile.lock file as changed because of the new version.
-        modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
-      end
-    end
-
-    # Updates the tasks file using the latest file found on Github
-    def update_tasks_task
-      require 'net/https'
-      require 'uri'
-      
-      uri = URI.parse('https://raw.github.com/wvanbergen/github-gem/master/tasks/github-gem.rake')
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      response = http.request(Net::HTTP::Get.new(uri.path))
-
-      if Net::HTTPSuccess === response
-        open(__FILE__, "w") { |file| file.write(response.body) }
-        relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
-        if `#{git} ls-files -m #{relative_file}`.split("\n").any?
-          sh git, 'add', relative_file
-          sh git, 'commit', '-m', "Updated to latest gem release management tasks."
-        else
-          puts "Release managament tasks already are at the latest version."
-        end
-      else
-        raise "Download failed with HTTP status #{response.code}!"
-      end
-    end
-  end
-end