solutious-stella 0.7.0.005 → 0.7.0.006

data/README.rdoc

@@ -20,6 +20,7 @@ This is an early preview of Stella. The following features are still under devel
 * File uploads.
 * Documentation.
 
+
 == Usage Example
 
     # Verify a test plan is defined correctly

data/examples/essentials/plan.rb

@@ -2,7 +2,7 @@
 
 desc "Business Finder Testplan"
 
-xusecase 65, "Simple search" do
+usecase 65, "Simple search" do
   resource :search_terms, list('search_terms.csv')
   
   get "/", "Homepage" do
@@ -35,7 +35,7 @@ xusecase 65, "Simple search" do
   
 end
 
-usecase 10, "Self-serve" do
+xusecase 10, "Self-serve" do
   post "/listing/add", "Add a listing" do
     wait 1..4 
     param :name => random(8)
@@ -47,7 +47,7 @@ usecase 10, "Self-serve" do
   end
 end
 
-xusecase "Listing API" do
+usecase "Listing API" do
   
   get '/listings.yaml', "View All" do
     response 200 do

data/lib/stella.rb

@@ -7,14 +7,15 @@ module Stella
 
   LIB_HOME = File.expand_path File.dirname(__FILE__) unless defined?(LIB_HOME)
   
-  %w{storable sysinfo gibbler}.each do |dir|
+  %w{storable sysinfo gibbler benelux}.each do |dir|
     $:.unshift File.join(LIB_HOME, '..', '..', dir, 'lib')
   end
-  require 'storable'
   require 'sysinfo'
+  require 'drydock/screen'
+  require 'storable'
   require 'gibbler'
   require 'gibbler/aliases'
-  require 'drydock/screen'
+  require 'benelux'
   
   @@sysinfo = SysInfo.new.freeze
   @@logger = Drydock::Screen
@@ -59,7 +60,8 @@ end
 require 'stella/version'
 require 'stella/exceptions'
 require 'stella/utils'
+require 'stella/config'
 
-Stella::Utils.require_glob(Stella::LIB_HOME, 'stella', '*.rb')
 Stella::Utils.require_vendor "httpclient", '2.1.5.2'
+Stella::Utils.require_glob(Stella::LIB_HOME, 'stella', '*.rb')
 

data/lib/stella/client.rb

@@ -4,7 +4,9 @@ require 'nokogiri'
 
 module Stella
   class Client
+    include Gibbler::Complex
     include Observable
+    
     attr_reader :client_id
     attr_accessor :base_uri
     attr_accessor :proxy
@@ -23,7 +25,6 @@ module Stella
       usecase.requests.each do |req|
         counter += 1
         update(:prepare_request, usecase, req, counter)
-        
         uri_obj = URI.parse(req.uri)
         params = prepare_params(usecase, req.params)
         headers = prepare_headers(usecase, req.headers)
@@ -35,16 +36,17 @@ module Stella
         
         meth = req.http_method.to_s.downcase
         Stella.ld "#{req.http_method}: " << "#{uri_obj.to_s} " << params.inspect
-        
+
         begin
-          update(:send_request, usecase, uri, req, params, container)
-          container.response = http_client.send(meth, uri, params, headers) # booya!
-          update(:receive_response, usecase, uri, req, params, container)
+          send_request http_client, usecase, meth, uri, req, params, headers, container
         rescue => ex
           update(:request_error, usecase, uri, req, params, ex)
           next
         end
         
+        #probe_header_size(container.response)
+        #probe_body_size(container.response)
+        
         ret = execute_response_handler container, req
         
         Stella.lflush
@@ -70,6 +72,12 @@ module Stella
     def benchmark?; @bm == true; end
       
   private
+    def send_request(http_client, usecase, meth, uri, req, params, headers, container)
+      update(:send_request, usecase, uri, req, params, container)
+      container.response = http_client.send(meth, uri, params, headers) # booya!
+      update(:receive_response, usecase, uri, req, params, container)
+    end
+    
     def update(kind, *args)
       changed and notify_observers(kind, @client_id, *args)
     end
@@ -121,26 +129,24 @@ module Stella
     # 
     # This method creates a new URI object using the @base_uri
     # if necessary and replaces all variables with literal values.
-    # If no replacement value can be found, the variable is not touched. 
-    def build_request_uri(requri, params, container)
-      uri = ""
-      request_uri = requri.to_s
-      if requri.host.nil?
-        uri = base_uri.to_s
-        uri.gsub! /\/$/, ''  # Don't double up on the first slash
-        request_uri = '/' << request_uri unless request_uri.match(/^\//)
-      end
+    # If no replacement value can be found, the variable will remain. 
+    def build_request_uri(uri, params, container)
+      uri = URI::HTTP.build({:path => uri}) unless uri.is_a?(URI::Generic)
+      uri.scheme = base_uri.scheme if uri.scheme.nil?
+      uri.host = base_uri.host if uri.host.nil?
+      uri.port = base_uri.port if uri.port.nil?
+      uri.path ||= ''
+      uri.path.gsub! /\/$/, ''  # Don't double up on the first slash
       # We call req.uri again because we need  
       # to modify request_uri inside the loop. 
-      requri.to_s.scan(/:([a-z_]+)/i) do |instances|
+      uri.path.clone.scan(/:([a-z_]+)/i) do |instances|
         instances.each do |varname|
           val = find_replacement_value(varname, params, container)
           #Stella.ld "FOUND: #{val}"
-          request_uri.gsub! /:#{varname}/, val.to_s unless val.nil?
+          uri.path.gsub! /:#{varname}/, val.to_s unless val.nil?
         end
       end
-      uri << request_uri
-      URI.parse uri
+      uri
     end
     
     # Testplan URIs can contain variables in the form <tt>:varname</tt>. 

data/lib/stella/engine.rb

@@ -1,59 +1,37 @@
 
 
 module Stella::Engine
+  
+  Benelux.add_timer      Stella::Client, :execute
+  Benelux.add_timer      Stella::Client, :send_request
+  Benelux.add_timer          HTTPClient, :do_request
+  Benelux.add_timer HTTPClient::Session, :create_socket
+  Benelux.add_timer HTTPClient::Session, :connect
+  Benelux.add_timer HTTPClient::Session, :query
+  Benelux.add_timer HTTPClient::Session, :socket_gets_initial_line
+  Benelux.add_timer HTTPClient::Session, :get_body
+  
   module Base
     extend self
-    def run
-      raise "override the run method"
-    end
     
     def update(*args)
       what, *args = args
-      Stella.ld "OBSERVER UPDATE: #{what}"
-      if !respond_to?("update_#{what}")
-        Stella.ld "NO UPDATE HANDLER FOR: #{what}" 
+      if respond_to?("update_#{what}")
+        Stella.ld "OBSERVER UPDATE: #{what}"
+        Stella.rescue { self.send("update_#{what}", *args) }
       else
-        Stella.rescue {
-          self.send("update_#{what}", *args) 
-        }
+        Stella.ld "NO UPDATE HANDLER FOR: #{what}" 
       end
     end
-    
-    def update_prepare_request(client_id, usecase, req, counter)
-      notice = "repeat: #{counter-1}" if counter > 1
-      Stella.li2 ' ' << " %-46s %16s ".att(:reverse) % [req.desc, notice]
-    end
-    
-    def update_send_request(client_id, usecase, uri, req, params, counter)
 
-    end
-    
-    def update_receive_response(client_id, usecase, uri, req, params, container)
-      Stella.li '  %-59s %3d' % [uri, container.status]
-      Stella.li2 "  Method: " << req.http_method
-      Stella.li2 "  Params: " << params.inspect
-      Stella.li3 $/, "  Headers:"
-      container.headers.all.each do |pair|
-        Stella.li3 "    %s: %s" % pair
-      end
-      Stella.li4 $/, "  Content:"
-      Stella.li4 container.body.empty? ? '    [empty]' : container.body
-      Stella.li2 $/
-    end
-    
-    def update_execute_response_handler(client_id, req, container)
-    end
-    
-    def update_error_execute_response_handler(client_id, ex, req, container)
-      Stella.le ex.message
-      Stella.ld ex.backtrace
-    end
-    
-    def update_request_error(client_id, usecase, uri, req, params, ex)
-      desc = "#{usecase.desc} > #{req.desc}"
-      Stella.le '  Client%-3s %-45s %s' % [client_id, desc, ex.message]
-      Stella.ld ex.backtrace
-    end
+    def run; raise; end
+    
+    def update_prepare_request(*args) raise end
+    def update_send_request(*args) raise end
+    def update_receive_response(*args) raise end
+    def update_execute_response_handler(*args) raise end
+    def update_error_execute_response_handler(*args) raise end
+    def update_request_error(*args) raise end
     
   end
 end

data/lib/stella/engine/functional.rb

@@ -16,6 +16,7 @@ module Stella::Engine
       
       client = Stella::Client.new opts[:hosts].first
       client.add_observer(self)
+
       client.enable_benchmark_mode if opts[:benchmark]
       
       Stella.li $/, "Starting test...", $/
@@ -28,9 +29,54 @@ module Stella::Engine
         Stella.rescue { client.execute uc }
       end
       
+      
+      #p client.benelux_at(:execute_start).first.name
+      
+      #p client.benelux_between(:execute_start, :execute_end)
+      
+      #p client.benelux_duration(:execute)
+      
       !plan.errors?
     end
     
+    
+    def update_prepare_request(client_id, usecase, req, counter)
+      notice = "repeat: #{counter-1}" if counter > 1
+      Stella.li2 ' ' << " %-46s %16s ".att(:reverse) % [req.desc, notice]
+    end
+    
+    def update_send_request(client_id, usecase, uri, req, params, counter)
+
+    end
+    
+    def update_receive_response(client_id, usecase, uri, req, params, container)
+      Stella.li '  %-59s %3d' % [uri, container.status]
+      Stella.li2 "  Method: " << req.http_method
+      Stella.li2 "  Params: " << params.inspect
+      Stella.li3 $/, "  Headers:"
+      container.headers.all.each do |pair|
+        Stella.li3 "    %s: %s" % pair
+      end
+      Stella.li4 $/, "  Content:"
+      Stella.li4 container.body.empty? ? '    [empty]' : container.body
+      Stella.li2 $/
+    end
+    
+    def update_execute_response_handler(client_id, req, container)
+    end
+    
+    def update_error_execute_response_handler(client_id, ex, req, container)
+      Stella.le ex.message
+      Stella.ld ex.backtrace
+    end
+    
+    def update_request_error(client_id, usecase, uri, req, params, ex)
+      desc = "#{usecase.desc} > #{req.desc}"
+      Stella.le '  Client%-3s %-45s %s' % [client_id, desc, ex.message]
+      Stella.ld ex.backtrace
+    end
+    
+    
   end
 end
 

data/lib/stella/engine/load.rb

@@ -28,6 +28,7 @@ module Stella::Engine
       Stella.lflush
       sleep 0.3
       
+      
       Thread.ify packages, :threads => opts[:clients] do |package|
         # TEMPFIX. The fill in build_thread_package is creating nil elements
         next if package.nil? 
@@ -36,8 +37,29 @@ module Stella::Engine
           # so we clone it here so each thread is unique.
           Stella.rescue { package.client.execute package.usecase }
         end
+        
+        #package.client.benelux_timeline.each do |i|
+        #  Stella.li "#{package.client.client_id}: #{i.to_f}: #{i.name}"
+        #end
+        #t = Benelux.thread_timeline.sort
+        #dur = t.last.to_f - t.first.to_f
+        #Stella.li [:thread, t.first.name, t.last.name, dur].inspect
+        #Stella.lflush
       end
       
+      #t = Benelux.timeline.sort
+      #dur = t.last.to_f - t.first.to_f
+      #Stella.li [:global, t.first.name, t.last.name, dur].inspect
+      
+      #puts Thread.list
+      #p Benelux.timeline
+      
+      prev = nil
+      #Stella.li Benelux.timeline.sort.collect { |obj|
+      #  str = "#{obj.to_f}: #{obj.name} (#{obj.same_timeline?(prev)})" 
+      #  prev = obj
+      #  str
+      #}
       !plan.errors?
     end
     
@@ -81,6 +103,7 @@ module Stella::Engine
       packages
     end
     
+    
     def update_prepare_request(client_id, usecase, req, counter)
 
     end

data/lib/stella/testplan.rb

@@ -88,7 +88,7 @@ class Testplan
 
   def pretty
     str = []
-    str << " %-50s ".att(:reverse) % [@desc]
+    str << " %-66s ".att(:reverse) % [@desc]
     @usecases.each_with_index do |uc,i| 
       description = uc.desc || "Usecase ##{i+1}"
       str << "  %s (%s%%)".bright % [description, uc.ratio_pretty]

data/lib/stella/utils.rb

@@ -66,7 +66,7 @@ module Stella
     #     vendor/httpclient-2.1.5.2/httpclient
     #
     def require_vendor(name, version)
-       $: << File.join(LIB_HOME, '..', 'vendor', "#{name}-#{version}")
+       $:.unshift File.join(LIB_HOME, '..', 'vendor', "#{name}-#{version}")
        require name
     end
     

data/lib/stella/version.rb

@@ -6,7 +6,7 @@ module Stella
       MAJOR = 0.freeze
       MINOR = 7.freeze
       TINY  = 0.freeze
-      PATCH = '005'.freeze
+      PATCH = '006'.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,8 +1,8 @@
 @spec = Gem::Specification.new do |s|
   s.name = "stella"
   s.rubyforge_project = 'stella'
-  s.version = "0.7.0.005"
-  s.summary = "Stella: Your friend in performance testing."
+  s.version = "0.7.0.006"
+  s.summary = "Stella: Perform load tests on your web applications with beauty and brute strength."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
   s.email = "delano@solutious.com"
@@ -15,6 +15,7 @@
   
   s.executables = %w[stella]
   
+  s.add_dependency 'benelux'
   s.add_dependency 'drydock',    '>= 0.6.8'
   s.add_dependency 'gibbler',    '>= 0.6.2'
   s.add_dependency 'storable',   '>= 0.5.7'

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

@@ -666,7 +666,6 @@ class HTTPClient
     end
 
     def create_socket(site)
-      @timer.create_socket
       socket = nil
       begin
         @debug_dev << "! CONNECT TO #{site.host}:#{site.port}\n" if @debug_dev
@@ -741,12 +740,15 @@ class HTTPClient
       end
       @next_connection = false unless @content_length
     end
-
+    
+    # Added by delano for Benelux support
+    def socket_gets_initial_line(*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("\n")
+          initial_line = socket_gets_initial_line("\n")
           if initial_line.nil?
             raise KeepAliveDisconnected.new
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.005
+  version: 0.7.0.006
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -12,6 +12,16 @@ cert_chain: []
 date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: benelux
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
   type: :runtime
@@ -62,7 +72,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: "Stella: Your friend in performance testing."
+description: "Stella: Perform load tests on your web applications with beauty and brute strength."
 email: delano@solutious.com
 executables: 
 - stella
@@ -128,7 +138,7 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --title
-- "Stella: Your friend in performance testing."
+- "Stella: Perform load tests on your web applications with beauty and brute strength."
 - --main
 - README.rdoc
 require_paths: 
@@ -151,6 +161,6 @@ rubyforge_project: stella
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
-summary: "Stella: Your friend in performance testing."
+summary: "Stella: Perform load tests on your web applications with beauty and brute strength."
 test_files: []