minfra-cli 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a48cc8f6178ef5a337fbaa5c7d26b17ae22e699c91c35e4b6835da9ea489183
-  data.tar.gz: fbcc714995a34fd2bf63aa48c09166d0f85c6a5f40495472f1cc7b96f7cf95a2
+  metadata.gz: 852b56a96bf9ed6edf769a5ab0f3543a41d0759d81c1bf99b4ecd488ed0467a4
+  data.tar.gz: badd1560a02911fa7a1b15de36eb6ae59abb584f29824247948899ae33ec11a2
 SHA512:
-  metadata.gz: e37680916acd863645042a241853cbdefef19aeaff358a5196f0068fb3be81604bab7c59a11fff19fa13e5e0b8ed5d153f20c88aebdabbad4e6aea2ddcd1c331
-  data.tar.gz: d395137f217d52837983604bd590c1a2ef813446ff27c7ada4e26575690f42b448d4623fe248825482a8ca569130e87d6ae2c4ee10665a1c9c9fb58a24684398
+  metadata.gz: d57dfbd9ac19d4a982ab32f418100ab9f8cdde0419ba20a59a34f0d519a1d9b7ca6f6dfcbb5a4203d659fc3e3ced737454f115668aac796dc44041a9f4062dc3
+  data.tar.gz: 2190a697f7044c2ee18ee722b2ab1a6497d5f90506d084145644e927404328203e8dd80481419a308e597ecc65d041e844d969aff41403baf4a1836b4d187f56

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.8.0
+ * more output which "require" failed when loading dependencies
+ * catching closed stream errors in Minfra::Cli::Runner
+ * stderr of runner goes to info
+ * stdout of runner goes to debug
 # 1.7.1
  * fix plugin install edge cases
 # 1.7.0

data/lib/minfra/cli/plugins.rb

@@ -49,7 +49,7 @@ module Minfra
               begin
                 require minfra_path # this should register the command
               rescue LoadError
-                 logger.warn("Minfra plugin detected but dependencies not installed: #{minfra_path} (try: minfra plugin install)")
+                 logger.warn("Minfra plugin detected but dependencies not installed: #{minfra_path} (#{$!}). TRY: minfra plugin install")
               end 
             end  
           else

data/lib/minfra/cli/runner.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'open3'
 
 module Minfra
@@ -5,16 +8,16 @@ module Minfra
     class Runner
       class Result
         include Logging
-        
+
         attr_writer :status
-        
+
         def initialize
-          @stderr_lines=[]
-          @stdout_lines=[]
-          @status=nil
+          @stderr_lines = []
+          @stdout_lines = []
+          @status = nil
         end
-        
-        def add(line, stream=:stdout)
+
+        def add(line, stream = :stdout)
           line.chomp!
           if stream == :stdout
             @stdout_lines << line
@@ -24,7 +27,11 @@ module Minfra
             error line
           end
         end
-           
+
+        def exitstatus
+          @status.exitstatus
+        end
+        
         def success?
           @status.success?
         end
@@ -36,11 +43,11 @@ module Minfra
         def stdout
           @stdout_lines.join("\n")
         end
-        
+
         def stderr
           @stderr_lines.join("\n")
-        end  
-        
+        end
+
         def to_s
           stdout
         end
@@ -52,39 +59,46 @@ module Minfra
       end
 
       attr_reader :exit_on_error
+
       def initialize(cmd, exit_on_error: true)
-        @cmd=cmd
+        @cmd = cmd
         @exit_on_error = exit_on_error
       end
 
       def run
         debug("running: #{@cmd}")
-        res=nil
+        res = nil
         begin
-          res=Result.new
+          res = Result.new
           # see: http://stackoverflow.com/a/1162850/83386
-          Open3.popen3(@cmd) do |stdin, stdout, stderr, thread|
+          # the whole implementation is problematic as we migth miss some output lines
+          # Open4 might be a solution. Using Select might be a solution. Using Process.fork might be a solution....
+          Open3.popen3(@cmd) do |_stdin, stdout, stderr, thread|
             # read each stream from a new thread
-            { :stdout => stdout, :stderr => stderr }.each do |key, stream|
+            { stdout: stdout, stderr: stderr }.each do |key, stream|
               Thread.new do
-                until (raw_line = stream.gets).nil? do
+                until (raw_line = stream.gets).nil?
+                  #                   stream.each do |raw_line|
                   res.add(raw_line, key)
                 end
+              rescue IOError # happens when you read from a close stream
+                raise unless ['stream closed in another thread', 'closed stream'].include?($ERROR_INFO.message)
+                # warn("Caught: #{$ERROR_INFO.message} for #{@cmd}")
               end
             end
             thread.join # don't exit until the external process is done
             res.status = thread.value
           end
-        rescue
+        rescue StandardError
         end
-        
+
         if res.error?
           error "command failed: #{@cmd}"
-          info  res.stdout
-          error res.stderr
+          debug  res.stdout
+          info  res.stderr
         end
         if exit_on_error && res.error?
-          info "exiting on error"
+          info "command exiting on error (#{res.exitstatus})"
           exit 1
         end
         res

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.7.1'.freeze
+    VERSION = '1.8.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor