stella 0.5.4 → 0.5.5

data/lib/stella/adapter/siege.rb

@@ -38,7 +38,7 @@ module Stella
       attr_accessor :rc, :file, :time, :benchmark, :internet
       
       def initialize(options={}, arguments=[])
-        super(options, arguments)
+        
         @name = 'siege'
         @reps = 1
         @concurrent = 1
@@ -47,6 +47,8 @@ module Stella
         
         @rc = File.join(ENV['HOME'] || ENV['USERPROFILE'], '.siegerc')
         
+        super(options, arguments)
+        
         # Siege won't run unless there's a siegerc file. If the default one doesn't exist
         # we need to call siege.config to create it. This should only happen once. 
         # We use capture_output here so STDOUT and STDERR don't print to the screen. 
@@ -121,12 +123,10 @@ module Stella
 
         update_orig_logfile if @orig_logfile
 
-        save_stats
       end
 
 
-      def process_options(arguments)
-        options = OpenStruct.new
+      def process_arguments(arguments)
         opts = OptionParser.new 
         opts.on('-V', '--version') do |v| @version = v end
         opts.on('-h', '--help') do |v| @help = v end
@@ -147,9 +147,6 @@ module Stella
         opts.on('-i', '--internet') do |v| @internet = true; end
         opts.on('-A S', '--user-agent=S', String) do |v| @user_agent ||= []; @user_agent << v end
 
-        unless options.benchmark
-          Stella::LOGGER.warn('--benchmark (or -b) is not selected. Siege will include "think-time" for all requests.') 
-        end
         
         opts.on('-n N',Integer) do |v| 
           Stella::LOGGER.error("-n is not a Siege parameter. You probably want -r.")
@@ -160,7 +157,13 @@ module Stella
         # It also fails when it finds unknown switches (i.e. -X)
         # Which should leave only the remaining arguments (URIs in this case)
         opts.parse!(arguments)
-        options
+
+        unless @benchmark
+          Stella::LOGGER.warn('--benchmark (or -b) is not selected. Siege will include "think time" for all requests.') 
+        end
+                
+        self.arguments = arguments
+        
       rescue OptionParser::InvalidOption => ex
         # We want to replace this text so we grab just the name of the argument
         badarg = ex.message.gsub('invalid option: ', '')
@@ -273,7 +276,7 @@ module Stella
       end
 
       # Siege writes the summary to STDERR
-      def stats_file
+      def summary_file
         File.new(stderr_path) if File.exists?(stderr_path)
       end
       
@@ -289,10 +292,10 @@ module Stella
         File.join(@working_directory, File.basename(@file))
       end
           
-      def stats
-        return unless stats_file
+      def summary
+        return unless summary_file
         raw = {}
-        stats_file.each_line { |l|
+        summary_file.each_line { |l|
           l.chomp!
           nvpair = l.split(':')
           next unless nvpair && nvpair.size == 2

data/lib/stella/cli/localtest.rb

@@ -31,9 +31,8 @@ module Stella
       def run
         process_stella_options
         
-        options = @adapter.process_options(@arguments)
-        
-        @adapter.options = options
+        @adapter.process_arguments(@arguments)
+
         @adapter.arguments = @arguments
         
         @testdef.vusers = @adapter.vusers

data/lib/stella/cli/sysinfo.rb

@@ -6,7 +6,6 @@ module Stella
       
       def run
         puts Stella::SYSINFO
-        #puts "HI"
       end
       
     end

data/lib/stella/cli.rb

@@ -1,52 +1,11 @@
 
 # http://www.ruby-doc.org/stdlib/libdoc/observer/rdoc/index.html
 
-require 'optparse'
-require 'ostruct'
 
 require 'stella/cli/base'
 
 module Stella
   
-  # Stella::Config
-  #
-  # This Config class manages the content of ENV['HOME]/.stella. The functionality 
-  # is currently disabled so stella is stateless. 
-  # RUBY_PLATFORM = 'java' in jruby and i386-mswin32 for windows
-  class Config < Storable
-    USER_HOME = ENV['USERPROFILE'] || ENV['HOME']
-    STELLA_DIR = '.stella'
-    DEFAULT_HOME = File.join(USER_HOME, STELLA_DIR).freeze unless defined? DEFAULT_HOME
-    DEFAULT_DATA_HOME = File.join(Dir.getwd, 'stella').freeze unless defined? DEFAULT_DATA_HOME
-    
-    attr_accessor :conf_path, :data_path
-    attr_accessor :agents
-    
-    def initialize(args={:conf_path => DEFAULT_HOME})
-      
-    end
-    
-    def working_directory
-      'stella'
-    end
-    
-    # Copy the default useragents file to the config directory. 
-    #unless File.exists? uafile_path
-    #  default_uafile = File.join(STELLA_HOME, 'support', 'useragents.txt')
-    #  STDERR.puts "There's no useragents.txt file. Supplied agents will be ignored" unless File.exists?(default_uafile)
-    #  File.copy(default_uafile, @config.uafile_path, true)
-    #end
-    
-    #def load
-    #    puts self.methods
-    #  loaded_config = Config.undump('yaml', FileUtil.read_file_to_array(@config_filepath))
-    #  current_config = @config.marshal_dump
-    #  current_config.merge! loaded_config if loaded_config.is_a? Hash
-    #
-    #  @config = OpenStruct.new(current_config)
-    #end
-      
-  end
     
   # Stella::CLI
   #
@@ -59,23 +18,28 @@ module Stella
     # Auto populated with 'command' => Stella::CLI::[class] by each cli class on 'require'.
     @@commands = {}
     
+    attr_reader :command_name
     attr_reader :options
     attr_reader :logger
-    
+    attr_reader :stella_arguments
+    attr_reader :command_arguments
 
     
     def initialize(arguments=[], stdin=nil)
       @arguments = arguments
       @stdin = stdin
       
-      @config = Stella::Config.new
       @options = OpenStruct.new
       @options.verbose = 0
-      @options.data_path = @config.working_directory
+      @options.data_path = 'stella'
       @options.agents = []
       
       @stella_arguments = []
       @command_arguments = []
+      
+      process_arguments
+      process_options
+      
     end
     
     def commands
@@ -84,9 +48,6 @@ module Stella
     
     def run
       
-      process_arguments
-      process_options
-      
       unless (@command_name)
         process_options(:display)
         exit 0
@@ -96,7 +57,7 @@ module Stella
       # and tell it what shortname that was used to call it.
       command = @@commands[@command_name].new(@command_name)
       
-      # Give the command object access to the config and runtime options
+      # Give the command object access to the runtime options and arguments
       command.stella_options = @options
       command.arguments = @command_arguments
       command.working_directory = @options.data_path
@@ -210,9 +171,7 @@ module Stella
             agent_ary = Stella::Util::expand_str(v || 'random')
             @options.agents.push(agent_ary)
           end
-
-          # The following options are considered "repeatable" so they're stored in 
-          # the config file and used as defaults for the next run. 
+ 
           opts.on('-d', '--datapath=S', String, Stella::TEXT.msg(:option_help_datapath, ".#{File::SEPARATOR}stella")) do |v| 
             @options.data_path = v.to_s 
           end
@@ -271,10 +230,6 @@ module Stella
 
           Stella::LOGGER.debug("Commands (#{@command_name}): #{@@commands.keys.join(',')}")
 
-          #Stella::LOGGER.debug("Configs: ")
-          #@config.to_hash.each_pair do |n,v|
-          #  Stella::LOGGER.debug("  #{n}=#{v}")
-          #end
           
           Stella::LOGGER.debug("Options: ")
           @options.marshal_dump.each_pair do |n,v|

data/lib/stella/command/base.rb

@@ -3,19 +3,6 @@
 module Stella::Command
   class Base
     
-    BrowserNicks = {
-      'ff' => 'firefox',
-      'ie' => 'internetexplorer'
-    }.freeze unless defined? BrowserNicks
-
-    OperatingSystemNicks = {
-      'win' => 'windows',
-      'lin' => 'linux',
-      'osx' => 'osx',
-      'freebsd' => 'bsd',
-      'netbsd' => 'bsd',
-      'openbsd' => 'bsd'
-    }.freeze unless defined? OperatingSystemNicks
     
     # TODO: See EC2::Platform for example to improve/generalize platform
     # discovery. We'll need this for monitoring. 
@@ -47,55 +34,6 @@ module Stella::Command
       sleep remainder if remainder > 0
     end
     
-    # find_agent
-    #
-    # Takes an input string which can be either a shortname or a complete
-    # user agent string. If the string matches the shortname format, it
-    # will select an agent string from useragents.txt based on the shortname.
-    # Shortname takes the following format: browser-version-os. 
-    # Examples: ff-3-linux, ie-5, opera-10-win, chrome-0.2-osx, random
-    # If os doesn't match, it will look for the browser and version. If it can't
-    # find the version it will look for the browser and apply the version given. 
-    # If browser doesn't match a known browser, it assumes the string is a 
-    # complete user agent and simply returns that value. 
-    def find_agent(name,second=nil,third=nil)
-      name = (BrowserNicks.has_key?(name)) ? BrowserNicks[name] : name
-      return name unless @available_agents.has_key?(name) || name == "random"
-
-      index = name
-      if (second && third)                # i.e. opera-9-osx
-        os = (OperatingSystemNicks.has_key?(third)) ? OperatingSystemNicks[third] : third
-        index = "#{name}-#{second}-#{os}"
-      elsif(second && second.to_i > 0)    # i.e. opera-9
-        index = "#{name}-#{second}"
-      elsif(second)                       # i.e. opera-osx
-        os = (OperatingSystemNicks.has_key?(second)) ? OperatingSystemNicks[second] : second
-        index = "#{name}-#{os}"
-      elsif(name == "random")
-        index = @available_agents.keys[ rand(@available_agents.keys.size) ]
-      end
-
-      # Attempt to find a pool of user agents that match the supplied index
-      ua_pool = @available_agents[index]
-
-      # In the event we don't find an agent above (which will only happen
-      # when the user provided a version), we'll take a random agent for 
-      # the same browser and apply the version supplied by the user. We 
-      # create the index using just the major version number so if the user
-      # supplies a specific verswion number, they will always end up here.
-      unless ua_pool
-        os = (OperatingSystemNicks.has_key?(third)) ? OperatingSystemNicks[third] : third
-        index = (os) ? "#{name}-#{os}" : name
-        ua_tmp = @available_agents[index][ rand(@available_agents[index].size) ]
-        ua_tmp.version = second if second.to_i > 0
-        ua_pool = [ua_tmp]
-      end
-
-      ua = ua_pool[ rand(ua_pool.size) ]
-
-      ua.to_s
-
-    end
 
 
   end

data/lib/stella/command/localtest.rb

@@ -26,6 +26,8 @@ module Stella
     
     attr_accessor :working_directory
     attr_reader :available_agents
+    attr_reader :test_stats
+    attr_reader :rampup_test_stats
     
     def initialize(testdef=nil, adapter=nil)
       @testdef = testdef if testdef
@@ -40,23 +42,15 @@ module Stella
       @paths = []
       @format = 'yaml'
       @agents = []
+      @verbose = 0
       
-      @available_agents = index_available_agents(File.join(STELLA_HOME, 'support', 'useragents.txt'))
+      ua_path = File.join(STELLA_HOME, 'support', 'useragents.txt')
+      Stella::LOGGER.debug("LOADING #{ua_path}")
+      
+      @available_agents = Stella::Util.process_useragents(ua_path)
     end
     
-    def index_available_agents(path)
-      Stella::LOGGER.debug("LOADING #{path}")
-      return [] unless File.exists?(path)
-      Stella::Util.process_useragents(FileUtil.read_file_to_array(path))
-    end
     
-    def translate_requested_agents(possible_agents=[])
-      agents = []
-      possible_agents.each do |a|
-        agents << find_agent(*a)
-      end
-      agents
-    end
     
     def run
       
@@ -69,11 +63,11 @@ module Stella
         return
       end
             
-      @agents = translate_requested_agents(@testdef.agents)
+      @agents = Stella::Util.find_agents(@available_agents, @testdef.agents)
       
-      test_path = _generate_test_path
+      @test_path = _generate_test_path
       
-      prepare_test(test_path)       
+      prepare_test(@test_path)       
       
         threshold = (@testdef.rampup) ? @testdef.rampup.ceiling : @adapter.vusers
         
@@ -120,7 +114,7 @@ module Stella
           
           # Rampup tests produce multiple summary files which include the batch
           # number. Regular runs have just one file we set here as the default. 
-          summary_name = "SUMMARY"
+          summary_name = "STATS"
         
           # It's possible for the interval to not divide evenly into the ceiling
           # If we have room between the current number of virtual users and the
@@ -133,14 +127,14 @@ module Stella
               @adapter.vusers += @testdef.rampup.interval
             end
             padded_users = @adapter.vusers.to_s.rjust(4, '0')
-            summary_name = "SUMMARY-#{padded_users}"
+            summary_name << "-#{padded_users}"
           end
         
           # Read the run summaries for this batch and produce totals, averages, 
           # and standard deviations.
-          test_stats = process_test_stats(@test_runpaths)
+          @test_stats = process_test_stats(@test_runpaths)
           print_summary(test_stats) if (@testdef.repetitions > 1)
-          save_summary(File.join(test_path, "#{summary_name}.#{@format}"), test_stats)
+          save_summary(File.join(test_path, "#{summary_name}.#{@format}"), @test_stats)
           
           
           # Non-rampup tests only need to run through the loop once. 
@@ -152,22 +146,22 @@ module Stella
         # Notice the difference between these test stats and the ones above?
         # These stats are based on the entire rampup test, across all levels
         # of virtual users.
-        test_stats = process_test_stats(@all_runpaths)
-        save_summary(File.join(test_path, "SUMMARY-RAMPUP.#{@format}"), test_stats)
+        @rampup_test_stats = process_test_stats(@all_runpaths)
+        save_summary(File.join(test_path, "STATS.#{@format}"), @rampup_test_stats)
         print_summary(test_stats) if (@testdef.repetitions > 1)
       end
     rescue Interrupt
-      puts "HIHIHI2222"
       exit
     rescue AdapterError => ex
       Stella::LOGGER.error(ex.message)
     end
     
-    def latest_test_symlink_path
+    def test_path_symlink
       return unless @working_directory
       File.join(@working_directory, 'latest') 
     end
     
+    
     private
       
       # prepare_test
@@ -185,8 +179,10 @@ module Stella
         # Make sure the test storage directory is created along with the
         # latest symlink
         FileUtil.create_dir(test_path)
-        #File.unlink(latest_test_symlink_path) if File.exists?(latest_test_symlink_path)
-        #File.symlink(File.expand_path(test_path), latest_test_symlink_path)
+        if Stella.sysinfo.os == :unix
+          File.unlink(test_path_symlink) if File.exists?(test_path_symlink)
+          File.symlink(File.expand_path(test_path), test_path_symlink)
+        end
         
         # Write the test ID to the storage directory
         # NOTE: Disabled until we resolve the issue with JRuby on OSX (won't load openssl)
@@ -267,7 +263,9 @@ module Stella
             raise AdapterError.new(@adapter.name, @adapter.error) 
           end
           
-          stats = @adapter.stats
+          @adapter.after
+          
+          stats = @adapter.summary
       
           save_summary(@adapter.summary_path(@format), stats)
       
@@ -289,6 +287,7 @@ module Stella
       # INPUT:
       # stats:: Any object that extends Stella::Test::Base object
       def print_summary(stats)
+        return if stats.nil?
         Stella::LOGGER.info(' ' << "-"*67) unless @quiet
 
         Stella::LOGGER.info_printf("%8s: %10d@%-6d %3.0f%% %9.2f/s ", "Total", stats.transactions_total || 0, stats.vusers_avg || 0, stats.availability || 0, stats.transaction_rate_avg || 0)
@@ -320,22 +319,21 @@ module Stella
       # filepath:: the complete path for the file (string)
       # stats:: Any object that extends Stella::Test::Base object
       def save_summary(filepath, stats)
-        FileUtil.write_file(filepath, stats.dump(@format, :with_titles), true) if stats
+        return unless stats
+        stats.format = @format
+        stats.to_file(filepath)
       end
       
       # Load SUMMARY file for each run and create a summary with
       # totals, averages, and standard deviations. 
       def process_test_stats(paths)
         return unless paths && !paths.empty?
-        test_stats = Stella::Test::Summary.new(@message)
-        return unless test_stats
-        all_stats_obj = []
+        test_stats = Stella::Test::Stats.new(@message)
+        
         paths.each do |path|
-          file_contents = FileUtil.read_file_to_array("#{path}/SUMMARY.#{@format}")
-          next if !file_contents || file_contents.empty?
-          stats = Stella::Test::Run::Summary.undump(@format, file_contents)
-          stats_obj = Stella::Test::Run::Summary.from_hash(stats)
-          test_stats.add_run(stats_obj)
+          next unless File.exists?("#{path}/SUMMARY.#{@format}")
+          test_run = Stella::Test::Run::Summary.from_file("#{path}/SUMMARY.#{@format}")
+          test_stats.add_run(test_run)
         end
 
         test_stats
@@ -354,6 +352,7 @@ module Stella
       end
 
       
+      
   end
 end
 

data/lib/stella/data/domain.rb

@@ -2,9 +2,15 @@
 
 module Stella::Data
   class DomainRequest < Stella::Storable
-    attr_accessor :time, :client_ip, :server_ip, :dns_data, :domain_name, :header
+    attr_accessor :dns_data
     attr_reader :raw_data
- 
+    
+    field :time => DateTime
+    field :client_ip => String
+    field :server_ip => String
+    field :domain_name => String
+    field :header => String
+    
     def initialize(raw_data)
       @raw_data = raw_data
       @dns_data, @domain_name, @header = DomainUtil::parse_domain_request(@raw_data)
@@ -20,10 +26,6 @@ module Stella::Data
       false
     end
     
-    def field_names
-      [ :time, :client_ip, :server_ip, :domain_name, :header ]
-    end
-    
     def to_s
       "%s: %s -> %s (%s)" % [@time, @client_ip, @server_ip, @domain_name]
     end
@@ -39,8 +41,17 @@ module Stella::Data
   end
   
   class DomainResponse < Stella::Storable
-    attr_accessor :time, :client_ip, :server_ip, :dns_data, :domain_name, :header, :addresses, :cnames
+    attr_accessor :dns_data
     attr_reader :raw_data
+    
+    field :time => DateTime
+    field :client_ip => String
+    field :server_ip => String
+    field :domain_name => String
+    field :header => String
+    field :addresses => Array
+    field :cnames => Array
+ 
  
     def initialize(raw_data)
       @raw_data = raw_data
@@ -57,10 +68,6 @@ module Stella::Data
       false
     end
     
-    def field_names
-      [ :time, :client_ip, :server_ip, :dns_data, :domain_name, :header, :addresses, :cnames ]
-    end
-    
     def to_s
       "%s: %s <- %s (%s) %s" % [@time, @client_ip, @server_ip, @domain_name, (@addresses || []).join(',')]
     end

data/lib/stella/data/http.rb

@@ -17,10 +17,16 @@ module Stella::Data
   end
   
   class HTTPRequest < Stella::Storable
-    attr_accessor :time, :client_ip, :server_ip, :header, :body, :method, :http_version 
     attr_reader :raw_data
-    attr_writer :uri, :body
-    attr_accessor :response
+    
+    field :time => DateTime
+    field :client_ip 
+    field :server_ip 
+    field :header 
+    field :uri
+    field :body 
+    field :http_method
+    field :http_version
     
     def has_body?
       @body && !@body.nil & !@body.empty?
@@ -35,7 +41,7 @@ module Stella::Data
     def initialize(raw_data=nil)
       @raw_data = raw_data
       if @raw_data
-        @method, @http_version, @uri, @header, @body = HTTPUtil::parse_http_request(raw_data) 
+        @http_method, @http_version, @uri, @header, @body = HTTPUtil::parse_http_request(raw_data) 
       end
       @response = Stella::Data::HTTPResponse.new
     end
@@ -51,32 +57,37 @@ module Stella::Data
       #(!header || header[:Content_Type] || header[:Content_Type] !~ /text/) ? Base64.encode64(@body) : @body
     end
     
-    def field_names
-      [ :time, :client_ip, :server_ip, :header, :uri, :body, :method, :http_version ]
-    end
+
     
     def inspect
       headers = []
       header.each_pair do |n,v|
         headers << "#{n.to_s.gsub('_', '-')}: #{v[0]}"
       end
-      str = "%s %s HTTP/%s" % [method, uri.to_s, http_version]
+      str = "%s %s HTTP/%s" % [http_method, uri.to_s, http_version]
       str << $/ + headers.join($/)
       str << $/ + $/ + body if body
       str
     end
     
     def to_s
-      str = "%s: %s %s HTTP/%s" % [time.strftime(NICE_TIME_FORMAT), method, uri.to_s, http_version]
+      str = "%s: %s %s HTTP/%s" % [time.strftime(NICE_TIME_FORMAT), http_method, uri.to_s, http_version]
       str
     end
     
   end
   
   class HTTPResponse < Stella::Storable
-    attr_accessor :time, :client_ip, :server_ip, :header, :status, :message, :http_version
     attr_reader :raw_data
-    attr_writer :body
+    
+    field :time => DateTime
+    field :client_ip => String
+    field :server_ip => String
+    field :header => String
+    field :body => String
+    field :status => String
+    field :message => String
+    field :http_version => String
     
     def initialize(raw_data=nil)
       @raw_data = raw_data
@@ -86,7 +97,7 @@ module Stella::Data
     end
     
     def has_body?
-      @body && !@body.nil & !@body.empty?
+      @body && !@body.nil? & !@body.empty?
     end
     def has_request?
       false
@@ -101,10 +112,6 @@ module Stella::Data
       (!header || !header[:Content_Type] || header[:Content_Type] !~ /text/) ? '' : @body
     end
     
-    def field_names
-      [ :time, :client_ip, :server_ip, :header, :body, :status, :message, :http_version ]
-    end
-    
     def inspect
       headers = []
       header.each_pair do |n,v|