stella 2.1.2.001 → 2.1.2.002

data/VERSION.yml

@@ -1,4 +1,4 @@
 :MAJOR: 2
 :MINOR: 1
 :PATCH: 2
-:BUILD: '001'
+:BUILD: '002'

data/bin/stella

@@ -82,6 +82,7 @@ class Stella::CLI::Definition
   option :c, :concurrency, Integer, "Maximum number of virtual clients"
   #option :a, :arrival, Float, "Arrival rate (new clients per second)"
   option :r, :repetitions, Integer, "Number of times to repeat the testplan (per vclient)"
+  option :timeout, Integer, "Timeout requests after the given number of seconds"
   option :W, :nowait, "Ignore wait times"
   option :w, :wait, Float, "Wait time (in seconds) between requests"
   command :checkup => Stella::CLI

data/lib/stella/cli.rb

@@ -17,6 +17,7 @@ class Stella::CLI < Drydock::Command
     run_opts = { 
       :repetitions => @option.repetitions || 1,
       :concurrency => @option.concurrency || 1,
+      :timeout => @option.timeout || 30,
       :wait => @option.wait || 1
     }
     # NOTE ABOUT CLI OUTPUT:
@@ -89,20 +90,28 @@ class Stella::CLI < Drydock::Command
         if @global.verbose > 0 || @report.errors?
           test_uri = @report.log.first ? @report.log.first.uri : '[unknown]'
           Stella.li 'Checkup for %s' % [test_uri]
-          Stella.li
-          Stella.li '  %s' % [@report.headers.request_headers.split(/\n/).join("\n  ")]
-          Stella.li
-          Stella.li '  %s' % [@report.headers.response_headers.split(/\n/).join("\n  ")]
-          Stella.li ''
+          if !@report.timeouts? && !@report.fubars?
+            Stella.li
+            Stella.li '  %s' % [@report.headers.request_headers.split(/\n/).join("\n  ")]
+            Stella.li
+            Stella.li '  %s' % [@report.headers.response_headers.split(/\n/).join("\n  ")]
+            Stella.li ''
+          end
         end
         metrics = @report.metrics
-        args = [@report.statuses.values.first,
-          metrics.response_time.mean*1000,
-          metrics.socket_connect.mean*1000,
-          metrics.first_byte.mean*1000,
-          metrics.last_byte.mean*1000,
-          @more_info]
-        Stella.li "[%3s] %7.2fms (%5.2fms + %6.2fms + %6.2fms)  %s" % args
+        if @report.fubars?
+          Stella.li "You found a Stella bug!"
+          Stella.li "Let Tucker know: https://www.blamestella.com/feedback"
+        else
+          args = [
+            @report.timeouts? ? 'timeout' : @report.statuses.values.first,
+            metrics.response_time.mean*1000,
+            metrics.socket_connect.mean*1000,
+            metrics.first_byte.mean*1000,
+            metrics.last_byte.mean*1000,
+            @more_info]
+          Stella.li "[%3s] %7.2fms (%5.2fms + %6.2fms + %6.2fms)  %s" % args
+        end
       end
     end
   rescue Stella::API::Unauthorized => ex

data/lib/stella/client.rb

@@ -88,7 +88,7 @@ class Stella
           
           tt.add_count :requests, 1, :kind => :http
           
-          run_sleeper @opts[:wait]
+          run_sleeper @opts[:wait] unless usecase.requests.size == idx+1
           
           if @session.response_handler?
             @session.handle_response

data/stella.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "2.1.2.001"
+  s.version = "2.1.2.002"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]

metadata

@@ -2,7 +2,7 @@
 name: stella
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.2.001
+  version: 2.1.2.002
 platform: ruby
 authors: 
 - Delano Mandelbaum