stella 0.7.3.002 → 0.7.4.001

data/lib/stella/logger.rb

@@ -0,0 +1,143 @@
+
+
+module Stella
+
+  class Logger
+    @@disable = false
+    def self.disable!()  @@disable = true  end
+    def self.disabled?()  @@disable == true end
+    
+    attr_accessor :lev
+    attr_reader :templates
+    
+    def initialize(output=STDOUT)
+      @mutex, @buffer = Mutex.new, StringIO.new
+      @lev, @offset = 1, 0
+      @templates = {}
+      @autoflush = false
+      return if Logger.disabled?
+      self.output = output
+    end
+    
+    def autoflush!()  @autoflush = true   end
+    def autoflush?()  @autoflush == true  end
+      
+    def add_template(name, str)
+      @templates[name.to_sym] = str
+    end
+    
+    def template(name)
+      @templates[name]
+    end
+    
+    def template?(name)
+      @templates.has_key? name
+    end
+    
+    def print(level, *msg)
+      return if level > @lev || Logger.disabled?
+      @buffer.print *msg
+      flush if autoflush?
+      true
+    end
+    def print!(level, msg)
+      return unless @lev == level
+      print level, msg
+    end
+    
+    def puts(level, *msg)
+      return if level > @lev || Logger.disabled?
+      @buffer.puts *msg
+      flush if autoflush?
+      true
+    end
+    
+    def info(*msg)   puts 1, *msg end
+    def info1(*msg)  puts 1, *msg end
+    def info2(*msg)  puts 2, *msg end
+    def info3(*msg)  puts 3, *msg end
+    def info4(*msg)  puts 4, *msg end
+    
+    def tinfo(templ, *args)
+      info template(templ) % args
+    end
+    
+    def twarn(templ, *args)
+      warn template(templ) % args
+    end
+    
+    class UnknownTemplate < Stella::Error
+    end
+    
+    def method_missing(meth, *args)
+      raise UnknownTemplate.new(meth.to_s) unless template? meth
+      tinfo meth, *args
+    end
+    
+    def output=(o)
+      @mutex.synchronize do
+        if o.kind_of? String
+          o = File.open(o, File::CREAT|File::TRUNC|File::RDWR, 0644)
+        end
+        @output = o
+      end
+    end
+    
+    def flush
+      return if Logger.disabled?
+      @mutex.synchronize do
+        #return if @offset == @output.tell
+        @buffer.seek @offset
+        @output.print @buffer.read unless @buffer.eof?
+        @offset = @buffer.tell
+        @output.flush
+      end
+      true
+    end
+    
+    def path
+      @output.path if @output.respond_to? :path
+    end
+    
+    def clear
+      return if Logger.disabled?
+      flush
+      @mutex.synchronize do
+        @buffer.rewind
+        @offset = 0
+      end
+    end
+    
+    def close
+      return if Logger.disabled?
+      flush
+      @buffer.close
+      @output.close
+    end
+  
+  end
+  
+  # Prints to a buffer. 
+  # Must call flush to send to output. 
+  class SyncLogger < Logger
+    def print(level, *msg)
+      return if level > @lev || Logger.disabled?
+      @mutex.synchronize { 
+        @buffer.print *msg 
+        flush if autoflush?
+      }
+      true
+    end
+
+    def puts(level, *msg)
+      #Stella.ld [level, @lev, msg]
+      return if level > @lev || Logger.disabled?
+      @mutex.synchronize { 
+        @buffer.puts *msg 
+        flush if autoflush?
+      }
+      true
+    end
+  end
+
+end

data/lib/stella/testplan.rb

@@ -1,11 +1,24 @@
-require 'stella/testplan/usecase'
-require 'stella/testplan/stats'
+autoload :CSV, 'csv'
 
 module Stella
 class Testplan
   include Gibbler::Complex
   extend Attic
   
+  @file_cache = {}
+  
+  class << self
+    attr_reader :file_cache
+    def readlines path
+      if @file_cache.has_key?(path)
+        Stella.ld "FILE CACHE HIT: #{path}"
+        return @file_cache[path]
+      end
+      Stella.ld "FILE CACHE LOAD: #{path}"
+      @file_cache[path] = File.readlines(path)
+    end
+  end
+  
   attic :base_path
   attic :plan_path
   
@@ -108,7 +121,7 @@ class Testplan
         dig = long ? r.digest_cache : r.digest_cache.shorter
         str << "    %-62s".bright % ["#{r.desc}  (#{dig})"]
         str << "      %s" % [r]
-        if Stella.loglev > 2
+        if Stella.stdout.lev > 2
           [:wait].each { |i| str << "      %s: %s" % [i, r.send(i)] }
         end
       end
@@ -121,23 +134,166 @@ class Testplan
     1.0 - @testplan_current_ratio
   end
   
+end
+end  
+  
+  
+module Stella
+class Testplan
+
+  #
+  # Any valid Ruby syntax will do the trick:
+  #
+  #     usecase(10, "Self-serve") {
+  #       post("/listing/add", "Add a listing") {
+  #         wait 1..4 
+  #         param :name => random(8)
+  #         param :city => "Vancouver"
+  #         response(302) {
+  #           repeat 3
+  #         }
+  #       }
+  #     }
+  #
+  class Usecase
+    include Gibbler::Complex
+    include Stella::Data::Helpers
+    extend Attic
+    
+    class Auth < Struct.new(:kind, :user, :pass)
+      include Gibbler::Complex
+    end
+    
+    attic :base_path # we don't want gibbler to see this
+    attic :plan_path
+    
+    attr_accessor :desc
+    attr_writer :ratio
+    attr_reader :http_auth
+    
+    attr_accessor :requests
+    attr_accessor :resources
+    
+    class UnknownResource < Stella::Error
+      def message; "UnknownResource: #{@obj}"; end
+    end
+    
+    def initialize(&blk)
+      @requests, @resources = [], {}
+      instance_eval &blk unless blk.nil?
+    end
+    
+    def desc(*args)
+      @desc = args.first unless args.empty?
+      @desc
+    end
+    
+    def resource(name, value=nil)
+      @resources[name] = value unless value.nil?
+      @resources[name]
+    end
+    
+    def ratio
+      r = (@ratio || 0).to_f
+      r = r/100 if r > 1 
+      r
+    end
+    
+    def ratio_pretty
+      r = (@ratio || 0).to_f
+      r > 1.0 ? r.to_i : (r * 100).to_i
+    end
+    
+    # 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
+      Stella.ld "READING FILE: #{path}"
+      Stella::Testplan.readlines path
+    end
+      
+    def list(path)
+      read(path).collect { |line| line.strip }
+    end
+    
+    def csv(path)
+      path = File.join(base_path, path) if base_path
+      Stella.ld "READING CSV: #{path}"
+      file = Stella::Testplan.readlines path
+      CSV.parse file.join
+    end
+    
+    def quickcsv(path)
+      path = File.join(base_path, path) if base_path
+      Stella.ld "READING CSV(QUICK): #{path}"
+      ar = []
+      file = Stella::Testplan.readlines path
+      file.each do |l|
+        l.strip!
+        ar << l.split(',')
+      end
+      ar
+    end
+    
+    def freeze
+      @requests.each { |r| r.freeze }
+      super
+      self
+    end
+    
+    def auth(user, pass=nil, kind=:basic)
+      @http_auth ||= Auth.new
+      @http_auth.user, @http_auth.pass, @http_auth.kind = user, pass, kind
+    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
+    end
+    def get(*args, &blk);    add_request :get,    *args, &blk; end
+    def put(*args, &blk);    add_request :put,    *args, &blk; end
+    def post(*args, &blk);   add_request :post,   *args, &blk; end
+    def head(*args, &blk);   add_request :head,   *args, &blk; end
+    def delete(*args, &blk); add_request :delete, *args, &blk; end
+    
+    def xget(*args, &blk);    Stella.ld "Skipping get" end
+    def xput(*args, &blk);    Stella.ld "Skipping put" end
+    def xpost(*args, &blk);   Stella.ld "Skipping post" end
+    def xhead(*args, &blk);   Stella.ld "Skipping head" end
+    def xdelete(*args, &blk); Stella.ld "Skipping delete" end
+    
+  end
+  
 end
 end
 
-__END__
-# instance_exec for Ruby 1.8 written by Mauricio Fernandez
-# http://eigenclass.org/hiki/instance_exec
-if RUBY_VERSION =~ /1.8/
-  module InstanceExecHelper; end
-  include InstanceExecHelper
-  def instance_exec(*args, &block) # !> method redefined; discarding old instance_exec
-    mname = "__instance_exec_#{Thread.current.object_id.abs}_#{object_id.abs}"
-    InstanceExecHelper.module_eval{ define_method(mname, &block) }
-    begin
-      ret = send(mname, *args)
-    ensure
-      InstanceExecHelper.module_eval{ undef_method(mname) } rescue nil
-    end
-    ret
+
+
+module Stella
+class Testplan
+
+  class Stats
+    include Gibbler::Complex
+    attr_reader :requests
+
+    def initialize
+      @requests = OpenStruct.new
+      reset
+    end
+    
+    def total_requests
+      @requests.successful + @requests.failed
+    end
+    
+    def reset 
+      @requests.successful = 0
+      @requests.failed = 0
+    end
+    
   end
+    
+end
 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.3.002"
+  s.version = "0.7.4.001"
   s.summary = "Blame Stella for breaking your web applications."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -15,10 +15,10 @@
   
   s.executables = %w[stella]
   
-  s.add_dependency 'benelux',    '>= 0.5.1'
+  s.add_dependency 'benelux',    '>= 0.5.2'
   s.add_dependency 'drydock',    '>= 0.6.8'
   s.add_dependency 'gibbler',    '>= 0.7.1'
-  s.add_dependency 'sysinfo',    '>= 0.7.0'
+  s.add_dependency 'sysinfo',    '>= 0.7.1'
   s.add_dependency 'storable',   '>= 0.5.8'
   s.add_dependency 'nokogiri'
   
@@ -42,33 +42,20 @@
   lib/stella/cli.rb
   lib/stella/client.rb
   lib/stella/client/container.rb
-  lib/stella/client/modifiers.rb
-  lib/stella/config.rb
+  lib/stella/common.rb
   lib/stella/data.rb
   lib/stella/data/http.rb
-  lib/stella/data/http/body.rb
-  lib/stella/data/http/request.rb
-  lib/stella/data/http/response.rb
   lib/stella/engine.rb
   lib/stella/engine/functional.rb
   lib/stella/engine/load_create.rb
   lib/stella/engine/load_package.rb
   lib/stella/engine/load_queue.rb
   lib/stella/engine/loadbase.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/logger.rb
   lib/stella/testplan.rb
-  lib/stella/testplan/stats.rb
-  lib/stella/testplan/usecase.rb
   lib/stella/utils.rb
   lib/stella/utils/httputil.rb
-  lib/stella/version.rb
   lib/threadify.rb
   stella.gemspec
   support/sample_webapp/app.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.3.002
+  version: 0.7.4.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -05:00
+date: 2009-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: storable
@@ -100,33 +100,20 @@ files:
 - lib/stella/cli.rb
 - lib/stella/client.rb
 - lib/stella/client/container.rb
-- lib/stella/client/modifiers.rb
-- lib/stella/config.rb
+- lib/stella/common.rb
 - lib/stella/data.rb
 - lib/stella/data/http.rb
-- lib/stella/data/http/body.rb
-- lib/stella/data/http/request.rb
-- lib/stella/data/http/response.rb
 - lib/stella/engine.rb
 - lib/stella/engine/functional.rb
 - lib/stella/engine/load_create.rb
 - lib/stella/engine/load_package.rb
 - lib/stella/engine/load_queue.rb
 - lib/stella/engine/loadbase.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/logger.rb
 - lib/stella/testplan.rb
-- lib/stella/testplan/stats.rb
-- lib/stella/testplan/usecase.rb
 - lib/stella/utils.rb
 - lib/stella/utils/httputil.rb
-- lib/stella/version.rb
 - lib/threadify.rb
 - stella.gemspec
 - support/sample_webapp/app.rb