stella 0.7.0.015 → 0.7.0.017

data/lib/stella/exceptions.rb

@@ -6,10 +6,15 @@ module Stella
     def message; "#{self.class}: #{@obj}"; end
   end
   
-  class InvalidOption < Stella::Error
+  class WackyRatio < Stella::Error
   end
   
-  class NoHostDefined < Stella::Error
+  class WackyDuration < Stella::Error
+  end
+  
+  class InvalidOption < Stella::Error
   end
   
+  class NoHostDefined < Stella::Error
+  end  
 end

data/lib/stella/mixins.rb

@@ -1,2 +1,5 @@
 
-Stella::Utils.require_glob(Stella::LIB_HOME, 'stella', 'mixins', '*.rb')
+require 'stella/mixins/time'
+require 'stella/mixins/string'
+require 'stella/mixins/numeric'
+require 'stella/mixins/thread'

data/lib/stella/mixins/numeric.rb

@@ -1,19 +1,20 @@
 
 
 class Numeric
-  # TODO: Use 1024
+  include Time::Units
+  # TODO: Use 1024?
   def to_bytes
     args = case self.abs.to_i
-    when 0..1_000
+    when 0..1000
       [(self).to_s, 'B']
-    when 1_000..1_000_000
-      [(self / 1000).to_s, 'KB']
-    when 1_000_000..1_000_000_000
-      [(self / (1000**2)).to_s, 'MB']
-    when 1_000_000_000..1_000_000_000_000
-      [(self / (1000**3)).to_s, 'GB']
-    when 1_000_000_000_000..1_000_000_000_000_000
-      [(self / (1000**4)).to_s, 'TB']
+    when (1000)..(1000**2)
+      [(self / 1000.to_f).to_s, 'KB']
+    when (1000**2)..(1000**3)
+      [(self / (1000**2).to_f).to_s, 'MB']
+    when (1000**3)..(1000**4)
+      [(self / (1000**3).to_f).to_s, 'GB']
+    when (1000**4)..(1000**6)
+      [(self / (1000**4).to_f).to_s, 'TB']
     else
       [self, 'B']
     end

data/lib/stella/mixins/string.rb

@@ -0,0 +1,12 @@
+# Assumes Time::Units and Numeric mixins are available. 
+
+class String
+  
+  def in_seconds
+    # "60m" => ["60", "m"]
+    q,u = self.scan(/([\d\.]+)([s,m,h])?/).flatten
+    q &&= q.to_f and u ||= 's'
+    q &&= q.in_seconds(u)
+  end
+  
+end

data/lib/stella/mixins/time.rb

@@ -0,0 +1,75 @@
+#encoding: utf-8
+
+$KCODE = "u" if RUBY_VERSION =~ /^1.8/
+
+class Time
+  module Units
+    PER_MICROSECOND = 0.000001.freeze
+    PER_MILLISECOND = 0.001.freeze
+    PER_MINUTE = 60.0.freeze
+    PER_HOUR = 3600.0.freeze
+    PER_DAY = 86400.0.freeze
+    
+    def microseconds()    seconds * PER_MICROSECOND     end
+    def milliseconds()    seconds * PER_MILLISECOND    end
+    def seconds()         self                         end
+    def minutes()         seconds * PER_MINUTE          end
+    def hours()           seconds * PER_HOUR             end
+    def days()            seconds * PER_DAY               end
+    def weeks()           seconds * PER_DAY * 7           end
+    def years()           seconds * PER_DAY * 365        end 
+            
+    def in_years()        seconds / PER_DAY / 365      end
+    def in_weeks()        seconds / PER_DAY / 7       end
+    def in_days()         seconds / PER_DAY          end
+    def in_hours()        seconds / PER_HOUR          end
+    def in_minutes()      seconds / PER_MINUTE         end
+    def in_milliseconds() seconds / PER_MILLISECOND    end
+    def in_microseconds() seconds / PER_MICROSECOND   end
+
+    def in_seconds(u=nil)
+      case u.to_s
+      when /\A(y)|(years?)\z/
+        years
+      when /\A(w)|(weeks?)\z/
+        weeks
+      when /\A(d)|(days?)\z/
+        days
+      when /\A(h)|(hours?)\z/
+        hours
+      when /\A(m)|(minutes?)\z/
+        minutes
+      when /\A(ms)|(milliseconds?)\z/
+        milliseconds
+      when /\A(us)|(microseconds?)|(μs)\z/
+        microseconds
+      else
+        self
+      end
+    end
+    
+    ## JRuby doesn't like using instance_methods.select here. 
+    ## It could be a bug or something quirky with Attic 
+    ## (although it works in 1.8 and 1.9). The error:
+    ##  
+    ##  lib/attic.rb:32:in `select': yield called out of block (LocalJumpError)
+    ##  lib/stella/mixins/numeric.rb:24
+    ##
+    ## Create singular methods, like hour and day. 
+    # instance_methods.select.each do |plural|
+    #   singular = plural.to_s.chop
+    #   alias_method singular, plural
+    # end
+    
+    alias_method :ms, :milliseconds
+    alias_method :'μs', :microseconds
+    alias_method :second, :seconds
+    alias_method :minute, :minutes
+    alias_method :hour, :hours
+    alias_method :day, :days
+    alias_method :week, :weeks
+    alias_method :year, :years
+
+  end
+end
+

data/lib/stella/testplan.rb

@@ -5,9 +5,6 @@ module Stella
 class Testplan
   include Gibbler::Complex
   
-  class WackyRatio < Stella::Error
-  end
-  
   attr_accessor :usecases
   attr_accessor :base_path
   attr_accessor :desc
@@ -17,8 +14,9 @@ class Testplan
     @desc, @usecases = "Test plan", []
     @testplan_current_ratio = 0
     @stats = Stella::Testplan::Stats.new
-    
+
     unless uris.empty?
+      uris = [uris] unless Array === uris
       usecase = Stella::Testplan::Usecase.new
       usecase.ratio = 1.0
       uris.each do |uri|
@@ -26,9 +24,7 @@ class Testplan
         uri = URI.parse uri
         uri.path = '/' if uri.path.nil? || uri.path.empty?
         req = usecase.add_request :get, uri.path
-        req.wait = opts[:delay] if opts[:delay]
-        req.gibbler
-        req.freeze
+        req.wait = opts[:wait] if opts[:wait]
       end
       self.add_usecase usecase
     end
@@ -40,8 +36,6 @@ 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
   
@@ -56,14 +50,17 @@ class Testplan
     if @testplan_current_ratio > 1.0 
       msg = "Usecase ratio cannot be higher than 1.0"
       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
+      raise Stella::WackyRatio, msg
     end
   end
-    
+  
+  # make sure all clients share identical test plans
+  def freeze
+    @usecases.each { |uc| uc.freeze }
+    super
+    self
+  end
+  
   def usecase(*args, &blk)
     return @usecases if args.empty?
     ratio, name = nil,nil
@@ -91,15 +88,15 @@ class Testplan
 
   def pretty(long=false)
     str = []
-    dig = long ? self.gibbler_cache : self.gibbler_cache.shorter
+    dig = long ? self.digest_cache : self.digest_cache.shorter
     str << " %-66s  ".att(:reverse) % ["#{@desc}  (#{dig})"]
     @usecases.each_with_index do |uc,i| 
-      dig = long ? uc.gibbler_cache : uc.gibbler_cache.shorter
+      dig = long ? uc.digest_cache : uc.digest_cache.shorter
       desc = uc.desc || "Usecase ##{i+1}"
       desc += "  (#{dig}) "
       str << (' ' << " %-61s %s%% ".att(:reverse).bright) % [desc, uc.ratio_pretty]
       requests = uc.requests.each do |r| 
-        dig = long ? r.gibbler_cache : r.gibbler_cache.shorter
+        dig = long ? r.digest_cache : r.digest_cache.shorter
         str << "    %-62s".bright % ["#{r.desc}  (#{dig})"]
         str << "      %s" % [r]
         if Stella.loglev > 2

data/lib/stella/testplan/usecase.rb

@@ -1,4 +1,4 @@
-
+autoload :CSV, 'csv'
 
 module Stella
 class Testplan
@@ -19,13 +19,15 @@ class Testplan
   #
   class Usecase
     include Gibbler::Complex
+    extend Attic
+    
+    attic :base_path # we don't want gibbler to see this
     
     attr_accessor :desc
     attr_writer :ratio
     
     attr_accessor :requests
     attr_accessor :resources
-    attr_accessor :base_path
     
     class UnknownResource < Stella::Error
       def message; "UnknownResource: #{@obj}"; end
@@ -60,7 +62,7 @@ class Testplan
     # Reads the contents of the file <tt>path</tt> (the current working
     # directory is assumed to be the same directory containing the test plan).
     def read(path)
-      path = File.join(@base_path, path) if @base_path
+      path = File.join(base_path, path) if base_path
       File.read(path)
     end
     
@@ -68,13 +70,22 @@ class Testplan
       read(path).split $/
     end
     
+    def csv(path)
+      path = File.join(base_path, path) if base_path
+      CSV.read(path)
+    end
+    
+    def freeze
+      @requests.each { |r| r.freeze }
+      super
+      self
+    end
+    
     def add_request(meth, *args, &blk)
       req = Stella::Data::HTTP::Request.new meth.to_s.upcase, args[0], &blk
       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/utils.rb

@@ -1,8 +1,6 @@
 
-require 'socket'
-require 'open-uri'
-require 'date'
-require 'timeout'
+require 'socket'  # Why doesn't socket work with autoload?
+autoload :Timeout, 'timeout'
 
 module Stella
   
@@ -66,10 +64,14 @@ module Stella
     #     vendor/httpclient-2.1.5.2/httpclient
     #
     def require_vendor(name, version)
-       $:.unshift File.join(LIB_HOME, '..', 'vendor', "#{name}-#{version}")
+       $:.unshift File.join(STELLA_LIB_HOME, '..', 'vendor', "#{name}-#{version}")
        require name
     end
     
+    # Same as <tt>require_vendor</tt>, but uses <tt>autoload</tt> instead.
+    def autoload_vendor(mod, name, version)
+      autoload mod, File.join(STELLA_LIB_HOME, '..', 'vendor', "#{name}-#{version}", name)
+    end
     
     # Checks whether something is listening to a socket. 
     # * +host+ A hostname

data/lib/stella/version.rb

@@ -6,7 +6,7 @@ module Stella
       MAJOR = 0.freeze
       MINOR = 7.freeze
       TINY  = 0.freeze
-      PATCH = '015'.freeze
+      PATCH = '017'.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY, PATCH].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.015"
+  s.version = "0.7.0.017"
   s.summary = "Stella: Perform load tests on your web applications with beauty and brute strength."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -15,12 +15,11 @@
   
   s.executables = %w[stella]
   
-  s.add_dependency 'benelux',    '>= 0.4.2'
+  s.add_dependency 'benelux',    '>= 0.4.3'
   s.add_dependency 'drydock',    '>= 0.6.8'
-  s.add_dependency 'gibbler',    '>= 0.6.3'
+  s.add_dependency 'gibbler',    '>= 0.7.0'
   s.add_dependency 'sysinfo',    '>= 0.7.0'
-  s.add_dependency 'storable',   '>= 0.5.7'
-  s.add_dependency 'httpclient', '>= 2.1.5'
+  s.add_dependency 'storable',   '>= 0.5.8'
   s.add_dependency 'nokogiri'
   
   # = MANIFEST =
@@ -33,9 +32,11 @@
   Rudyfile
   bin/stella
   examples/cookies/plan.rb
+  examples/csvdata/plan.rb
+  examples/csvdata/search_terms.csv
   examples/essentials/logo.png
   examples/essentials/plan.rb
-  examples/essentials/search_terms.csv
+  examples/essentials/search_terms.txt
   examples/exceptions/plan.rb
   lib/stella.rb
   lib/stella/cli.rb
@@ -51,12 +52,13 @@
   lib/stella/engine.rb
   lib/stella/engine/functional.rb
   lib/stella/engine/load.rb
-  lib/stella/engine/stress.rb
   lib/stella/exceptions.rb
   lib/stella/guidelines.rb
   lib/stella/mixins.rb
   lib/stella/mixins/numeric.rb
+  lib/stella/mixins/string.rb
   lib/stella/mixins/thread.rb
+  lib/stella/mixins/time.rb
   lib/stella/stats.rb
   lib/stella/testplan.rb
   lib/stella/testplan/stats.rb
@@ -69,6 +71,8 @@
   support/sample_webapp/app.rb
   support/sample_webapp/config.ru
   support/useragents.txt
+  tryouts/01_numeric_mixins_tryouts.rb
+  tryouts/12_digest_tryouts.rb
   vendor/httpclient-2.1.5.2/httpclient.rb
   vendor/httpclient-2.1.5.2/httpclient/auth.rb
   vendor/httpclient-2.1.5.2/httpclient/cacert.p7s

data/tryouts/01_numeric_mixins_tryouts.rb

@@ -0,0 +1,40 @@
+
+#encoding: utf-8
+$KCODE = "u" if RUBY_VERSION =~ /^1.8/
+
+group "Numeric mixins"
+library :stella, 'lib'
+
+tryouts "Natural language" do
+  
+  drill "base == 1.hour", 1.hour, 3600
+  drill "1.milliseconds", 1.milliseconds, 0.001
+  drill "1.microseconds", 1.microseconds, 0.000001
+  drill "10.minutes / 60.seconds", 10.minutes / 60.seconds, 10
+  drill "1.day", 1.day, 86400
+  drill "1.year == 365.days", 1.year, 31536000
+  drill "1.week == 7.days", 1.week, 604800
+  drill "1.week == 186.hours", 1.week, 168.hours
+
+  drill "60.in_minutes", 60.in_minutes, 1
+  drill "3600.in_hours", 3600.in_hours, 1
+  drill "5400.in_hours", 5400.in_hours, 1.5
+  drill "604800.in_days", 604800.in_days, 7
+  
+  drill "60.hours - 1.day", 60.hours - 1.day, 129600.0
+  drill "1.year - 5.days", 1.year - 5.days, 31104000.0
+  
+  drill "100 - 90", 100 - 90, 10.seconds
+  drill "90 + 9", 51 + 9, 1.minute
+  
+end
+
+
+tryouts "Bytes" do
+  drill "1000 == 1000.00B", 1000.to_bytes, "1000.00B"
+  drill "1010", 1010.to_bytes, "1.01KB"
+  drill "1020100", (1010 ** 2).to_bytes, "1.02MB"
+  drill "1030301000", (1010 ** 3).to_bytes, "1.03GB"
+  drill "1040604010000", (1010 ** 4).to_bytes, "1.04TB"
+end
+

data/tryouts/12_digest_tryouts.rb

@@ -0,0 +1,42 @@
+
+group "Stella"
+library :stella, 'lib'
+tryouts "Object Digests" do
+  setup do
+    #Gibbler.enable_debug
+  end
+  clean do
+    Gibbler.disable_debug
+  end
+  
+  dream "90199c341ea7ea4e22139e690e3d68a78ec6fce3"
+  drill "Request can gibbler" do
+    r = Stella::Data::HTTP::Request.new :get, '/'
+    r.digest
+  end
+  
+  dream "9ef5fb0707526e47547b3e6a59d8d3e3de64667f"
+  drill "Usecase can gibbler" do
+    u = Stella::Testplan::Usecase.new 
+    u.digest
+  end
+  
+  dream "0d5d6ac215563f09d4143d7e1ca9ac0611cc164d"
+  drill "Testplan can gibbler" do
+    t = Stella::Testplan.new 'localhost'
+    t.digest
+  end
+  
+  dream "a04e699bf8d354c68101ae62bf3e4f32fbae3221"
+  drill "Complex Testplan can gibbler" do
+    u = Stella::Testplan::Usecase.new 
+    r = u.add_request :get, '/', 'homepage'
+    r.param :user => :name
+    t = Stella::Testplan.new 'localhost'
+    t.add_usecase u
+    t.digest
+  end
+  
+end
+
+