wvanbergen-request-log-analyzer 1.2.5 → 1.2.6

data/.gitignore

@@ -0,0 +1,10 @@
+.svn/
+.DS_Store
+request-log-analyzer-*.gem
+requests.db
+/pkg
+/doc
+/tmp
+/classes
+/files
+/coverage

data/Rakefile

@@ -1,3 +1,5 @@
 Dir[File.dirname(__FILE__) + "/tasks/*.rake"].each { |file| load(file) }
+
+GithubGem::RakeTasks.new(:gem)
  
-task :default => "spec:fancy"
+task :default => "spec:specdoc"

data/lib/request_log_analyzer/aggregator/database.rb

@@ -46,6 +46,7 @@ module RequestLogAnalyzer::Aggregator
     def finalize
       @request_count = orm_module::Request.count
       remove_database_connection!
+      deinitialize_orm_module!
     end
     
     # Records w warining in the warnings table.
@@ -84,14 +85,20 @@ module RequestLogAnalyzer::Aggregator
         orm_base_class.abstract_class = true
         orm_module.const_set('Base', orm_base_class)
       end
-    end    
-    
+    end
+
+    # Deinitializes the ORM module and the ActiveRecord::Base subclass.
+    def deinitialize_orm_module!
+      file_format.class.send(:remove_const, 'Database') if file_format.class.const_defined?('Database')
+      @orm_module = nil
+    end
+
     # 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 ")
-    end    
-    
+    end
+
     def remove_database_connection!
       #ActiveRecord::Migration.class_eval("def self.connection; ActiveRecord::Base.connection; end ")      
       orm_module::Base.remove_connection
@@ -130,8 +137,8 @@ module RequestLogAnalyzer::Aggregator
       klass = Class.new(orm_module::Base)
       klass.send(:belongs_to, :request)
       
-      definition.captures.each do |capture|
-        klass.send(:serialize, capture[:name], Hash) if capture[:provides]
+      definition.captures.select { |c| c.has_key?(:provides) }.each do |capture|
+        klass.send(:serialize, capture[:name], Hash)
       end
       
       orm_module.const_set(class_name, klass) unless orm_module.const_defined?(class_name)

data/lib/request_log_analyzer.rb

@@ -11,7 +11,7 @@ module RequestLogAnalyzer
   
   # The current version of request-log-analyzer.
   # This will be diplayed in output reports etc.  
-  VERSION = '1.2.5'
+  VERSION = "1.2.6"
   
   # Loads constants in the RequestLogAnalyzer namespace using self.load_default_class_file(base, const)
   # <tt>const</tt>:: The constant that is not yet loaded in the RequestLogAnalyzer namespace. This should be passed as a string or symbol.

data/request-log-analyzer.gemspec

@@ -0,0 +1,36 @@
+Gem::Specification.new do |s|
+  s.name    = 'request-log-analyzer'
+  s.version = "1.2.6"
+  s.date    = "2009-09-02"
+  
+  s.rubyforge_project = 'r-l-a'
+  
+  s.bindir             = 'bin'
+  s.executables        = ['request-log-analyzer']
+  s.default_executable = 'request-log-analyzer'
+  
+  s.summary     = "A command line tool to analyze request logs for Rails, Merb and other application servers"
+  s.description = <<-eos
+    Request log analyzer's purpose is to find ot how your web application is being used 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 using various metrics. It can also insert all 
+    parsed request information into a database so you can roll your own analysis. It supports Rails- and Merb-based applications 
+    out of the box, but file formats of other applications can easily be supported by supplying an 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('rspec', '>= 1.2.4')
+  s.add_development_dependency('git',   '>= 1.1.0')
+  
+  s.authors  = ['Willem van Bergen', 'Bart ten Brinke']
+  s.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']
+  s.homepage = 'http://railsdoctors.com'
+
+  s.files      = %w(spec/unit/filter/anonymize_filter_spec.rb lib/request_log_analyzer/line_definition.rb lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/controller.rb spec/fixtures/rails_22_cached.log lib/request_log_analyzer/file_format/rails_development.rb spec/lib/macros.rb spec/fixtures/merb_prefixed.log tasks/request_log_analyzer.rake spec/unit/file_format/file_format_api_spec.rb spec/integration/command_line_usage_spec.rb spec/fixtures/decompression.log.bz2 lib/request_log_analyzer/log_processor.rb lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/filter.rb spec/fixtures/rails_unordered.log bin/request-log-analyzer request-log-analyzer.gemspec DESIGN.rdoc spec/unit/filter/timespan_filter_spec.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/tracker/frequency.rb spec/fixtures/decompression.log.gz spec/fixtures/decompression.log spec/lib/matchers.rb spec/fixtures/test_order.log lib/request_log_analyzer/output/fixed_width.rb lib/request_log_analyzer/filter/anonymize.rb spec/lib/testing_format.rb lib/request_log_analyzer/tracker/timespan.rb lib/request_log_analyzer/aggregator.rb lib/cli/progressbar.rb README.rdoc spec/fixtures/merb.log lib/request_log_analyzer/tracker/hourly_spread.rb .gitignore spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/duration_tracker_spec.rb lib/request_log_analyzer/aggregator/echo.rb spec/unit/controller/log_processor_spec.rb lib/request_log_analyzer.rb Rakefile spec/spec_helper.rb spec/unit/filter/filter_spec.rb lib/request_log_analyzer/aggregator/summarizer.rb lib/request_log_analyzer/file_format/rails.rb spec/fixtures/test_language_combined.log spec/fixtures/decompression.tar.gz spec/unit/filter/field_filter_spec.rb spec/spec.opts lib/request_log_analyzer/aggregator/database.rb lib/request_log_analyzer/filter/timespan.rb lib/request_log_analyzer/source/log_parser.rb spec/fixtures/decompression.tgz spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/fixtures/header_and_footer.log lib/cli/tools.rb lib/request_log_analyzer/file_format/merb.rb spec/fixtures/multiple_files_1.log spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/line_definition_spec.rb lib/request_log_analyzer/source.rb lib/request_log_analyzer/request.rb spec/unit/controller/controller_spec.rb lib/request_log_analyzer/output.rb spec/lib/helpers.rb spec/fixtures/rails_1x.log spec/lib/mocks.rb spec/fixtures/decompression.log.zip spec/unit/source/request_spec.rb spec/unit/source/log_parser_spec.rb spec/fixtures/test_file_format.log lib/request_log_analyzer/source/database.rb spec/unit/aggregator/database_spec.rb tasks/github-gem.rake lib/request_log_analyzer/tracker/duration.rb lib/request_log_analyzer/file_format.rb spec/unit/aggregator/summarizer_spec.rb spec/fixtures/rails_22.log spec/fixtures/multiple_files_2.log spec/fixtures/syslog_1x.log LICENSE spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/rails_format_spec.rb lib/cli/command_line_arguments.rb)
+  s.test_files = %w(spec/unit/filter/anonymize_filter_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/integration/command_line_usage_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/controller/controller_spec.rb spec/unit/source/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/aggregator/database_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/file_format/rails_format_spec.rb)
+end

data/spec/unit/aggregator/database_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe RequestLogAnalyzer::Aggregator::Database do
 
-  before(:each) do
+  before(:all) do
     log_parser = RequestLogAnalyzer::Source::LogParser.new(testing_format)
     @database_inserter = RequestLogAnalyzer::Aggregator::Database.new(log_parser, :database => ':memory:')
     
@@ -16,12 +16,18 @@ describe RequestLogAnalyzer::Aggregator::Database do
   describe '#prepare' do
 
     before(:each) do
-      @database_inserter.stub!(:establish_database_connection!)      
+      @database_inserter.stub!(:initialize_orm_module!)
+      @database_inserter.stub!(:establish_database_connection!)
       @database_inserter.stub!(:create_database_schema!)
     end
 
+    it 'should create the ORM mdoule in which the classes can be created' do
+      @database_inserter.should_receive(:initialize_orm_module!)
+      @database_inserter.prepare
+    end
+
     it 'should establish the database connection' do
-      @database_inserter.should_receive(:establish_database_connection!)      
+      @database_inserter.should_receive(:establish_database_connection!)
       @database_inserter.prepare
     end
     
@@ -31,6 +37,30 @@ describe RequestLogAnalyzer::Aggregator::Database do
     end
   end
   
+  # The database inserter creates is own "Database" module within the file format 
+  # class to create all the classes that are needed.
+  describe '#initialize_orm_module!' do
+    
+    before(:all) { @database_inserter.send(:deinitialize_orm_module!) }
+    after(:all)  { @database_inserter.send(:initialize_orm_module!) }
+    
+    before(:each) { @database_inserter.send(:initialize_orm_module!) }
+    after(:each)  { @database_inserter.send(:deinitialize_orm_module!) }
+    
+    it "should create a Database module under the file format's class" do
+      testing_format.class.should be_const_defined('Database')
+    end
+    
+    it "should define a Base class in the Database module" do
+      testing_format.class::Database.should be_const_defined('Base')
+    end
+    
+    it "should create a ActiveRecord::Base class in the Database module" do
+      testing_format.class::Database::Base.ancestors.should include(ActiveRecord::Base)
+    end
+    
+  end
+  
   # The create_database_table method should create a database table according to the line definition,
   # so that parsed lines can be stored in it later on.
   describe '#create_database_table' do

data/tasks/github-gem.rake

@@ -1,272 +1,256 @@
 require 'rubygems'
-require 'rubyforge'
 require 'rake'
 require 'rake/tasklib'
 require 'date'
+require 'git'
 
-module Rake 
+module GithubGem
   
-  class GithubGem < TaskLib
-    
-    attr_accessor :name
-    attr_accessor :specification
-   
-    def self.define_tasks!
-      gem_task_builder = Rake::GithubGem.new      
-      gem_task_builder.register_all_tasks!
+  def self.detect_gemspec_file
+    FileList['*.gemspec'].first
+  end
+  
+  def self.detect_main_include
+    if detect_gemspec_file =~ /^(\.*)\.gemspec$/ && File.exist?("lib/#{$1}.rb")
+      "lib/#{$1}.rb"
+    elsif FileList['lib/*.rb'].length == 1
+      FileList['lib/*.rb'].first
+    else
+      raise "Could not detect main include file!"
     end
+  end
+  
+  class RakeTasks
+    
+    attr_reader   :gemspec, :modified_files, :git
+    attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
     
+    def initialize(task_namespace = :gem)
+      @gemspec_file   = GithubGem.detect_gemspec_file
+      @task_namespace = task_namespace
+      @main_include   = GithubGem.detect_main_include
+      @modified_files = []
+      @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?
 
-    def initialize
-      reload_gemspec!
+      @git = Git.open(@root_dir)      
+      load_gemspec!      
+      define_tasks!
     end
+    
+    protected
+    
+    def define_test_tasks!
+      require 'rake/testtask'
 
-    def register_all_tasks!
-      namespace(:gem) do
-        desc "Updates the file lists for this gem"
-        task(:manifest) { manifest_task }
-
-        desc "Releases a new version of #{@name}"
-        task(:build => [:manifest]) { build_task } 
-        
-        
-        release_dependencies = [:check_clean_master_branch, :version, :build, :create_tag]
-        release_dependencies.push 'doc:publish' if has_rdoc?
-        release_dependencies.unshift 'test' if has_tests?
-        release_dependencies.unshift 'spec' if has_specs?
-                
-        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 }
+      namespace(:test) do
+        Rake::TestTask.new(:basic) do |t|
+          t.pattern = test_pattern
+          t.verbose = true
+          t.libs << 'test'
         end
-        
-        # helper task for releasing
-        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! }
       end
       
-      # Register RDoc tasks
-      if has_rdoc?
-        require 'rake/rdoctask'
-        
-        namespace(:doc) do 
-          desc 'Generate documentation for request-log-analyzer'
-          Rake::RDocTask.new(:compile) do |rdoc|
-            rdoc.rdoc_dir = 'doc'
-            rdoc.title    = @name
-            rdoc.options += @specification.rdoc_options
-            rdoc.rdoc_files.include(@specification.extra_rdoc_files)
-            rdoc.rdoc_files.include('lib/**/*.rb')
-          end
-          
-          desc "Publish RDoc files for #{@name} to Github"
-          task(:publish => :compile) do
-            sh 'git checkout gh-pages'
-            sh 'git pull origin gh-pages'
-            sh 'cp -rf doc/* .'
-            sh "git commit -am \"Publishing newest RDoc documentation for #{@name}\""
-            sh "git push origin gh-pages"
-            sh "git checkout master"
-          end
-        end
-      end
+      desc "Run all unit tests for #{gemspec.name}"
+      task(:test => ['test:basic'])
+    end
     
-      # Setup :spec task if RSpec files exist
-      if has_specs?
-        require 'spec/rake/spectask'
+    def define_rspec_tasks!
+      require 'spec/rake/spectask'
 
-        desc "Run all specs for #{@name}"
-        Spec::Rake::SpecTask.new(:spec) do |t|
-          t.spec_files = FileList['spec/**/*_spec.rb']
+      namespace(:spec) do
+        desc "Verify all RSpec examples for #{gemspec.name}"
+        Spec::Rake::SpecTask.new(:basic) do |t|
+          t.spec_files = FileList[spec_pattern]
         end
+        
+        desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
+        Spec::Rake::SpecTask.new(:specdoc) do |t|
+          t.spec_files = FileList[spec_pattern]
+          t.spec_opts << '--format' << 'specdoc' << '--color'
+        end
+        
+        desc "Run RCov on specs for #{gemspec.name}"
+        Spec::Rake::SpecTask.new(:rcov) do |t|
+          t.spec_files = FileList[spec_pattern]
+          t.rcov = true
+          t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']          
+        end          
       end
       
-      # Setup :test task if unit test files exist
-      if has_tests?
-        require 'rake/testtask'
-
-        desc "Run all unit tests for #{@name}"
-        Rake::TestTask.new(:test) do |t|
-          t.pattern = 'test/**/*_test.rb'
-          t.verbose = true
-          t.libs << 'test'
-        end
-      end      
+      desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
+      task(:spec => ['spec:specdoc'])      
     end
     
-    protected 
+    # 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 }
 
-    def has_rdoc?
-      @specification.has_rdoc
-    end
+        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?
+        
+        desc "Perform all checks that would occur before a release"
+        task(:release_checks => checks) 
 
-    def has_specs?
-      Dir['spec/**/*_spec.rb'].any?
+        desc "Release a new verison of the gem"
+        task(:release => [:release_checks, :set_version, :build, :push_changes]) { release_task }
+        
+        task(:push_changes => [:commit_modified_files, :tag_version]) { push_changes_task }
+        task(:tag_version) { tag_version_task }
+        task(:commit_modified_files) { commit_modified_files_task }
+      end
     end
     
-    def has_tests?
-      Dir['test/**/*_test.rb'].any?
-    end
-
-    def reload_gemspec!
-      raise "No gemspec file found!" if gemspec_file.nil?      
-      spec = File.read(gemspec_file)
-      @specification = eval(spec)
-      @name = specification.name  
-    end
-
-    def run_command(command)
-      lines = []
-      IO.popen(command) { |f| lines = f.readlines }
-      return lines
+    def manifest_task
+      # Load all the gem's files using "git ls-files"
+      repository_files = git.ls_files.keys
+      test_files       = Dir[test_pattern] + Dir[spec_pattern]
+      
+      update_gemspec(:files, repository_files)
+      update_gemspec(:test_files, repository_files & test_files)
     end
     
-    def git_modified?(file)
-      return !run_command('git status').detect { |line| Regexp.new(Regexp.quote(file)) =~ line }.nil?
+    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 git_commit_file(file, message, branch = nil)
-      verify_current_branch(branch) unless branch.nil?
-      if git_modified?(file)
-        sh "git add #{file}"
-        sh "git commit -m \"#{message}\""
-      else
-        raise "#{file} is not modified and cannot be committed!"
-      end
+    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 git_create_tag(tag_name, message)
-      sh "git tag -a \"#{tag_name}\" -m \"#{message}\""
+    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)
+      # Loads the latest version number using the created tags
+      newest_version   = git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max      
+      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version && newest_version >= proposed_version
     end
     
-    def git_push(remote = 'origin', branch = 'master', options = [])
-      verify_clean_status(branch)
-      options_str = options.map { |o| "--#{o}"}.join(' ')
-      sh "git push #{options_str} #{remote} #{branch}"
+    def check_not_diverged_task
+      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.branches["#{remote}/#{remote_branch}"].gcommit).any?
     end
     
-    def gemspec_version=(new_version)
-      spec = File.read(gemspec_file)
-      spec.gsub!(/^(\s*s\.version\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{new_version}'#{$5}" }
-      spec.gsub!(/^(\s*s\.date\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{Date.today.strftime('%Y-%m-%d')}'#{$5}" }    
-      File.open(gemspec_file, 'w') { |f| f << spec }
-      reload_gemspec!      
+    def check_clean_status_task
+      raise "The current working copy contains modifications" if git.status.changed.any?
     end
     
-    def gemspec_date=(new_date)
-      spec = File.read(gemspec_file)
-      spec.gsub!(/^(\s*s\.date\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{new_date.strftime('%Y-%m-%d')}'#{$5}" }    
-      File.open(gemspec_file, 'w') { |f| f << spec }
-      reload_gemspec!       
+    def check_current_branch_task
+      raise "Currently not on #{local_branch} branch!" unless git.branch.name == local_branch.to_s
     end
     
-    def gemspec_file 
-      @gemspec_file ||= Dir['*.gemspec'].first
+    def fetch_origin_task
+      git.fetch('origin')
     end
     
-    def verify_current_branch(branch)
-      run_command('git branch').detect { |line| /^\* (.+)/ =~ line }
-      raise "You are currently not working in the #{branch} branch!" unless branch == $1
+    def commit_modified_files_task
+      if modified_files.any?
+        modified_files.each { |file| git.add(file) }
+        git.commit("Released #{gemspec.name} gem version #{gemspec.version}")
+      end
     end
     
-    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
+    def tag_version_task
+      git.add_tag("#{gemspec.name}-#{gemspec.version}")
     end
     
-    def verify_clean_status(on_branch = nil)      
-      lines = run_command('git status')
-      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
+    def push_changes_task
+      git.push(remote, remote_branch, true)
     end
     
-    def verify_version(new_version)
-      newest_version = run_command('git tag').map { |tag| tag.split(name + '-').last }.compact.map { |v| Gem::Version.new(v) }.max
-      raise "This version number (#{new_version}) is not higher than the highest tagged version (#{newest_version})" if !newest_version.nil? && newest_version >= Gem::Version.new(new_version.to_s)
+    def release_task
+      puts
+      puts '------------------------------------------------------------'
+      puts "Released #{gemspec.name} version #{gemspec.version}"
     end
     
-    def set_gem_version!
-      # update gemspec file
-      self.gemspec_version = ENV['VERSION'] if Gem::Version.correct?(ENV['VERSION'])
-      self.gemspec_date    = Date.today
-    end
-
-    def manifest_task
-      verify_current_branch('master')
-      
-      list = Dir['**/*'].sort
-      list -= [gemspec_file]
-
-      if File.exist?('.gitignore')
-        File.read('.gitignore').each_line do |glob|
-          glob = glob.chomp.sub(/^\//, '')
-          list -= Dir[glob]
-          list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
-        end
-      end
-      
-      # update the spec file
-      spec = File.read(gemspec_file)
-      spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
-        assignment = $1
-        bunch = $2 ? list.grep(/^(test.*_test\.rb|spec.*_spec.rb)$/) : list
-        '%s%%w(%s)' % [assignment, bunch.join(' ')]
-      end
-
-      File.open(gemspec_file, 'w') { |f| f << spec }
-      reload_gemspec!
-    end
+    private
     
-    def build_task
-      sh "gem build #{gemspec_file}"
-      Dir.mkdir('pkg') unless File.exist?('pkg')
-      sh "mv #{name}-#{specification.version}.gem pkg/#{name}-#{specification.version}.gem" 
+    def has_specs?
+      FileList[spec_pattern].any?
     end
     
-    def install_task
-      raise "#{name} .gem file not found" unless File.exist?("pkg/#{name}-#{specification.version}.gem")
-      sh "gem install pkg/#{name}-#{specification.version}.gem"
+    def has_tests?
+      FileList[test_pattern].any?
     end
     
-    def uninstall_task
-      raise "#{name} .gem file not found" unless File.exist?("pkg/#{name}-#{specification.version}.gem")
-      sh "gem uninstall #{name}"
-    end    
     
-    def create_version_tag!
-      # commit the gemspec file
-      git_commit_file(gemspec_file, "Updated #{gemspec_file} for release of version #{@specification.version}") if git_modified?(gemspec_file)
-
-      # create tag and push changes
-      git_create_tag("#{@name}-#{@specification.version}", "Tagged version #{@specification.version}")
-      git_push('origin', 'master', [:tags])     
+    # Loads the gemspec file
+    def load_gemspec!
+      @gemspec = eval(File.read(@gemspec_file))
     end
     
-    def release_task
-      puts
-      puts '------------------------------------------------------------'
-      puts "Released #{@name} - version #{@specification.version}"
+    # 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
     
-    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 '------------------------------------------------------------'
+    # Updates the VERSION constant in the main include file if it exists
+    def update_version_constant(version)
+     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
+    
+    # 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!
+      end
     end
+    
   end
 end
-
-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.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,12 +10,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -07:00
+date: 2009-09-02 00:00:00 -07:00
 default_executable: request-log-analyzer
-dependencies: []
-
-description: Rails log analyzer's purpose is to find what actions are best candidates for optimization. This tool will parse all requests in the Rails logfile and aggregate the information. Once it is finished parsing the log file, it will show the requests that take op most server time using various metrics.
-email: willem@vanbergen.org
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: git
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+    version: 
+description: Request log analyzer's purpose is to find ot how your web application is being used 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 using various metrics. It can also insert all  parsed request information into a database so you can roll your own analysis. It supports Rails- and Merb-based applications  out of the box, but file formats of other applications can easily be supported by supplying an easy to write log file format  definition.
+email: 
+- willem@railsdoctors.com
+- bart@railsdoctors.com
 executables: 
 - request-log-analyzer
 extensions: []
@@ -23,116 +44,94 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- DESIGN.rdoc
-- LICENSE
-- README.rdoc
-- RELEASE_NOTES.rdoc
-- Rakefile
-- bin
-- bin/request-log-analyzer
-- lib
-- lib/cli
-- lib/cli/command_line_arguments.rb
-- lib/cli/progressbar.rb
-- lib/cli/tools.rb
-- lib/request_log_analyzer
-- lib/request_log_analyzer.rb
-- lib/request_log_analyzer/aggregator
-- lib/request_log_analyzer/aggregator.rb
-- lib/request_log_analyzer/aggregator/database.rb
-- lib/request_log_analyzer/aggregator/echo.rb
-- lib/request_log_analyzer/aggregator/summarizer.rb
+- spec/unit/filter/anonymize_filter_spec.rb
+- lib/request_log_analyzer/line_definition.rb
+- lib/request_log_analyzer/output/html.rb
 - lib/request_log_analyzer/controller.rb
-- lib/request_log_analyzer/file_format
-- lib/request_log_analyzer/file_format.rb
-- lib/request_log_analyzer/file_format/merb.rb
-- lib/request_log_analyzer/file_format/rails.rb
+- spec/fixtures/rails_22_cached.log
 - lib/request_log_analyzer/file_format/rails_development.rb
-- lib/request_log_analyzer/filter
-- 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
+- spec/lib/macros.rb
+- spec/fixtures/merb_prefixed.log
+- tasks/request_log_analyzer.rake
+- spec/unit/file_format/file_format_api_spec.rb
+- spec/integration/command_line_usage_spec.rb
+- spec/fixtures/decompression.log.bz2
 - lib/request_log_analyzer/log_processor.rb
-- lib/request_log_analyzer/output
-- 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
-- lib/request_log_analyzer/source.rb
-- lib/request_log_analyzer/source/database.rb
-- lib/request_log_analyzer/source/log_parser.rb
-- lib/request_log_analyzer/tracker
 - lib/request_log_analyzer/tracker.rb
-- lib/request_log_analyzer/tracker/duration.rb
+- lib/request_log_analyzer/filter.rb
+- spec/fixtures/rails_unordered.log
+- bin/request-log-analyzer
+- request-log-analyzer.gemspec
+- DESIGN.rdoc
+- spec/unit/filter/timespan_filter_spec.rb
+- lib/request_log_analyzer/filter/field.rb
 - lib/request_log_analyzer/tracker/frequency.rb
-- lib/request_log_analyzer/tracker/hourly_spread.rb
-- lib/request_log_analyzer/tracker/timespan.rb
-- spec
-- spec/fixtures
-- spec/fixtures/decompression.log
-- spec/fixtures/decompression.log.bz2
 - spec/fixtures/decompression.log.gz
-- spec/fixtures/decompression.log.zip
+- spec/fixtures/decompression.log
+- spec/lib/matchers.rb
+- spec/fixtures/test_order.log
+- lib/request_log_analyzer/output/fixed_width.rb
+- lib/request_log_analyzer/filter/anonymize.rb
+- spec/lib/testing_format.rb
+- lib/request_log_analyzer/tracker/timespan.rb
+- lib/request_log_analyzer/aggregator.rb
+- lib/cli/progressbar.rb
+- README.rdoc
+- spec/fixtures/merb.log
+- lib/request_log_analyzer/tracker/hourly_spread.rb
+- .gitignore
+- spec/unit/tracker/tracker_api_spec.rb
+- spec/unit/tracker/duration_tracker_spec.rb
+- lib/request_log_analyzer/aggregator/echo.rb
+- spec/unit/controller/log_processor_spec.rb
+- lib/request_log_analyzer.rb
+- Rakefile
+- spec/spec_helper.rb
+- spec/unit/filter/filter_spec.rb
+- lib/request_log_analyzer/aggregator/summarizer.rb
+- lib/request_log_analyzer/file_format/rails.rb
+- spec/fixtures/test_language_combined.log
 - spec/fixtures/decompression.tar.gz
+- spec/unit/filter/field_filter_spec.rb
+- spec/spec.opts
+- lib/request_log_analyzer/aggregator/database.rb
+- lib/request_log_analyzer/filter/timespan.rb
+- lib/request_log_analyzer/source/log_parser.rb
 - spec/fixtures/decompression.tgz
+- spec/unit/tracker/timespan_tracker_spec.rb
+- spec/unit/tracker/hourly_spread_spec.rb
 - spec/fixtures/header_and_footer.log
-- spec/fixtures/merb.log
-- spec/fixtures/merb_prefixed.log
+- lib/cli/tools.rb
+- lib/request_log_analyzer/file_format/merb.rb
 - spec/fixtures/multiple_files_1.log
-- spec/fixtures/multiple_files_2.log
-- spec/fixtures/rails_1x.log
-- spec/fixtures/rails_22.log
-- spec/fixtures/rails_22_cached.log
-- spec/fixtures/rails_unordered.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
-- spec/integration/command_line_usage_spec.rb
-- spec/lib
+- spec/unit/file_format/merb_format_spec.rb
+- spec/unit/file_format/line_definition_spec.rb
+- lib/request_log_analyzer/source.rb
+- lib/request_log_analyzer/request.rb
+- spec/unit/controller/controller_spec.rb
+- lib/request_log_analyzer/output.rb
 - spec/lib/helpers.rb
-- spec/lib/macros.rb
-- spec/lib/matchers.rb
+- spec/fixtures/rails_1x.log
 - spec/lib/mocks.rb
-- spec/lib/testing_format.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/unit
-- spec/unit/aggregator
+- spec/fixtures/decompression.log.zip
+- spec/unit/source/request_spec.rb
+- spec/unit/source/log_parser_spec.rb
+- spec/fixtures/test_file_format.log
+- lib/request_log_analyzer/source/database.rb
 - spec/unit/aggregator/database_spec.rb
+- tasks/github-gem.rake
+- lib/request_log_analyzer/tracker/duration.rb
+- lib/request_log_analyzer/file_format.rb
 - spec/unit/aggregator/summarizer_spec.rb
-- spec/unit/controller
-- spec/unit/controller/controller_spec.rb
-- spec/unit/controller/log_processor_spec.rb
-- spec/unit/file_format
-- spec/unit/file_format/file_format_api_spec.rb
-- spec/unit/file_format/line_definition_spec.rb
-- spec/unit/file_format/merb_format_spec.rb
-- spec/unit/file_format/rails_format_spec.rb
-- spec/unit/filter
-- 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/source
-- spec/unit/source/log_parser_spec.rb
-- spec/unit/source/request_spec.rb
-- spec/unit/tracker
-- spec/unit/tracker/duration_tracker_spec.rb
+- spec/fixtures/rails_22.log
+- spec/fixtures/multiple_files_2.log
+- spec/fixtures/syslog_1x.log
+- LICENSE
 - spec/unit/tracker/frequency_tracker_spec.rb
-- spec/unit/tracker/hourly_spread_spec.rb
-- spec/unit/tracker/timespan_tracker_spec.rb
-- spec/unit/tracker/tracker_api_spec.rb
-- tasks
-- tasks/github-gem.rake
-- tasks/request_log_analyzer.rake
-- tasks/rspec.rake
-has_rdoc: true
-homepage: http://github.com/wvanbergen/request-log-analyzer/wikis
+- spec/unit/file_format/rails_format_spec.rb
+- lib/cli/command_line_arguments.rb
+has_rdoc: false
+homepage: http://railsdoctors.com
 post_install_message: 
 rdoc_options: 
 - --title
@@ -155,31 +154,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
+requirements: 
+- To use the database inserter, ActiveRecord and an appropriate database adapter are required.
 rubyforge_project: r-l-a
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A command line tool to analyze Rails logs
+summary: A command line tool to analyze request logs for Rails, Merb and other application servers
 test_files: 
+- spec/unit/filter/anonymize_filter_spec.rb
+- spec/unit/file_format/file_format_api_spec.rb
 - spec/integration/command_line_usage_spec.rb
-- spec/unit/aggregator/database_spec.rb
-- spec/unit/aggregator/summarizer_spec.rb
-- spec/unit/controller/controller_spec.rb
+- spec/unit/filter/timespan_filter_spec.rb
+- spec/unit/tracker/tracker_api_spec.rb
+- spec/unit/tracker/duration_tracker_spec.rb
 - spec/unit/controller/log_processor_spec.rb
-- spec/unit/file_format/file_format_api_spec.rb
-- spec/unit/file_format/line_definition_spec.rb
-- spec/unit/file_format/merb_format_spec.rb
-- spec/unit/file_format/rails_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/source/log_parser_spec.rb
+- spec/unit/filter/field_filter_spec.rb
+- spec/unit/tracker/timespan_tracker_spec.rb
+- spec/unit/tracker/hourly_spread_spec.rb
+- spec/unit/file_format/merb_format_spec.rb
+- spec/unit/file_format/line_definition_spec.rb
+- spec/unit/controller/controller_spec.rb
 - spec/unit/source/request_spec.rb
-- spec/unit/tracker/duration_tracker_spec.rb
+- spec/unit/source/log_parser_spec.rb
+- spec/unit/aggregator/database_spec.rb
+- spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/tracker/frequency_tracker_spec.rb
-- spec/unit/tracker/hourly_spread_spec.rb
-- spec/unit/tracker/timespan_tracker_spec.rb
-- spec/unit/tracker/tracker_api_spec.rb
+- spec/unit/file_format/rails_format_spec.rb

data/RELEASE_NOTES.rdoc

@@ -1,19 +0,0 @@
-=== 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> )
- * Full Rdoc
- * Release notes
- * Updated rails take tasks
-
-=== 1.2.0
- * Ruby 1.9 support
- * Rcov coverage 

data/tasks/rspec.rake

@@ -1,19 +0,0 @@
-require 'rake'
-require 'spec/rake/spectask'
-
-namespace :spec do 
-  desc "Run all rspec with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
-  end
-
-  desc "Run all specs in spec directory (excluding plugin specs)"
-  Spec::Rake::SpecTask.new(:fancy) do |t|
-    t.spec_opts = ['--options', "\"spec/spec.opts\""]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
-end
-