hansel 0.2.9 → 0.2.10

data/README.markdown

@@ -12,9 +12,10 @@ Installing Httperf and Hansel
 For Linux (Ubuntu):
 
     apt-get update && apt-get -y install rubygems httperf ruby1.8-dev libcurl4-gnutls-dev
-    gem install rubygems-update
+    gem install rubygems-update -v 1.3.0
     export PATH=$PATH:/var/lib/gems/1.8/bin
     update_rubygems
+    gem update --system
     gem install hansel
 
 On MacOS X using homebrew:
@@ -43,6 +44,7 @@ Create a job queue file in ~/.hansel/jobs.yml:
         :low_rate: 10
         :high_rate: 50
         :rate_step: 10
+        :description: example
 
       - :server: www.apple.com
         :uri: /
@@ -50,6 +52,7 @@ Create a job queue file in ~/.hansel/jobs.yml:
         :low_rate: 10
         :high_rate: 50
         :rate_step: 10
+        :description: apple
 
 and run Hansel
 
@@ -59,14 +62,14 @@ By default, the output is written into the ~/hansel_output directory. When the o
 specified, it uses the default template octave.m.erb in the project templates. Here is a sample
 output from the previous job:
 
-    rate              = [5, 10, 15, 20];
-    request_rate      = [5.1, 9.3, 12.9, 15.8];
-    connection_rate   = [5.1, 9.3, 12.9, 15.8];
-    reply_rate_avg    = [0.0, 0.0, 0.0, 0.0];
-    reply_rate_max    = [0.0, 0.0, 0.0, 0.0];
-    reply_time        = [88.4, 93.4, 89.2, 89.1];
-    reply_rate_stddev = [0.0, 0.0, 0.0, 0.0];
-    errors            = [0, 0, 0, 0];
+    rate              = [10, 20, 30, 40, 50];
+    request_rate      = [8.8, 17.6, 18.9, 24.6, 19.3];
+    connection_rate   = [8.8, 17.6, 18.9, 24.6, 19.3];
+    reply_rate_avg    = [0.0, 0.0, 0.0, 0.0, 0.0];
+    reply_rate_max    = [0.0, 0.0, 0.0, 0.0, 0.0];
+    reply_time        = [62.7, 56.0, 55.8, 45.3, 118.0];
+    reply_rate_stddev = [0.0, 0.0, 0.0, 0.0, 0.0];
+    errors            = [0, 0, 0, 0, 0];
 
     plot(rate, request_rate, '-k*');
     hold on;
@@ -84,11 +87,11 @@ output from the previous job:
 
     grid on;
 
-    axis([0 20 0 20]);
-    title('Hansel report for www.example.com:80/ (10 connections per run)')
+    axis([0 50 0 50]);
+    title('Hansel report for www.apple.com:80/  (10 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('/Users/paulm/hansel_output/hansel-10.m.png', '-dpng')
+    print('www.apple.com-80-osx-10.png', '-dpng')
 
 Run octave on it will produce graph as a png file.
 

data/lib/hansel/formatting/formatting.rb

@@ -15,13 +15,20 @@ module HanselCore
     def octave_formatter
       res = results
       opts, num_conns = options, (res.first.num_conns rescue nil)
-      file_name = output_filename{ "-#{num_conns.to_s}" }
+      file_name = output_filename{ "#{num_conns.to_s}" }
       template = opts.template || File.join( [ File.dirname(__FILE__), '../../..', opts.template_path, 'octave.m.erb' ] )
+      description = @current_job && @current_job.description
       File.open(file_name, "w+") do |file|
         file.puts OctaveFormatter.new(res,
             { :output_file_name => file_name,
               :template         => template,
-              :png_file_name    => "#{@server}:#{@port}-#{num_conns.to_s}.png"
+              :description      => @description,
+              :png_file_name    => [[ @server, @port,
+                                      description,
+                                      num_conns.to_s
+                                    ].compact.join('-'), 
+                                    'png'
+                                   ].join('.')
             }).format
       end
     end
@@ -38,10 +45,11 @@ module HanselCore
     end
 
     def output_filename
-      opts, part = options, (block_given? ? yield : '')
-      type    = { :yaml => 'yml', :csv => 'csv', :octave => 'm' }[opts.format.to_sym]
+      part = [ @current_job && @current_job.description, ( yield if block_given? ) ].compact
+      type    = { :yaml => 'yml', :csv => 'csv', :octave => 'm' }[options.format.to_sym]
       @server, @port = (res = results.first) && res.server, res.port
-      [File.join([opts.output_dir, ("#{@server}:#{@port}" + part)]), type].join('.')
+      fname = [@server, @port, (part unless part.empty?)].compact.join('-')
+      [ File.join( [options.output_dir, fname] ), type ].join('.')
     end
   end
 end

data/lib/hansel/formatting/octave_formatter.rb

@@ -6,11 +6,12 @@ module HanselCore
   #
   class OctaveFormatter
     def initialize(data, options = {})
-      @data       = data
-      @template   = options[:template]
-      @rates      = @data.map &:rate
-      @max_rate   = @rates.max
-      @png_output = options[:png_file_name]
+      @data         = data
+      @template     = options[:template]
+      @rates        = @data.map &:rate
+      @max_rate     = @rates.max
+      @png_output   = options[:png_file_name]
+      @description  = options[:description]
     end
 
     # For each value of rate, collate the values in each variable in @vars

data/lib/hansel/version.rb

@@ -1,3 +1,3 @@
 module HanselCore
-  Version = VERSION = '0.2.9'
+  Version = VERSION = '0.2.10'
 end

data/spec/hansel_spec.rb

@@ -82,7 +82,7 @@ describe HanselCore, "in general" do
 
     describe "calling output" do
       before :each do
-        @default_name = File.join [ @hansel.options.output_dir, 'localhost:80.yml' ]
+        @default_name = File.join [ @hansel.options.output_dir, 'localhost-80.yml' ]
         FileUtils.rm @default_name if File.exists? @default_name
         @hansel.output
       end
@@ -93,7 +93,7 @@ describe HanselCore, "in general" do
 
       describe "should put the output into a file in the specified format" do
         it "should be in a file with the default file name" do
-          @default_name.should == @hansel.output_filename
+          @hansel.output_filename.should == @default_name
           File.exists?( @default_name ).should be_true
         end
       end

data/templates/octave.m.erb

@@ -24,7 +24,7 @@ plot(rate, errors, '-r*');
 grid on;
 
 axis([0 <%= @max_rate %> 0 <%= @max_rate %>]);
-title('Hansel report for <%= "#{@data.first.server}:#{@data.first.port}#{@data.first.uri} (#{@data.first.num_conns}" %> connections per run)')
+title('Hansel report for <%= "#{@data.first.server}:#{@data.first.port}#{@data.first.uri} #{@description} (#{@data.first.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')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hansel
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Paul Mylchreest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -04:00
+date: 2011-06-14 00:00:00 -04:00
 default_executable: 
 dependencies: []