hansel 0.2.7 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/hansel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hansel}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Mylchreest"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-06-19}
   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/hansel/formatting/formatting.rb

@@ -18,7 +18,11 @@ module HanselCore
       file_name = output_filename{ "-#{num_conns.to_s}" }
       template = opts.template || File.join( [ File.dirname(__FILE__), '../../..', opts.template_path, 'octave.m.erb' ] )
       File.open(file_name, "w+") do |file|
-        file.puts OctaveFormatter.new(res, { :output_file_name => file_name, :template => template }).format
+        file.puts OctaveFormatter.new(res,
+            { :output_file_name => file_name,
+              :template         => template,
+              :png_file_name    => "#{@server}:#{@port}-#{num_conns.to_s}.png"
+            }).format
       end
     end
 
@@ -36,8 +40,8 @@ module HanselCore
     def output_filename
       opts, part = options, (block_given? ? yield : '')
       type    = { :yaml => 'yml', :csv => 'csv', :octave => 'm' }[opts.format.to_sym]
-      server, port = (res = results.first) && res.server, res.port
-      [File.join([opts.output_dir, ("#{server}:#{port}" + part)]), type].join('.')
+      @server, @port = (res = results.first) && res.server, res.port
+      [File.join([opts.output_dir, ("#{@server}:#{@port}" + part)]), type].join('.')
     end
   end
 end

data/lib/hansel/formatting/octave_formatter.rb

@@ -8,15 +8,15 @@ module HanselCore
     def initialize(data, options = {})
       @data       = data
       @template   = options[:template]
-      @rates      = @data.map(&:rate)
+      @rates      = @data.map &:rate
       @max_rate   = @rates.max
-      @png_output = [(options[:output_file_name] || 'stats'), 'png'].join('.')
+      @png_output = options[:png_file_name]
     end
 
     # For each value of rate, collate the values in each variable in @vars
     # and format using the erb template
     def format
-      ERB.new(File.read(@template)).result(binding)
+      ERB.new(File.read(@template)).result binding
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Paul Mylchreest
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -04:00
+date: 2010-06-19 00:00:00 -04:00
 default_executable: hansel
 dependencies: 
 - !ruby/object:Gem::Dependency