herokubench 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2I3MWIyOTY5ZjYwMTNiYTk0MjJmOTBhNGFmM2ZiYTRiMWRhZjcxZg==
+    Y2M1MzM3ZTcwZTE3NDViYmJhNmYwYmI0ZmViNGU4OWYyY2Y3NjA0Yg==
   data.tar.gz: !binary |-
-    OWNiY2M4NWU2MmRlZDMzM2VjYWY3ZjE4NDE3MjgxNzhiMDk2ODhlNg==
+    NDVjOGUzNDdlNGFkZjIxOTc1ZDMwMzQ0NzEwN2Q4MjIyZjNiN2JmMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzRiNTIwNTdhYjM3YWFhYmY4MjA0M2Y3MWFmNzkxYzkyODlkN2FkN2M3M2Y4
-    ZTIyZTY5YTBjZTNlY2Y1NWVhZDBhMDllY2M1MGI2MWRjMGY1MmMyMjk4YzBh
-    NjliZjU0NmVhNDg1NDhkODNiZDcyZmU5Njk0NzA2ZDFkOWNkNDA=
+    ZmQ0NTk5Y2U4YmY4YjRjZGEzYTYwMTFhMjFmOTZhZmMzNDBlNWZkYTM2MWU2
+    ZmYyYTRiZDk0NTljNGM4ZTMzOTU3YTJmNjdmYTc2MWVkNTJlNGU3YzBjZmM4
+    YzQ2NGQ5ZTUwYjYwMDFhMDhhMTk1ZWU3NTMxY2E2ZGFkOGExODY=
   data.tar.gz: !binary |-
-    NTJmNDc4NDU2Y2YxMjJiNGExMTAwNWRiNmIxYjExMjI1YWViM2UzZDM4NTk0
-    ZWI1ZjIzMGU2NzkxNGM2NTAyOWFmZTUxNmQ5ZjYzNmNlN2M5OTg3ZjIyOTQ5
-    NjhkYzhlZTVkMTZlYTY3Mzc5YzI0NjYxYzM5ODI1YWMxNWYzNzc=
+    NzVjOTE1NmYzZWE5NDJhZGFjNTJlMDI1ZWQ1MTlkODUzNGZlMzc5MzZhNWU4
+    NGYwNTYwNGQ4NjIxM2E4NjJjYjJhNGI3ZmUwZmM0MjNmYzE0MDNlYmRjYTkz
+    NjI5YzkxOTBmNDFkNGY5Y2RkMzFjNWEyM2VhMmI5NmFiYmM4MTY=

data/bin/{hb → hbench}

@@ -6,5 +6,4 @@ require "tmpdir"
 require "uri"
 require "herokubench/cli"
 
-
 HerokuBench::CLI.start

data/lib/herokubench/cli.rb

@@ -28,8 +28,12 @@ class HerokuBench::CLI < Thor
     :generic_result=> /^([\w\s]+):\s*([\d|\.]+)/,
     :response_time_cdf=>/(\d+%)\s+(\d+)/
   }
-  @@summable_fields = ["Complete requests","Failed requests", "Write errors"]
-  @@medianable_fields = ["Connect", "Processing", "Waiting", "Total"]
+  @@summable_fields = ["Complete requests","Failed requests", "Write errors", "Requests per second",
+                      "Total Transferred", "HTML transferred", "Concurrency Level"
+                      ]
+  @@medianable_fields = ["Connect", "Processing", "Waiting", "Total", "Time per request",
+                        ]
+  @@maxable_fields    = ["50%", "66%", "75%", "80%", "90%", "95%", "98%", "99%","100%"]
 
   class_options["verbose"] = false if class_options["verbose"].nil?
   Heroku.user_agent = "heroku-gem/#{Heroku::VERSION} (#{RUBY_PLATFORM}) ruby/#{RUBY_VERSION}"
@@ -95,31 +99,29 @@ class HerokuBench::CLI < Thor
 
     ab_command = "ab #{args.join(' ')}"
 
-    p_bar = ProgressBar.new('Setup', dynos)
+    p_bar = ProgressBar.create(:title=>'Benching',:total=>dynos, :smoothing => 0.6)
 
     until n == dynos do
-      p_bar.inc
       outputs.push Tempfile.new("hbench_out_#{n}")
       pid = spawn( "ruby #{bencher_path} \"#{ab_command} \" --app #{config[:app]}", :out=>outputs[n].path)
       pid_map[pid] = n
       n += 1
     end
 
-    p_bar.finish
-    p_bar = ProgressBar.new('Benching', dynos)
 
     until n == 0 do
       output =  outputs[pid_map[Process.wait]]
-      last_output = output.read if n ==1
-      p_bar.inc
+      if n ==1
+        last_output = output.read if n ==1
+        output.rewind
+      end
+      p_bar.increment
       results.push get_result_hash output
       output.unlink
       n -= 1
     end
 
-    p_bar.finish
-
-    if results.last.length ==3
+    if results.last.length == 3
       summarize results
     else
       error last_output
@@ -147,13 +149,14 @@ class HerokuBench::CLI < Thor
       result.each do |type, hash|
         summary[type] = {} if summary[type].nil?
         hash.each do |k,v|
-          puts k if v.nil?
           summary[type][k] = [0.0] * v.length if summary[type][k].nil?
           v.each_index do |i|
             if not @@summable_fields.index(k).nil?
               summary[type][k][i] += v[i]
             elsif not @@medianable_fields.index(k).nil?
               summary[type][k][i] += v[i] / results.length.to_f
+            elsif not @@maxable_fields.index(k).nil?
+              summary[type][k][i] = [v[i], summary[type][k][i]].max
             else
               summary[type][k][i] = v[i]
             end
@@ -162,18 +165,18 @@ class HerokuBench::CLI < Thor
       end
     end
 
-    say "\tCumulative results"
+    say "\tCumulative results, summed across dynos"
     say ""
     summary[:generic_result].each{|k,v| say format(k+":",v, 25)}
 
     say ""
-    say "\t Connection Times (ms)"
+    say "\t Connection Times (ms), median across dynos"
     say format("",["min", "mean", "[+/-sd]" ,"median","max"],15)
     summary[:connection_times].each{|k,v| say format(k+":",v, 15)}
 
     say ""
     say "\t Percentage of the requests served within a certain time (ms)"
-    say "\t averaged across dynos"
+    say "\t across dynos"
     summary[:response_time_cdf].each{|k,v| say format(k+"",v, 15)}
   end
 

data/lib/herokubench/version.rb

@@ -1,5 +1,5 @@
 module HerokuBench
 
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herokubench
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Cory Dolphin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
@@ -65,11 +65,11 @@ description: ! "      Make it rain on the cloud.\n\n      herokubench, or hb for
   ab.\n\n      Confused? Checkout `hb help`\n"
 email: wcdolphin@gmail.com
 executables:
-- hb
+- hbench
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/hb
+- bin/hbench
 - lib/herokubench/bencher.rb
 - lib/herokubench/cli.rb
 - lib/herokubench/version.rb