stella 0.7.6.003 → 0.7.6.004

data/README.rdoc

@@ -106,6 +106,7 @@ Get it in one of the following ways:
 * Harm Aarts for the great test case and feedback!
 * Kalin Harvey for keeping me on track.
 * Dave L, the best intern money can't buy. 
+* Peter McCurdy for the feedback and bug fixes. 
 
 
 == License

data/bin/stella

@@ -42,7 +42,13 @@ class Stella::CLI::Definition
     Drydock.debug true
     Stella.enable_debug
   end
-  global :P, :pause, Integer, "Seconds to pause before starting test"
+  global :W, :wait, Integer, "Seconds to wait before starting test"
+  global :'no-header', "Do not include X-Stella-ID request header" do
+    true  # params starting with 'no-' return false??
+  end
+  global :'no-param', "Do not include __stella query parameter header" do
+    true
+  end
   global :E, :engine, String, "Specify a load engine (experimental)"
   global :o, :output, String, "Write output to the given file" do |v|
     String.disable_color

data/lib/stella/cli.rb

@@ -19,6 +19,9 @@ class Stella::CLI < Drydock::Command
     opts = {}
     opts[:hosts] = @hosts
     opts[:nowait] = true if @option.nowait
+    [:'disable-templates', :'disable-stats', :'no-header', :'no-param'].each do |opt|
+      opts[opt] = @global.send(opt) unless @global.send(opt).nil?
+    end
     ret = Stella::Engine::Functional.run @testplan, opts
     @exit_code = (ret ? 0 : 1)
   end
@@ -33,7 +36,8 @@ class Stella::CLI < Drydock::Command
     [:nowait, :clients, :repetitions, :duration, :arrival].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
-    [:'disable-templates', :'disable-stats'].each do |opt|
+
+    [:'disable-templates', :'disable-stats', :'no-header', :'no-param'].each do |opt|
       opts[opt] = @global.send(opt) unless @global.send(opt).nil?
     end
     

data/lib/stella/client.rb

@@ -18,7 +18,7 @@ module Stella
     
     def initialize(base_uri=nil, client_id=1, opts={})
       opts = {
-        :parse_templates => true
+        :'disable-templates' => true
       }.merge! opts
       @opts = opts
       @base_uri, @client_id = base_uri, client_id
@@ -72,8 +72,10 @@ module Stella
           Benelux.add_thread_tags :retry => counter
           Benelux.add_thread_tags :stella_id => stella_id
         
-          container.unique_id = stella_id
-          params['__stella'] = headers['X-Stella-ID'] = container.unique_id[0..10]
+          container.unique_id = stella_id[0..10]
+          
+          params['__stella'] = container.unique_id unless @opts[:'no-param']
+          headers['X-Stella-ID'] = container.unique_id unless @opts[:'no-header']
           
           meth = req.http_method.to_s.downcase
           Stella.ld "#{req.http_method}: " << "#{req.uri} " << params.inspect
@@ -198,7 +200,7 @@ module Stella
       #Stella.ld "PREPARE HEADERS: #{headers}"
       hashobj.each_pair do |n,v|
         v = container.instance_eval &v if v.is_a?(Proc)
-        if @opts[:parse_templates]
+        if @opts[:'disable-templates']
           v = container.parse_template v if String === v
         end
         v = extra.call(v) unless extra.nil?

data/lib/stella/common.rb

@@ -137,10 +137,6 @@ class Stella::Config < Storable
   field :apikey
   field :secret
   
-  field :redis_host
-  field :redis_port
-  field :redis_pass
-  
    # Returns true when the current config matches the default config
   def default?; to_hash.gibbler == DEFAULT_CONFIG_HASH; end
   
@@ -209,13 +205,18 @@ class Stella::Config < Storable
   
   
   unless defined?(DIR_NAME)
-    DIR_NAME = Stella.sysinfo.os == :windows ? 'Stella' : '.stella'
-    USER_PATH = File.join(Stella.sysinfo.home, DIR_NAME, 'config')
+    if Stella.sysinfo.os == :windows
+      DIR_NAME = 'Stella'
+      USER_PATH = File.join(Stella.sysinfo.home, DIR_NAME, 'config.txt')
+    else
+      DIR_NAME = '.stella'
+      USER_PATH = File.join(Stella.sysinfo.home, DIR_NAME, 'config')
+    end
     PROJECT_PATH = Stella::Config.find_project_config
     DEFAULT_CONFIG = <<CONF
 apikey: ''
 secret: ''
-remote: stella.solutious.com:443
+source: api.solutious.com
 CONF
     DEFAULT_CONFIG_HASH = YAML.load(DEFAULT_CONFIG).gibbler
   end

data/lib/stella/engine/functional.rb

@@ -10,7 +10,7 @@ module Stella::Engine
       Stella.ld "OPTIONS: #{opts.inspect}"
       Stella.stdout.info2 "Hosts: " << opts[:hosts].join(', ') if !opts[:hosts].empty?
       
-      client = Stella::Client.new opts[:hosts].first
+      client = Stella::Client.new opts[:hosts].first, 1, opts
       client.add_observer(self)
 
       client.enable_nowait_mode if opts[:nowait]
@@ -61,7 +61,7 @@ module Stella::Engine
       if req.http_method == 'POST'
         cont = container.response.request.body.content
         if String === cont
-          Stella.stdout.info3 ('   ' << cont.split($/).join("#{$/}    "))
+          Stella.stdout.info3('   ' << cont.split($/).join("#{$/}    "))
         elsif HTTP::Message::Body::Parts === cont
           cont.parts.each do |part|
             if File === part

data/lib/stella/engine/loadbase.rb

@@ -183,9 +183,7 @@ module Stella::Engine
         Stella.ld "THREAD PACKAGE: #{usecase.desc} (#{pointer} + #{count})"
         # Fill the thread_package with the contents of the block
         packages.fill(pointer, count) do |index|
-          copts = {}
-          copts[:parse_templates] = false if opts[:'disable-templates']
-          client = Stella::Client.new opts[:hosts].first, index+1, copts
+          client = Stella::Client.new opts[:hosts].first, index+1, opts
           client.add_observer(self)
           client.enable_nowait_mode if opts[:nowait]
           Stella.stdout.info4 "Created client #{client.digest.short}"

data/lib/stella.rb

@@ -23,7 +23,7 @@ module Stella
       MAJOR = 0.freeze
       MINOR = 7.freeze
       TINY  = 6.freeze
-      PATCH = '003'.freeze 
+      PATCH = '004'.freeze 
     end
     def self.to_s; [MAJOR, MINOR, TINY].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.6.003"
+  s.version = "0.7.6.004"
   s.summary = "Blame Stella for breaking your web applications."
   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.6.003
+  version: 0.7.6.004
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -05:00
+date: 2009-11-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency