qbash 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76514b64336276e5a7a6f930cdde69aa8f92a368385e661b8b930fcf56b74269
-  data.tar.gz: 551650cc2ab252c771d99b6cf7a1e57a432d24b13b660df5c80549e1156a12c1
+  metadata.gz: d7f1f277669b1692b1cb45029b2bfc954bc4aef15f50597eb2317b6487f064d1
+  data.tar.gz: 3bbdb5a60c288b6058b04bdadf622f8dcd0081604987ddcfa62b0e0b872d02a3
 SHA512:
-  metadata.gz: b0b790b282910bc8730657f264042caddaf3d960933be65ef5a9541277ca8d0f7e0d1f5371643eadee77f3f9b367f67db744ad99a6edbdf2a89c55b9ec0e63df
-  data.tar.gz: 904d66cdf396205812115e1f45d90a903fe65fa9bdc9bc66c62f410beb521261f3dd830f87831996dc650ade478d0a7601e29ccb390d7dc3b29dd1b2a156a86c
+  metadata.gz: 8f4c268dc6631f3907ca914711208debd8acaf089fb21a5bd957f18ecb4e3a494f0c57152af6a081803b854bc39344b94fe814cf44ed13ccaf0183f25ff5f4ea
+  data.tar.gz: 4daa2853fbbcda067f829106648f72528183d885f0e8dba68d2be3710171d50115aaeadb539e7aea489e813704e6962fd4addd3a03259024beba4f4fc06decf5

data/Gemfile.lock

@@ -38,13 +38,13 @@ GEM
       cucumber-gherkin (> 36, < 40)
       cucumber-messages (> 31, < 33)
       cucumber-tag-expressions (> 6, < 9)
-    cucumber-cucumber-expressions (18.0.1)
+    cucumber-cucumber-expressions (19.0.0)
       bigdecimal
-    cucumber-gherkin (37.0.1)
-      cucumber-messages (>= 31, < 32)
+    cucumber-gherkin (38.0.0)
+      cucumber-messages (>= 31, < 33)
     cucumber-html-formatter (22.3.0)
       cucumber-messages (> 23, < 33)
-    cucumber-messages (31.2.0)
+    cucumber-messages (32.0.1)
     cucumber-tag-expressions (8.1.0)
     date (3.5.1)
     diff-lcs (1.6.2)
@@ -52,6 +52,7 @@ GEM
     elapsed (0.2.2)
       loog (~> 0.6)
       tago (~> 0.1)
+    ellipsized (0.3.0)
     erb (6.0.1)
     ffi (1.17.3-aarch64-linux-gnu)
     ffi (1.17.3-arm-linux-gnu)
@@ -65,7 +66,8 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    loog (0.6.1)
+    loog (0.7.2)
+      ellipsized
       logger (~> 1.0)
     memoist3 (1.0.0)
     mini_mime (1.1.5)
@@ -153,7 +155,7 @@ GEM
     sys-uname (1.4.1)
       ffi (~> 1.1)
       memoist3 (~> 1.0.0)
-    tago (0.6.0)
+    tago (0.7.0)
     tsort (0.2.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)

data/README.md

@@ -28,13 +28,23 @@ Then, you can use [qbash] global function:
 
 ```ruby
 require 'qbash'
-stdout = qbash('echo "Hello, world!"', log: $stdout)
+stdout = qbash('echo "Hello, world!"')
 ```
 
 If the command fails, an exception is raised.
 
-The function automatically merges `stderr` with `stdout`
-  (you can't change this).
+By default, `stderr` merges with the `stdout` logger.
+You can redirect it elsewhere:
+
+```ruby
+# Redirect stderr to a separate logger
+out = Loog::Buffer.new
+err = Loog::Buffer.new
+qbash('cmd', stdout: out, stderr: err)
+
+# Discard stderr completely
+qbash('cmd', stderr: nil)
+```
 
 It's possible to provide the standard input and environment variables:
 
@@ -48,7 +58,7 @@ It's possible to configure the logging facility too, for example,
 
 ```ruby
 require 'loog'
-qbash('echo "Hello, world!"', log: Loog::VERBOSE)
+qbash('echo "Hello, world!"', stdout: Loog::VERBOSE)
 ```
 
 You can also make it return both stdout and exit code,

data/lib/qbash.rb

@@ -51,12 +51,12 @@ module Kernel
   #
   # == Logging
   #
-  #   # Enable detailed logging to stdout
-  #   qbash('ls -la', log: $stdout)
+  #   # Enable detailed logging to console
+  #   qbash('ls -la', stdout: $stdout)
   #
   #   # Use custom logger with specific level
   #   logger = Logger.new($stdout)
-  #   qbash('make all', log: logger, level: Logger::INFO)
+  #   qbash('make all', stdout: logger, level: Logger::INFO)
   #
   # == Process Control
   #
@@ -76,7 +76,21 @@ module Kernel
   #   qbash('git status', chdir: '/path/to/repo')
   #
   # For command with multiple arguments, you can use +Shellwords.escape()+ to
-  # properly escape each argument. Stderr automatically merges with stdout.
+  # properly escape each argument.
+  #
+  # == Stderr Handling
+  #
+  # By default, stderr merges with stdout. You can redirect it elsewhere:
+  #
+  #   # Merge stderr with stdout (default)
+  #   output = qbash('cmd', stderr: :stdout)
+  #
+  #   # Redirect stderr to a separate logger
+  #   err_log = Loog::Buffer.new
+  #   output = qbash('cmd', stderr: err_log)
+  #
+  #   # Discard stderr completely
+  #   output = qbash('cmd', stderr: nil)
   #
   # Read this <a href="https://github.com/yegor256/qbash">README</a> file for more details.
   #
@@ -84,90 +98,98 @@ module Kernel
   # @param [String] stdin The +stdin+ to provide to the command
   # @param [Array] opts List of bash options, like "--login" and "--noprofile"
   # @param [Hash] env Hash of environment variables
-  # @param [Loog|IO] log Logging facility with +.debug()+ method (or +$stdout+, or nil if should go to +/dev/null+)
+  # @param [Loog|IO] stdout Logging facility with +.debug()+ method (or +$stdout+, or nil if should go to +/dev/null+)
+  # @param [Loog|IO] stderr Where to send stderr
   # @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] level Logging level (use +Logger::DEBUG+, +Logger::INFO+, +Logger::WARN+, or +Logger::ERROR+)
   # @param [String] chdir Directory to change to before running the command (or +nil+ to use current directory)
   # @return [String] Everything that was printed to the +stdout+ by the command
-  def qbash(*cmd, opts: [], stdin: '', env: {}, log: Loog::NULL, accept: [0], both: false, level: Logger::DEBUG,
-            chdir: nil)
+  def qbash(*cmd, opts: [], stdin: '', env: {}, stdout: Loog::NULL, stderr: nil, accept: [0], both: false,
+            level: Logger::DEBUG, chdir: nil)
+    stderr ||= stdout
     env.each { |k, v| raise "env[#{k}] is nil" if v.nil? }
     cmd = cmd.reject { |a| a.nil? || (a.is_a?(String) && a.empty?) }.join(' ')
-    logit =
-      lambda do |msg|
+    mtd =
+      case level
+      when Logger::DEBUG
+        :debug
+      when Logger::INFO
+        :info
+      when Logger::WARN
+        :warn
+      when Logger::ERROR
+        :error
+      else
+        raise "Unknown log level #{level}"
+      end
+    printer =
+      lambda do |target, msg|
         msg = msg.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?').gsub(/\n$/, '')
-        mtd =
-          case level
-          when Logger::DEBUG
-            :debug
-          when Logger::INFO
-            :info
-          when Logger::WARN
-            :warn
-          when Logger::ERROR
-            :error
-          else
-            raise "Unknown log level #{level}"
-          end
-        if log.nil?
+        if target.nil?
           # nothing to print
-        elsif log.respond_to?(mtd)
-          log.__send__(mtd, msg)
+        elsif target.respond_to?(mtd)
+          target.__send__(mtd, msg)
         else
-          log.print("#{msg}\n")
+          target.print("#{msg}\n")
         end
       end
-    buf = ''
+    buf = +''
     e = 1
     start = Time.now
     bash = ['/bin/bash'] + opts + ['-c', cmd]
     popen = chdir.nil? ? [env, *bash] : [env, *bash, { chdir: }]
-    Open3.popen2e(*popen) do |sin, sout, ctrl|
+    Open3.send(:popen3, *popen) do |sin, sout, serr, ctrl|
       pid = ctrl.pid
-      logit["+ #{cmd} /##{pid}"]
+      printer[stderr, "+ #{cmd} /##{pid}"]
       consume =
-        lambda do
+        lambda do |stream, target, buffer|
           loop do
             sleep 0.001
-            break if sout.closed? || sout.eof?
-            ln = sout.gets # together with the \n at the end
+            break if stream.closed? || stream.eof?
+            ln = stream.gets
             next if ln.nil?
             next if ln.empty?
-            buf += ln
-            ln = "##{ctrl.pid}: #{ln}"
-            logit[ln]
+            buffer << ln if buffer
+            printer[target, "##{pid}: #{ln}"]
           rescue IOError => e
-            logit[e.message]
+            printer[stderr, e.message]
             break
           end
         end
       sin.write(stdin)
       sin.close
       if block_given?
-        watch = Thread.new { consume.call }
+        watch = Thread.new { consume.call(sout, stdout, buf) }
         watch.abort_on_exception = true
         begin
           yield pid
         ensure
           sout.close
+          serr&.close
           watch.join(0.01)
           watch.kill if watch.alive?
           attempt = 1
           since = Time.now
           loop do
-            Process.kill(0, pid) # should be dead already (raising Errno::ESRCH)
-            Process.kill('TERM', pid) # let's try to kill it
-            logit["Tried to stop ##{pid} with SIGTERM (attempt no.#{attempt}, #{since.ago}): #{cmd}"]
+            Process.kill(0, pid)
+            Process.kill('TERM', pid)
+            printer[stderr, "Tried to stop ##{pid} with SIGTERM (attempt no.#{attempt}, #{since.ago}): #{cmd}"]
             sleep(0.1)
             attempt += 1
           rescue Errno::ESRCH
-            logit["Process ##{pid} reacted to SIGTERM, after #{attempt} attempts and #{since.ago}"] if attempt > 1
+            if attempt > 1
+              printer[stderr,
+                      "Process ##{pid} reacted to SIGTERM, after #{attempt} attempts and #{since.ago}"]
+            end
             break
           end
         end
       else
-        consume.call
+        thread = Thread.new { consume.call(serr, stderr, nil) }
+        thread.abort_on_exception = true
+        consume.call(sout, stdout, buf)
+        thread.join
       end
       e = ctrl.value.exitstatus
       if !accept.nil? && !accept.include?(e)

data/qbash.gemspec

@@ -9,7 +9,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.6.0'
+  s.version = '0.7.1'
   s.license = 'MIT'
   s.summary = 'Quick Executor of a BASH Command'
   s.description =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbash
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Yegor Bugayenko