stella 0.7.0.012 → 0.7.0.014

data/CHANGES.txt

@@ -7,7 +7,7 @@ NOTE: Complete rewrite
 
 * New internal architecture. 
 * Improved stability and output for high thread loads. 
-* Updated test plan DSL
+* Updated configuration
 * Granular reporting via Benelux
 
 

data/bin/stella

@@ -19,7 +19,8 @@
 #--
 
 # Put our local lib in first place
-lib_dir = File.expand_path File.join(File.dirname(__FILE__), '..', 'lib')
+BASE_PATH = File.expand_path File.join(File.dirname(__FILE__), '..')
+lib_dir = File.join(BASE_PATH, 'lib')
 $:.unshift lib_dir  
 
 require 'drydock'
@@ -37,6 +38,9 @@ class Stella::CLI::Definition
   
   global :A, :apikey, String, "API Key"
   global :S, :secret, String, "Secret Key"
+  global :n, :nocolor, "Disable output colors" do
+    String.disable_color
+  end
   global :q, :quiet, "Be quiet!" do
     Stella.enable_quiet
   end
@@ -55,6 +59,14 @@ class Stella::CLI::Definition
   
   # ------------------------------------------------  STELLA  --------
   # ------------------------------------------------------------------
+  about "Instructions for running the example app and test"
+  usage "stella example"
+  command :example => Stella::CLI
+  
+  about "Preview the test plan"
+  usage "stella preview [-p path/2/testplan.rb] "
+  option :p, :testplan, String, "Path to testplan" 
+  command :preview => Stella::CLI
   
   about "Run a functional test"
   usage "stella verify http://stellaaahhhh.com/"
@@ -68,14 +80,25 @@ class Stella::CLI::Definition
   usage "stella load http://stellaaahhhh.com:3114/"
   usage "stella load --clients=10 --repetitions=2 http://stellaaahhhh.com/"
   usage "stella load -p path/2/testplan.rb -u 100 -r 5 http://stellaaahhhh.com/"
-  option :w, :nowait, "Ignore wait times"
   option :c, :clients, Integer, "Number of virtual clients"
   option :r, :repetitions, Integer, "Number of times to repeat the testplan (per vclient)"
-  option :t, :time, String, "Max duration to run test"
-  option :d, :delay, Float, "Delay (in seconds) between client requests (ignored if testplan supplied)"
+  option :d, :duration, String, "Max duration to run test"
+  option :W, :nowait, "Ignore wait times"
+  option :w, :wait, Float, "Wait time (in seconds) between client requests (ignored if testplan supplied)"
   option :p, :testplan, String, "Path to testplan" 
   command :load => Stella::CLI
   
+  about "Run a stress test"
+  usage "stella stress http://stellaaahhhh.com/"
+  usage "stella stress http://stellaaahhhh.com:3114/"
+  usage "stella stress --clients=10 --repetitions=2 http://stellaaahhhh.com/"
+  usage "stella stress -p path/2/testplan.rb -u 100 -r 5 http://stellaaahhhh.com/"
+  option :c, :clients, Integer, "Number of virtual clients"
+  option :r, :repetitions, Integer, "Number of times to repeat the testplan (per vclient)"
+  option :d, :duration, String, "Max duration to run test"
+  option :p, :testplan, String, "Path to testplan" 
+  command :stress => Stella::CLI
+  
   about "Initialize Stella configuration"
   command :init do
     Stella::Config.init
@@ -119,11 +142,11 @@ rescue Drydock::InvalidArgument => ex
   STDERR.puts ex.message
 rescue Stella::Error => ex
   STDERR.puts ex.message
-  STDERR.puts ex.backtrace if Drydock.debug?
+  STDERR.puts ex.backtrace if Stella.loglev > 2 || Drydock.debug?
 rescue Interrupt
   puts "#{$/}Exiting... "
   exit 1
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
-  STDERR.puts ex.backtrace if Drydock.debug?
+  STDERR.puts ex.backtrace if Stella.loglev > 2 || Drydock.debug?
 end

data/examples/essentials/plan.rb

@@ -18,14 +18,14 @@
 #
 # This plan contains 3 scenarios:
 # 
-# - Simple Search (60%)
-# - YAML API (30%)
+# - Simple Search (65%)
+# - YAML API (25%)
 # - Self-serve API (10%)
 #
 # The percentages represent the relative amount 
 # of traffic to be generated for each scenario.
-# In a test with 100 virtual users, 60 would 
-# follow the Simple Search usecase, 30 the YAML
+# In a test with 100 virtual users, 65 would 
+# follow the Simple Search usecase, 25 the YAML
 # API, and 10 would following the Self-Serve API.
 #
 #
@@ -40,17 +40,10 @@
 # 3. START THE EXAMPLE APPLICATION
 # 
 # You need to start the example web application before
-# running this testplan. You can do this in one of the
-# following ways:
+# running this testplan. You can generate the commands
+# for your local machine with this command:
 # 
-# $ ruby examples/example_webapp.rb
-#
-#     OR
-#
-# $ thin -R examples/example_webapp.ru start
-#
-# You can check that it's running by going to:
-# http://127.0.0.1:3000/
+# $ stella example
 #
 #
 # 4. RUNNING THE TEST PLAN
@@ -104,9 +97,9 @@ usecase 65, "Simple search" do
   # homepage ("/").
   #
   get "/", "Homepage" do
-    # This tells Stella to wait between 1 and 5
+    # This tells Stella to wait between 1 and 3
     # seconds before moving to the next request.
-    wait 1..5
+    wait 1..3
   end
   
   # In this request, the user has entered a simple
@@ -120,7 +113,7 @@ usecase 65, "Simple search" do
   #     get "http://example.com:8000/search"
   #
   get "/search", "Search Results" do
-    wait 2..5
+    wait 2..3
     
     # Two URI parameters will be included with this
     # request. Notice that the values for the what 
@@ -176,7 +169,7 @@ usecase 65, "Simple search" do
   #
   get "/listing/:lid" do 
     desc "Selected listing"
-    wait 1..8       
+    wait 1..4    
   end               
   
 end
@@ -241,7 +234,6 @@ usecase 10, "Self-serve API" do
   # identical to the ones you've seen above.
   #
   post "/listing/add", "Add a listing" do
-    wait 1..4 
     param :name => random(8)
     param :city => random(['Toronto', 'Vancouver', 'Montreal'])
     param :logo => file('logo.png')
@@ -252,4 +244,4 @@ usecase 10, "Self-serve API" do
   
 end
 
-# a5689bb64829d2dc1e9ab8901223cc90c975fe3a
+# 278a014c48dd64d2f2aca0588fa281b9553e825f

data/lib/stella.rb

@@ -59,7 +59,7 @@ module Stella
     blk.call
   rescue => ex
     Stella.le "ERROR: #{ex.message}"
-    Stella.ld ex.backtrace
+    Stella.li3 ex.backtrace
   end
 end
 

data/lib/stella/cli.rb

@@ -27,13 +27,57 @@ class Stella::CLI < Drydock::Command
   def load
     opts = {}
     opts[:hosts] = @hosts
-    [:nowait, :clients, :repetitions, :delay, :time].each do |opt|
+    [:nowait, :clients, :repetitions, :wait, :duration].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
     ret = Stella::Engine::Load.run @testplan, opts
     @exit_code = (ret ? 0 : 1)
   end
-
+  
+  def stress_valid?
+    create_testplan
+  end
+  
+  def stress
+    opts = {}
+    opts[:hosts] = @hosts
+    [:clients, :repetitions, :duration].each do |opt|
+      opts[opt] = @option.send(opt) unless @option.send(opt).nil?
+    end
+    ret = Stella::Engine::Stress.run @testplan, opts
+    @exit_code = (ret ? 0 : 1)
+  end
+  
+  def example
+    base_path = File.expand_path(File.join(Stella::LIB_HOME, '..'))
+    thin_path = File.join(base_path, 'support', 'sample_webapp', 'config.ru')
+    webrick_path = File.join(base_path, 'support', 'sample_webapp', 'app.rb')
+    tp_path = File.join(base_path, 'examples', 'essentials', 'plan.rb')
+    puts "1. Start the web app:".bright
+    puts %Q{
+    $ thin -p 3114 -R #{thin_path} start
+      OR  
+    $ ruby #{webrick_path}
+    }
+    puts "2. Check the web app in your browser".bright
+    puts %Q{
+    http://127.0.0.1:3114/
+    }
+    puts "3. Run a functional test:".bright
+    puts %Q{
+    $ stella verify -p #{tp_path} 127.0.0.1:3114
+    }
+    puts "4. Run a load test:".bright
+    puts %Q{
+    $ stella load -p #{tp_path} 127.0.0.1:3114
+    }
+  end
+  
+  def preview
+    create_testplan
+    Stella.li @testplan.pretty(Stella.loglev > 1)
+  end
+  
   private
   def create_testplan
     unless @option.testplan.nil? || File.exists?(@option.testplan)
@@ -47,11 +91,11 @@ class Stella::CLI < Drydock::Command
       @testplan = Stella::Testplan.load_file @option.testplan
     else
       opts = {}
-      opts[:delay] = @option.delay if @option.delay
+      opts[:delay] = @option.wait if @option.wait
       @testplan = Stella::Testplan.new(@argv, opts)
     end
     @testplan.check!  # raise errors, update usecase ratios
-    Stella.li3 " File: #{@option.testplan} (#{@testplan.digest})", $/
+    Stella.li2 " #{@option.testplan || @testplan.desc} (#{@testplan.digest})" 
     true
   end
   

data/lib/stella/client.rb

@@ -37,31 +37,35 @@ module Stella
         headers = prepare_headers(container, req.headers)
         uri = build_request_uri uri_obj, params, container
         raise NoHostDefined, uri_obj if uri.host.nil? || uri.host.empty?
-        stella_id = [Time.now, self.gibbler_cache, req, params, headers, counter].gibbler
+        stella_id = [Time.now, self.gibbler_cache, req.gibbler_cache, params, headers, counter].gibbler
         
         Benelux.add_thread_tags :request => req.gibbler_cache
         Benelux.add_thread_tags :retry => counter
         Benelux.add_thread_tags :stella_id => stella_id
         
-        params['__stella'] = stella_id
-        headers['X-Stella-ID'] = stella_id
+        params['__stella'] = stella_id.short
+        headers['X-Stella-ID'] = stella_id.short
         
         meth = req.http_method.to_s.downcase
         Stella.ld "#{req.http_method}: " << "#{uri_obj.to_s} " << params.inspect
 
         begin
           send_request http_client, usecase, meth, uri, req, params, headers, container, counter
-          #http_client.save_cookie_store
-          update(:stats, http_client, usecase, req)
+          
+          Benelux.add_thread_tags :status => container.status
+          Benelux.thread_timeline.add_count :request_header_size, container.response.request.header.dump.size
+          Benelux.thread_timeline.add_count :request_content_size, container.response.request.body.content.size
+          Benelux.thread_timeline.add_count :response_headers_size, container.response.header.dump.size
+          Benelux.thread_timeline.add_count :response_content_size, container.response.body.content.size
+          ret = execute_response_handler container, req
+          Benelux.remove_thread_tags :status
+           
         rescue => ex
+          Benelux.thread_timeline.add_count :failed, 1
           update(:request_error, usecase, uri, req, params, ex)
           next
         end
         
-        Benelux.add_thread_tags :status => container.status
-        ret = execute_response_handler container, req
-        Benelux.remove_thread_tags :status
-        
         Stella.lflush
         
         run_sleeper(req.wait) if req.wait && !nowait?
@@ -116,6 +120,7 @@ module Stella
       http_client.set_proxy_auth(@proxy.user, @proxy.pass) if @proxy.user
       http_client.debug_dev = STDOUT if Stella.debug? && Stella.loglev > 3
       #http_client.set_cookie_store @cookie_file.path
+      http_client.protocol_version = "HTTP/1.1"
       http_client
     end
     

data/lib/stella/engine.rb

@@ -4,7 +4,7 @@ module Stella::Engine
   
   # These commented out timers are not very revealing.
   #Benelux.add_timer      Stella::Client, :execute
-  #Benelux.add_timer      Stella::Client, :send_request
+  Benelux.add_counter      Stella::Client, :execute_response_handler
   #Benelux.add_timer          HTTPClient, :create_request
   
   # These timers are interesting from a reporting perspective.
@@ -15,7 +15,9 @@ module Stella::Engine
   Benelux.add_timer HTTPClient::Session, :query
   Benelux.add_timer HTTPClient::Session, :socket_gets_first_byte
   Benelux.add_timer HTTPClient::Session, :get_body
-
+  
+  #Benelux.add_counter Stella::Client, :execute_response_handler
+  
   module Base
     extend self
     
@@ -33,18 +35,12 @@ module Stella::Engine
     
     
     def update_quit_usecase client_id, msg
-      Stella.li2 "  Client-%s     QUIT   %s" % [client_id.shorter, msg]
     end
     
-    
     def update_repeat_request client_id, counter, total
-      Stella.li3 "  Client-%s     REPEAT   %d of %d" % [client_id.shorter, counter, total]
     end
     
     def update_stats client_id, http_client, usecase, req
-      #range = Thread.current.timeline.ranges(:do_request).last
-      #Thread.current.stathash 
-      #Stella.li "Client-%s: %s-%s %s %.4f" % [client_id.short, usecase.gibbler.short, req.gibbler.short, req.desc, range.duration]
     end
     
     def update_prepare_request(*args) raise end

data/lib/stella/engine/functional.rb

@@ -12,7 +12,6 @@ module Stella::Engine
       }.merge! opts
       Stella.ld "OPTIONS: #{opts.inspect}"
       Stella.li2 "Hosts: " << opts[:hosts].join(', ') if !opts[:hosts].empty?
-      Stella.li plan.pretty
       
       client = Stella::Client.new opts[:hosts].first
       client.add_observer(self)
@@ -29,13 +28,18 @@ module Stella::Engine
         Stella.rescue { client.execute uc }
       end
       
-      !plan.errors?
+      #Benelux.update_all_track_timelines
+      #tl = Benelux.timeline
+      
+      # errors?
+      
     end
     
     
     def update_prepare_request(client_id, usecase, req, counter)
       notice = "repeat: #{counter-1}" if counter > 1
-      Stella.li2 "  %-46s %16s ".bright % [req.desc, notice]
+      desc = "#{req.desc}  (#{req.gibbler_cache.shorter}) "
+      Stella.li2 "  %-46s %16s ".bright % [desc, notice]
     end
     
     def update_receive_response(client_id, usecase, uri, req, counter, container)
@@ -62,16 +66,24 @@ module Stella::Engine
     
     def update_error_execute_response_handler(client_id, ex, req, container)
       Stella.le ex.message
-      Stella.ld ex.backtrace
+      Stella.li3 ex.backtrace
     end
     
     def update_request_error(client_id, usecase, uri, req, params, ex)
       desc = "#{usecase.desc} > #{req.desc}"
       Stella.le '  Client-%s %-45s %s' % [client_id.short, desc, ex.message]
-      Stella.ld ex.backtrace
+      Stella.li3 ex.backtrace
+    end
+    
+    def update_quit_usecase client_id, msg
+      Stella.li4 "  Client-%s     QUIT   %s" % [client_id.shorter, msg]
     end
     
     
+    def update_repeat_request client_id, counter, total
+      Stella.li4 "  Client-%s     REPEAT   %d of %d" % [client_id.shorter, counter, total]
+    end
+    
   end
 end
 

data/lib/stella/engine/load.rb

@@ -3,211 +3,42 @@ module Stella::Engine
   module Load
     extend Stella::Engine::Base
     extend self
-      
+    
+    @timers = [:do_request]
+    @counts = [:response_content_size]
+    
+    class << self
+      attr_accessor :timers, :counts
+    end
+    
     def run(plan, opts={})
       opts = {
-        :hosts        => [],
+        :hosts          => [],
         :clients        => 1,
-        :time         => nil,
-        :nowait    => false,
-        :repetitions  => 1
+        :duration       => nil,
+        :nowait         => false,
+        :repetitions    => 1
       }.merge! opts
       opts[:clients] = plan.usecases.size if opts[:clients] < plan.usecases.size
       opts[:clients] = 1000 if opts[:clients] > 1000
       
-      Stella.ld "OPTIONS: #{opts.inspect}"
-      Stella.li3 "Hosts: " << opts[:hosts].join(', ')
-      Stella.li2 plan.pretty
-      
-      counts = calculate_usecase_clients plan, opts
+      Stella.li3 " Options: #{opts.inspect}"
+      Stella.li3 " Hosts: " << opts[:hosts].join(', ') 
       
-      Stella.li $/, "Preparing #{counts[:total]} virtual clients...", $/
-      Stella.lflush
-      packages = build_thread_package plan, opts, counts
+      #wait_for_reporter
       
-      Stella.li "Generating load...", $/
-      Stella.lflush
+      # errors?
       
-      begin
-        execute_test_plan packages, opts[:repetitions]
-      rescue Interrupt
-        Stella.li "Stopping test...", $/
-        Stella.abort!
-      ensure
-        Stella.li "Processing statistics...", $/
-        Stella.lflush
-        generate_report plan
-
-        rep_stats = self.timeline.ranges(:build_thread_package).first    
-        Stella.li "%20s %0.4f" % ['Prep time:', rep_stats.duration]
-
-        rep_stats = self.timeline.ranges(:execute_test_plan).first    
-        Stella.li "%20s %0.4f" % ['Test time:', rep_stats.duration]
-
-        rep_stats = self.timeline.ranges(:generate_report).first    
-        Stella.li "%20s %0.4f" % ['Reporting time:', rep_stats.duration]
-        Stella.li $/
-      end
-      
-
-      
-      !plan.errors?
-    end
-    
-
-  protected
-    class ThreadPackage
-      attr_accessor :index
-      attr_accessor :client
-      attr_accessor :usecase
-      def initialize(i, c, u)
-        @index, @client, @usecase = i, c, u
-      end
     end
     
-    def calculate_usecase_clients(plan, opts)
-      counts = { :total => 0 }
-      plan.usecases.each_with_index do |usecase,i|
-        count = case opts[:clients]
-        when 0..9
-          if (opts[:clients] % plan.usecases.size > 0) 
-            msg = "Client count does not evenly match usecase count"
-            raise Stella::Testplan::WackyRatio, msg
-          else
-            (opts[:clients] / plan.usecases.size)
-          end
-        else
-          (opts[:clients] * usecase.ratio).to_i
-        end
-        counts[usecase.gibbler_cache] = count
-        counts[:total] += count
-      end
-      counts
+    def wait_for_reporter
+      Benelux.reporter.wait
     end
     
-    def build_thread_package(plan, opts, counts)
-      packages, pointer = Array.new(counts[:total]), 0
-      plan.usecases.each do |usecase|
-        count = counts[usecase.gibbler_cache]
-        Stella.ld "THREAD PACKAGE: #{usecase.desc} (#{pointer} + #{count})"
-        # Fill the thread_package with the contents of the block
-        packages.fill(pointer, count) do |index|
-          Stella.li3 "Creating client ##{index+1} "
-          client = Stella::Client.new opts[:hosts].first, index+1
-          client.add_observer(self)
-          client.enable_nowait_mode if opts[:nowait]
-          ThreadPackage.new(index+1, client, usecase)
-        end
-        pointer += count
-      end
-      packages.compact # TODO: Why one nil element sometimes?
-    end
-    
-    def execute_test_plan(packages, reps=1)
-      Thread.ify packages, :threads => packages.size do |package|
-        
-        # This thread will stay on this one track. 
-        Benelux.current_track package.client.gibbler
-        Benelux.add_thread_tags :usecase => package.usecase.gibbler_cache
-        
-        (1..reps).to_a.each do |rep|
-          Benelux.add_thread_tags :rep =>  rep
-          Stella::Engine::Load.rescue(package.client.gibbler_cache) {
-            print '.' if Stella.loglev == 1
-            stats = package.client.execute package.usecase
-            break if Stella.abort?
-          }
-          Benelux.remove_thread_tags :rep
-        end
-        
-        Benelux.remove_thread_tags :usecase
-      end
-      Stella.li $/, $/
-    end
-      
-    def generate_report(plan)
-      Benelux.update_all_track_timelines
-      global_timeline = Benelux.timeline
-      
-      Stella.li $/, " %-72s  ".att(:reverse) % ["#{plan.desc}  (#{plan.gibbler_cache.shorter})"]
-      plan.usecases.uniq.each_with_index do |uc,i| 
-        
-        # TODO: Create Ranges object, like Stats object
-        # global_timeline.ranges(:do_request)[:usecase => '1111']
-        # The following returns globl do_request ranges. 
-        requests = 0 #global_timeline.ranges(:do_request).size
-        
-        desc = uc.desc || "Usecase ##{i+1} "
-        desc << "  (#{uc.gibbler_cache.shorter}) "
-        str = ' ' << " %-66s %s   %d%% ".bright.att(:reverse)
-        Stella.li str % [desc, '', uc.ratio_pretty]
-        
-        uc.requests.each do |req| 
-          desc = req.desc 
-          Stella.li "   %-72s ".bright % ["#{req.desc}  (#{req.gibbler_cache.shorter})"]
-          Stella.li "    %s" % [req.to_s]
-          global_timeline.stats.each_pair do |n,stat|
-            filter = {
-              :usecase => uc.gibbler_cache,
-              :request => req.gibbler_cache
-            }
-            stats = stat[filter]
-            Stella.li '      %-30s %.3f <= %.3f >= %.3f; %.3f(SD) %d(N)' % [n, stats.min, stats.mean, stats.max, stats.sd, stats.n]
-            Stella.lflush
-          end
-          Stella.li $/
-        end
-      end
-    end
-    
-    
-    def update_prepare_request(client_id, usecase, req, counter)
-      
-    end
-      
-    def update_receive_response(client_id, usecase, uri, req, counter, container)
-      desc = "#{usecase.desc} > #{req.desc}"
-      Stella.li2 '  Client-%s %3d %-6s %-45s' % [client_id.shorter, container.status, req.http_method, uri]
-    end
-    
-    def update_execute_response_handler(client_id, req, container)
-    end
-    
-    def update_error_execute_response_handler(client_id, ex, req, container)
-      desc = "#{container.usecase.desc} > #{req.desc}"
-      Stella.li $/ if Stella.loglev == 1
-      Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.ld ex.backtrace
-    end
-    
-    def update_request_error(client_id, usecase, uri, req, params, ex)
-      desc = "#{usecase.desc} > #{req.desc}"
-      Stella.li $/ if Stella.loglev == 1
-      Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.ld ex.backtrace
-    end
-
-    
-    def self.rescue(client_id, &blk)
-      blk.call
-    rescue => ex
-      Stella.le '  Error in Client-%s: %s' % [client_id.shorter, ex.message]
-      Stella.ld ex.backtrace
-    end
+  protected
     
+    #Benelux.add_timer Stella::Engine::Load, :build_thread_package
     
-    Benelux.add_timer Stella::Engine::Load, :generate_report
-    Benelux.add_timer Stella::Engine::Load, :build_thread_package
-    Benelux.add_timer Stella::Engine::Load, :execute_test_plan
-    Benelux.add_timer Stella::Client, :execute_response_handler
   end
 end
 
-__END__
-
-
-$ stella verify -p examples/basic/plan.rb http://localhost:3114
-$ stella load -p examples/basic/plan.rb http://localhost:3114
-$ stella remote-load -p examples/basic/plan.rb http://localhost:3114
-$ stella remote-verify -p examples/basic/plan.rb http://localhost:3114
-

data/lib/stella/mixins/numeric.rb

@@ -0,0 +1,23 @@
+
+
+class Numeric
+  # TODO: Use 1024
+  def to_bytes
+    args = case self.abs.to_i
+    when 0..1_000
+      [(self).to_s, 'B']
+    when 1_000..1_000_000
+      [(self / 1000).to_s, 'KB']
+    when 1_000_000..1_000_000_000
+      [(self / (1000**2)).to_s, 'MB']
+    when 1_000_000_000..1_000_000_000_000
+      [(self / (1000**3)).to_s, 'GB']
+    when 1_000_000_000_000..1_000_000_000_000_000
+      [(self / (1000**4)).to_s, 'TB']
+    else
+      [self, 'B']
+    end
+    '%3.2f%s' % args
+  end
+end
+

data/lib/stella/testplan.rb

@@ -14,7 +14,7 @@ class Testplan
   attr_reader :stats
   
   def initialize(uris=[], opts={})
-    @desc, @usecases = "Stella's plan", []
+    @desc, @usecases = "Test plan", []
     @testplan_current_ratio = 0
     @stats = Stella::Testplan::Stats.new
     
@@ -27,6 +27,8 @@ class Testplan
         uri.path = '/' if uri.path.nil? || uri.path.empty?
         req = usecase.add_request :get, uri.path
         req.wait = opts[:delay] if opts[:delay]
+        req.gibbler
+        req.freeze
       end
       self.add_usecase usecase
     end
@@ -43,12 +45,6 @@ class Testplan
     plan
   end
   
-  # Were there any errors in any of the usecases?
-  def errors?
-    Stella.ld "TODO: tally use case errors"
-    false
-  end
-  
   def check!
     # Adjust ratios if necessary
     needy = @usecases.select { |u| u.ratio == -1 }
@@ -93,15 +89,18 @@ class Testplan
     @desc
   end
 
-  def pretty
+  def pretty(long=false)
     str = []
-    str << " %-66s  ".att(:reverse) % ["#{@desc}  (#{self.gibbler_cache.shorter})"]
+    dig = long ? self.gibbler_cache : self.gibbler_cache.shorter
+    str << " %-66s  ".att(:reverse) % ["#{@desc}  (#{dig})"]
     @usecases.each_with_index do |uc,i| 
+      dig = long ? uc.gibbler_cache : uc.gibbler_cache.shorter
       desc = uc.desc || "Usecase ##{i+1}"
-      desc += "  (#{uc.gibbler_cache.shorter}) "
+      desc += "  (#{dig}) "
       str << (' ' << " %-61s %s%% ".att(:reverse).bright) % [desc, uc.ratio_pretty]
       requests = uc.requests.each do |r| 
-        str << "    %-62s".bright % ["#{r.desc}  (#{r.gibbler_cache.shorter})"]
+        dig = long ? r.gibbler_cache : r.gibbler_cache.shorter
+        str << "    %-62s".bright % ["#{r.desc}  (#{dig})"]
         str << "      %s" % [r]
         if Stella.loglev > 2
           [:wait].each { |i| str << "      %s: %s" % [i, r.send(i)] }

data/lib/stella/testplan/usecase.rb

@@ -73,8 +73,6 @@ class Testplan
       req.desc = args[1] if args.size > 1 # Description is optional
       Stella.ld req
       @requests << req
-      req.gibbler
-      req.freeze
       req
     end
     def get(*args, &blk);    add_request :get,    *args, &blk; end

data/lib/stella/version.rb

@@ -6,7 +6,7 @@ module Stella
       MAJOR = 0.freeze
       MINOR = 7.freeze
       TINY  = 0.freeze
-      PATCH = '012'.freeze
+      PATCH = '014'.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/stella.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "stella"
   s.rubyforge_project = 'stella'
-  s.version = "0.7.0.012"
+  s.version = "0.7.0.014"
   s.summary = "Stella: Perform load tests on your web applications with beauty and brute strength."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -15,7 +15,7 @@
   
   s.executables = %w[stella]
   
-  s.add_dependency 'benelux',    '>= 0.3.2'
+  s.add_dependency 'benelux',    '>= 0.4.0'
   s.add_dependency 'drydock',    '>= 0.6.8'
   s.add_dependency 'gibbler',    '>= 0.6.3'
   s.add_dependency 'storable',   '>= 0.5.7'
@@ -34,8 +34,6 @@
   examples/essentials/logo.png
   examples/essentials/plan.rb
   examples/essentials/search_terms.csv
-  examples/example_webapp.rb
-  examples/example_webapp.ru
   examples/exceptions/plan.rb
   lib/stella.rb
   lib/stella/cli.rb
@@ -54,6 +52,7 @@
   lib/stella/exceptions.rb
   lib/stella/guidelines.rb
   lib/stella/mixins.rb
+  lib/stella/mixins/numeric.rb
   lib/stella/mixins/thread.rb
   lib/stella/stats.rb
   lib/stella/testplan.rb
@@ -64,6 +63,8 @@
   lib/stella/version.rb
   lib/threadify.rb
   stella.gemspec
+  support/sample_webapp/app.rb
+  support/sample_webapp/config.ru
   support/useragents.txt
   vendor/httpclient-2.1.5.2/httpclient.rb
   vendor/httpclient-2.1.5.2/httpclient/auth.rb

data/{examples/example_webapp.rb → support/sample_webapp/app.rb}

@@ -1,16 +1,27 @@
 #!/usr/bin/ruby
 
+# Stella Sample Web Application
+#
+# This application plays nicely with the example
+# test plans (see examples/).
+#
+# Usage:
+# 
+#     $ ruby support/sample_webapp/app.rb
+#       OR
+#     $ thin -R support/sample_webapp/config.ru -p 3114 start
+#
+
 require "rubygems"
 require "sinatra"
+require "yaml"
 
-require 'yaml'
-
-set :run => $0 == __FILE__ ? true : false
-set :environment => :development
-set :dump_errors => true
-set :port => 3114
-set :reload => true
-set :max_listings => 1000
+set :run              => ($0 == __FILE__)
+set :environment      => :development
+set :dump_errors      => true
+set :port             => 3114
+set :reload           => true
+set :max_listings     => 1000
 
 LISTINGS = [
   { :id => 1000, :name => 'John West Smoked Oysters', :city => 'Toronto'  },

data/support/sample_webapp/config.ru

@@ -0,0 +1,12 @@
+# Stella Sample Web Application
+#
+# This application plays nicely with the example
+# test plans (see examples/).
+#
+# Usage:
+# 
+#     $ thin -R support/sample_webapp/config.ru -p 3114 start
+
+dir = ::File.expand_path(::File.dirname(__FILE__))
+require ::File.join(dir, 'app.rb')
+run Sinatra::Application

data/vendor/httpclient-2.1.5.2/httpclient.rb

@@ -773,10 +773,10 @@ private
         retry_count -= 1
       end
     end
-    
     res
   end
-
+  
+  # NOTE: Not tracked by Benelux / Stella
   def do_request_async(method, uri, query, body, extheader)
     conn = Connection.new
     t = Thread.new(conn) { |tconn|
@@ -954,10 +954,10 @@ private
     res = HTTP::Message.new_response(content)
     @debug_dev << "= Request\n\n" if @debug_dev
     sess = @session_manager.query(req, proxy)
-    
     res.peer_cert = sess.ssl_peer_cert
     @debug_dev << "\n\n= Response\n\n" if @debug_dev
     do_get_header(req, res, sess)
+    res.header.size = sess.headers_bytes
     conn.push(res)
     sess.get_body do |part|
       if block
@@ -1005,6 +1005,7 @@ private
 
   def do_get_header(req, res, sess)
     res.version, res.status, res.reason, headers = sess.get_header
+    #Benelux.thread_timeline.add_count :response_header_size, res.header
     headers.each do |key, value|
       res.header.add(key, value)
     end

data/vendor/httpclient-2.1.5.2/httpclient/http.rb

@@ -95,6 +95,9 @@ module HTTP
 
     # Represents HTTP message header.
     class Headers
+      # Size of Header content (original string). Set from session.headers_bytes.
+      attr_accessor :size
+      
       # HTTP version in a HTTP header.  Float.
       attr_accessor :http_version
       # Size of body.  nil when size is unknown (e.g. chunked response).
@@ -429,6 +432,8 @@ module HTTP
       # If no dev (the second argument) given, this method returns a dumped
       # String.
       def dump(header = '', dev = '')
+        #header_size = header.size
+        #body_size = 0
         if @body.is_a?(Parts)
           dev << header
           buf = ''
@@ -436,17 +441,24 @@ module HTTP
             if Message.file?(part)
               reset_pos(part)
               while !part.read(@chunk_size, buf).nil?
+                #body_size += buf.size
                 dev << buf
               end
             else
+              #body_size += part.size
               dev << part
             end
           end
         elsif @body
+          #body_size = @body.size
           dev << header + @body
         else
           dev << header
         end
+        
+        #Benelux.thread_timeline.add_count :data_sent, header_size, :type => :header
+        #Benelux.thread_timeline.add_count :data_sent, body_size, :type => :body
+        
         dev
       end
 
@@ -726,7 +738,7 @@ module HTTP
       # Returns true if the given HTTP version allows keep alive connection.
       # version:: Float
       def keep_alive_enabled?(version)
-        version >= 1.1
+        version.to_f >= 1.1
       end
 
       # Returns true if the given query (or body) has a multiple parameter.
@@ -800,6 +812,7 @@ module HTTP
     # dev needs to respond to <<.
     def dump(dev = '')
       str = header.dump + CRLF
+      body_size = body ? body.size : 0
       if header.chunked
         dev = body.dump_chunked(str, dev)
       elsif body

data/vendor/httpclient-2.1.5.2/httpclient/session.rb

@@ -481,7 +481,10 @@ class HTTPClient
     attr_accessor :ssl_config
     attr_reader :ssl_peer_cert
     attr_accessor :test_loopback_http_response
-
+    
+    attr_reader :headers_bytes
+    attr_reader :content_bytes
+    
     def initialize(client, dest, agent_name, from)
       @client = client
       @dest = dest
@@ -512,7 +515,8 @@ class HTTPClient
       @status = nil
       @reason = nil
       @headers = []
-
+      @headers_bytes = 0
+      @content_bytes = 0
       @socket = nil
       @readbuf = nil
     end
@@ -752,6 +756,7 @@ class HTTPClient
           if initial_line.nil?
             raise KeepAliveDisconnected.new
           end
+          @headers_bytes += initial_line.size
           if StatusParseRegexp !~ initial_line
             @version = '0.9'
             @status = nil
@@ -774,6 +779,7 @@ class HTTPClient
             key, value = line.split(/\s*:\s*/, 2)
             parse_keepalive_header(key, value)
             @headers << [key, value]
+            @headers_bytes += line.size
           end
         end while (@version == '1.1' && @status == 100)
       end
@@ -811,6 +817,7 @@ class HTTPClient
         end
         if buf && buf.length > 0
           @content_length -= buf.length
+          @content_bytes += buf.length
           yield buf
         else
           @content_length = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.012
+  version: 0.7.0.014
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -04:00
+date: 2009-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
@@ -92,8 +92,6 @@ files:
 - examples/essentials/logo.png
 - examples/essentials/plan.rb
 - examples/essentials/search_terms.csv
-- examples/example_webapp.rb
-- examples/example_webapp.ru
 - examples/exceptions/plan.rb
 - lib/stella.rb
 - lib/stella/cli.rb
@@ -112,6 +110,7 @@ files:
 - lib/stella/exceptions.rb
 - lib/stella/guidelines.rb
 - lib/stella/mixins.rb
+- lib/stella/mixins/numeric.rb
 - lib/stella/mixins/thread.rb
 - lib/stella/stats.rb
 - lib/stella/testplan.rb
@@ -122,6 +121,8 @@ files:
 - lib/stella/version.rb
 - lib/threadify.rb
 - stella.gemspec
+- support/sample_webapp/app.rb
+- support/sample_webapp/config.ru
 - support/useragents.txt
 - vendor/httpclient-2.1.5.2/httpclient.rb
 - vendor/httpclient-2.1.5.2/httpclient/auth.rb

data/examples/example_webapp.ru

@@ -1,9 +0,0 @@
-# Stella Demo Rackup
-#
-# Usage:
-# 
-#     $ thin -R examples/example_webapp.ru -p 3114 start
-
-dir = ::File.expand_path(::File.dirname(__FILE__))
-require ::File.join(dir, 'example_webapp.rb')
-run Sinatra::Application