hansel 0.2.19 → 0.2.20

data/lib/hansel/formatting/formatting.rb

@@ -32,7 +32,7 @@ module HanselCore
             { :output_file_name => file_name,
               :template         => template,
               :description      => @description,
-              :png_file_name    => [ @server, @port, description, num_conns.to_s ].compact.join('-')
+              :png_file_name    => [ @server.gsub('.', '_'), @port, description, num_conns.to_s ].compact.join('_')
             }).format
       end
     end
@@ -51,8 +51,8 @@ module HanselCore
     def output_filename
       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
-      fname = [@server, @port, (part unless part.empty?)].compact.join('-')
+      @server, @port, @num_conns = (res = results.first) && res.server, res.port, res.num_conns
+      fname = [ @server.gsub('.', '_'), @port, (part unless part.empty?), @num_conns ].compact.join('_')
       [ File.join( [options.output_dir, fname] ), type ].join('.')
     end
   end

data/lib/hansel/formatting/octave_formatter.rb

@@ -10,7 +10,7 @@ module HanselCore
       @template     = options[:template]
       @rates        = @data.map &:rate
       @max_rate     = @rates.max
-      @png_output   = options[:png_file_name].gsub( '.', '-') # make latex happy
+      @png_output   = options[:png_file_name].gsub( '.', '_') # make latex happy
       @description  = options[:description]
     end
 

data/lib/hansel/{tasks.rake → tasks/octave.rake}

@@ -9,11 +9,11 @@ namespace :hansel do
       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',
+                              '../../../templates',
                               'multiplot.m.erb' ] )
       first = data.first
       output_dir = args.output_dir
-      output_name = args.input_file.split('/').last.gsub( '.', '-') + '.m'
+      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,
@@ -21,9 +21,10 @@ namespace :hansel do
               :template         => template,
               :description      => first.description,
               :png_file_name    => [  first.server,
+                                      first.port,
                                       first.description,
                                       first.num_conns.to_s
-                                   ].compact.join('-')
+                                   ].compact.join('_')
             }).format
       end
     end

data/lib/hansel/version.rb

@@ -1,3 +1,3 @@
 module HanselCore
-  Version = VERSION = '0.2.19' unless defined? HanselCore::VERSION
+  Version = VERSION = '0.2.20' unless defined? HanselCore::VERSION
 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_1.yml' ]
         FileUtils.rm @default_name if File.exists? @default_name
         @hansel.output
       end

data/templates/multiplot.m.erb

@@ -8,28 +8,21 @@ 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' },
-    ]
+    { :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*');
+<% pages.each do |page| %>
+    title('<%= page[:ylabel] %>')
+    plot(rate, <%= page[:yvar] %>, '-k*');
     xlabel('Demanded Request Rate');
-    ylabel('<%= plot[:ylabel] %>');
+    ylabel('<%= page[:ylabel] %>');
     grid on;
-  <% end %>
-  print('<%= "#{@png_output}-#{page_num + 1}" %>.png', '-dpng')
+    print('<%= "#{@png_output}-#{page[:yvar]}" %>.png', '-dpng')
 <% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hansel
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Paul Mylchreest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -04:00
+date: 2011-07-08 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -43,7 +43,7 @@ files:
 - lib/hansel/httperf_result.rb
 - lib/hansel/httperf_result_parser.rb
 - lib/hansel/job_queue/job_queue.rb
-- lib/hansel/tasks.rake
+- lib/hansel/tasks/octave.rake
 - lib/hansel/version.rb
 - lib/hansel.rb
 - spec/arg_parser_spec.rb