winr 1.0.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9edbfd97d6566e4b2a73a54020d1a4ccccdcbb1dbc65f771d8c58b527868ec5e
-  data.tar.gz: 1e5b06ca102234793875f50e37f9424ac1a977b91922e4662fb1552d90f14bb2
+  metadata.gz: 1f466d21a414cdea4c453ef9b013370b1ef383dfc9cef095ce3b9d56b3c51c87
+  data.tar.gz: c11050797b81cea16ae8520dd42e5c62480e633f492b9d60034d20c3759a124b
 SHA512:
-  metadata.gz: 890807ab0362d1e7db37baa79dea67a0a502c1cdb5debf66bef70d7d8688818068603500dc23e9308f0cc931a1ccf77b7db17fce10a6893d1cd5a518596acde9
-  data.tar.gz: d15d49fb4f467fd70345411d6a146acf55248a5698f396d05eba780f3ddf620d77a002e9690db9e4447e87c642570628ba79d4a93cc495f3283b3011ecf0e3d3
+  metadata.gz: 4c1796a055f9070506c0b35dac80f27e547dbc490d7a5609660feb19496488bf959ff41f6f18b214aea512e775245773dadff53a5bcf95306dd49dcf810935fb
+  data.tar.gz: 02ccbab2deaa98fcefa060a04bd7304d5a8027c96f9a94e0e2897dde26c6a20d6f7159878f2abed813031a8ad49dad5323cc4770992cab72b606154a028a0dd6

data/bin/winr

@@ -4,7 +4,7 @@
 # winr - A quick and lightweight benchmarking tool for Ruby
 #
 # Author: Steve Shreeve (steve.shreeve@gmail.com)
-#   Date: Feb 14, 2023
+#   Date: June 28, 2023
 # ============================================================================
 # GOALS:
 # 1. Provide a simple way to benchmark code
@@ -20,9 +20,11 @@ trap("INT") { abort "\n" }
 require "erb"
 require "optparse"
 require "shellwords"
+require "yaml"
 require "tempfile"
 
 OptionParser.new.instance_eval do
+  @version = "1.2.0"
   @banner  = "usage: #{program_name} [options] <dir ...>"
 
   on "-c"               , "--[no-]color", "Enable color output (default is true)", TrueClass
@@ -43,6 +45,8 @@ OptionParser.new.instance_eval do
         time     time to run all iterations
   end
 
+  Kernel.abort to_s if ARGV.empty?
+
   self
 end.parse!(into: opts={}) rescue abort($!.message)
 
@@ -60,13 +64,10 @@ show.empty? and abort "invalid list of statistics #{opts[:stats].inspect}"
 
 # ==[ Define some constants, ansi codes, and make hashes more flexible ]==
 
-# used by the scale() method below
-Infinity = 1.0 / 0
-Overflow = "\n\nERROR: numeric overflow"
 
 module Ansi
   refine String do
-    $ansi = <<~"".scan(/(\d+)(?:\/(\d+))?=(\w+)/).inject({}) do |ansi, (code, undo, name)|
+    $ansi ||= <<~"".scan(/(\d+)(?:\/(\d+))?=(\w+)/).inject({}) do |ansi, (code, undo, name)|
       0=reset 1/22=bold 2/22=dim 3/23=italic 4/24=under 5/25=blink 7/27=inverse 9/29=strike
       30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white 39=default
       40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white 49=default
@@ -175,10 +176,30 @@ end
 
 # ==[ Helpers ]==
 
+# ┌───┬───┐ ╔═══╦═══╗ ╓───╥───╖ ╒═══╤═══╕ ╭────╮
+# │   │   │ ║   ║   ║ ║   ║   ║ │   │   │ │test│
+# ├───┼───┤ ╠═══╬═══╣ ╟───╫───╢ ╞═══╪═══╡ ╰────╯
+# │   │   │ ║   ║   ║ ║   ║   ║ │   │   │
+# └───┴───┘ ╚═══╩═══╝ ╙───╨───╜ ╘═══╧═══╛
+
+# Returns box top, middle, and bottom rows, as follows:
+#
+# main = width of main column
+# cols = array of data column widths
+# runs = count of data column repeats
+#
+# For example: puts boxlines(10, [3,4,5], 2)
+#
+# ╭────────────┬────────────────────┬────────────────────╮ <= top     # returned here
+# │ 1234567890 │ Instance 1         │ Instance 2         │ <= HEADER  # generated in your code
+# ├────────────┼─────┬──────┬───────┼─────┬──────┬───────┤ <= middle  # returned here
+# │ 1234567890 │ 123 │ 1234 │ 12345 │ 123 │ 1234 │ 12345 │ <= CONTENT # generated in your code
+# ╰────────────┴─────┴──────┴───────┴─────┴──────┴───────╯ <= bottom  # returned here
+
 def boxlines(main, cols, runs=1)
-  [ "┌┬──┐",
+  [ "╭┬──╮",
     "├┼┬─┤",
-    "└┴┴─┘" ]
+    "╰┴┴─╯" ]
   .map do |str|
     list = [main, *(cols * runs)]
     list.map.with_index do |col, i|
@@ -194,14 +215,14 @@ def execute(command, path)
   eval(File.read(path))
 end
 
-def scale(show, unit)
+def scale(show, unit, base=1000)
+  base = base.to_f
   slot = 3
   span = ["G", "M", "K", " ", "m", "µ", "n"]
-  [0, Infinity].include?(show) and abort Overflow
-  show *= 1000.0 and slot += 1 while show > 0 && show < 1.0
-  show /= 1000.0 and slot -= 1 while show >= 1000.0
-  slot.between?(0, 6) or abort Overflow
-  "%6.2f %s%s" % [show, span[slot], unit]
+  show.zero? and return "(overflow)"
+  show *= base and slot += 1 while show > 0 && show < 1.0
+  show /= base and slot -= 1 while show >= base
+  slot.between?(0, 6) ? "%6.2f %s%s" % [show, span[slot], unit] : "(overflow)"
 end
 
 def stats(list, scope=nil)
@@ -225,15 +246,24 @@ end
 
 # ==[ Workflow ]==
 
-# read the winr script
-winr = ARGV.first or abort "missing winr script"
+# compile the template
 tmpl = ERB.new(template)
 
-# grok the config
-$config = eval(File.read(winr))
-es = $config.environments || [{}]
-cs = $config.contexts     || [{}]
-ts = $config.tasks        || [{}]
+# read the winr script
+winr = ARGV.first or abort "missing script"
+case File.extname(winr)
+when ".yaml"
+  $config = YAML.load(File.read(winr))
+  es = [ {} ]
+  cs = [ begin: $config["begin"] ]
+  ts = $config["tasks"].map {|k,v| { name: k, script: v } }
+when ".rb"
+  $config = eval(File.read(winr))
+  es = $config.environments || [{}]
+  cs = $config.contexts     || [{}]
+  ts = $config.tasks        || [{}]
+else abort "unknown script format '#{winr}'"
+end rescue abort "unable to read script '#{winr}'"
 
 # adjust script fields, if needed
 [*es, *cs].each do |item|
@@ -294,7 +324,9 @@ es.each_with_index do |e, ei|
   puts rb, ""
 end
 
-# show the comparison
+# ==[ Performance comparison ]==
+
+# header
 rank.sort! {|a, b| b[0] <=> a[0] }
 fast = rank.first[0]
 slow = rank.last[0]
@@ -308,6 +340,7 @@ rh = "│ %-*.*s │" % [wide, wide, "Rank"]
 rh << " %-*.*s │" % [full, full, "Performance".center(full)]
 puts rt, rh, rm
 
+# results
 flip = cs.size > 1 && ts.size == 1
 rank.each do |ips, ei, ci, ti|
   name = (flip ? cs[ci] : ts[ti]).name

data/bin/winr-scan.rb

@@ -0,0 +1,24 @@
+{
+  contexts: [
+    {
+      begin: <<~"|".strip
+        require "strscan"
+        scanner = StringScanner.new("test string")
+      |
+    }
+  ],
+  tasks: [
+    {
+      name: "regexp_pattern",
+      script: 'scanner.scan(/\w/)'
+    },
+    {
+      name: "regexp_literal",
+      script: 'scanner.scan(/test/)'
+    },
+    {
+      name: "string",
+      script: 'scanner.scan("test")'
+    },
+  ]
+}

data/bin/winr.yaml

@@ -0,0 +1,10 @@
+begin: |-
+  require "strscan"
+  scanner = StringScanner.new("test string")
+tasks:
+  regexp_pattern: |
+    scanner.scan(/\w/)
+  regexp_literal: |
+    scanner.scan(/test/)
+  string: |
+    scanner.scan("test")

data/test/sum.rb

@@ -14,7 +14,14 @@
       begin: <<~"|",
         require "digest/md5"
 
-        max = 1e5.to_i
+        max = 5e4.to_i
+      |
+    },
+    {
+      begin: <<~"|",
+        require "digest/md5"
+
+        max = 1e3.to_i
       |
     },
   ],
@@ -34,5 +41,5 @@
       |
     },
   ],
-  warmup: 3,
+  warmup: 2,
 }

data/winr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "winr"
-  s.version     = "1.0.6"
+  s.version     = `grep -m 1 '^\s*@version' bin/winr | cut -f 2 -d '"'`
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     =

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: winr
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-18 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies: []
 description: A quick and lightweight benchmarking tool for Ruby
 email: steve.shreeve@gmail.com
 executables:
 - winr
+- winr-scan.rb
+- winr.yaml
 extensions: []
 extra_rdoc_files: []
 files:
@@ -21,6 +23,8 @@ files:
 - LICENSE
 - README.md
 - bin/winr
+- bin/winr-scan.rb
+- bin/winr.yaml
 - test/sum.rb
 - winr.gemspec
 homepage: https://github.com/shreeve/winr
@@ -42,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: A quick and lightweight benchmarking tool for Ruby