wvanbergen-request-log-analyzer 1.2.3 → 1.2.4

data/RELEASE_NOTES.rdoc

@@ -1,3 +1,12 @@
+=== 1.2.3
+ * Refactored database functions
+ * Cleaned up specs and tried some heckle
+ * Interrupts are handled more gracefully
+ * Moved munin tracker to seperate Github project (http://github.com/barttenbrinke/munin-plugins-rails/)
+
+=== 1.2.2
+ * Not released
+
 === 1.2.1
  * Compressed logfile support
  * Parsable YAML results as output (use --dump <filename> )

data/lib/request_log_analyzer/aggregator/database.rb

@@ -64,6 +64,11 @@ module RequestLogAnalyzer::Aggregator
       output << "\n"
     end
     
+    # Retreives the connection that is used for the database inserter
+    def connection
+      orm_module::Base.connection
+    end    
+    
     protected 
     
     # Create a module and a default subclass of ActiveRecord::Base on which to establish the database connection
@@ -84,11 +89,11 @@ module RequestLogAnalyzer::Aggregator
     # Established a connection with the database for this session
     def establish_database_connection!
       orm_module::Base.establish_connection(:adapter => 'sqlite3', :database => options[:database])
-      ActiveRecord::Migration.class_eval("def self.connection; #{@orm_module.to_s}::Base.connection; end ")
+      #ActiveRecord::Migration.class_eval("def self.connection; #{@orm_module.to_s}::Base.connection; end ")
     end    
     
     def remove_database_connection!
-      ActiveRecord::Migration.class_eval("def self.connection; ActiveRecord::Base.connection; end ")      
+      #ActiveRecord::Migration.class_eval("def self.connection; ActiveRecord::Base.connection; end ")      
       orm_module::Base.remove_connection
     end
     
@@ -97,8 +102,7 @@ module RequestLogAnalyzer::Aggregator
     # what line in the original file the line was found, and a request_id to link lines related
     # to the same request. It will also create an index in the request_id field to speed up queries.
     def create_database_table(definition)
-      ActiveRecord::Migration.verbose = options[:debug] # keep it down a notch please
-      ActiveRecord::Migration.create_table("#{definition.name}_lines") do |t|
+      connection.create_table("#{definition.name}_lines") do |t|
         
         # Add default fields for every line type
         t.column(:request_id, :integer)
@@ -114,7 +118,7 @@ module RequestLogAnalyzer::Aggregator
       end
       
       # Create an index on the request_id column to support faster querying
-      ActiveRecord::Migration.add_index("#{definition.name}_lines", [:request_id])
+      connection.add_index("#{definition.name}_lines", [:request_id])
     end
     
     # Creates an ActiveRecord class for a given line definition.
@@ -137,10 +141,9 @@ module RequestLogAnalyzer::Aggregator
     # Creates a requests table, in which a record is created for every request. It also creates an
     # ActiveRecord::Base class to communicate with this table.
     def create_request_table_and_class
-      ActiveRecord::Migration.verbose = options[:debug]
-      ActiveRecord::Migration.create_table("requests") do |t|
-        t.integer :first_lineno
-        t.integer :last_lineno
+      connection.create_table("requests") do |t|
+        t.column :first_lineno, :integer
+        t.column :last_lineno,  :integer
       end    
       
       orm_module.const_set('Request', Class.new(orm_module::Base)) unless orm_module.const_defined?('Request')     
@@ -149,11 +152,10 @@ module RequestLogAnalyzer::Aggregator
 
     # Creates a warnings table and a corresponding Warning class to communicate with this table using ActiveRecord.
     def create_warning_table_and_class
-      ActiveRecord::Migration.verbose = options[:debug]
-      ActiveRecord::Migration.create_table("warnings") do |t|
-        t.string  :warning_type, :limit => 30, :null => false
-        t.string  :message
-        t.integer :lineno          
+      connection.create_table("warnings") do |t|
+        t.column  :warning_type, :string, :limit => 30, :null => false
+        t.column  :message, :string
+        t.column  :lineno, :integer
       end    
       
       orm_module.const_set('Warning', Class.new(orm_module::Base)) unless orm_module.const_defined?('Warning')

data/lib/request_log_analyzer/request.rb

@@ -145,11 +145,11 @@ module RequestLogAnalyzer
     end
     
     def first_lineno
-      @lines.first[:lineno]
+      @lines.map { |line| line[:lineno] }.reject { |v| v.nil? }.min
     end
     
     def last_lineno
-      @lines.last[:lineno]
+      @lines.map { |line| line[:lineno] }.reject { |v| v.nil? }.max
     end
   end
 end

data/spec/lib/mocks.rb

@@ -38,10 +38,21 @@ module RequestLogAnalyzer::Spec::Mocks
     output.stub!(:title)
     output.stub!(:line)
     output.stub!(:with_style)    
-    output.stub!(:table) { yield [] }
+    output.stub!(:table).and_yield([])
     output.stub!(:io).and_return(mock_io)
     return output
   end
   
+  def mock_migrator
+    table_creator = mock('ActiveRecord table creator')
+    table_creator.stub!(:column)
+    
+    migrator = mock('ActiveRecord::Base.connection for migrations')
+    migrator.stub!(:add_index)
+    migrator.stub!(:create_table).and_yield(table_creator).and_return(true)
+    migrator.stub!(:table_creator).and_return(table_creator)
+    return migrator
+  end
+  
   
 end

data/spec/unit/aggregator/database_spec.rb

@@ -8,7 +8,7 @@ describe RequestLogAnalyzer::Aggregator::Database do
     
     @line_definition = RequestLogAnalyzer::LineDefinition.new(:test, { :regexp   => /Testing (\w+), tries\: (\d+)/,
                           :captures => [{ :name => :what, :type => :string }, { :name => :tries, :type => :integer },
-                            { :name => :evaluated, :type => :hash, :provides => {:evaluated_field => :duration} }]})    
+                            { :name => :evaluated, :type => :hash, :provides => {:evaluated_field => :duration} }]})                               
   end
   
   # The prepare method is called before the parsing starts. It should establish a connection
@@ -36,43 +36,41 @@ describe RequestLogAnalyzer::Aggregator::Database do
   describe '#create_database_table' do
     
     before(:each) do
-      @table_creator = mock('create_table block')
-      @table_creator.stub!(:column)
-      ActiveRecord::Migration.stub!(:create_table).and_yield(@table_creator)
-      ActiveRecord::Migration.stub!(:add_index)
+      @connection = mock_migrator
+      @database_inserter.stub!(:connection).and_return(@connection)
     end
     
     it "should create a table based on the line type name" do
-      ActiveRecord::Migration.should_receive(:create_table).with('test_lines')
+      @connection.should_receive(:create_table).with('test_lines')
       @database_inserter.send(:create_database_table, @line_definition)
     end    
     
     it "should create an index on the request_id field" do
-      ActiveRecord::Migration.should_receive(:add_index).with('test_lines', [:request_id])
+      @connection.should_receive(:add_index).with('test_lines', [:request_id])
       @database_inserter.send(:create_database_table, @line_definition)
     end
     
     it "should create a request_id field to link the requests together" do
-      @table_creator.should_receive(:column).with(:request_id, :integer)
+      @connection.table_creator.should_receive(:column).with(:request_id, :integer)
       @database_inserter.send(:create_database_table, @line_definition)
     end
     
     it "should create a lineno field to save the location of the line in the original file" do
-      @table_creator.should_receive(:column).with(:lineno, :integer)
+      @connection.table_creator.should_receive(:column).with(:lineno, :integer)
       @database_inserter.send(:create_database_table, @line_definition)
     end
     
     it "should create a field of the correct type for every defined field" do
-      @table_creator.should_receive(:column).with(:what, :string)
-      @table_creator.should_receive(:column).with(:tries, :integer)
+      @connection.table_creator.should_receive(:column).with(:what, :string)
+      @connection.table_creator.should_receive(:column).with(:tries, :integer)
       # :hash capture type should map on a :text field type
-      @table_creator.should_receive(:column).with(:evaluated, :text) 
+      @connection.table_creator.should_receive(:column).with(:evaluated, :text) 
       @database_inserter.send(:create_database_table, @line_definition)      
     end
     
     it "should create a field of the correct type for every provided field" do
       # :duration capture type should map on a :double field type
-      @table_creator.should_receive(:column).with(:evaluated_field, :double) 
+      @connection.table_creator.should_receive(:column).with(:evaluated_field, :double) 
       @database_inserter.send(:create_database_table, @line_definition)   
     end
   end
@@ -129,21 +127,19 @@ describe RequestLogAnalyzer::Aggregator::Database do
     before(:each) do
       @line_type_cnt = testing_format.line_definitions.length
 
-      #Make sure no actual migrations occur
-      ActiveRecord::Migration.stub!(:add_index)
-      ActiveRecord::Migration.stub!(:create_table)
+      @connection = mock_migrator
+      @database_inserter.stub!(:connection).and_return(@connection)      
       
       # Stub the expected method calls for the preparation
       @database_inserter.stub!(:create_database_table)
       @database_inserter.stub!(:create_activerecord_class) 
 
-      
       # Make sure the ORM module exists
       @database_inserter.send(:initialize_orm_module!)
     end
 
     it "should create a requests table to join request lines" do
-      ActiveRecord::Migration.should_receive(:create_table).with("requests")
+      @connection.should_receive(:create_table).with("requests")
       @database_inserter.send :create_database_schema!
     end
         
@@ -153,7 +149,7 @@ describe RequestLogAnalyzer::Aggregator::Database do
     end
     
     it "should create a warnings table for logging parse warnings" do
-      ActiveRecord::Migration.should_receive(:create_table).with("warnings")
+      @connection.should_receive(:create_table).with("warnings")
       @database_inserter.send :create_database_schema!
     end
 

data/spec/unit/source/request_spec.rb

@@ -1,85 +1,111 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RequestLogAnalyzer::Request, :incomplete_request do
+describe RequestLogAnalyzer::Request do
   
   before(:each) do
-    @incomplete_request = testing_format.request
-    @incomplete_request << { :line_type => :test, :lineno => 1, :test_capture => 'awesome!' }
-  end
-  
-  it "should be single if only one line has been added" do
-    @incomplete_request.should_not be_empty
-  end
-  
-  it "should not be a completed request" do
-    @incomplete_request.should_not be_completed
+    @request = testing_format.request
   end  
   
-  it "should take the line type of the first line as global line_type" do
-    @incomplete_request.lines[0][:line_type].should == :test
-    @incomplete_request.should =~ :test
+  it "should be empty without any captured lines in it" do
+    @request.should be_empty
   end
   
-  it "should return the first field value" do
-    @incomplete_request[:test_capture].should == 'awesome!'
-  end
-  
-  it "should return nil if no such field is present" do
-    @incomplete_request[:nonexisting].should be_nil
-  end
-end  
-
-
-describe RequestLogAnalyzer::Request, :completed_request do
+  context :incomplete do
   
-  before(:each) do
-    @completed_request = testing_format.request
-    @completed_request << { :line_type => :first, :lineno =>  1, :name => 'first line!' }    
-    @completed_request << { :line_type => :test,  :lineno =>  4, :test_capture => 'testing' }        
-    @completed_request << { :line_type => :test,  :lineno =>  7, :test_capture => 'testing some more' }            
-    @completed_request << { :line_type => :last,  :lineno => 10, :time => 0.03 }
-  end
+    before(:each) do
+      @request << { :line_type => :test, :lineno => 1, :test_capture => 'awesome!' }
+    end
   
-  it "should not be empty when multiple liness are added" do
-    @completed_request.should_not be_empty
-  end
+    it "should be single if only one line has been added" do
+      @request.should_not be_empty
+    end
   
-  it "should be a completed request" do
-    @completed_request.should be_completed
-  end
+    it "should not be a completed request" do
+      @request.should_not be_completed
+    end  
   
-  it "should recognize all line types" do
-    [:first, :test, :last].each { |type| @completed_request.should =~ type }
-  end
+    it "should take the line type of the first line as global line_type" do
+      @request.lines[0][:line_type].should == :test
+      @request.should =~ :test
+    end
   
-  it "should detect the correct field value" do
-    @completed_request[:name].should == 'first line!'
-    @completed_request[:time].should == 0.03
-  end
+    it "should return the first field value" do
+      @request[:test_capture].should == 'awesome!'
+    end
   
-  it "should detect the first matching field value" do  
-    @completed_request.first(:test_capture).should == 'testing'
+    it "should return nil if no such field is present" do
+      @request[:nonexisting].should be_nil
+    end
   end
   
-  it "should detect the every matching field value" do  
-    @completed_request.every(:test_capture).should == ['testing', "testing some more"]
-  end
-  
-  it "should set the first_lineno for a request to the lowest lineno encountered" do
-    @completed_request.first_lineno.should eql(1)
-  end
+  context :completed do
+    
+    before(:each) do
+      @request << { :line_type => :first, :lineno =>  1, :name => 'first line!' }    
+      @request << { :line_type => :test,  :lineno =>  4, :test_capture => 'testing' }        
+      @request << { :line_type => :test,  :lineno =>  7, :test_capture => 'testing some more' }            
+      @request << { :line_type => :last,  :lineno => 10, :time => 0.03 }
+    end
 
-  it "should set the last_lineno for a request to the highest encountered lineno" do
-    @completed_request.last_lineno.should eql(10)
-  end
+    it "should not be empty when multiple liness are added" do
+      @request.should_not be_empty
+    end
 
-  it "should not have a timestamp if no such field is captured" do
-    @completed_request.timestamp.should be_nil
-  end
+    it "should be a completed request" do
+      @request.should be_completed
+    end
+
+    it "should recognize all line types" do
+      [:first, :test, :last].each { |type| @request.should =~ type }
+    end
+
+    it "should detect the correct field value" do
+      @request[:name].should == 'first line!'
+      @request[:time].should == 0.03
+    end
+
+    it "should detect the first matching field value" do  
+      @request.first(:test_capture).should == 'testing'
+    end
 
-  it "should set return a timestamp field if such a field is captured" do
-    @completed_request << { :line_type => :first, :lineno =>  1, :name => 'first line!', :timestamp => Time.now}    
-    @completed_request.timestamp.should_not be_nil
+    it "should detect the every matching field value" do  
+      @request.every(:test_capture).should == ['testing', "testing some more"]
+    end
+
+    it "should set the first_lineno for a request to the lowest lineno encountered" do
+      @request.first_lineno.should eql(1)
+    end
+    
+    it "should set the first_lineno for a request if a line with a lower lineno is added" do
+      @request << { :line_type => :test, :lineno =>  0 }          
+      @request.first_lineno.should eql(0)
+    end    
+
+    it "should set the last_lineno for a request to the highest encountered lineno" do
+      @request.last_lineno.should eql(10)
+    end
+    
+    it "should not set the last_lineno for a request if a line with a lower lineno is added" do
+      @request << { :line_type => :test, :lineno =>  7 }          
+      @request.last_lineno.should eql(10)
+    end
+
+    it "should not have a timestamp if no such field is captured" do
+      @request.timestamp.should be_nil
+    end
+
+    it "should set return a timestamp field if such a field is captured" do
+      @request << { :line_type => :first, :lineno =>  1, :name => 'first line!', :timestamp => Time.now}    
+      @request.timestamp.should_not be_nil
+    end    
   end
   
-end
+  context 'single line' do
+    # combined is both a header and a footer line
+    before(:each) { @request << { :line_type => :combined, :lineno => 1 } }
+  
+    it "should be a completed request if the line is both header and footer" do
+      @request.should be_completed
+    end   
+  end
+end  

data/tasks/github-gem.rake

@@ -14,7 +14,8 @@ module Rake
     def self.define_tasks!
       gem_task_builder = Rake::GithubGem.new      
       gem_task_builder.register_all_tasks!
-    end    
+    end
+    
 
     def initialize
       reload_gemspec!
@@ -37,8 +38,18 @@ module Rake
         desc "Releases a new version of #{@name}"
         task(:release => release_dependencies) { release_task } 
         
+        namespace(:release) do
+          release_checks = [:check_clean_master_branch, :check_version, :build]
+          release_checks.push 'doc:compile' if has_rdoc?
+          release_checks.unshift 'test' if has_tests?
+          release_checks.unshift 'spec' if has_specs?          
+          
+          desc "Test release conditions"
+          task(:check => release_checks) { release_check_task }
+        end
+        
         # helper task for releasing
-        task(:check_clean_master_branch) { verify_clean_status('master') }
+        task(:check_clean_master_branch) { verify_fast_forward('master', 'origin', 'master'); verify_clean_status('master') }
         task(:check_version) { verify_version(ENV['VERSION'] || @specification.version) }
         task(:version => [:check_version]) { set_gem_version! }
         task(:create_tag) { create_version_tag! }
@@ -165,13 +176,17 @@ module Rake
     
     def verify_current_branch(branch)
       run_command('git branch').detect { |line| /^\* (.+)/ =~ line }
-      raise "You are currently not working in the master branch!" unless branch == $1
+      raise "You are currently not working in the #{branch} branch!" unless branch == $1
     end
     
-    def verify_clean_status(on_branch = nil)
-      sh "git fetch"
+    def verify_fast_forward(local_branch = 'master', remote = 'origin', remote_branch = 'master')
+      sh "git fetch #{remote}"
+      lines = run_command("git rev-list #{local_branch}..remotes/#{remote}/#{remote_branch}")
+      raise "Remote branch #{remote}/#{remote_branch} has commits that are not yet incorporated in local #{local_branch} branch" unless lines.length == 0
+    end
+    
+    def verify_clean_status(on_branch = nil)      
       lines = run_command('git status')
-      raise "You don't have the most recent version available. Run git pull first." if /^\# Your branch is behind/ =~ lines[1]
       raise "You are currently not working in the #{on_branch} branch!" unless on_branch.nil? || (/^\# On branch (.+)/ =~ lines.first && $1 == on_branch)
       raise "Your master branch contains modifications!" unless /^nothing to commit \(working directory clean\)/ =~ lines.last
     end
@@ -243,7 +258,15 @@ module Rake
       puts '------------------------------------------------------------'
       puts "Released #{@name} - version #{@specification.version}"
     end
+    
+    def release_check_task
+      puts
+      puts '------------------------------------------------------------'
+      puts "Checked all conditions for a release of version #{ENV['VERSION'] || @specification.version}!"
+      puts 'You should be safe to do a release now.'
+      puts '------------------------------------------------------------'
+    end
   end
 end
 
-Rake::GithubGem.define_tasks!
+Rake::GithubGem.define_tasks!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: request-log-analyzer
 dependencies: []
 
@@ -132,7 +132,6 @@ files:
 - tasks/rspec.rake
 has_rdoc: true
 homepage: http://github.com/wvanbergen/request-log-analyzer/wikis
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --title
@@ -158,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: r-l-a
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A command line tool to analyze Rails logs