winr 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f21441bb531e1d38f35a8f66a06cde6ab1082b2ea9713d4f25f78dc6ca2f870
-  data.tar.gz: 2d0149171faeb84c7942f6d0546591c3d8ac9789771a682271a9a1d650820f09
+  metadata.gz: 92cf6d6550696708f56fbdaf257a4dc03c45f492d29da6e48c6402475e5b6071
+  data.tar.gz: a5453c06028778540c0c46d1822917a634dd295f2689cc96eed153ed436c7e7e
 SHA512:
-  metadata.gz: 67f0e74a0135c3927d4826d1160302ce30c2091193b762ae56b48db0eaf2c77cbe14e26ce212ff022feafebf38938ded4ddf3429a956240f3c0742be8dc0c1a5
-  data.tar.gz: 34d00a66c0d6bb5d100d551543d5c69e61f873bca05db421c830dce67df8b00a028369b04ee6f1e8d8b042a11e14d3ed6d50b1d6fc4a05a0409d91442b4d5905
+  metadata.gz: d2b10ae402f1d2852fb383d8ac37edaa62bd745934f69b7365cf4ffd11030fe1e7ec33e663a8b375ea35dc81ee7f89d5c31332735117ee24e23c307ee6f6ef9c
+  data.tar.gz: ef2bddad89692a60e7f0eb3f06d7644c029918bd2bfbe10916ae4fe307b58fd32470ee6c203cfa3bc655c09d506878149da969739bdc655e78cbcfdf831cba58

data/bin/winr

@@ -15,7 +15,7 @@
 # 1. Enable YAML config files
 # ============================================================================
 
-trap("INT" ) { abort "\n" }
+trap("INT") { abort "\n" }
 
 require "erb"
 require "optparse"
@@ -150,6 +150,29 @@ def compile(task, path)
   |
 end
 
+def template
+  <<~"end"
+    # ============================================================================
+    # Environment <%= ei + 1 %>: <%= e.name %>
+    #     Context <%= ci + 1 %>: <%= c.name %>
+    #        Task <%= ti + 1 %>: <%= t.name %>
+    # ============================================================================
+
+    trap("INT") { exit }
+
+    # def __winr_timer; Process.clock_gettime(Process::CLOCK_MONOTONIC); end
+    def __winr_timer; Time.now.to_f; end
+
+    <%= e.begin %>
+    <%= c.begin %>
+
+    <%= compile(t, file.path) %>
+
+    <%= c.end %>
+    <%= e.end %>
+  end
+end
+
 # ==[ Helpers ]==
 
 def boxlines(main, cols, runs=1)
@@ -204,28 +227,7 @@ end
 
 # read the winr script
 winr = ARGV.first or abort "missing winr script"
-
-# generate the code template
-tmpl = ERB.new(<<~"end")
-  # ============================================================================
-  # Environment <%= ei + 1 %>: <%= e.name %>
-  #     Context <%= ci + 1 %>: <%= c.name %>
-  #        Task <%= ti + 1 %>: <%= t.name %>
-  # ============================================================================
-
-  trap("INT") { exit }
-
-  # def __winr_timer; Process.clock_gettime(Process::CLOCK_MONOTONIC); end
-  def __winr_timer; Time.now.to_f; end
-
-  <%= e.begin %>
-  <%= c.begin %>
-
-  <%= compile(t, file.path) %>
-
-  <%= c.end %>
-  <%= e.end %>
-end
+tmpl = ERB.new(template)
 
 # grok the config
 $config = eval(File.read(winr))
@@ -233,6 +235,16 @@ es = $config.environments || [{}]
 cs = $config.contexts     || [{}]
 ts = $config.tasks        || [{}]
 
+# adjust script fields, if needed
+[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"
+    end
+    item.begin = item.script
+  end
+end
+
 # box drawing
 cols = stats(show)
 full = cols.map(&:size).sum + cols.size * 11 - 3
@@ -250,6 +262,7 @@ es.each_with_index do |e, ei|
   puts IO.popen(["ruby", "-v"].join(" "), &:read) unless hush
   puts rt
 
+  # TODO: read this from e.command
   command = ["/usr/bin/env ruby"]
 
   # loop over context(s) and task(s)
@@ -295,8 +308,8 @@ full = cols.sum + (cols.size - 1) * 3
 rt, rm, rb = boxlines(wide, cols)
 rh = "│ %-*.*s │" % [wide, wide, "Rank"]
 rh << " %-*.*s │" % [full, full, "Performance".center(full)]
-
 puts rt, rh, rm
+
 flip = cs.size > 1 && ts.size == 1
 rank.each do |ips, ei, ci, ti|
   name = (flip ? cs[ci] : ts[ti]).name

data/winr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "winr"
-  s.version     = "1.0.1"
+  s.version     = "1.0.2"
   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.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Steve Shreeve