bombard 0.0.4 → 0.0.5

data/lib/bombard/publisher/jenkins_plot.rb

@@ -7,7 +7,7 @@ module Bombard
         site, asset = @options.split(',')
         prefix      = site + '_' + asset + '_'
 
-        %w[response longest shortest failed].each do |p|
+        %w[response longest shortest failed transaction_rate concurrency data_transferred].each do |p|
           prop = 'YVALUE=' + @results.send(p).to_s
           file = File.new(prefix + p + '.properties', 'w')
           file.puts prop

data/lib/bombard/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Bombard
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/siege/results.rb

@@ -23,26 +23,26 @@ class Siege
                 :response_time, :transaction_rate, :throughput, :concurrency,
                 :failed_requests, :longest_request, :shortest_request
 
-    alias_method :failed, :failed_requests
+    alias_method :failed,   :failed_requests
     alias_method :shortest, :shortest_request
-    alias_method :longest, :longest_request
+    alias_method :longest,  :longest_request
     alias_method :response, :response_time
 
     def initialize(results)
-      @transactions         = Integer TRANSACTIONS.match(results)[1]
-      @availability         = Float AVAILABILITY.match(results)[1]
-      @elapsed_time         = Float ELAPSED_TIME.match(results)[1]
-      @data_transferred     = Float DATA_TRANSFERRED.match(results)[1]
-      @response_time        = Float RESPONSE_TIME.match(results)[1]
-      @transaction_rate     = Float TRANSACTION_RATE.match(results)[1]
-      @throughput           = Float THROUGHPUT.match(results)[1]
-      @concurrency          = Float CONCURRENCY.match(results)[1]
-      @failed_requests      = Integer FAILED_REQUESTS.match(results)[1]
-      @longest_request      = Float LONGEST_REQUEST.match(results)[1]
-      @shortest_request     = Float SHORTEST_REQUEST.match(results)[1]
+      @transactions         = Integer parse(:transactions)
+      @availability         = Float   parse(:availability)
+      @elapsed_time         = Float   parse(:elapsed_time)
+      @data_transferred     = Float   parse(:data_transferred)
+      @response_time        = Float   parse(:response_time)
+      @transaction_rate     = Float   parse(:transaction_rate)
+      @throughput           = Float   parse(:throughput)
+      @concurrency          = Float   parse(:concurrency)
+      @failed_requests      = Integer parse(:failed_requests)
+      @longest_request      = Float   parse(:longest_request)
+      @shortest_request     = Float   parse(:shortest_request)
       @results              = results
     rescue ArgumentError => e
-      (e.message.include?('invalid value')) ? abort("A Siege error cccurred:\n#{results}") : raise(e)
+      (e.message.include?('invalid value')) ? dump_results : raise(e)
     end
 
     def[](key)
@@ -68,5 +68,14 @@ class Siege
         shortest_request:     @shortest_request
       }
     end
+
+    def parse(const)
+      dump_results unless match = const_get(const).match(results)
+      match[1]
+    end
+
+    def dump_results
+      abort "A Siege error occurred:\n#@results"
+    end
   end
 end

data/lib/siege.rb

@@ -31,13 +31,23 @@ class Siege
 
   def executor
     puts "Sieging with:\n\tsiege #{cli_opts} -f#{@url_file.name} 2>&1"
-    `siege #{cli_opts} -f#{@url_file.name} 2>&1`
+    `siege #{cli_opts}`
+  end
+
+  def url_opt
+    ' -f' + @url_file.name
+  end
+
+  def stdout_to_stdin
+    ' 2>&1'
   end
 
   def cli_opts
     @conf.flat_map { |opt, val| OPTIONS[opt] + val.to_s }.
         join(' ').
         gsub(/(\-\w) true/, '\1').
-        gsub(/\-\w false/, '')
+        gsub(/\-\w false/, '') +
+        url_opt +
+        stdout_to_stdin
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bombard
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,12 +170,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1593328606361558836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1593328606361558836
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -183,4 +189,3 @@ signing_key:
 specification_version: 3
 summary: Bombard is a(nother) Siege wrapper for Ruby thats extensible.
 test_files: []
-has_rdoc: