stella 0.7.0.017 → 0.7.0.018

data/Rudyfile

@@ -1,4 +1,4 @@
-require 'stella'
+  require 'stella'
 
 machines do
   
@@ -37,7 +37,7 @@ commands do
   allow :stella
   allow :rm
   allow :rackup_path do
-    "/usr/lib/ruby/gems/1.8/gems/stella/#{Stella::VERSION}/support/sample_webapp/config.ru"
+    "/usr/lib/ruby/gems/1.8/gems/stella-#{Stella::VERSION}/support/sample_webapp/config.ru"
   end
 end
 
@@ -45,15 +45,19 @@ routines do
            
   role :app do                     
     
+    # rudy -r app -v start
     start do
       remote do
-        thin :d, :p, 3114, :R, rackup_path, 'start'
+        thin :d, :l, 'thin.log', :p, 3114, :R, rackup_path, 'start'
       end
     end
     
+    # rudy -r app -v stop
     stop do 
       remote do
-        thin :d, :p, 3114, :R, rackup_path, 'stop'
+        thin :R, rackup_path, 'stop'
+        sleep 1
+        ps 'ux'
       end
     end
     
@@ -71,7 +75,7 @@ routines do
     # rudy -v -r gen generate ip-10-251-27-245.ec2.internal:3114
     generate do
       remote do |arg|
-        stella :v, 'generate', :c, 50, :r, 4, "#{arg.first}"
+        stella :v, 'generate', :c, 200, :d, '30m', "#{arg.first}"
       end
     end
     
@@ -123,6 +127,7 @@ routines do
     
   end
   
+   
   installdeps do
     remote :root do
       gem_install "test-spec", "rspec", "camping", "fcgi", "memcache-client"

data/bin/stella

@@ -53,7 +53,7 @@ class Stella::CLI::Definition
     Stella.loglev += 1
   end
   global :V, :version, "Display version number" do
-    puts "Stella version: #{Stella::VERSION} (#{Stella::VERSION::PATCH})"
+    puts "Stella version: #{Stella::VERSION}"
     exit 0
   end
 
@@ -77,7 +77,7 @@ class Stella::CLI::Definition
   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/"
+  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)"

data/lib/stella.rb

@@ -24,7 +24,7 @@ module Stella
   
   SLEEP_METRICS = {
     :create_thread     => 0.001,
-    :check_threads     => 0.3
+    :check_threads     => 0.0005
   }.freeze unless defined?(SLEEP_METRICS)
     
   @sysinfo = nil

data/lib/stella/cli.rb

@@ -69,7 +69,7 @@ class Stella::CLI < Drydock::Command
       raise Stella::InvalidOption, "Bad path: #{@option.testplan}" 
     end
     @hosts = @argv.collect { |uri|; 
-      uri = 'http://' << uri unless uri.match /^http:\/\//i
+      uri = 'http://' << uri unless uri.match /^https?:\/\//i
       URI.parse uri; 
     }
     if @option.testplan

data/lib/stella/client.rb

@@ -17,6 +17,7 @@ module Stella
     
     def initialize(base_uri=nil, client_id=1)
       @base_uri, @client_id = base_uri, client_id
+      
       #@cookie_file = File.new("cookies-#{client_id}", 'w')
       @proxy = OpenStruct.new
     end
@@ -95,7 +96,7 @@ module Stella
   private
     def send_request(http_client, usecase, meth, uri, req, params, headers, container, counter)
       container.response = http_client.send(meth, uri, params, headers) # booya!
-      update(:receive_response, usecase, uri, req, counter, container)
+      update(:receive_response, usecase, uri, req, params, counter, container)
     end
     
     def update(kind, *args)

data/lib/stella/data.rb

@@ -3,6 +3,12 @@ module Stella::Data
     
   module Helpers
     
+    def resource(name)
+      Proc.new do
+        resource name 
+      end
+    end
+    
     def file(*args)
       input = args.size > 1 ? args : args.first
       Proc.new do

data/lib/stella/engine/functional.rb

@@ -43,11 +43,16 @@ module Stella::Engine
       Stella.li2 "  %-46s %16s ".bright % [desc, notice]
     end
     
-    def update_receive_response(client_id, usecase, uri, req, counter, container)
+    def update_receive_response(client_id, usecase, uri, req, params, counter, container)
       Stella.li '   %-59s %3d' % [uri, container.status]
       
       Stella.li2 '   ' << container.response.request.header.send(:request_line)
       
+      Stella.li2 $/, "   Request-Params:"
+      params.each do |pair|
+        Stella.li2 "     %s: %s" % pair
+      end
+      
       Stella.li2 $/, "   Request-Headers:"
       container.response.request.header.all.each do |pair|
         Stella.li2 "     %s: %s" % pair

data/lib/stella/engine/load.rb

@@ -68,7 +68,7 @@ module Stella::Engine
     end
     
     def wait_for_reporter
-      Benelux.reporter.wait
+      Benelux.reporter.force_update
     end
     
   protected
@@ -179,7 +179,7 @@ module Stella::Engine
           time_elapsed = (Time.now - time_started).to_i
           msg = "#{time_elapsed} of #{duration} (threads: %d)" % running_threads.size
           Stella.li3 "*** TIME ELAPSED: #{msg} ***"
-          sleep 0.5 and redo if time_elapsed <= duration 
+          redo if time_elapsed <= duration 
           break if time_elapsed >= duration
         end
 
@@ -292,7 +292,7 @@ module Stella::Engine
       
     end
       
-    def update_receive_response(client_id, usecase, uri, req, counter, container)
+    def update_receive_response(client_id, usecase, uri, req, params, counter, container)
       desc = "#{usecase.desc} > #{req.desc}"
       Stella.li3 '  Client-%s %3d %-6s %-45s' % [client_id.shorter, container.status, req.http_method, uri]
     end

data/lib/stella/mixins/string.rb

@@ -9,4 +9,8 @@ class String
     q &&= q.in_seconds(u)
   end
   
-end
+end
+
+class MatchData
+  include Gibbler::String
+end

data/lib/stella/version.rb

@@ -6,7 +6,7 @@ module Stella
       MAJOR = 0.freeze
       MINOR = 7.freeze
       TINY  = 0.freeze
-      PATCH = '017'.freeze
+      PATCH = '018'.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.017"
+  s.version = "0.7.0.018"
   s.summary = "Stella: Perform load tests on your web applications with beauty and brute strength."
   s.description = s.summary
   s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.017
+  version: 0.7.0.018
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -04:00
+date: 2009-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency