vete 0.6.3 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99919fa6a5c6a28cbc48510c551a6f0dabdac96f317a9cdaa181b37fd4fdd5bf
-  data.tar.gz: bd70e8b7eef1b32c302ac20b749a1aa55e6b4b276fda1024a30c7ccedac983fd
+  metadata.gz: 7e4fc5b306a83552b0d01f0d66ed585ac21327f6d0770778329ee8f5f6a2d45b
+  data.tar.gz: d15f798085770e94721d3c388155292c1f18dff1cb5f588aa0ad5a952d94794a
 SHA512:
-  metadata.gz: 4011761a29f57994863b77e357d2633ffa16b9f0c000569bd69c357a6214c583bf50f9b677bc3508d2036becff0dd4f238a34e388c1444c62205991b65b462c1
-  data.tar.gz: a0d1b80373d0941d6cf7911d18be4be936f4d3b6e599a13fd7af08ebc17a16b568e68c697967fd85c9ceabc12baba2472e76612b200a1787839570d8f3f1ae93
+  metadata.gz: cc13e483ac0301df8c5a7ceac34577fd965a6645474c3d117f4674072d67bdc34ace32d372ae7fa6acf18f901bafc6ebb3c2242d13b474a2b8284f6fb0dbe670
+  data.tar.gz: fa3cecc1dd5af2ec412a3796b48df87473b5d4c8bf40401297caa4c62606be394bbc74b53405713dccdec8373dd626854177121f422d41f6155612f3d0a4b621

data/lib/vete.rb

@@ -19,7 +19,7 @@ trap("INT"  ) { print clear + go; abort "\n" }
 trap("WINCH") { print clear or draw if @pid == Process.pid }
 
 OptionParser.new.instance_eval do
-  @version = "0.6.3"
+  @version = "0.6.6"
   @banner  = "usage: #{program_name} [options]"
 
   on "-b", "--bar <width>"            , "Progress bar width, in characters", Integer
@@ -31,7 +31,7 @@ OptionParser.new.instance_eval do
   on "-w", "--workers <count>"        , "Set the number of workers (default is 1)", Integer
 
   self
-end.parse!(into: opts={}) rescue abort($!.message)
+end.parse!(into: @opts = opts = {}) rescue abort($!.message)
 
 # populate CLI options
 @char = opts[:char   ] || "•"; @char = @char[0]
@@ -53,12 +53,11 @@ end
 # define job directories
 @vete = File.expand_path(".vete")
 @todo = File.join(@vete, "todo")
-@live = File.join(@vete, "live")
 @done = File.join(@vete, "done")
 @died = File.join(@vete, "died")
 
 def move(path, dest)
-  dest = File.join(dest, File.basename(path))
+  dest = File.join(dest, File.basename(path)) unless path.is_a?(Array)
   FileUtils.mv(path, dest, force: true, secure: true)
 end
 
@@ -73,13 +72,13 @@ end
 
 def vete_init
   nuke
-  list = [@todo, @live, @done, @died]
+  list = [@todo, @done, @died]
   list.each {|path| FileUtils.mkdir_p(path) }
 end
 
 def vete_retry
   list = Dir.glob(File.join(@died, "*")).sort.each {|path| FileUtils.touch(path) }
-  move(list, @todo)
+  list.empty? ? false : !!move(list, @todo)
 end
 
 def vete_todo(path, data=nil)
@@ -96,13 +95,19 @@ def cursor(on)     ; print on ? "\e[?25h": "\e[?25l"; end
 def go(r=1,c=1)    ; "\e[#{r};#{c}H"                ; end
 def go!(...)       ; print go(...)                  ; end
 
-def fg(rgb=nil); rgb ? "\e[38;2;#{hx(rgb)}m" : "\e[39m"; end
-def bg(rgb=nil); rgb ? "\e[48;2;#{hx(rgb)}m" : "\e[49m"; end
-def hx(str=nil); str =~ /\A#?(?:(\h\h)(\h\h)(\h\h)|(\h)(\h)(\h))\z/ or return
-  r, g, b = $1 ? [$1, $2, $3] : [$4*2, $5*2, $6*2]
-  [r.hex, g.hex, b.hex] * ";"
+@hex={}
+
+def hex(str=nil)
+  @hex[str] ||= begin
+    str =~ /\A#?(?:(\h\h)(\h\h)(\h\h)|(\h)(\h)(\h))\z/ or return
+    r, g, b = $1 ? [$1, $2, $3] : [$4*2, $5*2, $6*2]
+    [r.hex, g.hex, b.hex] * ";"
+  end
 end
 
+def fg(rgb=nil); rgb ? "\e[38;2;#{hex(rgb)}m" : "\e[39m"; end
+def bg(rgb=nil); rgb ? "\e[48;2;#{hex(rgb)}m" : "\e[49m"; end
+
 def draw(live=0, done=0, died=0, jobs=0, info=nil)
 
   # outer box
@@ -122,7 +127,7 @@ def draw(live=0, done=0, died=0, jobs=0, info=nil)
   info.each do |slot, this|
     tpct = this.to_f / most
     cols = ppct * tpct * @wide
-    print go(slot + 1, @len + 5) + bg("5383ec") + @char * cols
+    print go(slot + 1, @len + 5) + bg("5383ec") + @char * cols # fg("fff")
   end
 
   # summary bar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vete
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.6
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies: []
 description: Ruby CLI to spawn processes to get work done
 email: steve.shreeve@gmail.com
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby CLI to spawn processes to get work done