qbash 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629198be7c8f09f07807f2fdc3f43b771df5d1b97ef33ae3a827c1d56a9ec98c
-  data.tar.gz: f7b85be41ea296b819d13e3f4cb23f9d0bfb8137de8f05cd6f10737e535c68a7
+  metadata.gz: 413276b3af88e8343fc3a872a6c41141525cf5a9977e4a78bf4f51954f949ef9
+  data.tar.gz: 2dccf907789c415829801f0fc3c6caec76a19e98fb2f86009c56e2097778d7c3
 SHA512:
-  metadata.gz: 026321cb7140203439059803f02a305980c5c44b988c9ebab82522eb8ede41d9d45dad8c6b1d312fcf7a9ae2192cabd2a67b7305e98d8836fd25d5276ceb6a48
-  data.tar.gz: fd16b90f2af7f1a8ff116e0c1d95cc66a760e4c6c74fcc2763990d9ccf8b07517b6886277e81c8e18164db4c794ac7b619f5df98a20eed888b36fc0fbd300423
+  metadata.gz: 43bd520c7e65fe1a9124beea490c45fb416927b79399892de8c58ff7ddde1ea65ef9dcf1a5c1e759cec0b8b8037c7378a37559e211d36d6d4f632bb67db43e4d
+  data.tar.gz: bf9eea333fa3f58a275b23e5ee8d8ae899bc4ce28c686ab32e158265b49be6a4b945a81115286b1f0bd7801bb77d900d8e6c88efcde8f64db36dbdb4a9f58101

data/README.md

@@ -32,6 +32,9 @@ stdout = qbash('echo "Hello, world!"', log: $stdout)
 
 If the command fails, an exception will be raised.
 
+The function automatically merges `stderr` with `stdout`
+(you can't change this).
+
 It's possible to provide the standard input and environment variables:
 
 ```ruby

data/lib/qbash.rb

@@ -34,22 +34,28 @@ require 'tago'
 module Kernel
   # Execute a single bash command.
   #
+  # For example:
+  #
+  #  year = qbash('date +%Y')
+  #
   # If exit code is not zero, an exception will be raised.
   #
   # To escape arguments, use +Shellwords.escape()+ method.
   #
+  # Stderr automatically merges with stdout.
+  #
   # Read this <a href="https://github.com/yegor256/qbash">README</a> file for more details.
   #
   # @param [String] cmd The command to run, for example +echo "Hello, world!"+
   # @param [String] stdin The +stdin+ to provide to the command
   # @param [Hash] env Hash of environment variables
   # @param [Loog|IO] log Logging facility with +.debug()+ method (or +$stdout+)
-  # @param [Array] accept List of accepted exit codes (accepts all if the list is empty)
+  # @param [Array] accept List of accepted exit codes (accepts all if the list is +nil+)
   # @param [Boolean] both If set to TRUE, the function returns an array +(stdout, code)+
   # @param [Integer] timeout If it's set to non-NIL, the execution will fail after this number of seconds
   # @return [String] Everything that was printed to the +stdout+ by the command
   def qbash(cmd, stdin: '', env: {}, log: Loog::NULL, accept: [0], both: false, timeout: nil)
-    cmd = cmd.join(' ') if cmd.is_a?(Array)
+    cmd = cmd.reject { |a| a.nil? || a.empty? }.join(' ') if cmd.is_a?(Array)
     if log.respond_to?(:debug)
       log.debug("+ #{cmd}")
     else
@@ -77,7 +83,7 @@ module Kernel
             buf += ln
           end
           e = thr.value.to_i
-          if !accept.empty? && !accept.include?(e)
+          if !accept.nil? && !accept.include?(e)
             raise "The command '#{cmd}' failed with exit code ##{e} in #{start.ago}\n#{buf}"
           end
         end

data/qbash.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.2'
   s.name = 'qbash'
-  s.version = '0.0.5'
+  s.version = '0.0.7'
   s.license = 'MIT'
   s.summary = 'Quick Executor of a BASH Command'
   s.description =

data/test/test_qbash.rb

@@ -48,6 +48,10 @@ class TestQbash < Minitest::Test
     qbash('echo Hello world!', log: $stdout)
   end
 
+  def test_skip_nil
+    assert_equal('Hi!', qbash(['printf', nil, 'Hi!', '']))
+  end
+
   def test_with_stdin
     Dir.mktmpdir do |home|
       f = File.join(home, 'a b c.txt')
@@ -75,13 +79,13 @@ class TestQbash < Minitest::Test
 
   def test_ignore_errors
     Dir.mktmpdir do |home|
-      qbash("cat #{Shellwords.escape(File.join(home, 'b.txt'))}", accept: [])
+      qbash("cat #{Shellwords.escape(File.join(home, 'b.txt'))}", accept: nil)
     end
   end
 
   def test_with_both
     Dir.mktmpdir do |home|
-      stdout, code = qbash("cat #{Shellwords.escape(File.join(home, 'foo.txt'))}", accept: [], both: true)
+      stdout, code = qbash("cat #{Shellwords.escape(File.join(home, 'foo.txt'))}", accept: nil, both: true)
       assert(code.positive?)
       assert(!stdout.empty?)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qbash
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace