stella 0.7.0.015 → 0.7.0.017

data/CHANGES.txt

@@ -1,13 +1,13 @@
 STELLA, CHANGES
 
 
-#### 0.7.0 (2009-09-05) ###############################
+#### 0.7.0 (2009-10-??) ###############################
 
-NOTE: Complete rewrite
+NOTE: Complete rewrite. Features include:
 
 * New internal architecture. 
 * Improved stability and output for high thread loads. 
-* Updated configuration
+* Updated configuration syntax
 * Granular reporting via Benelux
 
 

data/README.rdoc

@@ -2,9 +2,6 @@
 
 <b>Perform load tests on your web applications with beauty and brute strength.</b>
 
-
-
-
 == Features
 
 * Realistic load simulation
@@ -27,9 +24,8 @@ This is an early preview of Stella. The following features are still under devel
     # by running a single user functional test.
     $ stella verify -p examples/basic/plan.rb http://stellaaahhhh.com/
     
-    # Perform a load test  
-    # using the same test plan. 
-    $ stella load -p examples/basic/plan.rb http://stellaaahhhh.com/
+    # Generate requests using the same test plan. 
+    $ stella generate -p examples/basic/plan.rb http://stellaaahhhh.com/
     
     
 == Test Plan Example

data/Rudyfile

@@ -68,10 +68,10 @@ routines do
       end
     end
     
-    # rudy -v -r gen stress ip-10-251-27-245.ec2.internal:3114
-    stress do
+    # rudy -v -r gen generate ip-10-251-27-245.ec2.internal:3114
+    generate do
       remote do |arg|
-        stella :v, 'stress', :c, 50, :r, 4, "#{arg.first}"
+        stella :v, 'generate', :c, 50, :r, 4, "#{arg.first}"
       end
     end
     

data/bin/stella

@@ -36,8 +36,9 @@ class Stella::CLI::Definition
   # ----------------------------------------  STELLA GLOBALS  --------
   # ------------------------------------------------------------------
   
-  global :A, :apikey, String, "API Key"
-  global :S, :secret, String, "Secret Key"
+  #global :A, :apikey, String, "API Key"
+  #global :S, :secret, String, "Secret Key"
+  global :p, :pause, Integer, "Seconds to pause before starting test"
   global :n, :nocolor, "Disable output colors" do
     String.disable_color
   end
@@ -63,43 +64,45 @@ class Stella::CLI::Definition
   usage "stella example"
   command :example => Stella::CLI
   
-  about "Preview the test plan"
+  about "Preview a test plan"
   usage "stella preview [-p path/2/testplan.rb] "
+  option :c, :clients, Integer, "Maximum number of virtual clients (ignored)"
+  option :r, :repetitions, Integer, "Number of times to repeat the testplan (ignored)"
+  option :d, :duration, String, "Max duration to run test (ignored)"
+  option :W, :nowait, "Ignore wait times (ignored)"
+  option :w, :wait, Float, "Wait time (in seconds) between client requests (ignored if testplan supplied)"
   option :p, :testplan, String, "Path to testplan" 
   command :preview => Stella::CLI
   
-  about "Run a functional test"
-  usage "stella verify http://stellaaahhhh.com/"
-  usage "stella verify -p path/2/testplan.rb http://stellaaahhhh.com/"
+  about "Verify a test plan"
+  usage "stella verify [-p path/2/testplan.rb] URI"
+  usage "e.g."
+  usage "   $stella verify -p path/2/testplan.rb http://stellaaahhhh.com/"
+  option :c, :clients, Integer, "Maximum number of virtual clients (ignored)"
+  option :r, :repetitions, Integer, "Number of times to repeat the testplan (ignored)"
+  option :d, :duration, String, "Max duration to run test (ignored)"
   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 :verify => Stella::CLI
   
-  about "Run a load test"
-  usage "stella load 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 :c, :clients, Integer, "Number of virtual clients"
+  about "Generate requests"
+  usage "stella generate [options] URI"
+  #usage "stella load [options] URI"
+  #usage "stella stress [options] URI"
+  usage "e.g. "
+  usage "   $ stella generate -p path/2/testplan.rb -u 100 -r 50 http://stellaaahhhh.com:3114/"
+  #usage "   $ stella stress --clients=50 --repetitions=20 http://stellaaahhhh.com/"
+  option :c, :clients, Integer, "Maximum 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 :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
-  
+  command :generate => Stella::CLI
+#  command_alias :generate, :load 
+#  command_alias :generate, :stress 
+
   about "Initialize Stella configuration"
   command :init do
     Stella::Config.init
@@ -117,8 +120,15 @@ class Stella::CLI::Definition
   # ------------------------------------------------------------------
 
   before do |obj|
+    #puts $$
     @start = Time.now
-    Stella.enable_debug if Drydock.debug?
+    if obj.global.pause
+      obj.global.pause.to_i.times do |i|
+        print "Waiting for %s" % [(obj.global.pause-i)]
+        sleep 1
+        print "\r%30s\r" % ''  # clear line
+      end
+    end
   end
 
   after do |obj|  
@@ -141,6 +151,8 @@ rescue Drydock::ArgError, Drydock::OptError => ex
   STDERR.puts ex.usage
 rescue Drydock::InvalidArgument => ex
   STDERR.puts ex.message
+rescue Drydock::UnknownCommand => ex
+  STDERR.puts "Unknown command: %s" % ex.name
 rescue Stella::Error => ex
   STDERR.puts ex.message
   STDERR.puts ex.backtrace if Stella.loglev > 2 || Drydock.debug?

data/examples/cookies/plan.rb

@@ -1,3 +1,9 @@
+# Stella Test Plan - Cookies (2009-10-08)
+#
+# TO BE DOCUMENTED.
+# 
+# If you're reading this, remind me!
+#
 desc "Maintain Your Cookies"
 
 usecase 65, "Simple search" do
@@ -15,4 +21,6 @@ usecase 65, "Simple search" do
     end
   end
   
-end
+end
+
+# c88c5e4e8c72e305928c8e512ca1e26baf271544

data/examples/csvdata/plan.rb

@@ -0,0 +1,27 @@
+# Stella Test Plan - Reading CSV Data (2009-10-08)
+#
+# TO BE DOCUMENTED.
+# 
+# If you're reading this, remind me!
+#
+
+usecase "Reading CSV Data" do
+  resource :search_terms, csv('search_terms.csv')
+  
+  get "/search", "Search (random)" do
+    param :what  => random(:search_terms, 0)
+    param :where => random(:search_terms, 1)
+  end
+  
+  get "/search", "Search (sequential #1)" do
+    param :what  => sequential(:search_terms, 0)
+    param :where => sequential(:search_terms, 1)
+  end
+  
+  get "/search", "Search (sequential #2)" do
+    param :what  => sequential(:search_terms, 0)
+    param :where => sequential(:search_terms, 1)
+  end
+end
+
+# d93df136283f3867f462266a98675ce0b2f51b08

data/examples/csvdata/search_terms.csv

@@ -0,0 +1,14 @@
+west,toronto
+smoked,toronto
+pen,toronto
+fire,toronto
+ink,to
+town,toronto
+big,montreal
+ti,on
+al,montreal
+furniture,mont
+keyboard,montreal
+rods,toronto
+beads,montreal
+fu,montreal

data/examples/essentials/plan.rb

@@ -1,4 +1,4 @@
-# Stella - Example Test Plan
+# Stella Test Plan - Essentials (2009-10-08)
 # 
 #
 # 1. INTRODUCTION
@@ -57,11 +57,11 @@
 # The "verify" command executes the plan with a 
 # single user and provides more detailed output.
 #
-# "load" tests are run in a similar way:
+# And this is how you generate load:
 # 
-# $ stella load -c 50 -r 10 -p examples/essentials/plan.rb http://127.0.0.1:3114/
+# $ stella generate -c 50 -r 10 -p examples/essentials/plan.rb http://127.0.0.1:3114/
 #
-# where "c" is the number of concurrent users and
+# where "c" is the number of concurrent clients,
 # "r" is the number of times to repeat the plan. 
 #
 # 
@@ -89,7 +89,7 @@ usecase 65, "Simple search" do
   # into an array called :search_terms. The 
   # colon is Ruby's way of defining a symbol.
   #
-  resource :search_terms, list('search_terms.csv')
+  resource :search_terms, list('search_terms.txt')
   
   # Requests are defined with one of the 
   # following methods: get, post, head, delete.
@@ -244,4 +244,4 @@ usecase 10, "Self-serve API" do
   
 end
 
-# 278a014c48dd64d2f2aca0588fa281b9553e825f
+# 80661e5f4c731ed905b01fdcdb52896629c7dd1e

data/examples/exceptions/plan.rb

@@ -1,4 +1,9 @@
-
+# Stella Test Plan - Exception Handling (2009-10-08)
+#
+# TO BE DOCUMENTED. 
+# 
+# If you're reading this, remind me!
+#
 
 usecase "Exception Handling" do
   
@@ -10,4 +15,6 @@ usecase "Exception Handling" do
     end
   end
   
-end
+end
+
+# 0f354b3579e6c5b5b3f303aabb2ac3aa5b11096a

data/lib/stella.rb

@@ -1,59 +1,79 @@
 
-require 'ostruct'
+STELLA_LIB_HOME = File.expand_path File.dirname(__FILE__) unless defined?(STELLA_LIB_HOME)
+
+%w{attic hexoid storable sysinfo gibbler benelux}.each do |dir|
+  $:.unshift File.join(STELLA_LIB_HOME, '..', '..', dir, 'lib')
+end
+
+autoload :SysInfo, 'sysinfo'
+autoload :Drydock, 'drydock'
+autoload :URI, 'uri'
+autoload :OpenStruct, 'ostruct'
+autoload :Storable, 'storable'
+autoload :Gibbler, 'gibbler/aliases'
+autoload :Attic, 'attic'
+
+require 'benelux'
 require 'threadify'
+require 'tracer'
+
+
 
 module Stella
   extend self
-
-  LIB_HOME = File.expand_path File.dirname(__FILE__) unless defined?(LIB_HOME)
   
-  %w{storable sysinfo gibbler benelux}.each do |dir|
-    $:.unshift File.join(LIB_HOME, '..', '..', dir, 'lib')
+  SLEEP_METRICS = {
+    :create_thread     => 0.001,
+    :check_threads     => 0.3
+  }.freeze unless defined?(SLEEP_METRICS)
+    
+  @sysinfo = nil
+  @logger  = Drydock::Screen
+  @loglev  = 1
+  @debug   = false
+  @abort   = false
+  
+  class << self
+    attr_accessor :loglev, :logger
   end
-  require 'sysinfo'
-  require 'drydock/screen'
-  require 'storable'
-  require 'gibbler'
-  require 'gibbler/aliases'
-  require 'benelux'
   
-  @@sysinfo = SysInfo.new.freeze
-  @@logger = Drydock::Screen
-  @@loglev = 1
-  @@debug  = false
-  @@abort  = false
+  def sleep(metric)
+    unless SLEEP_METRICS.has_key? metric
+      raise "unknown sleep metric: #{metric}" 
+    end
+    Kernel.sleep SLEEP_METRICS[metric]
+  end
   
-  # 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
-  def li3(*msg); li *msg if @@loglev >= 3 end
-  def li4(*msg); li *msg if @@loglev >= 4 end
+  # 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
+  def li3(*msg); li *msg if @loglev >= 3 end
+  def li4(*msg); li *msg if @loglev >= 4 end
   
-  # Puts +msg+ to +@@logger+ with "ERROR: " prepended
-  def le(*msg); @@logger.puts "  " << msg.join("#{$/}  ").color(:red); end
-  # Puts +msg+ to +@@logger+ if +Rudy.debug?+ returns true
+  # Puts +msg+ to +@logger+ with "ERROR: " prepended
+  def le(*msg); @logger.puts "  " << msg.join("#{$/}  ").color(:red); end
+  # Puts +msg+ to +@logger+ if +Rudy.debug?+ returns true
   def ld(*msg)
-    @@logger.puts "D:  " << msg.join("#{$/}D:  ") if debug?
+    @logger.puts "D:  " << msg.join("#{$/}D:  ") if debug?
   end
   
-  def loglev; @@loglev; end
-  def loglev=(val); @@loglev = val; end
-  def sysinfo; @@sysinfo; end
+  def sysinfo
+    @sysinfo = SysInfo.new.freeze if @sysinfo.nil?
+    @sysinfo 
+  end
   
-  def quiet?; @@loglev == 0; end
-  def enable_quiet; @@loglev = 0; end
-  def disable_quiet; @@loglev = 1; end
+  def quiet?()        @loglev == 0    end
+  def enable_quiet()  @loglev =  0    end
+  def disable_quiet() @loglev =  1    end
 
-  def debug?; @@debug == true; end
-  def enable_debug; @@debug = true; end
-  def disable_debug; @@debug = false; end
+  def debug?()        @debug == true  end
+  def enable_debug()  @debug =  true  end
+  def disable_debug() @debug =  false end
   
-  def abort?
-    @@abort == true
-  end
-  def abort!() @@abort = true end
+  def abort?()        @abort == true  end
+  def abort!()        @abort =  true  end
   
   def rescue(&blk)
     blk.call
@@ -61,15 +81,20 @@ module Stella
     Stella.le "ERROR: #{ex.message}"
     Stella.li3 ex.backtrace
   end
+  
+  require 'stella/exceptions'
+  
+  autoload :VERSION, 'stella/version'
+  autoload :Utils, 'stella/utils'
+  autoload :Config, 'stella/config'
+  autoload :Data, 'stella/data'
+  autoload :Testplan, 'stella/testplan'
+  autoload :Engine, 'stella/engine'
+  autoload :Client, 'stella/client'
+  
+  require 'stella/mixins'
 end
 
-require 'stella/version'
-require 'stella/exceptions'
-require 'stella/utils'
-require 'stella/config'
-require 'stella/data'
-require 'stella/client'
 
-Stella::Utils.require_vendor "httpclient", '2.1.5.2'
-Stella::Utils.require_glob(Stella::LIB_HOME, 'stella', '*.rb')
+
 

data/lib/stella/cli.rb

@@ -1,5 +1,4 @@
 
-
 class Stella::CLI < Drydock::Command
   attr_accessor :exit_code
   
@@ -20,36 +19,22 @@ class Stella::CLI < Drydock::Command
     @exit_code = (ret ? 0 : 1)
   end
   
-  def load_valid?
+  def generate_valid?
     create_testplan
   end
   
-  def load
+  def generate
     opts = {}
     opts[:hosts] = @hosts
-    [:nowait, :clients, :repetitions, :wait, :duration].each do |opt|
+    [:nowait, :clients, :repetitions, :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, '..'))
+    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')
@@ -63,13 +48,13 @@ class Stella::CLI < Drydock::Command
     puts %Q{
     http://127.0.0.1:3114/
     }
-    puts "3. Run a functional test:".bright
+    puts "3. Verify the testplan is correct (functional test):".bright
     puts %Q{
     $ stella verify -p #{tp_path} 127.0.0.1:3114
     }
-    puts "4. Run a load test:".bright
+    puts "4. Generate requests (load test):".bright
     puts %Q{
-    $ stella load -p #{tp_path} 127.0.0.1:3114
+    $ stella generate -p #{tp_path} 127.0.0.1:3114
     }
   end
   
@@ -91,10 +76,11 @@ class Stella::CLI < Drydock::Command
       @testplan = Stella::Testplan.load_file @option.testplan
     else
       opts = {}
-      opts[:delay] = @option.wait if @option.wait
+      opts[:wait] = @option.wait if @option.wait
       @testplan = Stella::Testplan.new(@argv, opts)
     end
     @testplan.check!  # raise errors, update usecase ratios
+    @testplan.freeze  # cascades through usecases and requests
     Stella.li2 " #{@option.testplan || @testplan.desc} (#{@testplan.digest})" 
     true
   end