stella 0.7.0.002 → 0.7.0.003

data/README.rdoc

@@ -34,6 +34,7 @@ This is an early preview of Stella. It's still missing the following features (a
     
 == Test Plan Example
 
+
 Test plans are defined in the Ruby programming language. This makes it possible to define sophisticated logic to handle responses. They also typically contain more than one usecase which is important when simulating realistic load. In this example, 65% of virtual users will execute the first usecase and 35% will execute the second.
 
     usecase 65, "Simple search" do

data/bin/stella

@@ -12,9 +12,11 @@
 # Usage:
 # 
 #     $ stella -h
-#     $ stella verify 
+#     $ stella verify -p plans/basic.rb http://test.example.com/
 #     $ stella load -u 10 -t 60 http://test.example.com/
 #     $ stella load -u 10 -r 40 -p plans/basic.rb http://test.example.com/
+#
+#--
 
 STELLA_LIB_HOME = File.expand_path File.join(File.dirname(__FILE__), '..', 'lib')
 

data/examples/basic/plan.rb

@@ -1,4 +1,4 @@
-# 1f5e852e934debd56aa98552c0a9227c93006f21
+# 4f61ac3d5607139350b50335ca59a34d04b34ec7
 
 desc "Business Finder Testplan"
 
@@ -58,7 +58,7 @@ usecase "YAML API" do
   
 end
 
-usecase 10, "Advertiser self-serve" do
+usecase 10, "Self-serve" do
   post "/listing/add" do
     desc "Add a business"
     wait 1..4 

data/lib/stella.rb

@@ -16,7 +16,6 @@ require 'threadify'
 require 'drydock/screen'
 
 module Stella
-  VERSION = "0.7.0.002"
   extend self
   require 'stella/version'
   require 'stella/exceptions'

data/lib/stella/client.rb

@@ -16,6 +16,7 @@ module Stella
       @stats = Stella::Stats.new("Client #{@client_id}")
     end
     
+    
     def execute(usecase)
       http_client = generate_http_client
       container = Container.new(usecase)
@@ -30,16 +31,15 @@ module Stella
         meth = req.http_method.to_s.downcase
         Stella.ld "#{meth}: " << "#{uri_obj.to_s} " << req.params.inspect
         
-        changed and notify_observers(:send_request, @client_id, usecase, meth, uri, req, params, counter)
         begin
+          update(:send_request, usecase, meth, uri, req, params, counter)
           container.response = http_client.send(meth, uri, params) # booya!
-          changed and notify_observers(:receive_response, @client_id, usecase, meth, uri, req, params, container)
+          update(:receive_response, usecase, meth, uri, req, params, container)
         rescue => ex
-          changed and notify_observers(:request_error, @client_id, usecase, meth, uri, req, params, ex)
+          update(:request_error, usecase, meth, uri, req, params, ex)
           next
         end
         
-        
         ret = execute_response_handler container, req
         
         Drydock::Screen.flush
@@ -62,6 +62,11 @@ module Stella
     def benchmark?; @bm == true; end
       
   private
+    def update(kind, *args)
+      changed
+      notify_observers(kind, @client_id, *args)
+    end
+  
     def run_sleeper(wait)
       if wait.is_a?(Range)
         ms = rand(wait.last * 1000).to_f 
@@ -139,19 +144,19 @@ module Stella
     # HTTP response status against the configured handlers. 
     # If several match, the first one is used. 
     def execute_response_handler(container, req)
-      handlers = req.response.select do |regex,handler|
+      handler = nil
+      req.response.each_pair do |regex,h|
         regex = /#{regex}/ unless regex.is_a? Regexp
         Stella.ld "HANDLER REGEX: #{regex} (#{container.status})"
-        container.status.to_s =~ regex
+        handler = h and break if container.status.to_s =~ regex
       end
       ret = nil
-      unless handlers.empty?
+      unless handler.nil?
         begin
-          changed
-          ret = container.instance_eval &handlers.values.first
-          notify_observers(:execute_response_handler, @client_id, req, container)
+          ret = container.instance_eval &handler
+          update(:execute_response_handler, req, container)
         rescue => ex
-          notify_observers(:error_execute_response_handler, @client_id, ex, req, container)
+          update(:error_execute_response_handler, ex, req, container)
           Stella.ld ex.message, ex.backtrace
         end
       end

data/lib/stella/version.rb

@@ -1,12 +1,12 @@
 
 
 module Stella
-  module Version
+  module VERSION
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
       TINY  = 0.freeze
-      PATCH = '001'.freeze
+      PATCH = '003'.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.002"
+  s.version = "0.7.0.003"
   s.summary = "Stella: Your friend in performance testing."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -15,10 +15,11 @@
   
   s.executables = %w[stella]
   
-  s.add_dependency 'drydock',    '>= 0.6.7'
+  s.add_dependency 'drydock',    '>= 0.6.8'
   s.add_dependency 'gibbler',    '>= 0.6.2'
   s.add_dependency 'storable',   '>= 0.5.7'
   s.add_dependency 'httpclient', '>= 2.1.5'
+  s.add_dependency 'nokogiri'
   
   # = MANIFEST =
   # git ls-files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.002
+  version: 0.7.0.003
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -04:00
+date: 2009-09-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.7
+        version: 0.6.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: gibbler
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.5
     version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: "Stella: Your friend in performance testing."
 email: delano@solutious.com
 executables: