qbash 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bcb7505bb5d037e9270a685ccc8c2b55fffe4ba0de40744a71e67261d176c65
-  data.tar.gz: 5cf3716ada0456b85887c95f09d653441ee903c5a8146ff7aef5f9e04989fd1c
+  metadata.gz: df6e6d3493e78bba7aa90acd7e51c84b8b869e5fac3e1fe696ed67e29a50219c
+  data.tar.gz: 7b5b9e9ae374085166d01b17ddf16c7ba740b50f5f0c4dfb407bb9da2ffcc6bc
 SHA512:
-  metadata.gz: 3221e4ce357d1bc544ef9bd9235f975576442f0f6ae390f9e62845f49856629b74921b26ef28254a2c795990a105096fed31f86e7532f4b240994643b5d71e12
-  data.tar.gz: 731fc1acd072b6087947895431d40e8dd44c1cc635a59ce9e0aac900c8e670b7cb7a9a2ef99da570f204d07eab5004dfeaf48b818f3bc1f0b67367dc3d66fbc7
+  metadata.gz: 348fabb99cb7a962b51d354b0b668e08e009f9c82db7433c91fa738336e19f0e51c9cd319d0dae522a73813e7a80344a54e717cca09d9f67ad1068e403058966
+  data.tar.gz: 3c72c3b7a39d5e3523cda49ed38be201147e07d15f8cae5b69bfd74b5f2cec6b8a8ac3f4d7d78ffc321a415893ed1c46005372030aa651a15679d8686523eac3

data/.gitignore

@@ -9,3 +9,5 @@ node_modules/
 rdoc/
 temp/
 vendor/
+
+**/.claude/settings.local.json

data/Gemfile

@@ -12,6 +12,7 @@ gem 'minitest-reporters', '~>1.7', require: false
 gem 'net-ping', '~>2.0', require: false
 gem 'rake', '~>13.2', require: false
 gem 'random-port', '~>0.0', require: false
+gem 'rdoc', '~>6.13', require: false
 gem 'rubocop', '~>1.73', require: false
 gem 'rubocop-minitest', '>0', require: false
 gem 'rubocop-performance', '>0', require: false

data/Gemfile.lock

@@ -45,6 +45,7 @@ GEM
       cucumber-messages (> 19, < 28)
     cucumber-messages (22.0.0)
     cucumber-tag-expressions (6.1.2)
+    date (3.4.1)
     diff-lcs (1.6.1)
     docile (1.4.1)
     elapsed (0.0.1)
@@ -94,12 +95,17 @@ GEM
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
+    psych (5.2.5)
+      date
+      stringio
     public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     random-port (0.7.5)
       tago (> 0)
+    rdoc (6.13.1)
+      psych (>= 4.0.0)
     regexp_parser (2.10.0)
     rexml (3.4.1)
     rubocop (1.75.5)
@@ -137,6 +143,7 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
+    stringio (3.1.7)
     sys-uname (1.3.1)
       ffi (~> 1.1)
     tago (0.1.0)
@@ -171,6 +178,7 @@ DEPENDENCIES
   qbash!
   rake (~> 13.2)
   random-port (~> 0.0)
+  rdoc (~> 6.13)
   rubocop (~> 1.73)
   rubocop-minitest (> 0)
   rubocop-performance (> 0)

data/lib/qbash.rb

@@ -84,84 +84,77 @@ module Kernel
   def qbash(cmd, stdin: '', env: {}, log: Loog::NULL, accept: [0], both: false, level: Logger::DEBUG)
     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(' ') if cmd.is_a?(Array)
-    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}"
+    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
+        if log.nil?
+          # nothing to print
+        elsif log.respond_to?(mtd)
+          log.__send__(mtd, msg)
+        else
+          log.print("#{msg}\n")
+        end
       end
-    if log.nil?
-      # nothing to print
-    elsif log.respond_to?(mtd)
-      log.__send__(mtd, "+ #{cmd}")
-    else
-      log.print("+ #{cmd}\n")
-    end
+    logit["+ #{cmd}"]
     buf = ''
     e = 1
     start = Time.now
     Open3.popen2e(env, "/bin/bash -c #{Shellwords.escape(cmd)}") do |sin, sout, ctrl|
+      consume =
+        lambda do
+          loop do
+            break if sout.eof?
+            ln = sout.gets
+            next if ln.nil?
+            next if ln.empty?
+            buf += ln
+            ln = "##{ctrl.pid}: #{ln}"
+            logit[ln]
+          rescue IOError => e
+            logit[e.message]
+            break
+          end
+        end
       sin.write(stdin)
       sin.close
       if block_given?
-        closed = false
-        watch =
-          Thread.new do
-            until closed
-              begin
-                ln = sout.gets
-              rescue IOError => e
-                ln = Backtrace.new(e).to_s
-              end
-              next if ln.nil?
-              next if ln.empty?
-              ln = "##{ctrl.pid}: #{ln}"
-              if log.nil?
-                # no logging
-              elsif log.respond_to?(mtd)
-                log.__send__(mtd, ln)
-              else
-                log.print(ln)
-              end
-              buf += ln
-            end
-          end
+        watch = Thread.new { consume.call }
+        watch.abort_on_exception = true
         pid = ctrl.pid
         yield pid
-        begin
-          Process.kill('TERM', pid)
+        sout.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}"]
+          sleep(0.1)
+          attempt += 1
         rescue Errno::ESRCH
-          # simply ignore it
+          logit["Process ##{pid} exited gracefully"]
+          break
         end
-        closed = true
-        watch.join
       else
-        until sout.eof?
-          begin
-            ln = sout.gets
-          rescue IOError => e
-            ln = Backtrace.new(e).to_s
-          end
-          if log.nil?
-            # no logging
-          elsif log.respond_to?(mtd)
-            log.__send__(mtd, ln)
-          else
-            log.print(ln)
-          end
-          buf += ln
-        end
-        e = ctrl.value.to_i
-        if !accept.nil? && !accept.include?(e)
-          raise "The command '#{cmd}' failed with exit code ##{e} in #{start.ago}\n#{buf}"
-        end
+        consume.call
+      end
+      e = ctrl.value.to_i
+      if !accept.nil? && !accept.include?(e)
+        raise "The command '#{cmd}' failed with exit code ##{e} in #{start.ago}\n#{buf}"
       end
     end
     return [buf, e] if both

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.4.1'
+  s.version = '0.4.3'
   s.license = 'MIT'
   s.summary = 'Quick Executor of a BASH Command'
   s.description =

data/test/test__helper.rb

@@ -15,8 +15,8 @@ unless SimpleCov.running || ENV['PICKS']
       SimpleCov::Formatter::CoberturaFormatter
     ]
   )
-  SimpleCov.minimum_coverage 90
-  SimpleCov.minimum_coverage_by_file 90
+  SimpleCov.minimum_coverage 95
+  SimpleCov.minimum_coverage_by_file 95
   SimpleCov.start do
     add_filter 'test/'
     add_filter 'vendor/'

data/test/test_qbash.rb

@@ -81,7 +81,7 @@ class TestQbash < Minitest::Test
 
   def test_kills_in_thread
     Thread.new do
-      qbash('sleep 9999') do |pid|
+      qbash('sleep 9999', accept: nil) do |pid|
         Process.kill('KILL', pid)
       end
     end.join
@@ -92,9 +92,10 @@ class TestQbash < Minitest::Test
     buf = Loog::Buffer.new
     Dir.mktmpdir do |home|
       flag = File.join(home, 'started.txt')
+      cmd = "while true; do date; touch #{Shellwords.escape(flag)}; sleep 0.001; done"
       Thread.new do
         stdout =
-          qbash("while true; do date; touch #{Shellwords.escape(flag)}; sleep 0.001; done", log: buf) do |pid|
+          qbash(cmd, log: buf, accept: nil) do |pid|
             loop { break if File.exist?(flag) }
             Process.kill('KILL', pid)
           end
@@ -113,4 +114,21 @@ class TestQbash < Minitest::Test
       refute_empty(stdout)
     end
   end
+
+  def test_exists_after_background_stop
+    stop = false
+    pid = nil
+    t =
+      Thread.new do
+        qbash('trap "" TERM; sleep 10', accept: nil) do |id|
+          pid = id
+          loop { break if stop }
+        end
+      end
+    t.abort_on_exception = true
+    sleep(0.01)
+    stop = true
+    refute(t.join(0.1))
+    t.kill
+  end
 end

metadata

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