hansel 0.1.3 → 0.1.4

data/Rakefile

@@ -10,7 +10,6 @@ begin
     gem.email       = "paul.mylchreest@mac.com"
     gem.homepage    = "http://github.com/xlymian/hansel"
     gem.authors     = ["Paul Mylchreest"]
-    gem.add_dependency("mutter", ">= 0.5.2")
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/hansel

@@ -11,13 +11,9 @@ class File
 end
 
 require File.here '/../lib/arg_parser'
-require File.here '/../lib/mutter'
 require File.here '/../lib/config'
 require File.here '/../lib/hansel'
 
-include Config
-include Mutter
-
-hansel = Hansel.new(options)
+options = Hansel::Config.new(ARGV).options
 exit if options.exit
-hansel.run
+Hansel::Hansel.new(options).run

data/hansel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hansel}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Mylchreest"]
-  s.date = %q{2010-04-20}
+  s.date = %q{2010-04-27}
   s.default_executable = %q{hansel}
   s.description = %q{Ruby driver for httperf - automated load and performance testing}
   s.email = %q{paul.mylchreest@mac.com}
@@ -27,19 +27,17 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/hansel",
      "hansel.gemspec",
-     "hansel.rb",
      "lib/arg_parser.rb",
      "lib/config.rb",
      "lib/csv_formatter.rb",
      "lib/hansel.rb",
-     "lib/mutter.rb",
      "lib/octave_formatter.rb",
      "lib/yaml_formatter.rb"
   ]
   s.homepage = %q{http://github.com/xlymian/hansel}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Ruby driver for httperf - automated load and performance testing}
 
   if s.respond_to? :specification_version then
@@ -47,12 +45,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mutter>, [">= 0.5.2"])
     else
-      s.add_dependency(%q<mutter>, [">= 0.5.2"])
     end
   else
-    s.add_dependency(%q<mutter>, [">= 0.5.2"])
   end
 end
 

data/lib/arg_parser.rb

@@ -1,101 +1,144 @@
-class ArgParser
-  # http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
-  # Return a structure describing the options.
-  def self.parse(args)
-    # The options specified on the command line will be collected in *options*.
-    # We set default values here.
-    options               = OpenStruct.new
-    options.verbose       = false
-    options.server        = 'localhost'
-    options.port          = '80'
-    options.uri           = '/'
-    options.num_conns     = 1
-    options.rate          = 1
-    options.cookie        = nil
-    options.low_rate      = 1
-    options.high_rate     = 2
-    options.rate_step     = 1
-    options.output_format = :yaml
-    options.output        = nil
-    options.output_dir    = File.join ENV['HOME'], 'hansel_output'
-    options.exit          = false
-
-    opts = OptionParser.new do |opts|
-      opts.banner = "Usage: hansel [options]"
-
-      opts.separator "Specific options:"
-
-      # Mandatory argument.
-      opts.on("-s", "--server=S",
+module Hansel
+  #
+  # Parse the command configuration file options and command line arguments.
+  # Command line arguments override those from the configuration file
+  # See http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
+  #
+  class ArgParser
+    #
+    # Setup default values for the parsed options
+    #
+    def initialize args
+      @args     = args
+      @options  = OpenStruct.new(
+        :verbose       => false,
+        :server        => 'localhost',
+        :port          => '80',
+        :uri           => '/',
+        :num_conns     => 1,
+        :rate          => 1,
+        :cookie        => nil,
+        :low_rate      => 1,
+        :high_rate     => 2,
+        :rate_step     => 1,
+        :output_format => :yaml,
+        :output        => nil,
+        :output_dir    => File.join(ENV['HOME'], 'hansel_output'),
+        :exit          => false
+      )
+    end
+
+    def server options
+      options.on("-s", "--server=S",
               "Specifies the IP hostname of the server.") do |opt|
-        options.server = opt
+        @options.server = opt
       end
+    end
 
-      opts.on("-p", "--port=N",
-              "This option specifies the port number N on which the web server is listening for HTTP requests.") do |opt|
-        options.port = opt
+    def port options
+      options.on("-p", "--port=N",
+        "This option specifies the port number N on which the web server is listening for HTTP requests.") do |opt|
+        @options.port = opt
       end
+    end
 
-      opts.on("-u", "--uri=S",
+    def uri options
+      options.on("-u", "--uri=S",
               "Specifies that URI S should be accessed on the server.") do |opt|
-        options.uri = opt
+        @options.uri = opt
       end
+    end
 
-      opts.on("-n", "--num_conns=N",
+    def connections options
+      options.on("-n", "--num_conns=N",
               "Specifies the total number of connections to create.") do |opt|
-        options.num_conns = opt.to_i
+        @options.num_conns = opt
       end
+    end
 
-      opts.on("-l", "--low_rate=S",
+    def low_rate options
+      options.on("-l", "--low_rate=S",
               "Specifies the starting fixed rate at which connections are created.") do |opt|
-        options.low_rate = opt.to_i
+        @options.low_rate = opt
       end
+    end
 
-      opts.on("-l", "--high_rate=S",
+    def high_rate options
+      options.on("-l", "--high_rate=S",
               "Specifies the ending fixed rate at which connections are created.") do |opt|
-        options.high_rate = opt.to_i
+        @options.high_rate = opt
       end
+    end
 
-      opts.on("-l", "--rate_step=S",
+    def rate_step options
+      options.on("-l", "--rate_step=S",
               "Specifies the fixed rate step at which connections are created.") do |opt|
-        options.rate_step = opt.to_i
+        @options.rate_step = opt
       end
+    end
 
-      opts.on("-c", "--cookie=C", "Specify a cookie.") do |opt|
-        options.cookie = opt
+    def cookie options
+      options.on("-c", "--cookie=C", "Specify a cookie.") do |opt|
+        @options.cookie = opt
       end
+    end
 
-      opts.on("-f", "--format=FILE [yaml|csv]", "Specify an output format.") do |opt|
-        options.output_format = opt.to_sym
+    def format options
+      options.on("-f", "--format=FILE [yaml|csv]", "Specify an output format.") do |opt|
+        @options.output_format = opt.to_sym
       end
+    end
 
-      opts.on("-o", "--output=FILE", "Specify an output file.") do |opt|
-        options.output = opt
+    def output options
+      options.on("-o", "--output=FILE", "Specify an output file.") do |opt|
+        @options.output = opt
       end
+    end
 
-      opts.on("-d", "--output_dir=PATH", "Specify an output directory.") do |opt|
-        options.output_dir = opt
+    def output_dir options
+      options.on("-d", "--output_dir=PATH", "Specify an output directory.") do |opt|
+        @options.output_dir = opt
       end
+    end
 
-      opts.separator "Common options:"
-
-      # Boolean switch.
-      opts.on("-v", "--[no-]verbose", "Run verbosely") do |opt|
-        options.verbose = opt
+    def verbose options
+      options.on("-v", "--[no-]verbose", "Run verbosely") do |opt|
+        @options.verbose = opt
       end
+    end
 
-      opts.on_tail("-h", "--help", "Show this message") do
-        puts opts
-        options.exit = true
+    def help options
+      options.on_tail("-h", "--help", "Show this message") do
+        puts options
+        @options.exit = true
       end
+    end
 
-      opts.on_tail("--version", "Show version") do
+    def version options
+      options.on_tail("--version", "Show version") do
         puts "Hansel version #{IO.foreach('VERSION').first.strip}"
-        options.exit = true
+        @options.exit = true
       end
     end
 
-    opts.parse!(args)
-    options
+    def parse_options options
+      options.banner = "Usage: hansel [options]"
+      options.separator "Options:"
+      %w(server port uri connections low_rate high_rate rate_step cookie
+        format output output_dir verbose help version).map(&:to_sym).each do |method|
+          self.send method, options
+      end
+    end
+
+    #
+    # Uses OptionParser to return an OpenStruct object describing the options.
+    #
+    def parse
+      # The options specified on the command line will be collected in *options*.
+      # We set default values here.
+      OptionParser.new { |options| parse_options options}.parse!(@args)
+      @options
+    end
+
   end
 end

data/lib/config.rb

@@ -1,27 +1,60 @@
-module Config
-  def config_path
-    config_path ||= File.join [ENV['HOME'], '.hansel']
-  end
+module Hansel
+  #
+  # Loads and parses the configuration file
+  #
+  class Config
+    def initialize(argv)
+      @argv = argv
+      @args = []
+    end
 
-  def options_path
-    options_path ||= File.join config_path, 'options'
-  end
+    #
+    # The main configuration directory: defaults to ~/.hansel
+    # Creates the configuration directory if it doesn't exist.
+    #
+    def config_path
+      @config_path ||= File.join [ENV['HOME'], '.hansel']
+      FileUtils.mkdir_p @config_path unless File.exists? @config_path
+      @config_path
+    end
 
-  def read_config_file
-    args = []
-    FileUtils.mkdir_p config_path unless File.exists? config_path
-    if File.exists? options_path
-      File.open options_path do |file|
-        file.read.split("\n").each do |line|
-          next if line =~ /#+/
-          args += line.split(' ')
-        end
+    #
+    # The options file located in the configuration directory
+    #
+    def options_path
+      @options_path ||= File.join config_path, 'options'
+    end
+
+    def read_lines file
+      file.read.split("\n").each do |line|
+        next if line =~ /#+/
+        @args += line.split(' ')
       end
     end
-    args
-  end
 
-  def options
-    @opt ||= ArgParser.parse(read_config_file + ARGV)
+    def read_file path
+      File.open path do |file|
+        read_lines file
+      end
+    end
+
+    #
+    # Reads the options file and returns an Array of String objects.
+    # Line starting with '#' are skipped.
+    #
+    def read_config_file
+      path = options_path
+      if File.exists? path
+        read_file path
+      end
+      @args
+    end
+
+    #
+    # Returns an OpenStruct object with the options
+    #
+    def options
+      @options ||= ArgParser.new(read_config_file + @argv).parse
+    end
   end
 end

data/lib/csv_formatter.rb

@@ -1,20 +1,41 @@
 require 'csv'
+module Hansel
+  #
+  # Output to csv format
+  #
+  class CsvFormatter
+    def initialize(data)
+      return if data.empty?
+      @data = data
+      @csv = ""
+      @info_keys = []
+      @data_keys = []
+      @data.keys.each do |key|
+        @info_keys << key if key.instance_of? Symbol
+        @data_keys << key if key.instance_of? Fixnum
+      end
+      @keys ||= @data[@data_keys.first].keys
+      @info = @info_keys.collect{|key| @data[key]}
+      line header
+    end
 
-class CsvFormatter
-  def initialize(data)
-    @data = data
-  end
+    def line text
+      @csv << text
+      @csv << "\n"
+    end
+
+    def header
+      @header ||= CSV.generate_line((@info_keys + @keys).map(&:to_s))
+    end
+
+    def format_line data_key
+      line CSV.generate_line(@info + @keys.collect{|key| @data[data_key][key]})
+    end
 
-  def format
-    result = ""
-    return result if @data.empty?
-    keys = @data[@data.keys.first].keys
-    result << CSV.generate_line(keys.map(&:to_s))
-    result << "\n"
-    @data.each_pair do |key, value|
-      result << CSV.generate_line(keys.collect{|k| value[k]})
-      result << "\n"
+    def format
+      return result if @data.empty?
+      @data_keys.each { |data_key| format_line data_key }
+      @csv
     end
-    result
   end
 end

data/lib/hansel.rb

@@ -1,93 +1,178 @@
 require 'fileutils'
+module Hansel
+  #
+  # Class wrapper over httperf.
+  #
+  class Hansel
+    def initialize(options = {})
+      @options = options
+      @results = {}
+      @current_rate = nil
+    end
 
-class Hansel
-  def initialize(options = {})
-    @options = options
-    @results = {}
-  end
+    def options
+      @options
+    end
 
-  def options
-    @options
-  end
+    def parse_replies line
+      @result[:replies] = $1 if line =~ /^Total: .*replies (\d+)/
+    end
 
-  def verbose?
-    options.verbose
-  end
+    def parse_connection_rate line
+      @result[:connection_rate] = $1 if line =~ /^Connection rate: (\d+\.\d)/
+    end
+
+    def parse_request_rate line
+      @result[:request_rate] = $1 if line =~ /^Request rate: (\d+\.\d)/
+    end
+
+    def parse_reply_time line
+      @result[:reply_time] = $1 if line =~ /^Reply time .* response (\d+\.\d)/
+    end
+
+    def parse_net_io line
+      @result[:net_io] = $1 if line =~ /^Net I\/O: (\d+\.\d)/
+    end
 
-  def benchmark(rate)
-    result = {:output => ""}
-    httperf_cmd = [
-      "httperf --hog",
-      "--server=#{options.server}",
-      "--port=#{options.port}",
-      "--uri=#{options.uri}",
-      "--num-conns=#{options.num_conns}",
-      "--rate=#{rate}",
-      options.cookie && "--add-header='Cookie: #{options.cookie}\\n'"
-    ].compact.join ' '
-
-    IO.popen("#{httperf_cmd} 2>&1") do |pipe|
-      puts "\n#{httperf_cmd}"
+    def parse_errors line
+      @result[:errors] = $1 if line =~ /^Errors: total (\d+)/
+    end
+
+    def parse_status line
+      @result[:status] = $1 if line =~ /^Reply status: 1xx=\d+ 2xx=\d+ 3xx=\d+ 4xx=\d+ 5xx=(\d+)/
+    end
+
+    def parse_reply_rate line
+      if line =~ /^Reply rate .*min (\d+\.\d) avg (\d+\.\d) max (\d+\.\d) stddev (\d+\.\d)/
+        @result[:reply_rate_min]     = $1
+        @result[:reply_rate_avg]     = $2
+        @result[:reply_rate_max]     = $3
+        @result[:reply_rate_stddev]  = $4
+      end
+    end
+
+    def parse_line line
+      %w(parse_replies parse_connection_rate parse_request_rate
+      parse_reply_time parse_net_io parse_errors parse_status
+      parse_reply_rate).map(&:to_sym).each do |method|
+        self.send method, line
+      end
+    end
+
+    def parse pipe
+      @result = {:output => ""}
       while line = pipe.gets
-        case line
-          when /^Total: .*replies (\d+)/ then result[:replies] = $1
-          when /^Connection rate: (\d+\.\d)/ then result[:connection_rate] = $1
-          when /^Request rate: (\d+\.\d)/ then result[:request_rate] = $1
-          when /^Reply time .* response (\d+\.\d)/ then result[:reply_time] = $1
-          when /^Net I\/O: (\d+\.\d)/ then result[:net_io] = $1
-          when /^Errors: total (\d+)/ then result[:errors] = $1
-          when /^Reply rate .*min (\d+\.\d) avg (\d+\.\d) max (\d+\.\d) stddev (\d+\.\d)/ then
-            result[:reply_rate_min] = $1
-            result[:reply_rate_avg] = $2
-            result[:reply_rate_max] = $3
-            result[:reply_rate_stddev] = $4
-          when /^Reply status: 1xx=\d+ 2xx=\d+ 3xx=\d+ 4xx=\d+ 5xx=(\d+)/ then result[:status] = $1
-        end
+        parse_line line
       end
     end
-    result
-  end
 
-  def output
-    if options.output
-      FileUtils.mkdir_p options.output_dir
-      output_file_name = [options.server, options.num_conns.to_s].join('.')
-      output_file = File.join options.output_dir, output_file_name
-      type = { :yaml => 'yml', :csv => 'csv', :octave => 'm' }[options.output_format]
-      File.open([output_file, type].join('.'), "w+") do |f|
-        formatter = case options.output_format
-          when :yaml
-            load File.here '/../lib/yaml_formatter.rb'
-            YamlFormatter.new(@results)
-          when :csv
-            load File.here '/../lib/csv_formatter.rb'
-            CsvFormatter.new(@results)
-          when :octave
-            load File.here '/../lib/octave_formatter.rb'
-            OctaveFormatter.new(@results, {:output_file_name => output_file_name})
-        end
-        f.puts formatter.format
+    def build_httperf_cmd
+      cookie = @options.cookie
+      httperf_cmd = [
+        "httperf --hog",
+        "--server=#{@options.server}",
+        "--port=#{@options.port}",
+        "--uri=#{@options.uri}",
+        "--num-conns=#{@options.num_conns}",
+        "--rate=#{@current_rate}",
+        cookie && "--add-header='Cookie: #{cookie}\\n'"
+      ].compact.join ' '
+    end
+
+    # 
+    # Runs httperf with a given request rate. Parses the output and returns
+    # a hash with the results.
+    # 
+    def httperf
+      httperf_cmd = build_httperf_cmd
+      IO.popen("#{httperf_cmd} 2>&1") do |pipe|
+        puts "\n#{httperf_cmd}"
+        parse pipe
       end
+      @results[@current_rate] = @result
     end
-  end
 
-  def run
-    puts "starting run..." if verbose?
-    (options.low_rate..options.high_rate).step(options.rate_step) do |rate|
-      puts "benchmarking at rate: #{rate}" if verbose?
-      @results[:server]     = options.server
-      @results[:port]       = options.port
-      @results[:uri]        = options.uri
-      @results[:num_conns]  = options.num_conns
-      @results[rate]        = benchmark(rate)
-    end
-    puts "ending run..." if verbose?
-    output
-    @results
-  end
+    def yaml_formatter
+      load File.here '/../lib/yaml_formatter.rb'
+      YamlFormatter.new(@results)
+    end
+
+    def csv_formatter
+      load File.here '/../lib/csv_formatter.rb'
+      CsvFormatter.new(@results)
+    end
+
+    def octave_formatter
+      load File.here '/../lib/octave_formatter.rb'
+      puts @output_file_name
+      OctaveFormatter.new(@results, {:output_file_name => @output_file_name})
+    end
+
+    def make_formatter format
+      case format
+        when :yaml
+          yaml_formatter
+        when :csv
+          csv_formatter
+        when :octave
+          octave_formatter
+      end
+    end
+
+    def formatted_output
+      @output_file_name = [@options.server, @options.num_conns.to_s].join('.')
+      output_file = File.join @options.output_dir, @output_file_name
+      output_format = @options.output_format
+      type = { :yaml => 'yml', :csv => 'csv', :octave => 'm' }[output_format]
+      File.open([output_file, type].join('.'), "w+") do |file|
+        file.puts make_formatter(output_format).format
+      end
+    end
 
-  trap("INT") {
-    puts "Terminating tests."
-    Process.exit
-  }
+    # 
+    # Output the results based on the requested output format
+    # 
+    def output
+      if @options.output
+        FileUtils.mkdir_p @options.output_dir
+        formatted_output
+      end
+    end
+
+    def status text
+      puts text if @options.verbose
+    end
+
+    def one_run
+      @results[:server]       = @options.server
+      @results[:port]         = @options.port
+      @results[:uri]          = @options.uri
+      @results[:num_conns]    = @options.num_conns
+      httperf
+    end
+
+    def run_all
+      (@options.low_rate.to_i..@options.high_rate.to_i).step(@options.rate_step.to_i) do |rate|
+        status "running httperf at rate: #{rate}"
+        @current_rate = rate
+        one_run
+      end
+    end
+
+    # 
+    # Run httperf from low_rate to high_rate, stepping by rate_step
+    # 
+    def run
+      status "starting run..."
+      run_all
+      status "ending run..."
+      output
+      @results
+    end
+
+    trap("INT") {
+      puts "Terminating."
+      Process.exit
+    }
+  end
 end

data/lib/octave_formatter.rb

@@ -1,53 +1,69 @@
-class OctaveFormatter
-  def initialize(data, options = {})
-    @data = data
-    @options = options
-    @png_output = [(options[:output_file_name] || 'stats'), 'png'].join('.')
-  end
+module Hansel
+  #
+  # Output to a Octave script.
+  #
+  class OctaveFormatter
+    def initialize(data, options = {})
+      @data = data
+      @options = options
+      @png_output = [(options[:output_file_name] || 'stats'), 'png'].join('.')
+      @rates = @data.keys.select{|key| key.instance_of? Fixnum}.map(&:to_i).sort
+      @max_rate = @rates.last
+      @results  = OpenStruct.new(
+        :request_rate      => [],
+        :connection_rate   => [],
+        :reply_rate_avg    => [],
+        :reply_rate_max    => [],
+        :reply_time        => [],
+        :reply_rate_stddev => [],
+        :errors            => []
+      )
+    end
 
-  def format
-    rate              = @data.keys.reject{|x| x.instance_of? Symbol}.map(&:to_i).sort
-    request_rate      = rate.collect{|x| @data[x][:request_rate]}
-    connection_rate   = rate.collect{|x| @data[x][:connection_rate]}
-    reply_rate_avg    = rate.collect{|x| @data[x][:reply_rate_avg]}
-    reply_rate_max    = rate.collect{|x| @data[x][:reply_rate_max]}
-    reply_time        = rate.collect{|x| @data[x][:reply_time]}
-    reply_rate_stddev = rate.collect{|x| @data[x][:reply_rate_stddev]}
-    errors            = rate.collect{|x| @data[x][:errors]}
+    def build_arrays rate, data
+      %w(request_rate connection_rate reply_rate_avg reply_rate_max
+      reply_time reply_rate_stddev errors).map(&:to_sym).each do |method|
+        (@results.send method) << data[method]
+      end
+    end
 
-    result = <<-EOS
-      rate              = [#{rate.join(',')}];
-      request_rate      = [#{request_rate.join(',')}];
-      connection_rate   = [#{connection_rate.join(',')}];
-      reply_rate_avg    = [#{reply_rate_avg.join(',')}];
-      reply_rate_max    = [#{reply_rate_max.join(',')}];
-      reply_time        = [#{reply_time.join(',')}];
-      reply_rate_stddev = [#{reply_rate_stddev.join(',')}];
-      errors            = [#{errors.join(',')}];
+    def format
+      # TODO: render an erb template instead.
+      @rates.each { |rate| build_arrays rate, @data[rate] }
+      result = <<-EOS
+        rate              = [#{@rates.join(',')}];
+        request_rate      = [#{@results.request_rate.join(',')}];
+        connection_rate   = [#{@results.connection_rate.join(',')}];
+        reply_rate_avg    = [#{@results.reply_rate_avg.join(',')}];
+        reply_rate_max    = [#{@results.reply_rate_max.join(',')}];
+        reply_time        = [#{@results.reply_time.join(',')}];
+        reply_rate_stddev = [#{@results.reply_rate_stddev.join(',')}];
+        errors            = [#{@results.errors.join(',')}];
 
-      plot(rate, request_rate, '-k*');
-      hold on;
-      plot(rate, connection_rate, '-kd');
-      hold on;
-      plot(rate, reply_rate_max, '-kp');
-      hold on;
-      plot(rate, reply_rate_max, '-k+');
-      hold on;
-      plot(rate, reply_rate_stddev, '-kh');
-      hold on;
-      plot(rate, reply_time, '-g*');
-      hold on;
-      plot(rate, errors, '-r*');
+        plot(rate, request_rate, '-k*');
+        hold on;
+        plot(rate, connection_rate, '-kd');
+        hold on;
+        plot(rate, reply_rate_max, '-kp');
+        hold on;
+        plot(rate, reply_rate_max, '-k+');
+        hold on;
+        plot(rate, reply_rate_stddev, '-kh');
+        hold on;
+        plot(rate, reply_time, '-g*');
+        hold on;
+        plot(rate, errors, '-r*');
 
-      grid on;
+        grid on;
 
-      axis([0 #{rate.last} 0 #{rate.last}]);
-      title('Hansel report for #{@data[:server]}:#{@data[:port]}#{@data[:uri]} (#{@data[:num_conns]} connections per run)')
-      xlabel('Demanded Request Rate');
-      legend('Request Rate', 'Connection Rate', 'Avg. reply rate', 'Max. reply rate', 'Reply rate StdDev', 'Reply time', 'Errors');
-      print('#{@png_output}', '-dpng')
-    EOS
-    result = result.gsub '  ', ''
-    result
+        axis([0 #{@max_rate} 0 #{@max_rate}]);
+        title('Hansel report for #{@data[:server]}:#{@data[:port]}#{@data[:uri]} (#{@data[:num_conns]} connections per run)')
+        xlabel('Demanded Request Rate');
+        legend('Request Rate', 'Connection Rate', 'Avg. reply rate', 'Max. reply rate', 'Reply rate StdDev', 'Reply time', 'Errors');
+        print('#{@png_output}', '-dpng')
+      EOS
+      result = result.gsub '  ', ''
+      result
+    end
   end
 end

data/lib/yaml_formatter.rb

@@ -1,9 +1,14 @@
-class YamlFormatter
-  def initialize(data)
-    @data = data
-  end
+module Hansel
+  #
+  # Output to yaml format
+  #
+  class YamlFormatter
+    def initialize(data)
+      @data = data
+    end
 
-  def format
-    @data.to_yaml
+    def format
+      @data.to_yaml
+    end
   end
-end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hansel
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Paul Mylchreest
@@ -9,19 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-04-27 00:00:00 -04:00
 default_executable: hansel
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mutter
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
+dependencies: []
+
 description: Ruby driver for httperf - automated load and performance testing
 email: paul.mylchreest@mac.com
 executables: 
@@ -40,12 +36,10 @@ files:
 - VERSION
 - bin/hansel
 - hansel.gemspec
-- hansel.rb
 - lib/arg_parser.rb
 - lib/config.rb
 - lib/csv_formatter.rb
 - lib/hansel.rb
-- lib/mutter.rb
 - lib/octave_formatter.rb
 - lib/yaml_formatter.rb
 has_rdoc: true
@@ -61,18 +55,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby driver for httperf - automated load and performance testing

data/lib/mutter.rb

@@ -1,16 +0,0 @@
-module Mutter
-  begin
-    require 'mutter'
-  rescue LoadError
-    STDERR.puts "mutter gem wasn't found, using default output."
-  end
-
-  def mutter
-    mutter ||= Mutter.new({
-      :underline => %w'( )', :yellow => %w'[ ]',
-      :bold      => %w'< >'
-    }).clear(:default)
-  rescue
-    nil
-  end
-end