vete 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c68c30f1f9ce2177fb7c5a83ac8fa9f402b387203e2e1de2321a04ec3effa0c
-  data.tar.gz: 246eed50879a2fd260d1f0b18aab85d3ffe953cd6980d9bb5cca1311a789b202
+  metadata.gz: 1d1ef6e5614f544a633cfe36109f37ef7a37676b7ba276be48abcc40d6e9cf54
+  data.tar.gz: a0036c27a47eddba9385673345f4456fbae869fa816c8c2c0d46ce92a0866d82
 SHA512:
-  metadata.gz: 55b4b6dd945930575cf37a814ce1c9d7b7dbfbab6e8a306887841d48dd49331f6b302cfbac0d1741e409fd6bac57153fa52d5bbabe5fab4110f736f3e7660136
-  data.tar.gz: 992cd2007a936f4f7ef53b0741011c916aa3b90802a8794c31a48577fb551fadb50adbcb98e6521d0f5e2716a29e74ca650b5b0dd01c0b023585ecabf89696bc
+  metadata.gz: a0f287195bba7b81a368560aa3f0694b60e7afe8292957b9d947ca820291b603bdfc3d231bd9432c175a4f3df88714eba91b7a41db5dea744154e063000d2e42
+  data.tar.gz: 0aeb6cfa54c5a55d6b822ce29e5045f78176b428bd2948fd039ea5dce5096d42a0d7dd6e8b04ce2c2631fb28bd02480f79e5c75fdb8a489e729f614ae191c428

data/lib/vete.rb

@@ -16,7 +16,7 @@ require "thread"
 trap("INT" ) { print clear + go; abort "\n" }
 
 OptionParser.new.instance_eval do
-  @version = "0.1.0"
+  @version = "0.2.0"
   @banner  = "usage: #{program_name} [options]"
 
   on "-b", "--bar <width>"            , "Progress bar width, in characters", Integer
@@ -30,10 +30,10 @@ OptionParser.new.instance_eval do
 end.parse!(into: opts={}) rescue abort($!.message)
 
 # populate CLI options
-@bar = opts[:bar    ] || 20
-@chr = opts[:char   ] || "•"; @chr = @chr[0]
-@rmf = opts[:reset  ]
-@wrk = opts[:workers] || 1
+@char = opts[:char   ] || "•"; @char = @char[0]
+@nuke = opts[:reset  ]
+@wide = opts[:bar    ] || 20
+@work = opts[:workers] || 1
 
 # define job directories
 @vete = File.expand_path(".vete")
@@ -42,14 +42,34 @@ end.parse!(into: opts={}) rescue abort($!.message)
 @done = File.join(@vete, "done")
 @bomb = File.join(@vete, "bomb")
 
-if @rmf
-  FileUtils.rm_rf @vete
-  exit
-end
 
 def move(path, dest)
   dest = File.join(dest, File.basename(path))
-  FileUtils.mv(path, dest)
+  FileUtils.mv(path, dest, force: true, secure: true)
+end
+
+def nuke
+  FileUtils.rm_rf(@vete)
+end
+
+if @nuke
+  nuke
+  exit
+end
+
+def vete_init
+  nuke
+  list = [@todo, @live, @done, @bomb]
+  list.each {|path| File.mkdir_p(path, force: true, secure: true) }
+end
+
+def vete_retry
+  list = Dir.glob(File.join(@bomb, "*")).sort.each {|path| FileUtils.touch(path) }
+  move(list, @todo)
+end
+
+def vete_todo(path)
+  FileUtils.touch(path, force: true, secure: true)
 end
 
 # ==[ Drawing ]===============================================================
@@ -74,10 +94,10 @@ def draw(rows, done=0, live=0, bomb=0, jobs=0, info=nil)
   unless info
     print [
       clear,
-      go(2 + rows, @len + 3) + "└" + "─" * (@bar + 2) + "┘\n",
-      go(1       , @len + 3) + "┌" + "─" * (@bar + 2) + "┐\n",
+      go(2 + rows, @len + 3) + "└" + "─" * (@wide + 2) + "┘\n",
+      go(1       , @len + 3) + "┌" + "─" * (@wide + 2) + "┐\n",
     ].join
-    rows.times {|i| print " %*d │ %*s │\n" % [@len, i + 1, @bar, ""] }
+    rows.times {|i| print " %*d │ %*s │\n" % [@len, i + 1, @wide, ""] }
     return
   end
 
@@ -87,20 +107,20 @@ def draw(rows, done=0, live=0, bomb=0, jobs=0, info=nil)
   most = info.values.max
   info.each do |slot, this|
     tpct = this.to_f / most
-    cols = dpct * tpct * @bar
-    print go(slot + 1, @len + 5) + bg("5383ec") + @chr * cols
+    cols = dpct * tpct * @wide
+    print go(slot + 1, @len + 5) + bg("5383ec") + @char * cols
   end
 
   # summary bar
-  gcol = dpct * @bar
-  ycol = lpct * @bar
+  gcol = dpct * @wide
+  ycol = lpct * @wide
   print [
     go(rows + 3, @len + 5),
     fg("fff"),
-    bg("58a65c") + @chr * (       gcol       )     , #  green (done)
-    bg("f1bf42") + @chr * (              ycol)     , # yellow (live) <= Add live
-    bg("d85140") + " "  * (@bar - gcol - ycol).ceil, #    red (left)
-    go(rows + 3, @len + 5 + @bar + 3) + " %.1f%% done " % [dpct * 100],
+    bg("58a65c") + @char * (       gcol       )     , #  green (done)
+    bg("f1bf42") + @char * (              ycol)     , # yellow (live) <= Add live
+    bg("d85140") + " "  * (@wide - gcol - ycol).ceil, #    red (left)
+    go(rows + 3, @len + 5 + @wide + 3) + " %.1f%% done " % [dpct * 100],
     bomb == 0 ? nil : (bg + " " + bg("f1bf42") + " #{bomb} bombed "),
   ].join
 
@@ -120,9 +140,9 @@ FileUtils.mkdir_p @bomb
 
 # ==[ Configure workers ]=====================================================
 
-@len = @wrk.to_s.size
+@len = @work.to_s.size
 @mtx = Mutex.new
-@que = Thread::Queue.new; @wrk.times {|slot| @que << (slot + 1) }
+@que = Thread::Queue.new; @work.times {|slot| @que << (slot + 1) }
 
 begin
   list = Dir[File.join(@todo, "*")]
@@ -132,7 +152,7 @@ begin
   setup
 
   cursor(false)
-  draw(@wrk)
+  draw(@work)
 
   time = Time.now
   done = 0
@@ -145,7 +165,7 @@ begin
         live += 1
       }
       show = "Working on task " + File.basename(path)
-      print go(slot + 1, @len + 5 + @bar + 3) + show
+      print go(slot + 1, @len + 5 + @wide + 3) + show
       if chld = fork # parent
         Thread.new do
           okay = Process.waitpid2(chld)[1] == 0
@@ -158,22 +178,22 @@ begin
             info[slot] += 1
           }
         end
-        draw(@wrk, done, live, bomb, jobs, info.dup)
+        draw(@work, done, live, bomb, jobs, info.dup)
       else
         perform(slot, path)
         exit
       end
     end
   end.join
-  draw(@wrk, done, live, bomb, jobs, info)
+  draw(@work, done, live, bomb, jobs, info)
   secs = Time.now.to_f - time.to_f
 
   # summary
   print [
-    go(@wrk + 5, 1),
+    go(@work + 5, 1),
     "%.2f secs" % secs,
     " for #{jobs} jobs",
-    " by #{@wrk} workers",
+    " by #{@work} workers",
     " @ %.2f jobs/sec" % [jobs / secs]
   ].join + "\n\n"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vete
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby CLI to spawn processes to get work done
 email: steve.shreeve@gmail.com