winr 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92cf6d6550696708f56fbdaf257a4dc03c45f492d29da6e48c6402475e5b6071
-  data.tar.gz: a5453c06028778540c0c46d1822917a634dd295f2689cc96eed153ed436c7e7e
+  metadata.gz: 38f86d556218355c4e595fb33774565d9ccda930368801e5a22f132836e0fb18
+  data.tar.gz: 502c9dbceec99afd1194380bb27421fcfa240fe74d09f1c6e159ef53720c28b9
 SHA512:
-  metadata.gz: d2b10ae402f1d2852fb383d8ac37edaa62bd745934f69b7365cf4ffd11030fe1e7ec33e663a8b375ea35dc81ee7f89d5c31332735117ee24e23c307ee6f6ef9c
-  data.tar.gz: ef2bddad89692a60e7f0eb3f06d7644c029918bd2bfbe10916ae4fe307b58fd32470ee6c203cfa3bc655c09d506878149da969739bdc655e78cbcfdf831cba58
+  metadata.gz: 7f452bc2804419bb14b818613351cd963663bf8f191138e481662f5ca8850d8045d46985a8b412753aae7179bc9fc1c91f57ed414af59e97561db6eec00e1deb
+  data.tar.gz: 1cf7d74de6ecebef12d73c6e257db1e4fc76d3a4d5c1b115b22f5bda22d549dd9144f2a81816fcc6e045fb0843d6234496118ca3885a9a84f94a24efac1b0057

data/README.md

@@ -143,7 +143,7 @@ Available statistics:
 
   ips      iterations per second
   loops    number of iterations
-  spi      seconds for iteration
+  spi      seconds per iteration
   time     time to run all iterations
 ```
 

data/bin/winr

@@ -39,7 +39,7 @@ OptionParser.new.instance_eval do
 
         ips      iterations per second
         loops    number of iterations
-        spi      seconds for iteration
+        spi      seconds per iteration
         time     time to run all iterations
   end
 
@@ -160,8 +160,7 @@ def template
 
     trap("INT") { exit }
 
-    # def __winr_timer; Process.clock_gettime(Process::CLOCK_MONOTONIC); end
-    def __winr_timer; Time.now.to_f; end
+    def __winr_timer; Process.clock_gettime(Process::CLOCK_MONOTONIC); end
 
     <%= e.begin %>
     <%= c.begin %>
@@ -236,7 +235,7 @@ cs = $config.contexts     || [{}]
 ts = $config.tasks        || [{}]
 
 # adjust script fields, if needed
-[es, cs].each do |item|
+[*es, *cs].each do |item|
   if item.script
     if item.begin || item.end
       abort "scripts for environments and contexts should go into begin or end"
@@ -259,21 +258,19 @@ puts "```", [$0, *ARGV].shelljoin, "" unless hush
 
 # loop over environment(s)
 es.each_with_index do |e, ei|
-  puts IO.popen(["ruby", "-v"].join(" "), &:read) unless hush
-  puts rt
 
-  # TODO: read this from e.command
+  # TODO: get command from environment
   command = ["/usr/bin/env ruby"]
-
-  # loop over context(s) and task(s)
-  ys, xs = swap ? [ts, cs] : [cs, ts]
+  puts IO.popen(["ruby", "-v"].join(" "), &:read) unless hush
 
   # row: content, header
+  ys, xs = swap ? [ts, cs] : [cs, ts]
   rc = "Task" # or "Context"
   rh = "│ %-*.*s │" % [wide, wide, e.name(es.size > 1 ? "Env ##{ei + 1}" : rc)]
   rh = xs.inject(rh) {|s, x| s << " %-*.*s │" % [full, full, x.name("Results").center(full)] }
-  puts rh, rm
+  puts rt, rh, rm
 
+  # loop over context(s) and task(s)
   ys.each_with_index do |y, yi|
     print "│ %-*.*s │" % [wide, wide, y.name("Results")]
     xs.each_with_index do |x, xi|
@@ -281,6 +278,7 @@ es.each_with_index do |e, ei|
       delay = Tempfile.open(['winr-', '.rb']) do |file|
         t.loops = runs if runs
         code = tmpl.result(binding).rstrip + "\n"
+        puts "", "", code, "=" * 78, "" if hack
         write(file, code) do |path|
           runs, time = execute(command, path)
           t.loops ||= runs
@@ -288,7 +286,6 @@ es.each_with_index do |e, ei|
           rank << [runs/time, ei, ci, ti]
           print vals.zip(cols).map {|pair| " %s │" % scale(*pair) }.join
         end
-        puts "", code, "=" * 78 if hack
       end
     end
     print "\n"

data/winr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "winr"
-  s.version     = "1.0.2"
+  s.version     = "1.0.4"
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winr
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Steve Shreeve