performance_tester 0.0.5 → 0.0.6

data/lib/performance_tester.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-require 'performance_tester/environment'
 require 'performance_tester/runner'
 require 'performance_tester/scenario'
 require 'performance_tester/version'

data/lib/performance_tester/csv_logger.rb

@@ -3,9 +3,10 @@ require 'csv'
 
 module PerformanceTester
   class CsvLogger
-    attr_reader :outcome, :path
+    attr_reader :name, :outcome, :path
 
-    def initialize(outcome, options = {})
+    def initialize(name, outcome, options = {})
+      @name = name
       @outcome = outcome
       @path = options.fetch(:path) { 'performance_test.csv' }
     end
@@ -21,6 +22,7 @@ module PerformanceTester
 
     def header_line
       [
+        'Run name',
         'Run datetime',
         'Host alias',
         'Path',
@@ -31,6 +33,7 @@ module PerformanceTester
 
     def request_line(request)
       [
+        name,
         outcome.started_at,
         request.host_alias,
         request.path,
@@ -40,7 +43,7 @@ module PerformanceTester
     end
 
     def total_line
-      [outcome.started_at, '', '', '', outcome.total_time_elapsed]
+      [name, outcome.started_at, '', '', '', outcome.total_time_elapsed]
     end
 
     def with_csv

data/lib/performance_tester/puts_aggregate_logger.rb

@@ -2,13 +2,15 @@
 
 module PerformanceTester
   class PutsAggregateLogger
-    attr_reader :outcome
+    attr_reader :name, :outcome
 
-    def initialize(outcome)
+    def initialize(name, outcome)
+      @name = name
       @outcome = outcome
     end
 
     def log
+      puts "Test 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

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'capybara'
 require 'capybara/dsl'
+require 'capybara/poltergeist'
 require 'performance_tester/outcome'
 require 'performance_tester/puts_aggregate_logger'
 require 'performance_tester/csv_logger'
@@ -8,61 +9,101 @@ require 'performance_tester/csv_logger'
 module PerformanceTester
   # Executes a scenario in an environment and creates outcomes
   class Runner
-    include Capybara::DSL
+    attr_reader :options
 
-    attr_reader :environment, :options
-
-    def initialize(environment, options = {})
-      @environment = environment
+    def initialize(options = {})
       @options = options
+      initialize_browser
     end
 
     def run(scenario)
       start = time_now
-      begin
-        instance_eval(&scenario)
-      rescue => error
-      end
+      context = build_context
+      context.execute(scenario)
       stop = time_now
       period = (start .. stop)
-      outcome = create_outcome(period, error)
+      outcome = create_outcome(period, context)
       log_outcome(outcome)
       outcome
     end
 
-    def create_outcome(period, error)
-      network_traffic = page.driver.network_traffic
-      outcome.new(network_traffic, period, hosts, error)
+    def initialize_browser
+      browser.run_server = false
+      browser.current_driver = :poltergeist
+      browser.register_driver :poltergeist do |app|
+        driver.new(app, :debug => false)
+      end
     end
 
-    def outcome
-      options.fetch(:outcome) { Outcome }
+    def create_outcome(period, context)
+      outcome.new(context.network_traffic, period, hosts, context.error)
     end
 
     def log_outcome(outcome)
       loggers.each do |logger|
-        logger.new(outcome).log
+        logger.new(name, outcome).log
       end
     end
 
-    def loggers
-      options.fetch(:loggers) { [PutsAggregateLogger, CsvLogger] }
+    def build_context
+      Context.new(params, hosts)
     end
 
     def time_now
       clock.now
     end
 
+    def name
+      options.fetch(:name) { '' }
+    end
+
+    def params
+      options.fetch(:params) { {} }
+    end
+
+    def hosts
+      options.fetch(:hosts) { {} }
+    end
+
+    def outcome
+      options.fetch(:outcome) { Outcome }
+    end
+
+    def loggers
+      options.fetch(:loggers) { [PutsAggregateLogger, CsvLogger] }
+    end
+
     def clock
       options.fetch(:clock) { Time }
     end
 
-    def env
-      environment.options
+    def browser
+      options.fetch(:browser) { Capybara }
     end
 
-    def hosts
-      environment.hosts
+    def driver
+      options.fetch(:driver) { Capybara::Poltergeist::Driver }
+    end
+
+    class Context
+      include Capybara::DSL
+
+      attr_reader :params, :hosts, :error
+
+      def initialize(params, hosts)
+        @params = params
+        @hosts = hosts
+      end
+
+      def execute(scenario)
+        instance_eval(&scenario)
+      rescue => error
+        @error = error
+      end
+
+      def network_traffic
+        page.driver.network_traffic
+      end
     end
   end
 end

data/lib/performance_tester/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: performance_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
@@ -41,7 +41,6 @@ files:
 - Rakefile
 - lib/performance_tester.rb
 - lib/performance_tester/csv_logger.rb
-- lib/performance_tester/environment.rb
 - lib/performance_tester/outcome.rb
 - lib/performance_tester/puts_aggregate_logger.rb
 - lib/performance_tester/runner.rb

data/lib/performance_tester/environment.rb

@@ -1,31 +0,0 @@
-# encoding: UTF-8
-require "capybara"
-require "capybara/poltergeist"
-
-module PerformanceTester
-  # Describe an execution environment - server, credentials, etc.
-  class Environment
-    attr_reader :options
-
-    def initialize(options = {})
-      @options = options
-      browser.run_server = false
-      browser.current_driver = :poltergeist
-      browser.register_driver :poltergeist do |app|
-        driver.new(app, :debug => false)
-      end
-    end
-
-    def hosts
-      options.fetch(:hosts) { {} }
-    end
-
-    def browser
-      options.fetch(:browser) { Capybara }
-    end
-
-    def driver
-      options.fetch(:driver) { Capybara::Poltergeist::Driver }
-    end
-  end
-end