request-log-analyzer 1.11.0 → 1.11.1

data/.travis.yml

@@ -0,0 +1,10 @@
+script: bundle exec rake
+rvm:
+  - 1.8.7
+  - 1.9.1
+  - 1.9.2
+  - ruby-head
+  - ree
+  - rbx
+  - rbx-2.0
+  - jruby

data/README.rdoc

@@ -28,11 +28,12 @@ For more details, other file formats, and available command line options, see th
 
   $ time ./bin/request-log-analyzer 40MBRailsFile.log
 
-  ruby-1.9.2-p0   15.19s user 0.95s system 99% cpu 16.143 total
-  ruby-1.8.7      25.21s user 1.02s system 99% cpu 26.238 total
-  jruby-1.5.3     32.64s user 4.84s system 99% cpu 37.629 total
-  rbx             46.60s user 2.71s system 108% cpu 45.324 total
-  macruby         75.00s user 20.10s system 110% cpu 1:26.13 total
+  ruby-1.9.2-p180   15.19s user 0.95s system 99% cpu 16.143 total
+  ree-1.8.7-2011.03 22.81s user 1.28s system 92% cpu 25.938 total
+  ruby-1.8.7-p334   25.21s user 1.02s system 99% cpu 26.238 total
+  jruby-1.5.3       32.64s user 4.84s system 99% cpu 37.629 total
+  rbx-2.0.0pre      39.62s user 2.24s system 104% cpu 40.098 total
+  macruby           75.00s user 20.10s system 110% cpu 1:26.13 total
 
 == Additional information
 

data/bin/request-log-analyzer

@@ -21,7 +21,7 @@ begin
 
     command_line.command(:strip) do |strip|
       strip.minimum_parameters = 1
-      strip.option(:format, :alias => :f, :default => 'rails')
+      strip.option(:format, :alias => :f, :default => 'rails3')
       strip.option(:output, :alias => :o)
       strip.switch(:discard_teaser_lines, :t)
       strip.switch(:keep_junk_lines, :j)
@@ -34,7 +34,7 @@ begin
     command_line.option(:file, :alias => :e)
     command_line.option(:mail, :alias => :m)
     command_line.option(:mailhost, :default => 'localhost')
-    command_line.option(:mailsubject)    
+    command_line.option(:mailsubject)
     command_line.option(:parse_strategy, :default => 'assume-correct')
     command_line.option(:yaml)
     command_line.option(:dump) # To be deprecated

data/lib/request_log_analyzer.rb

@@ -13,7 +13,7 @@ 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.11.0"
+  VERSION = "1.11.1"
 
   # 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 

data/lib/request_log_analyzer/controller.rb

@@ -77,7 +77,7 @@ module RequestLogAnalyzer
 
       # Guess file format
       if !options[:format] && options[:source_files]
-        options[:format] = :rails # Default
+        options[:format] = :rails3 # Default
 
         if options[:source_files] != $stdin
           if options[:source_files].class == String

data/lib/request_log_analyzer/filter/timespan.rb

@@ -30,11 +30,11 @@ module RequestLogAnalyzer::Filter
     # Returns nil otherwise
     # <tt>request</tt> Request object.
     def filter(request)
-      if @after && @before && request.timestamp <= @before && @after <= request.timestamp
+      if @after && @before && request.timestamp && request.timestamp <= @before && @after <= request.timestamp
         return request
-      elsif @after && @before.nil? && @after <= request.timestamp
+      elsif @after && @before.nil? && request.timestamp && @after <= request.timestamp
         return request
-      elsif @before && @after.nil? && request.timestamp <= @before
+      elsif @before && @after.nil? && request.timestamp && request.timestamp <= @before
         return request
       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.11.0"
-  s.date    = "2011-04-27"
+  s.version = "1.11.1"
+  s.date    = "2011-08-20"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 2.0')
 
   s.add_development_dependency('activerecord')
-  s.add_development_dependency('sqlite3-ruby')
+  s.add_development_dependency('sqlite3')
 
   s.authors  = ['Willem van Bergen', 'Bart ten Brinke']
   s.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']
@@ -39,6 +39,6 @@ Gem::Specification.new do |s|
 
   # 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 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/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/haproxy.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/file_format/mysql.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_unordered.log 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_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.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/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/haproxy.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/file_format/mysql.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_unordered.log 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_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_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)
 end

data/spec/integration/command_line_usage_spec.rb

@@ -14,7 +14,7 @@ describe RequestLogAnalyzer, 'running from command line' do
     output = run("#{log_fixture(:rails_1x)}")
     output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should be_true
   end
-  
+
   it "should find 2 requests when parsing a compressed file" do
     output = run("#{log_fixture(:decompression, :tgz)}")
     output.any? { |line| /^Parsed requests\:\s*2\s/ =~ line }.should be_true
@@ -58,7 +58,7 @@ describe RequestLogAnalyzer, 'running from command line' do
   end
 
   it "should use no colors in the report with the --boring option" do
-    output = run("#{log_fixture(:rails_1x)} --boring")
+    output = run("#{log_fixture(:rails_1x)} --boring --format rails")
     output.any? { |line| /\e/ =~ line }.should be_false
   end
 
@@ -84,7 +84,7 @@ describe RequestLogAnalyzer, 'running from command line' do
   end
 
   it "should parse 4 requests from the standard input" do
-    output = run("- < #{log_fixture(:rails_1x)}")
+    output = run("--format rails - < #{log_fixture(:rails_1x)}")
     output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should be_true
   end
 end

data/spec/unit/database/database_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'request_log_analyzer/database'
 
 describe RequestLogAnalyzer::Database do
 

data/spec/unit/file_format/postgresql_format_spec.rb

@@ -24,18 +24,18 @@ describe RequestLogAnalyzer::FileFormat::Postgresql do
     end
   end
 
-  describe '#parse_io' do
-    it "should parse a multiline query entry correctly" do
-      fixture = <<-EOS
-        2010-10-10 15:00:02 GMT [38747]: [1669-1] LOG:  00000: duration: 0.195 ms  statement: INSERT INTO "delayed_jobs" ("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at", "last_error") VALUES(NULL, NULL, '2010-10-10 15:00:02.159884', E'--- !ruby/object:RuntheChooChootrain {}
-        	', '2010-10-10 15:00:02.159884', 0, '2010-10-10 16:00:00.000000', 0, NULL, NULL) RETURNING "id"
-        2010-10-10 15:00:02 GMT [38747]: [1670-1] LOCATION:  exec_simple_query, postgres.c:1081
-      EOS
-
-      log_parser.should_not_receive(:warn)
-      log_parser.parse_string(fixture) do |request|
-        request[:query].should == 'INSERT INTO delayed_jobs (failed_at, locked_by, created_at, handler, updated_at, priority, run_at, attempts, locked_at, last_error) VALUES(NULL, NULL, :string, E:string, :string, :int, :string, :int, NULL, NULL) RETURNING id'
-      end
-    end
-  end
+  # describe '#parse_io' do
+  #   it "should parse a multiline query entry correctly" do
+  #     fixture = <<-EOS
+  #       2010-10-10 15:00:02 GMT [38747]: [1669-1] LOG:  00000: duration: 0.195 ms  statement: INSERT INTO "delayed_jobs" ("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at", "last_error") VALUES(NULL, NULL, '2010-10-10 15:00:02.159884', E'--- !ruby/object:RuntheChooChootrain {}
+  #         ', '2010-10-10 15:00:02.159884', 0, '2010-10-10 16:00:00.000000', 0, NULL, NULL) RETURNING "id"
+  #       2010-10-10 15:00:02 GMT [38747]: [1670-1] LOCATION:  exec_simple_query, postgres.c:1081
+  #     EOS
+  # 
+  #     log_parser.should_not_receive(:warn)
+  #     log_parser.parse_string(fixture) do |request|
+  #       request[:query].should == 'INSERT INTO delayed_jobs (failed_at, locked_by, created_at, handler, updated_at, priority, run_at, attempts, locked_at, last_error) VALUES(NULL, NULL, :string, E:string, :string, :int, :string, :int, NULL, NULL) RETURNING id'
+  #     end
+  #   end
+  # end
 end

data/spec/unit/source/log_parser_spec.rb

@@ -1,119 +1,125 @@
 require 'spec_helper'
 
-describe RequestLogAnalyzer::Source::LogParser, :requests do
-
-  before(:each) do
-    @log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format)
-  end
-
-  it "should have multiple line definitions" do
-    @log_parser.file_format.line_definitions.length.should >= 2
-  end
-
-  it "should have a valid language" do
-    @log_parser.file_format.should be_well_formed
-  end
-
-  it "should set the :source for every parsed line" do
-    @log_parser.parse_file(log_fixture(:rails_22)) do |request|
-      request.lines.all? { |line| line[:source] == log_fixture(:rails_22) }.should be_true
+describe RequestLogAnalyzer::Source::LogParser do
+  describe 'parsing request' do
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format)
     end
-  end
 
-  it "should set the :lineno for every parsed line" do
-    @log_parser.parse_file(log_fixture(:rails_22)) do |request|
-      request.lines.all? { |line| line.has_key?(:lineno) }.should be_true
+    it "should have multiple line definitions" do
+      @log_parser.file_format.line_definitions.length.should >= 2
     end
-  end
 
-  it "should parse more lines than requests" do
-    @log_parser.should_receive(:handle_request).with(an_instance_of(TestingFormat::Request)).twice
-    @log_parser.parse_file(log_fixture(:test_language_combined))
-    @log_parser.parsed_lines.should > 2
-  end
+    it "should have a valid language" do
+      @log_parser.file_format.should be_well_formed
+    end
 
-  it "should parse requests spanned over multiple files" do
-    @log_parser.should_receive(:handle_request).with(an_instance_of(TestingFormat::Request)).once
-    @log_parser.parse_files([log_fixture(:multiple_files_1), log_fixture(:multiple_files_2)])
-  end
+    it "should set the :source for every parsed line" do
+      @log_parser.parse_file(log_fixture(:rails_22)) do |request|
+        request.lines.all? { |line| line[:source] == log_fixture(:rails_22) }.should be_true
+      end
+    end
 
-  it "should parse all request values when spanned over multiple files" do
-    @log_parser.parse_files([log_fixture(:multiple_files_1), log_fixture(:multiple_files_2)]) do |request|
-      request.lines.should have(4).items
-      request[:request_no].should == 1
-      request[:test_capture].should == "Testing is amazing" # Note the custom converter
+    it "should set the :lineno for every parsed line" do
+      @log_parser.parse_file(log_fixture(:rails_22)) do |request|
+        request.lines.all? { |line| line.has_key?(:lineno) }.should be_true
+      end
     end
-  end
 
-  it "should parse a stream and find valid requests" do
-    io = File.new(log_fixture(:test_file_format), 'rb')
-    @log_parser.parse_io(io) do |request|
-      request.should be_kind_of(RequestLogAnalyzer::Request)
-      request.should =~ :test
-      request[:test_capture].should_not be_nil
+    it "should parse more lines than requests" do
+      @log_parser.should_receive(:handle_request).with(an_instance_of(TestingFormat::Request)).twice
+      @log_parser.parse_file(log_fixture(:test_language_combined))
+      @log_parser.parsed_lines.should > 2
     end
-    io.close
-  end
 
-  it "should parse a request that only consists of one line" do
-    @log_parser.parse_file(log_fixture(:header_and_footer))
-    @log_parser.parsed_requests.should == 2
-  end
-end
+    it "should parse requests spanned over multiple files" do
+      @log_parser.should_receive(:handle_request).with(an_instance_of(TestingFormat::Request)).once
+      @log_parser.parse_files([log_fixture(:multiple_files_1), log_fixture(:multiple_files_2)])
+    end
 
-describe RequestLogAnalyzer::Source::LogParser, :warnings do
+    it "should parse all request values when spanned over multiple files" do
+      @log_parser.parse_files([log_fixture(:multiple_files_1), log_fixture(:multiple_files_2)]) do |request|
+        request.lines.should have(4).items
+        request[:request_no].should == 1
+        request[:test_capture].should == "Testing is amazing" # Note the custom converter
+      end
+    end
 
-  before(:each) do
-    @log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format, :parse_strategy => 'cautious')
-  end
+    it "should parse a stream and find valid requests" do
+      io = File.new(log_fixture(:test_file_format), 'rb')
+      @log_parser.parse_io(io) do |request|
+        request.should be_kind_of(RequestLogAnalyzer::Request)
+        request.should =~ :test
+        request[:test_capture].should_not be_nil
+      end
+      io.close
+    end
 
-  it "should warn about teaser matching problems" do
-    @log_parser.should_receive(:warn).with(:teaser_check_failed, anything).exactly(5).times
-    @log_parser.parse_file(log_fixture(:test_file_format))
+    it "should parse a request that only consists of one line" do
+      @log_parser.parse_file(log_fixture(:header_and_footer))
+      @log_parser.parsed_requests.should == 2
+    end
   end
 
-  it "should warn about unmatching request headers and footers" do
-    @log_parser.should_receive(:warn).with(:unclosed_request, anything).at_least(1).times
-    @log_parser.should_receive(:warn).with(:no_current_request, anything).at_least(1).times
-    @log_parser.should_not_receive(:handle_request)
-    @log_parser.parse_file(log_fixture(:test_order))
-  end
-end
+  describe 'parse warnings' do
 
-describe RequestLogAnalyzer::Source::LogParser, :decompression do
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format, :parse_strategy => 'cautious')
+    end
 
-  before(:each) do
-    @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat::Rails.create)
-  end
+    it "should warn about teaser matching problems" do
+      @log_parser.should_receive(:warn).with(:teaser_check_failed, anything).exactly(5).times
+      @log_parser.parse_file(log_fixture(:test_file_format))
+    end
 
-  it "should parse a rails gzipped log file" do
-    @log_parser.should_receive(:handle_request).once
-    @log_parser.parse_file(log_fixture(:decompression, "log.gz"))
-    @log_parser.parsed_lines.should > 0
+    it "should warn about unmatching request headers and footers" do
+      @log_parser.should_receive(:warn).with(:unclosed_request, anything).at_least(1).times
+      @log_parser.should_receive(:warn).with(:no_current_request, anything).at_least(1).times
+      @log_parser.should_not_receive(:handle_request)
+      @log_parser.parse_file(log_fixture(:test_order))
+    end
   end
 
-  it "should parse a rails tar gzipped log folder" do
-    @log_parser.should_receive(:handle_request).twice
-    @log_parser.parse_file(log_fixture(:decompression, "tar.gz"))
-    @log_parser.parsed_lines.should > 1
-  end
+  describe 'log file decompression' do
 
-  it "should parse a rails tar gzipped log folder" do
-    @log_parser.should_receive(:handle_request).twice
-    @log_parser.parse_file(log_fixture(:decompression, "tgz"))
-    @log_parser.parsed_lines.should > 1
-  end
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat::Rails.create)
+    end
 
-  it "should parse a rails bz2 zipped log file" do
-    @log_parser.should_receive(:handle_request).once
-    @log_parser.parse_file(log_fixture(:decompression, "log.bz2"))
-    @log_parser.parsed_lines.should > 0
-  end
+    if `which gunzip` != ""
+      it "should parse a rails gzipped log file" do
+        @log_parser.should_receive(:handle_request).once
+        @log_parser.parse_file(log_fixture(:decompression, "log.gz"))
+        @log_parser.parsed_lines.should > 0
+      end
+
+      it "should parse a rails tar gzipped log folder" do
+        @log_parser.should_receive(:handle_request).twice
+        @log_parser.parse_file(log_fixture(:decompression, "tar.gz"))
+        @log_parser.parsed_lines.should > 1
+      end
+    end
 
-  it "should parse a rails zipped log file" do
-    @log_parser.should_receive(:handle_request).once
-    @log_parser.parse_file(log_fixture(:decompression, "log.zip"))
-    @log_parser.parsed_lines.should > 0
+    if `which bunzip2` != ""
+      it "should parse a rails tar gzipped log folder" do
+        @log_parser.should_receive(:handle_request).twice
+        @log_parser.parse_file(log_fixture(:decompression, "tgz"))
+        @log_parser.parsed_lines.should > 1
+      end
+
+      it "should parse a rails bz2 zipped log file" do
+        @log_parser.should_receive(:handle_request).once
+        @log_parser.parse_file(log_fixture(:decompression, "log.bz2"))
+        @log_parser.parsed_lines.should > 0
+      end
+    end
+  
+    if `which unzip` != ""
+      it "should parse a rails zipped log file" do
+        @log_parser.should_receive(:handle_request).once
+        @log_parser.parse_file(log_fixture(:decompression, "log.zip"))
+        @log_parser.parsed_lines.should > 0
+      end
+    end
   end
-
 end

data/tasks/github-gem.rake

@@ -13,8 +13,8 @@ module GithubGem
 
   # Detects the main include file of this project using heuristics
   def self.detect_main_include
-    if detect_gemspec_file =~ /^(\.*)\.gemspec$/ && File.exist?("lib/#{$1}.rb")
-      "lib/#{$1}.rb"
+    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
@@ -24,6 +24,8 @@ module GithubGem
 
   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
 
@@ -342,7 +344,7 @@ module GithubGem
       require 'net/https'
       require 'uri'
       
-      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      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
@@ -362,4 +364,4 @@ module GithubGem
       end
     end
   end
-end
+end

metadata

@@ -1,89 +1,84 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: request-log-analyzer
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 11
-  - 0
-  version: 1.11.0
+version: !ruby/object:Gem::Version
+  version: 1.11.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Willem van Bergen
 - Bart ten Brinke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-27 00:00:00 -04:00
+date: 2011-08-20 00:00:00.000000000 -04:00
 default_executable: request-log-analyzer
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153310460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153310460
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153309700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153309700
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2153309000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153309000
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2153308320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-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    information. Once it is finished parsing the log file(s), it will show the requests that take op most server time \n    using various metrics. It can also insert all parsed request information into a database so you can roll your own\n    analysis. It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3 access logs and MySQL \n    slow query logs out of the box, but file formats of other applications can easily be supported by supplying an \n    easy to write log file format definition.\n"
-email: 
+  prerelease: false
+  version_requirements: *2153308320
+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
+  \   information. Once it is finished parsing the log file(s), it will show the requests
+  that take op most server time \n    using various metrics. It can also insert all
+  parsed request information into a database so you can roll your own\n    analysis.
+  It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3
+  access logs and MySQL \n    slow query logs out of the box, but file formats of
+  other applications can easily be supported by supplying an \n    easy to write log
+  file format definition.\n"
+email:
 - willem@railsdoctors.com
 - bart@railsdoctors.com
-executables: 
+executables:
 - request-log-analyzer
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .infinity_test
+- .travis.yml
 - DESIGN.rdoc
 - Gemfile
 - LICENSE
@@ -226,41 +221,38 @@ files:
 has_rdoc: true
 homepage: http://railsdoctors.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - request-log-analyzer
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- To use the database inserter, ActiveRecord and an appropriate database adapter are required.
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
+- To use the database inserter, ActiveRecord and an appropriate database adapter are
+  required.
 rubyforge_project: r-l-a
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers
-test_files: 
+summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
+  and other web application servers
+test_files:
 - spec/integration/command_line_usage_spec.rb
 - spec/integration/mailer_spec.rb
 - spec/integration/munin_plugins_rails_spec.rb