shellfold 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzljZDMxNGIyZmRiMjZhOTkyMjlmNWRjNzYzODY2NTA1N2UyZTY1OQ==
+    ZjFjZWYzM2RhZmY4ZmZjNGNhMjk2MjU4ZWFlODAzOThkZWE3NTVlYw==
   data.tar.gz: !binary |-
-    MmNiYmQ1YWRjOGVmYTExMDEyNjEyMmI3MmZiM2IzMWJlN2E3Y2MyNg==
+    OWY1YmZjN2JhMzdkMzVkMDJhNmVjYWU2MzlkNzhlNjc3YTY0NGVkZA==
 SHA512:
   metadata.gz: !binary |-
-    ZWQ2MGU5NTdhM2RjMGU2OTA2YTllZTg0Y2Y4OGFmY2FjMTUyYzdkN2JlYmVk
-    Nzc4OGFkNmFhNzZmNzg0ZmViYjhiODViYjg5ZmRmNTJjMDc4OTU5ZTgzYmY2
-    ZWIyN2RkNWRkNTVjMjgyNTczOTM4YTc5ZTExNWE1ZjA0MDA0N2Y=
+    NmVkOTk2YTBiMmUyYTA4NGRkNGFkODkzYjk2YmIxYmQ1ODIyYWQwNzRkNTA5
+    NzQ1YjI5MzYwYzk3YmE4Zjc0MzllNzllOGQzMjRhZTk5YWUzMmM1OGM0OGRm
+    NGZmYjMzODBmOWYwZmJkYzE2Zjk3MTJkMGJlODMwZTFlNDdmYWE=
   data.tar.gz: !binary |-
-    MjBjYmJjNDZjY2YyYWY0ZmFhOTEwYWE2ZjI0MGJjMjRkNjkxZGM3MzBhNTBk
-    N2IzY2MzYjA2ZDdmODcwNjMyNDU4MmJmMTk1OTE5Yjk5YjlmZDc0NWM2MzEz
-    Mzk0MDIyZDU2ZWZlMmFjYTY3Mjc1MmE2M2FlY2FkZDVkODE1MzQ=
+    MGU1NWIzMTUyMWQ1OWNkNzI0ZjQ2MzE0NGFiY2RiM2JmMGY3N2I5OWFjM2U1
+    M2NiOTI3ZTA2NzA0MmYxMGRkYWU5NWQzNmZmNGNmMmVjODU3OGE2MTBhMzFl
+    Mzk2NDQ5YjhhOWRjZTAxNjNlYTk1NGVlZTczNTM4MWI1OGM1MjY=

data/lib/shellfold.rb

@@ -7,52 +7,64 @@ module Shellfold
   class Command
     include MonitorMixin
 
+    attr_reader :command
     attr_reader :desc
     attr_reader :out
-    attr_reader :out_bar
-    attr_reader :command
+    attr_reader :live_log
+    attr_reader :log_failure
+    attr_reader :last_output_max
 
     def initialize(*args, desc: nil,
                           out: $stdout,
+                          live_log: false,
+                          log_failure: false,
                           last_output_max: 200, **kwargs)
       super()
 
-      @out = out
-      @last_output_max = last_output_max
+      kwargs.merge!(live_stderr: out, live_stdout: out) if live_log
+
       @command = Mixlib::ShellOut.new(*args, **kwargs)
       @desc = desc || command.command
+      @out = out
+      @live_log = live_log
+      @log_failure = log_failure
+      @last_output_max = last_output_max
       @running = false
     end
 
-    def run!
-      run(ignore_failure: false)
-    end
-
-    def run(ignore_failure: true)
+    def run
       running!
-      write_out{"#{desc}"}
-
-      thr = Thread.new do
-        loop do
-          sleep 10
-          break unless running?
-          write_out{' '} if not @been_here.tap{@been_here = true}
-          write_out{'.'}
+
+      progress_bar_thr = nil
+
+      unless live_log
+        write_out{desc}
+        progress_bar_thr = Thread.new do
+          loop do
+            sleep 10
+            break unless running?
+            write_out do
+              [@been_here.tap{@been_here = true} ? nil : ' ', '.'].compact.join
+            end
+          end
         end
+      else
+        write_out{desc + "\n"}
       end
 
       on_command_finish = proc do
+        next if live_log
         if not command.status.success?
           write_out{" [FAILED: #{command.status.inspect}]"}
-          if ignore_failure
-            write_out{"\n"}
-          else
+          if log_failure
             msg = ["# COMMAND: #{command.command}\n",
                    "# LAST OUTPUT BEGIN:\n",
                    *[*command.stdout.lines,
-                     *command.stderr.lines].reverse[0...@last_output_max].reverse,
+                     *command.stderr.lines].last(last_output_max),
                    "# LAST OUTPUT END\n"].join
             write_out{"\n#{msg}"}
+          else
+            write_out{"\n"}
           end
         else
           write_out{" [DONE]\n"}
@@ -66,7 +78,7 @@ module Shellfold
       rescue Mixlib::ShellOut::CommandTimeout
         on_command_finish.call
       ensure
-        thr.kill
+        progress_bar_thr.kill if progress_bar_thr
       end
 
       command
@@ -92,12 +104,12 @@ module Shellfold
   end # Command
 
   class << self
-    def run(*args)
-      Command.new(*args).run
+    def run(*args, **kwargs)
+      Command.new(*args, **kwargs).run
     end
 
-    def run!(*args)
-      Command.new(*args).run!
+    def run!(*args, **kwargs)
+      Command.new(*args, log_failure: true, **kwargs).run
     end
   end # << self
 end # Shellfold

data/lib/shellfold/version.rb

@@ -1,3 +1,3 @@
 module Shellfold
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellfold
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - flant