stella 0.7.0.004 → 0.7.0.005

data/bin/stella

@@ -18,9 +18,9 @@
 #
 #--
 
-STELLA_LIB_HOME = File.expand_path File.join(File.dirname(__FILE__), '..', 'lib')
-
-$:.unshift STELLA_LIB_HOME  # Put our local lib in first place
+# Put our local lib in first place
+lib_dir = File.expand_path File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift lib_dir  
 
 require 'drydock'
 require 'stella'
@@ -31,7 +31,6 @@ class Stella::CLI::Definition
   extend Drydock
   
   debug :off
-  default :verify    # when no command is provided
   
   # ----------------------------------------  STELLA GLOBALS  --------
   # ------------------------------------------------------------------
@@ -56,32 +55,28 @@ class Stella::CLI::Definition
   
   # ------------------------------------------------  STELLA  --------
   # ------------------------------------------------------------------
-
+  
   about "Run a functional test"
   usage "stella verify http://stellaaahhhh.com/"
   usage "stella verify -p path/2/testplan.rb http://stellaaahhhh.com/"
   option :b, :benchmark, "Benchmark mode (ignore wait times)"
-  option :p, :testplan, String, "Path to testplan" do |v|
-    raise Stella::InvalidOption, "Bad path: #{v}" unless File.exists?(v)
-    v
-  end
+  option :p, :testplan, String, "Path to testplan" 
   command :verify => Stella::CLI
   
   about "Run a load test"
   usage "stella load http://stellaaahhhh.com/"
-  usage "stella load -p path/2/testplan.rb http://stellaaahhhh.com/"
+  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 :b, :benchmark, "Benchmark mode (ignore wait times)"
-  option :u, :users, Integer, "Number of virtual users"
-  option :r, :repetitions, Integer, "Number of times to repeat the testplan (per vuser)"
+  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 between client requests (s)"
-  option :p, :testplan, String, "Path to testplan" do |v|
-    raise Stella::InvalidOption, "Bad path: #{v}" unless File.exists?(v)
-    v
-  end
+  option :d, :delay, Float, "Delay (in seconds) between client requests (ignored if testplan supplied)"
+  option :p, :testplan, String, "Path to testplan" 
   command :load => Stella::CLI
   
-  about "Initialize Stella"
+  about "Initialize Stella configuration"
   command :init do
     Stella::Config.init
   end
@@ -103,13 +98,14 @@ class Stella::CLI::Definition
   end
 
   after do |obj|  
-    Drydock::Screen.flush
+    Stella.lflush
     @elapsed = Time.now - @start
     if Stella.loglev > 1 && @elapsed > 0.1
       puts
       puts "Elapsed: %.2f seconds" % @elapsed.to_f
     end
-    exit obj.exit_code || 0
+    code = obj.exit_code if obj.respond_to? :exit_code
+    exit code ||= 0
   end
   
 end

data/examples/{basic → essentials}/plan.rb

@@ -2,7 +2,7 @@
 
 desc "Business Finder Testplan"
 
-usecase 65, "Simple search" do
+xusecase 65, "Simple search" do
   resource :search_terms, list('search_terms.csv')
   
   get "/", "Homepage" do
@@ -23,6 +23,9 @@ usecase 65, "Simple search" do
       listing = doc.css('div.listing').first
       set :lid, listing['id'].match(/(\d+)/)[0]
     end
+    response 404 do 
+      quit "No results"
+    end
   end
   
   get "/listing/:lid" do           # URIs can contain variables.
@@ -36,14 +39,15 @@ usecase 10, "Self-serve" do
   post "/listing/add", "Add a listing" do
     wait 1..4 
     param :name => random(8)
-    param :city => "Vancouver"
+    param :city => sequential("Montreal", "Toronto", "Vancouver")
+    param :logo => file('logo.png')
     response 302 do
       repeat 3
     end
   end
 end
 
-usecase "Listing API" do
+xusecase "Listing API" do
   
   get '/listings.yaml', "View All" do
     response 200 do

data/examples/example_webapp.rb

@@ -1,14 +1,11 @@
 #!/usr/bin/ruby
 
-# Use Ruby 1.8
-
 require "rubygems"
-require "rack"
 require "sinatra"
 
 require 'yaml'
 
-set :run => true
+set :run => $0 == __FILE__ ? true : false
 set :environment => :development
 set :dump_errors => true
 set :port => 3114
@@ -78,6 +75,12 @@ post '/listing/add' do
     if find_name(params[:name], @listings).empty?
       @listings.shift if @listings.size >= options.max_listings
       @listings << { :name => params[:name], :id => rand(100000), :city => params[:city] }
+      if params[:logo].is_a?(Hash) && params[:logo][:tempfile]
+        p "TODO: Fix uploads"
+        #p params[:logo]
+        #FileUtils.mv params[:logo][:tempfile].path, "logo-#{params[:name]}"
+      end
+      
       redirect '/listings'
     else
       status 500

data/examples/example_webapp.ru

@@ -0,0 +1,3 @@
+dir = ::File.expand_path(::File.dirname(__FILE__))
+require ::File.join(dir, 'example_webapp.rb')
+run Sinatra::Application

data/lib/stella.rb

@@ -1,43 +1,28 @@
 
-unless defined?(STELLA_LIB_HOME)
-  STELLA_LIB_HOME = File.expand_path File.dirname(__FILE__)
-end
-
-local_libs = %w{drydock storable sysinfo gibbler}
-local_libs.each { |dir| $:.unshift File.join(STELLA_LIB_HOME, '..', '..', dir, 'lib') }
-#require 'rubygems'
-
-require 'storable'
-require 'sysinfo'
-require 'gibbler'
-require 'gibbler/aliases'
 require 'ostruct'
 require 'threadify'
-require 'drydock/screen'
 
 module Stella
   extend self
-  require 'stella/version'
-  require 'stella/exceptions'
-  require 'stella/utils'
-  require 'stella/stats'
-  require 'stella/mixins'
-  require 'stella/dsl'
-  require 'stella/engine'
-  require 'stella/testplan'
 
-  autoload :Utils, STELLA_LIB_HOME + "/stella/utils"
-  autoload :Data, STELLA_LIB_HOME + "/stella/data"
-  autoload :Config, STELLA_LIB_HOME + "/stella/config"
-  autoload :Client, STELLA_LIB_HOME + "/stella/client"
+  LIB_HOME = File.expand_path File.dirname(__FILE__) unless defined?(LIB_HOME)
+  
+  %w{storable sysinfo gibbler}.each do |dir|
+    $:.unshift File.join(LIB_HOME, '..', '..', dir, 'lib')
+  end
+  require 'storable'
+  require 'sysinfo'
+  require 'gibbler'
+  require 'gibbler/aliases'
+  require 'drydock/screen'
   
   @@sysinfo = SysInfo.new.freeze
-    
   @@logger = Drydock::Screen
   @@loglev = 1
   @@debug  = false
   
   # Puts +msg+ to +@@logger+
+  def lflush; @@logger.flush if @@logger.respond_to? :flush; end
   def li(*msg); msg.each { |m| @@logger.puts m } if !quiet? end
   def li1(*msg); li *msg if @@loglev >= 1 end
   def li2(*msg); li *msg if @@loglev >= 2 end
@@ -71,3 +56,10 @@ module Stella
   end
 end
 
+require 'stella/version'
+require 'stella/exceptions'
+require 'stella/utils'
+
+Stella::Utils.require_glob(Stella::LIB_HOME, 'stella', '*.rb')
+Stella::Utils.require_vendor "httpclient", '2.1.5.2'
+

data/lib/stella/cli.rb

@@ -27,7 +27,7 @@ class Stella::CLI < Drydock::Command
   def load
     opts = {}
     opts[:hosts] = @hosts
-    [:benchmark, :users, :repetitions, :delay, :time].each do |opt|
+    [:benchmark, :clients, :repetitions, :delay, :time].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
     ret = Stella::Engine::Load.run @testplan, opts
@@ -36,6 +36,9 @@ class Stella::CLI < Drydock::Command
 
   private
   def create_testplan
+    unless @option.testplan.nil? || File.exists?(@option.testplan)
+      raise Stella::InvalidOption, "Bad path: #{@option.testplan}" 
+    end
     @hosts = @argv.collect { |uri|; URI.parse uri; }
     if @option.testplan
       @testplan = Stella::Testplan.load_file @option.testplan

data/lib/stella/client.rb

@@ -1,6 +1,5 @@
 require "observer"
 require "tempfile"
-require 'httpclient'
 require 'nokogiri'
 
 module Stella
@@ -14,43 +13,52 @@ module Stella
       @base_uri, @client_id = base_uri, client_id
       @cookie_file = Tempfile.new('stella-cookie')
       @stats = Stella::Stats.new("Client #{@client_id}")
+      @proxy = OpenStruct.new
     end
     
-    
     def execute(usecase)
-      http_client = generate_http_client
+      http_client = create_http_client
       container = Container.new(usecase)
       counter = 0
       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)
         uri = build_request_uri uri_obj, params, container
         raise NoHostDefined, uri_obj if uri.host.nil? || uri.host.empty?
         
+        unique_id = [req, params, headers, counter].gibbler
+        req_id = req.gibbler
+        
         meth = req.http_method.to_s.downcase
-        Stella.ld "#{meth}: " << "#{uri_obj.to_s} " << req.params.inspect
+        Stella.ld "#{req.http_method}: " << "#{uri_obj.to_s} " << params.inspect
         
         begin
-          update(:send_request, usecase, meth, uri, req, params, counter)
-          container.response = http_client.send(meth, uri, params) # booya!
-          update(:receive_response, usecase, meth, uri, req, params, 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)
         rescue => ex
-          update(:request_error, usecase, meth, uri, req, params, ex)
+          update(:request_error, usecase, uri, req, params, ex)
           next
         end
         
         ret = execute_response_handler container, req
         
-        Drydock::Screen.flush
+        Stella.lflush
         
-        if ret.kind_of?(ResponseModifier)
-          case ret.class.to_s
-          when "Stella::Client::Repeat"
-            Stella.ld "REPETITION: #{counter} of #{ret.times+1}"
-            redo if counter <= ret.times
-          end
+        # TODO: consider throw/catch
+        case ret.class.to_s
+        when "Stella::Client::Repeat"
+          Stella.ld "REPETITION: #{counter} of #{ret.times+1}"
+          redo if counter <= ret.times
+        when "Stella::Client::Quit"
+          Stella.ld "QUIT USECASE: #{ret.message}"
+          break
         end
+      
         
         counter = 0 # reset
         run_sleeper(req.wait) if req.wait && !benchmark?
@@ -63,8 +71,7 @@ module Stella
       
   private
     def update(kind, *args)
-      changed
-      notify_observers(kind, @client_id, *args)
+      changed and notify_observers(kind, @client_id, *args)
     end
   
     def run_sleeper(wait)
@@ -77,26 +84,36 @@ module Stella
       sleep ms / 1000
     end
     
-    def generate_http_client
-      if @proxy
-        http_client = HTTPClient.new(@proxy.uri)
-        http_client.set_proxy_auth(@proxy.user, @proxy.pass) if @proxy.user
-      else
-        http_client = HTTPClient.new
-      end
+    def create_http_client
+      opts = {
+        :proxy       => @proxy.uri || nil, # a tautology for clarity
+        :agent_name  => "Stella/#{Stella::VERSION}",
+        :from        => nil
+      }
+      http_client = HTTPClient.new opts
+      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.to_s
+      #http_client.redirect_uri_callback = ??
       http_client
     end
     
     def prepare_params(usecase, params)
       newparams = {}
       params.each_pair do |n,v|
+        Stella.ld "PREPARE PARAM: #{n}"
         v = usecase.instance_eval &v if v.is_a?(Proc)
         newparams[n] = v
       end
       newparams
     end
     
+    def prepare_headers(usecase, headers)
+      Stella.ld "PREPARE HEADERS: #{headers}"
+      headers = usecase.instance_eval &headers if headers.is_a?(Proc)
+      headers
+    end
+    
     # Testplan URIs can be relative or absolute. Either one can
     # contain variables in the form <tt>:varname</tt>, as in:
     #
@@ -146,8 +163,8 @@ module Stella
     def execute_response_handler(container, req)
       handler = nil
       req.response.each_pair do |regex,h|
+        Stella.ld "HANDLER REGEX: #{regex.to_s} (#{container.status})"
         regex = /#{regex}/ unless regex.is_a? Regexp
-        Stella.ld "HANDLER REGEX: #{regex} (#{container.status})"
         handler = h and break if container.status.to_s =~ regex
       end
       ret = nil
@@ -204,7 +221,7 @@ module Stella
       def set(n, v); usecase.resource n, v; end
       def resource(n);    usecase.resource n;    end
       def wait(t); sleep t; end
-      
+      def quit(msg=nil); Quit.new(msg); end
       def repeat(t=1); Repeat.new(t); end
     end
     
@@ -215,5 +232,11 @@ module Stella
         @times = times
       end
     end
+    class Quit < ResponseModifier; 
+      attr_accessor :message
+      def initialize(msg=nil)
+        @message = msg
+      end
+    end
   end
 end

data/lib/stella/data.rb

@@ -3,6 +3,26 @@ module Stella::Data
     
   module Helpers
     
+    def file(*args)
+      input = args.size > 1 ? args : args.first
+      Proc.new do
+        value = case input.class.to_s
+        when "String"
+          Stella.ld "FILE: #{input}"
+          path = File.exists?(input) ? input : File.join(@base_path, input)
+          Stella.ld "Creating file object: #{path}"
+          File.new(path)
+        when "Proc"
+          input.call
+        else
+          input
+        end
+        raise Stella::Testplan::Usecase::UnknownResource, input if value.nil?
+        Stella.ld "FILE: #{value}"
+        value
+      end
+    end
+    
     def random(*args)
       input = args.size > 1 ? args : args.first
       Proc.new do
@@ -13,6 +33,8 @@ module Stella::Data
           input
         when "Range"
           input.to_a
+        when "Proc"
+          input.call
         when "Fixnum"
           Stella::Utils.strand( input )
         when "NilClass"
@@ -28,7 +50,6 @@ module Stella::Data
     
     def sequential(*args)
       input = args.size > 1 ? args : args.first
-      digest = input.gibbler
       Proc.new do
         value = case input.class.to_s
         when "Symbol"
@@ -38,15 +59,18 @@ module Stella::Data
           input
         when "Range"
           input.to_a
+        when "Proc"
+          input.call
         end
-        Stella.ld "SEQVALUES: #{input} #{value.inspect}"
+        digest = value.gibbler
         @sequential_offset ||= {}
         @sequential_offset[digest] ||= 0
+        Stella.ld "SEQVALUES: #{input} #{value.inspect} #{@sequential_offset[digest]}"
         if value.is_a?(Array)
-          size = value[ @sequential_offset[digest] ].size
+          size = value.size
+          @sequential_offset[digest] = 0 if @sequential_offset[digest] >= size
           value = value[ @sequential_offset[digest] ] 
           @sequential_offset[digest] += 1
-          @sequential_offset[digest] = 0 if @sequential_offset[digest] > size
         end
         Stella.ld "SELECTED: #{value}"
         value
@@ -55,7 +79,6 @@ module Stella::Data
     
     def rsequential(*args)
       input = args.size > 1 ? args : args.first
-      digest = input.gibbler
       Proc.new do
         value = case input.class.to_s
         when "Symbol"
@@ -65,15 +88,18 @@ module Stella::Data
           input
         when "Range"
           input.to_a
+        when "Proc"
+          input.call
         end
-        Stella.ld "RSEQVALUES: #{input} #{value.inspect}"
+        digest = value.gibbler
         @rsequential_offset ||= {}
         @rsequential_offset[digest] ||= value.size-1 rescue 1
+        Stella.ld "RSEQVALUES: #{input} #{value.inspect} #{@rsequential_offset[digest]}"
         if value.is_a?(Array)
-          size = value[ @rsequential_offset[digest] ].size
+          size = value.size
+          @rsequential_offset[digest] = size-1 if @rsequential_offset[digest] < 0
           value = value[ @rsequential_offset[digest] ] 
           @rsequential_offset[digest] -= 1
-          @rsequential_offset[digest] = size if @rsequential_offset[digest] < 0
         end
         Stella.ld "SELECTED: #{value}"
         value
@@ -84,4 +110,4 @@ module Stella::Data
       
 end
 
-Stella::Utils.require_glob(STELLA_LIB_HOME, 'stella', 'data', '*.rb')
+Stella::Utils.require_glob(Stella::LIB_HOME, 'stella', 'data', '*.rb')