hansel 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/hansel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hansel}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Mylchreest"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-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}

data/lib/arg_parser.rb

@@ -17,6 +17,7 @@ class ArgParser
     options.rate_step     = 1
     options.output_format = :yaml
     options.output        = nil
+    options.output_dir    = File.join ENV['HOME'], 'hansel_output'
 
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: hansel [options]"
@@ -72,6 +73,10 @@ class ArgParser
         options.output = opt
       end
 
+      opts.on("-d", "--output_dir=PATH", "Specify an output directory.") do |opt|
+        options.output_dir = opt
+      end
+
       opts.separator ""
       opts.separator "Common options:"
 

data/lib/hansel.rb

@@ -1,23 +1,29 @@
+require 'fileutils'
+
 class Hansel
   def initialize(options = {})
     @options = options
     @results = {}
   end
 
+  def options
+    @options
+  end
+
   def verbose?
-    @options.verbose
+    options.verbose
   end
 
   def benchmark(rate)
     result = {:output => ""}
     httperf_cmd = [
       "httperf --hog",
-      "--server=#{@options.server}",
-      "--port=#{@options.port}",
-      "--uri=#{@options.uri}",
-      "--num-conns=#{@options.num_conns}",
+      "--server=#{options.server}",
+      "--port=#{options.port}",
+      "--uri=#{options.uri}",
+      "--num-conns=#{options.num_conns}",
       "--rate=#{rate}",
-      @options.cookie && "--add-header='Cookie: #{@options.cookie}\\n'"
+      options.cookie && "--add-header='Cookie: #{options.cookie}\\n'"
     ].compact.join ' '
 
     IO.popen("#{httperf_cmd} 2>&1") do |pipe|
@@ -43,9 +49,12 @@ class Hansel
   end
 
   def output
-    if @options.output
-      File.open(@options.output, "w+") do |f|
-        formatter = case @options.output_format
+    if options.output
+      FileUtils.mkdir_p options.output_dir
+      output_file = File.join options.output_dir, [options.server, options.num_conns.to_s].join('.')
+      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)
@@ -54,7 +63,7 @@ class Hansel
             CsvFormatter.new(@results)
           when :octave
             load File.here '/../lib/octave_formatter.rb'
-            OctaveFormatter.new(@results)
+            OctaveFormatter.new(@results, {:output_file => output_file})
         end
         f.puts formatter.format
       end
@@ -63,12 +72,12 @@ class Hansel
 
   def run
     puts "starting run..." if verbose?
-    (@options.low_rate..@options.high_rate).step(@options.rate_step) do |rate|
+    (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[: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?

data/lib/octave_formatter.rb

@@ -1,6 +1,8 @@
 class OctaveFormatter
-  def initialize(data)
+  def initialize(data, options = {})
     @data = data
+    @options = options
+    @png_output = [(options[:output_file] || 'stats'), 'png'].join('.')
   end
 
   def format
@@ -39,7 +41,7 @@ class OctaveFormatter
       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', 'Errors');
-      print('stats.png', '-dpng')
+      print('#{@png_output}', '-dpng')
     EOS
     result = result.gsub '  ', ''
     result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hansel
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Paul Mylchreest
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -05:00
+date: 2010-02-27 00:00:00 -05:00
 default_executable: hansel
 dependencies: 
 - !ruby/object:Gem::Dependency