request-log-analyzer 1.12.3 → 1.12.4

data/lib/cli/tools.rb

@@ -32,10 +32,10 @@ end
 # Raises if it cannot find the project folder or if the install_type is now known.
 def install_rake_tasks(install_type = :rails)
   if install_type.to_sym == :rails
-    require 'ftools'
+    require 'fileutils'
     if File.directory?('./lib/tasks/')
       task_file = File.expand_path('../../tasks/request_log_analyzer.rake', File.dirname(__FILE__))
-      File.copy(task_file, './lib/tasks/request_log_analyze.rake')
+      FileUtils.copy(task_file, './lib/tasks/request_log_analyze.rake')
       puts "Installed rake tasks."
       puts "To use, run: rake rla:report"
     else

data/lib/request_log_analyzer.rb

@@ -10,7 +10,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.12.1"
+  VERSION = "1.12.4"
 
   # 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/request-log-analyzer.gemspec

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

data/spec/lib/mocks.rb

@@ -14,10 +14,9 @@ module RequestLogAnalyzer::RSpec::Mocks
     source.stub!(:prepare)
     source.stub!(:finalize)
 
-    source.stub!(:each_request).and_return do |block|
-      block.call(testing_format.request(:field => 'value1'))
-      block.call(testing_format.request(:field => 'value2'))
-    end
+    source.stub!(:each_request).
+      and_yield(testing_format.request(:field => 'value1')).
+      and_yield(testing_format.request(:field => 'value2'))
 
     return source
   end

data/tasks/request_log_analyzer.rake

@@ -1,25 +1,40 @@
 namespace :rla do
   desc "Analyze the Rails log file using the request-log-analyzer gem."
   task :report  => :environment do
+    rails_env  = defined?(RAILS_ENV) ? RAILS_ENV : Rails.env
+    rails_root = defined?(RAILS_ROOT) ? RAILS_ROOT : Rails.root
+    rails_version = Rails.version.split(".").first.to_i
+
+    log_file   = defined?(Rails.configuration.log_path) ? Rails.configuration.log_path : Rails.configuration.paths["log"].first
+    log_format = rails_version > 2 ? "rails3" : "rails"
+
     puts "Analyzing the Rails log file using the request-log-analyzer gem."
-    puts "  Environment: #{RAILS_ENV}"
-    puts "  Logfile: #{Rails.configuration.log_path}"
+    puts "  Environment: #{rails_env}"
+    puts "  Logfile: #{log_file}"
     puts ""
-    IO.popen("request-log-analyzer #{Rails.configuration.log_path}") { |io| $stdout << io.read }
 
+    IO.popen("request-log-analyzer #{log_file} --format #{log_format}") { |io| $stdout << io.read }
   end
 
   namespace :report do
     desc "Analyze the Rails log file using the request-log-analyzer gem and output an HTML file."
     task :html  => :environment do
-      output_file = Rails.configuration.log_path + ".html"
+      rails_env  = defined?(RAILS_ENV) ? RAILS_ENV : Rails.env
+      rails_root = defined?(RAILS_ROOT) ? RAILS_ROOT : Rails.root
+      rails_version = Rails.version.split(".").first.to_i
+
+      log_file   = defined?(Rails.configuration.log_path) ? Rails.configuration.log_path : Rails.configuration.paths["log"].first
+      log_format = rails_version > 2 ? "rails3" : "rails"
+
+      output_file = File.join(rails_root, 'public', 'performance.html')
 
       puts "Analyzing the Rails log file using the request-log-analyzer gem."
-      puts "  Environment: #{RAILS_ENV}"
-      puts "  Logfile: #{Rails.configuration.log_path}"
+      puts "  Environment: #{rails_env}"
+      puts "  Logfile: #{log_file}"
       puts "  Output: #{output_file}"
       puts ""
-      IO.popen("request-log-analyzer #{Rails.configuration.log_path} --output HTML --file #{output_file}") { |io| $stdout << io.read }
+
+      IO.popen("request-log-analyzer #{log_file} --output HTML --file #{output_file} --format #{log_format}") { |io| $stdout << io.read }
     end
   end
 

metadata

@@ -1,74 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: request-log-analyzer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.12.4
   prerelease: 
-  version: 1.12.3
 platform: ruby
-authors: 
+authors:
 - Willem van Bergen
 - Bart ten Brinke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-09 00:00:00 +02:00
-default_executable: request-log-analyzer
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70130940523300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        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: *70130940523300
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70130940522420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.8.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70130940522420
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70130940521320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70130940521320
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70130940520020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        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: *70130940520020
+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
@@ -211,40 +217,40 @@ files:
 - spec/unit/tracker/traffic_tracker_spec.rb
 - tasks/github-gem.rake
 - tasks/request_log_analyzer.rake
-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 
-      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 
-      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.6.2
+rubygems_version: 1.8.16
 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