cheetah 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e79228df3ba4822704c7f3e81fe0fdbec93a7a36f7935d2b117380470be1ed
-  data.tar.gz: f398f8b357f85c2c7cf8f08a790bb77f586e1d251eba4eea0d97ea940e651517
+  metadata.gz: 7ffad6048946bc9340bf92edbc08b4955a2444da86ed5c029bcf3a2f5b799f78
+  data.tar.gz: d3fc65ea30218372099bf81ab8ab86d4c5a2eb5314faac7c972c5518f910331c
 SHA512:
-  metadata.gz: 06fbed837fee79bbf04be03355c8c339df1ffdf9d3f005743f6bcc7896a2c4a604a53f723e8cc2f95e6d07db4cd0b6ca105272ab0ac870b6d37d21baa15d4a38
-  data.tar.gz: 1ef2088f550bf7d7bf4c3ea7369fdef6ea3e9a49b36d5f5666f6ddcf449663e484073eb85a47f47f9e5d14b89ba6da13ac7b0065852884fb7fcc7f848f631d11
+  metadata.gz: ff33b7ccf7423baf8c8158287be0efd1ad184069a6542f0d945fa493ea04c2a43c98b84e4e6e50f54d119ddb09575cddd0780fdaa7676fff3f9e839539db591c
+  data.tar.gz: f930f40f3eac5de9c611061ea0c3844d47e4c3475a392f4cfb74a3fe4350519eaca35e57eda0a9ef9fead81157d90b2967c14943b599e9d456220ee68a42b72c

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.5.2 (2020-01-06)
+------------------
+
+* If listed in allowed_exitstatus, log exit code as Info, not as Error
+  (bsc#1153749)
+* Added support for ruby 2.7
+
 0.5.1 (2019-10-16)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/cheetah.rb

@@ -402,8 +402,12 @@ module Cheetah
       select_loop(streams, pipes, recorder)
       _pid, status = Process.wait2(pid)
 
+      # when more exit status are allowed, then redefine success as command
+      # not failed (bsc#1153749)
+      adapt_status(status, options)
+
       begin
-        check_errors(commands, status, streams, streamed, options)
+        check_errors(commands, status, streams, streamed)
       ensure
         recorder.record_status(status)
       end
@@ -413,6 +417,14 @@ module Cheetah
 
     private
 
+    def adapt_status(status, options)
+      return unless allowed_exitstatus?(options)
+
+      status.define_singleton_method(:success?) do
+        options[:allowed_exitstatus].include?(exitstatus)
+      end
+    end
+
     # Parts of Cheetah.run
 
     def with_env(env, &block)
@@ -558,7 +570,7 @@ module Cheetah
         next if (0..2).include?(fd)
 
         # here we intentionally ignore some failures when fd close failed
-        # rubocop:disable Lint/HandleExceptions
+        # rubocop:disable Lint/SuppressedException
         begin
           IO.new(fd).close
         # Ruby reserves some fds for its VM and it result in this exception
@@ -566,7 +578,7 @@ module Cheetah
         # Ignore if close failed with invalid FD
         rescue Errno::EBADF
         end
-        # rubocop:enable Lint/HandleExceptions
+        # rubocop:enable Lint/SuppressedException
       end
     end
 
@@ -643,9 +655,8 @@ module Cheetah
       end
     end
 
-    def check_errors(commands, status, streams, streamed, options)
+    def check_errors(commands, status, streams, streamed)
       return if status.success?
-      return if options[:allowed_exitstatus].include?(status.exitstatus)
 
       stderr_part = if streamed[:stderr]
                       " (error output streamed away)"
@@ -678,8 +689,7 @@ module Cheetah
               [streams[:stdout].string, streams[:stderr].string]
             end
 
-      # do not capture only for empty array or nil converted to empty array
-      if !options[:allowed_exitstatus].is_a?(Array) || !options[:allowed_exitstatus].empty?
+      if allowed_exitstatus?(options)
         if res.nil?
           res = status.exitstatus
         else
@@ -691,6 +701,11 @@ module Cheetah
       res
     end
 
+    def allowed_exitstatus?(options)
+      # more exit status allowed for non array or non empty array
+      !options[:allowed_exitstatus].is_a?(Array) || !options[:allowed_exitstatus].empty?
+    end
+
     def format_commands(commands)
       '"' + commands.map { |c| Shellwords.join(c) }.join(" | ") + '"'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheetah
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - David Majda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_method
@@ -84,7 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Your swiss army knife for executing external commands in Ruby safely and