hansel 0.2.15 → 0.2.16

data/Rakefile

@@ -8,7 +8,7 @@ rescue LoadError
 end
 
 $LOAD_PATH.unshift 'lib'
-# require 'hansel/tasks'
+load 'tasks/octave.rake'
 
 RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = [ "--color" ]

data/lib/hansel/formatting/csv_formatter.rb

@@ -5,8 +5,10 @@ module HanselCore
   # Output to csv format
   #
   class CsvFormatter
-    COLUMNS = %w(server port num_conns rate replies connection_rate request_rate reply_time net_io
-                  errors status reply_rate_min reply_rate_avg reply_rate_max reply_rate_stddev)
+    COLUMNS = %w( rate replies connection_rate
+                  request_rate reply_time net_io errors status
+                  reply_rate_min reply_rate_avg reply_rate_max
+                  reply_rate_stddev server port num_conns  )
 
     def self.line text
       @csv << text
@@ -19,7 +21,7 @@ module HanselCore
 
     def self.format results
       @csv = ""
-      line CSV.generate_line(COLUMNS)
+      line '# ' + CSV.generate_line(COLUMNS)
       results.each { |data| format_line data } unless results.empty?
       @csv
     end

data/lib/hansel/formatting/formatting.rb

@@ -16,7 +16,13 @@ module HanselCore
       res = results
       opts, num_conns = options, (res.first.num_conns rescue nil)
       file_name = output_filename{ "#{num_conns.to_s}" }
-      template = opts.template || File.join( [ File.dirname(__FILE__), '../../..', opts.template_path, 'octave.m.erb' ] )
+
+      template_name = (opts.template && opts.template + '.m.erb') || 'octave.m.erb'
+      template = File.join( [ File.dirname(__FILE__),
+                              '../../..',
+                              opts.template_path,
+                              template_name ] )
+
       description = @current_job && @current_job.description
       File.open(file_name, "w+") do |file|
         file.puts OctaveFormatter.new(res,

data/lib/hansel/httperf_result.rb

@@ -15,5 +15,10 @@ module HanselCore
       @uri        = opt[:uri]
       @num_conns  = opt[:num_conns]
     end
+
+    def post_deserialize
+      puts "** I'm awake!"
+    end
+
   end
 end

data/lib/hansel/version.rb

@@ -1,3 +1,3 @@
 module HanselCore
-  Version = VERSION = '0.2.15'
+  Version = VERSION = '0.2.16'
 end

data/lib/tasks/octave.rake

@@ -0,0 +1,37 @@
+require 'ostruct'
+require 'hansel/formatting/octave_formatter.rb'
+
+namespace :hansel do
+  namespace :octave do
+    # rake hansel:octave:plot[input_file,output_dir]
+    desc "Generate octave multiplots for an input yaml file"
+    task :plot, :input_file, :output_dir do |t, args|
+      desc "Generate octave plot for a file"
+      data = YAML.load_file( args.input_file ).collect{ |o| OpenStruct.new o.ivars }
+      template = File.join( [ File.dirname(__FILE__),
+                              '../../templates',
+                              'multiplot.m.erb' ] )
+      first = data.first
+      output_dir = args.output_dir
+      output_name = args.input_file.split('/').last.gsub( '.', '-') + '.m'
+      output_file = File.join([ output_dir, output_name ])
+      File.open( output_file, 'w+' ) do |output|
+        output.puts HanselCore::OctaveFormatter.new(data,
+            { :output_file_name => output_name,
+              :template         => template,
+              :description      => first.description,
+              :png_file_name    => [  first.server,
+                                      first.description,
+                                      first.num_conns.to_s
+                                   ].compact.join('-')
+            }).format
+      end
+    end
+
+    # rake hansel:octave:run[input_dir]
+    desc "Run octave on all *.m files in the specified directory"
+    task :run, :input_dir do |t, args|
+      %x[ cd #{args.input_dir} && octave *.m ]
+    end
+  end
+end

data/templates/multiplot.m.erb

@@ -0,0 +1,35 @@
+rate              = [<%= @data.map(&:rate).join(', ') %>];
+request_rate      = [<%= @data.map(&:request_rate).join(', ') %>];
+connection_rate   = [<%= @data.map(&:connection_rate).join(', ') %>];
+reply_rate_avg    = [<%= @data.map(&:reply_rate_avg).join(', ') %>];
+reply_rate_max    = [<%= @data.map(&:reply_rate_max).join(', ') %>];
+reply_time        = [<%= @data.map(&:reply_time).join(', ') %>];
+reply_rate_stddev = [<%= @data.map(&:reply_rate_stddev).join(', ') %>];
+errors            = [<%= @data.map(&:errors).join(', ') %>];
+
+<% pages = [
+    [
+      { :ylabel => 'Request Rate',    :yvar   => 'request_rate' },
+      { :ylabel => 'Connection Rate', :yvar   => 'connection_rate' },
+      { :ylabel => 'Reply time',      :yvar   => 'reply_time' },
+    ],
+    [
+      { :ylabel => 'Avg. reply rate',   :yvar   => 'reply_rate_avg' },
+      { :ylabel => 'Max. reply rate',   :yvar   => 'reply_rate_max' },
+      { :ylabel => 'Reply rate StdDev', :yvar   => 'reply_rate_stddev' },
+      { :ylabel => 'Errors',            :yvar   => 'errors' },
+    ]
+  ]
+%>
+
+<% pages.each_with_index do |page, page_num| %>
+  <% page.each_with_index do |plot, i| %>
+    title('<%= plot[:ylabel] %>')
+    subplot (2, 2, <%= i + 1 %>)
+    plot(rate, <%= plot[:yvar] %>, '-k*');
+    xlabel('Demanded Request Rate');
+    ylabel('<%= plot[:ylabel] %>');
+    grid on;
+  <% end %>
+  print('<%= "#{@png_output}-#{page_num + 1}" %>.png', '-dpng')
+<% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hansel
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Paul Mylchreest
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 Z
+date: 2011-07-05 00:00:00 -04:00
+default_executable: 
 dependencies: []
 
 description: "    Hansel is a pure ruby driver for httperf for automated load and\n    performance testing. It will load a job queue file, in a yaml format, run\n    httperf with each job.\n"
@@ -44,12 +45,15 @@ files:
 - lib/hansel/job_queue/job_queue.rb
 - lib/hansel/version.rb
 - lib/hansel.rb
+- lib/tasks/octave.rake
 - spec/arg_parser_spec.rb
 - spec/hansel_spec.rb
 - spec/httperf_result_parser_spec.rb
 - spec/jobs.yml
 - spec/spec_helper.rb
+- templates/multiplot.m.erb
 - templates/octave.m.erb
+has_rdoc: true
 homepage: http://github.com/xlymian/hansel
 licenses: []
 
@@ -79,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby driver for httperf - automated load and performance testing.