performance_tester 0.0.6 → 0.0.7

data/lib/performance_tester.rb

@@ -2,3 +2,4 @@
 require 'performance_tester/runner'
 require 'performance_tester/scenario'
 require 'performance_tester/version'
+require 'performance_tester/logger'

data/lib/performance_tester/csv_logger.rb

@@ -2,13 +2,9 @@
 require 'csv'
 
 module PerformanceTester
-  class CsvLogger
-    attr_reader :name, :outcome, :path
-
-    def initialize(name, outcome, options = {})
-      @name = name
-      @outcome = outcome
-      @path = options.fetch(:path) { 'performance_test.csv' }
+  class CsvLogger < Logger
+    def path
+      options.fetch(:path) { 'performance_test.csv' }
     end
 
     def log
@@ -20,6 +16,15 @@ module PerformanceTester
       end
     end
 
+    def with_csv
+      append = File.exists?(path)
+      flags = append ? 'ab' : 'wb'
+      CSV.open(path, flags) do |csv|
+        csv << header_line unless append
+        yield csv
+      end
+    end
+
     def header_line
       [
         'Run name',
@@ -33,7 +38,7 @@ module PerformanceTester
 
     def request_line(request)
       [
-        name,
+        run_name,
         outcome.started_at,
         request.host_alias,
         request.path,
@@ -43,16 +48,7 @@ module PerformanceTester
     end
 
     def total_line
-      [name, outcome.started_at, '', '', '', outcome.total_time_elapsed]
-    end
-
-    def with_csv
-      append = File.exists?(path)
-      flags = append ? 'ab' : 'wb'
-      CSV.open(path, flags) do |csv|
-        csv << header_line unless append
-        yield csv
-      end
+      [run_name, outcome.started_at, '', '', '', outcome.total_time_elapsed]
     end
   end
 end

data/lib/performance_tester/logger.rb

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+
+module PerformanceTester
+  module_function
+
+  def loggers
+    @loggers ||= {}
+  end
+
+  def register_logger(name, klass)
+    loggers[name] = klass
+  end
+
+  def registered_logger(name)
+    loggers.fetch(name)
+  rescue KeyError
+    raise ArgumentError, "Unregistered logger: #{name}"
+  end
+
+  class Logger
+    attr_reader :run_name, :outcome, :options
+
+    def initialize(run_name, outcome, options = {})
+      @run_name = run_name
+      @outcome = outcome
+      @options = options
+    end
+
+    def log
+    end
+  end
+end
+
+require 'performance_tester/puts_aggregate_logger'
+require 'performance_tester/csv_logger'
+
+PerformanceTester.register_logger(
+  :summary, PerformanceTester::PutsAggregateLogger)
+PerformanceTester.register_logger(:csv, PerformanceTester::CsvLogger)

data/lib/performance_tester/outcome.rb

@@ -51,7 +51,7 @@ module PerformanceTester
       end
 
       def path
-        url.path
+        url.request_uri
       end
 
       def time_elapsed

data/lib/performance_tester/puts_aggregate_logger.rb

@@ -1,16 +1,9 @@
 # encoding: UTF-8
 
 module PerformanceTester
-  class PutsAggregateLogger
-    attr_reader :name, :outcome
-
-    def initialize(name, outcome)
-      @name = name
-      @outcome = outcome
-    end
-
+  class PutsAggregateLogger < Logger
     def log
-      puts "Test run: #{name}"
+      puts "Test run: #{run_name}"
       puts "Success: #{outcome.success?}"
       puts "Number of requests: #{number_of_requests}"
       puts "Sum of request times: #{sprintf("%.02f", sum_of_times_of_all_requests)}"

data/lib/performance_tester/runner.rb

@@ -3,11 +3,9 @@ require 'capybara'
 require 'capybara/dsl'
 require 'capybara/poltergeist'
 require 'performance_tester/outcome'
-require 'performance_tester/puts_aggregate_logger'
-require 'performance_tester/csv_logger'
 
 module PerformanceTester
-  # Executes a scenario in an environment and creates outcomes
+  # Executes a scenario, then creates and logs outcomes
   class Runner
     attr_reader :options
 
@@ -17,8 +15,8 @@ module PerformanceTester
     end
 
     def run(scenario)
-      start = time_now
       context = build_context
+      start = time_now
       context.execute(scenario)
       stop = time_now
       period = (start .. stop)
@@ -40,8 +38,9 @@ module PerformanceTester
     end
 
     def log_outcome(outcome)
-      loggers.each do |logger|
-        logger.new(name, outcome).log
+      loggers.each do |logger_name, logger_options|
+        logger = PerformanceTester.registered_logger(logger_name)
+        logger.new(run_name, outcome, logger_options).log
       end
     end
 
@@ -53,7 +52,7 @@ module PerformanceTester
       clock.now
     end
 
-    def name
+    def run_name
       options.fetch(:name) { '' }
     end
 
@@ -65,12 +64,12 @@ module PerformanceTester
       options.fetch(:hosts) { {} }
     end
 
-    def outcome
-      options.fetch(:outcome) { Outcome }
+    def loggers
+      options.fetch(:loggers) { {} }
     end
 
-    def loggers
-      options.fetch(:loggers) { [PutsAggregateLogger, CsvLogger] }
+    def outcome
+      options.fetch(:outcome) { Outcome }
     end
 
     def clock

data/lib/performance_tester/version.rb

@@ -1,3 +1,3 @@
 module PerformanceTester
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: performance_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -41,6 +41,7 @@ files:
 - Rakefile
 - lib/performance_tester.rb
 - lib/performance_tester/csv_logger.rb
+- lib/performance_tester/logger.rb
 - lib/performance_tester/outcome.rb
 - lib/performance_tester/puts_aggregate_logger.rb
 - lib/performance_tester/runner.rb