stella 0.7.0.006 → 0.7.0.012

data/lib/stella/stats.rb

@@ -1,12 +1,11 @@
 
 module Stella
 # Based on Mongrel::Stats, Copyright (c) 2005 Zed A. Shaw
-class Stats    
+class Stats < Array
 
   attr_reader :sum, :sumsq, :n, :min, :max
 
-  def initialize(name)
-    @name = name
+  def initialize
     reset
   end
   
@@ -16,13 +15,19 @@ class Stats
   
   # Resets the internal counters so you can start sampling again.
   def reset
+    self.clear
     @n, @sum, @sumsq = 0.0, 0.0, 0.0
-    @last_time = Time.new
+    @last_time = 0.0
     @min, @max = 0.0, 0.0
   end
 
   # Adds a sampling to the calculations.
   def sample(s)
+    self << s
+    update s
+  end
+  
+  def update(s)
     @sum += s
     @sumsq += s * s
     if @n == 0
@@ -33,7 +38,7 @@ class Stats
     end
     @n+=1
   end
-
+  
   # Dump this Stats object with an optional additional message.
   def dump(msg = "", out=STDERR)
     out.puts "#{msg}: #{self.inspect}"
@@ -42,26 +47,16 @@ class Stats
   # Returns a common display (used by dump)
   def inspect
     v = [mean, @n, @sum, @sumsq, sd, @min, @max]
-    t = %w"N=%0.4f SUM=%0.4f SUMSQ=%0.4f SD=%0.4f MIN=%0.4f MAX=%0.4f"
-    "%0.4f: " << t % v
+    t = %q"N=%0.4f SUM=%0.4f SUMSQ=%0.4f SD=%0.4f MIN=%0.4f MAX=%0.4f"
+    ("%0.4f: " << t) % v
   end
 
-  def to_s
-    mean.to_s
-  end
-  
-  def to_f
-    mean.to_f
-  end
-  
-  def to_i
-    mean.to_i
-  end
+  def to_s; mean.to_s; end
+  def to_f; mean.to_f; end
+  def to_i; mean.to_i; end
   
   # Calculates and returns the mean for the data passed so far.
-  def mean
-    @sum / @n
-  end
+  def mean; return 0.0 unless @n > 0; @sum / @n; end
 
   # Calculates the standard deviation of the data so far.
   def sd
@@ -73,21 +68,12 @@ class Stats
       return 0.0
     end
   end
-
-
-  # Adds a time delta between now and the last time you called this.  This
-  # will give you the average time between two activities.
-  #
-  # An example is:
-  #
-  #  t = Stats.new("do_stuff")
-  #  10000.times { do_stuff(); t.tick }
-  #  t.dump("time")
-  #
-  def tick
-    now = Time.now
-    sample(now - @last_time)
-    @last_time = now
+  
+  def recalculate
+    samples = self.clone
+    reset
+    samples.each { |s| sample(s) }
   end
+  
 end
 end

data/lib/stella/testplan/usecase.rb

@@ -73,6 +73,8 @@ 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/testplan.rb

@@ -22,8 +22,9 @@ class Testplan
       usecase = Stella::Testplan::Usecase.new
       usecase.ratio = 1.0
       uris.each do |uri|
+        uri = 'http://' << uri unless uri.match /^http:\/\//i
         uri = URI.parse uri
-        uri.path = '/' if uri.path.empty?
+        uri.path = '/' if uri.path.nil? || uri.path.empty?
         req = usecase.add_request :get, uri.path
         req.wait = opts[:delay] if opts[:delay]
       end
@@ -37,6 +38,8 @@ class Testplan
     plan.base_path = File.dirname path
     # eval so the DSL code can be executed in this namespace.
     plan.instance_eval conf
+    plan.gibbler
+    plan.freeze
     plan
   end
   
@@ -59,6 +62,10 @@ class Testplan
       msg << " (#{@testplan_current_ratio})"
       raise WackyRatio, msg
     end
+    @usecases.each do |uc| 
+      uc.gibbler  # make sure gibbler_cache has a value
+      uc.freeze   # make sure all clients share identical usecases
+    end
   end
     
   def usecase(*args, &blk)
@@ -88,12 +95,14 @@ class Testplan
 
   def pretty
     str = []
-    str << " %-66s ".att(:reverse) % [@desc]
+    str << " %-66s  ".att(:reverse) % ["#{@desc}  (#{self.gibbler_cache.shorter})"]
     @usecases.each_with_index do |uc,i| 
-      description = uc.desc || "Usecase ##{i+1}"
-      str << "  %s (%s%%)".bright % [description, uc.ratio_pretty]
+      desc = uc.desc || "Usecase ##{i+1}"
+      desc += "  (#{uc.gibbler_cache.shorter}) "
+      str << (' ' << " %-61s %s%% ".att(:reverse).bright) % [desc, uc.ratio_pretty]
       requests = uc.requests.each do |r| 
-        str << "    %-35s %s" % ["#{r.desc}:", r]
+        str << "    %-62s".bright % ["#{r.desc}  (#{r.gibbler_cache.shorter})"]
+        str << "      %s" % [r]
         if Stella.loglev > 2
           [:wait].each { |i| str << "      %s: %s" % [i, r.send(i)] }
         end

data/lib/stella/version.rb

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

data/lib/stella.rb

@@ -21,6 +21,7 @@ module Stella
   @@logger = Drydock::Screen
   @@loglev = 1
   @@debug  = false
+  @@abort  = false
   
   # Puts +msg+ to +@@logger+
   def lflush; @@logger.flush if @@logger.respond_to? :flush; end
@@ -49,6 +50,11 @@ module Stella
   def enable_debug; @@debug = true; end
   def disable_debug; @@debug = false; end
   
+  def abort?
+    @@abort == true
+  end
+  def abort!() @@abort = true end
+  
   def rescue(&blk)
     blk.call
   rescue => ex
@@ -61,6 +67,7 @@ require 'stella/version'
 require 'stella/exceptions'
 require 'stella/utils'
 require 'stella/config'
+require 'stella/data'
 
 Stella::Utils.require_vendor "httpclient", '2.1.5.2'
 Stella::Utils.require_glob(Stella::LIB_HOME, 'stella', '*.rb')

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.006"
+  s.version = "0.7.0.012"
   s.summary = "Stella: Perform load tests on your web applications with beauty and brute strength."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -15,9 +15,9 @@
   
   s.executables = %w[stella]
   
-  s.add_dependency 'benelux'
+  s.add_dependency 'benelux',    '>= 0.3.2'
   s.add_dependency 'drydock',    '>= 0.6.8'
-  s.add_dependency 'gibbler',    '>= 0.6.2'
+  s.add_dependency 'gibbler',    '>= 0.6.3'
   s.add_dependency 'storable',   '>= 0.5.7'
   s.add_dependency 'httpclient', '>= 2.1.5'
   s.add_dependency 'nokogiri'
@@ -30,6 +30,7 @@
   README.rdoc
   Rakefile
   bin/stella
+  examples/cookies/plan.rb
   examples/essentials/logo.png
   examples/essentials/plan.rb
   examples/essentials/search_terms.csv
@@ -39,6 +40,8 @@
   lib/stella.rb
   lib/stella/cli.rb
   lib/stella/client.rb
+  lib/stella/client/container.rb
+  lib/stella/client/modifiers.rb
   lib/stella/config.rb
   lib/stella/data.rb
   lib/stella/data/http.rb
@@ -51,6 +54,7 @@
   lib/stella/exceptions.rb
   lib/stella/guidelines.rb
   lib/stella/mixins.rb
+  lib/stella/mixins/thread.rb
   lib/stella/stats.rb
   lib/stella/testplan.rb
   lib/stella/testplan/stats.rb
@@ -70,7 +74,6 @@
   vendor/httpclient-2.1.5.2/httpclient/http.rb
   vendor/httpclient-2.1.5.2/httpclient/session.rb
   vendor/httpclient-2.1.5.2/httpclient/ssl_config.rb
-  vendor/httpclient-2.1.5.2/httpclient/stats.rb
   vendor/httpclient-2.1.5.2/httpclient/timeout.rb
   vendor/httpclient-2.1.5.2/httpclient/util.rb
   )

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

@@ -25,9 +25,9 @@ class WebAgent
 
     def tail_match?(str1, str2)
       if str1.length > 0
-	str1 == str2[-str1.length..-1].to_s
+        str1 == str2[-str1.length..-1].to_s
       else
-	true
+        true
       end
     end
 
@@ -36,14 +36,14 @@ class WebAgent
       hostname = host.sub(/\.\z/, '').downcase
       case domain
       when /\d+\.\d+\.\d+\.\d+/
-	return (hostname == domainname)
+        return (hostname == domainname)
       when '.' 
-	return true
+        return true
       when /^\./
         # allows; host == rubyforge.org, domain == .rubyforge.org
-	return tail_match?(domainname, '.' + hostname)
+        return tail_match?(domainname, '.' + hostname)
       else
-	return (hostname == domainname)
+        return (hostname == domainname)
       end
     end
 
@@ -125,12 +125,12 @@ class WebAgent
     def match?(url)
       domainname = url.host
       if (!domainname ||
-	  !domain_match(domainname, @domain) ||
-	  (@path && !head_match?(@path, url.path)) ||
-	  (@secure && (url.scheme != 'https')) )
-	return false
+          !domain_match(domainname, @domain) ||
+          (@path && !head_match?(@path, url.path)) ||
+          (@secure && (url.scheme != 'https')) )
+        return false
       else
-	return true
+        return true
       end
     end
 
@@ -138,22 +138,22 @@ class WebAgent
       ret = Array.new()
       old_elem = nil
       array.each{|elem|
-	if (elem.scan(/"/).length % 2) == 0
-	  if old_elem
-	    old_elem << sep << elem
-	  else
-	    ret << elem
-	    old_elem = nil
-	  end  
-	else
-	  if old_elem
-	    old_elem << sep << elem
-	    ret << old_elem
-	    old_elem = nil
-	  else
-	    old_elem = elem.dup
-	  end
-	end
+        if (elem.scan(/"/).length % 2) == 0
+          if old_elem
+            old_elem << sep << elem
+          else
+            ret << elem
+            old_elem = nil
+          end  
+        else
+          if old_elem
+            old_elem << sep << elem
+            ret << old_elem
+            old_elem = nil
+          else
+            old_elem = elem.dup
+          end
+        end
       }
       ret
     end
@@ -166,31 +166,31 @@ class WebAgent
       cookie_elem -= [""] # del empty elements, a cookie might included ";;"
       first_elem = cookie_elem.shift
       if first_elem !~ /([^=]*)(\=(.*))?/
-	return
-	## raise ArgumentError 'invalid cookie value'
+        return
+        ## raise ArgumentError 'invalid cookie value'
       end
       @name = $1.strip
       @value = normalize_cookie_value($3)
       cookie_elem.each{|pair|
-	key, value = pair.split(/=/, 2)  ## value may nil
-	key.strip!
+        key, value = pair.split(/=/, 2)  ## value may nil
+        key.strip!
         value = normalize_cookie_value(value)
-	case key.downcase
-	when 'domain'
-	  @domain = value
-	when 'expires'
+        case key.downcase
+        when 'domain'
+          @domain = value
+        when 'expires'
           @expires = nil
-	  begin
-	    @expires = Time.parse(value).gmtime() if value
-	  rescue ArgumentError
-	  end
-	when 'path'
-	  @path = value
-	when 'secure'
-	  @secure = true  ## value may nil, but must 'true'.
-	else
-	  ## ignore
-	end
+          begin
+            @expires = Time.parse(value).gmtime() if value
+          rescue ArgumentError
+          end
+        when 'path'
+          @path = value
+        when 'secure'
+          @secure = true  ## value may nil, but must 'true'.
+        else
+          ## ignore
+        end
       }
     end
 
@@ -281,14 +281,14 @@ class WebAgent
 
     def make_cookie_str(cookie_list)
       if cookie_list.empty?
-	return nil
+        return nil
       end
 
       ret = ''
       c = cookie_list.shift
       ret += "#{c.name}=#{c.value}"
       cookie_list.each{|cookie|
-	ret += "; #{cookie.name}=#{cookie.value}"
+        ret += "; #{cookie.name}=#{cookie.value}"
       }
       return ret
     end
@@ -312,7 +312,7 @@ class WebAgent
 
     def find_cookie_info(domain, path, name)
       @cookies.find{|c|
-	c.domain == domain && c.path == path && c.name == name
+        c.domain == domain && c.path == path && c.name == name
       }
     end
     private :find_cookie_info
@@ -320,7 +320,7 @@ class WebAgent
     # not tested well; used only netscape_rule = true.
     def cookie_error(err, override)
       if !err.kind_of?(ErrorOverrideOK) || !override
-	raise err
+        raise err
       end
     end
     private :cookie_error
@@ -329,11 +329,11 @@ class WebAgent
       url = cookie.url
       name, value = cookie.name, cookie.value
       expires, domain, path = 
-	cookie.expires, cookie.domain, cookie.path
+        cookie.expires, cookie.domain, cookie.path
       secure, domain_orig, path_orig = 
-	cookie.secure?, cookie.domain_orig?, cookie.path_orig?
+        cookie.secure?, cookie.domain_orig?, cookie.path_orig?
       discard, override = 
-	cookie.discard?, cookie.override?
+        cookie.discard?, cookie.override?
 
       domainname = url.host
       domain_orig, path_orig = domain, path
@@ -341,14 +341,14 @@ class WebAgent
 
       if domain
 
-	# [DRAFT 12] s. 4.2.2 (does not apply in the case that
-	# host name is the same as domain attribute for version 0
-	# cookie)
-	# I think that this rule has almost the same effect as the
-	# tail match of [NETSCAPE].
-	if domain !~ /^\./ && domainname != domain
-	  domain = '.'+domain
-	end
+        # [DRAFT 12] s. 4.2.2 (does not apply in the case that
+        # host name is the same as domain attribute for version 0
+        # cookie)
+        # I think that this rule has almost the same effect as the
+        # tail match of [NETSCAPE].
+        if domain !~ /^\./ && domainname != domain
+          domain = '.'+domain
+        end
 
         # [NETSCAPE] rule
         if @netscape_rule
@@ -396,10 +396,10 @@ class WebAgent
       cookie.domain_orig = domain_orig
       cookie.path_orig = path_orig
       if discard || cookie.expires == nil
-	cookie.discard = true
+        cookie.discard = true
       else
-	cookie.discard = false
-	@is_saved = false
+        cookie.discard = false
+        @is_saved = false
       end
     end
 
@@ -430,17 +430,17 @@ class WebAgent
 
     def check_cookie_accept_domain(domain)
       unless domain
-	return false
+        return false
       end
       @accept_domains.each{|dom|
-	if domain_match(domain, dom)
-	  return true
-	end
+        if domain_match(domain, dom)
+          return true
+        end
       }
       @reject_domains.each{|dom|
-	if domain_match(domain, dom)
-	  return false
-	end
+        if domain_match(domain, dom)
+          return false
+        end
       }
       return true
     end

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

@@ -780,7 +780,10 @@ module HTTP
 
     # HTTP::Message::Body:: message body.
     attr_reader :body
-
+    
+    # Response only.  Request object associated to this response. 
+    attr_accessor :request
+    
     # OpenSSL::X509::Certificate:: response only.  server certificate which is
     #                              used for retrieving the response.
     attr_accessor :peer_cert

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

@@ -541,7 +541,7 @@ class HTTPClient
           raise
         end
       end
-
+      
       @state = :META if @state == :WAIT
       @next_connection = nil
       @requests.push(req)
@@ -742,13 +742,13 @@ class HTTPClient
     end
     
     # Added by delano for Benelux support
-    def socket_gets_initial_line(*args); @socket.gets(*args); end
+    def socket_gets_first_byte(*args); @socket.gets(*args); end
     
     StatusParseRegexp = %r(\AHTTP/(\d+\.\d+)\s+(\d\d\d)\s*([^\r\n]+)?\r?\n\z)
     def parse_header
       timeout(@receive_timeout, ReceiveTimeoutError) do
         begin
-          initial_line = socket_gets_initial_line("\n")
+          initial_line = socket_gets_first_byte("\n")
           if initial_line.nil?
             raise KeepAliveDisconnected.new
           end

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

@@ -82,7 +82,8 @@ class HTTPClient
       @timeout = nil
       @options = defined?(SSL::OP_ALL) ? SSL::OP_ALL | SSL::OP_NO_SSLv2 : nil
       @ciphers = "ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH"
-      load_cacerts
+      # TODO: Load only once for all instances.
+      @cert_store = @@cacerts
     end
 
     # Sets certificate (OpenSSL::X509::Certificate) for SSL client
@@ -338,7 +339,7 @@ class HTTPClient
       @client.reset_all
     end
 
-    def load_cacerts
+    def self.load_cacerts
       [
         [DIST_CERT, 'cacert.p7s'],
         [DIST_CERT_SHA1, 'cacert_sha1.p7s']
@@ -350,14 +351,15 @@ class HTTPClient
           store = X509::Store.new
           store.add_cert(selfcert)
           if (p7.verify(nil, store, p7.data, 0))
-            set_trust_ca(file)
-            return
+            #set_trust_ca(file)
+            store.add_file(file)
+            return store
           end
         end
       end
       STDERR.puts("cacerts loading failed")
     end
-
+    
     DIST_CERT =<<__DIST_CERT__
 -----BEGIN CERTIFICATE-----
 MIID/TCCAuWgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBLMQswCQYDVQQGEwJKUDER
@@ -411,7 +413,9 @@ RwRyYoHysODGvnu8VXS1hGRr2GIxeBga7dAGa2VLE/iUQ0d4lEskYU+6C4ZLyAWF
 O89dvLNRzpL10MaWCYVREks=
 -----END CERTIFICATE-----
 __DIST_CERT__
-  end
 
 
+    @@cacerts = load_cacerts
+  end
+    
 end

data/vendor/httpclient-2.1.5.2/httpclient.rb

@@ -19,7 +19,6 @@ require 'httpclient/session'
 require 'httpclient/http'
 require 'httpclient/auth'
 require 'httpclient/cookie'
-require 'httpclient/stats'
 
 
 # The HTTPClient class provides several methods for accessing Web resources
@@ -298,8 +297,6 @@ class HTTPClient
   # How many times get_content and post_content follows HTTP redirect.
   # 10 by default.
   attr_accessor :follow_redirect_count
-  # A Timer object containing response times
-  attr_reader :timer
   
   # Set HTTP version as a String:: 'HTTP/1.0' or 'HTTP/1.1'
   attr_proxy(:protocol_version, true)
@@ -357,7 +354,6 @@ class HTTPClient
     @session_manager.ssl_config = @ssl_config = SSLConfig.new(self)
     @cookie_manager = WebAgent::CookieManager.new
     @follow_redirect_count = 10
-    @timer = Timer.new
     load_environment
     self.proxy = proxy if proxy
   end
@@ -770,12 +766,14 @@ private
           do_get_block(req, proxy, conn, &block)
         end
         res = conn.pop
+        res.request = req
         break
       rescue RetryableResponse
         res = conn.pop
         retry_count -= 1
       end
     end
+    
     res
   end
 
@@ -956,6 +954,7 @@ 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)