qbash 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72371631590029a1533bf6e899fa51833c924fd89e070c2747bea4bd1257a906
-  data.tar.gz: 5855c06aa2c9444779f214783d35d56925fed96ed010c1fb187f4549618e63f2
+  metadata.gz: 352743a00eafd7847765e2839c66af94008228e5d614ef58c6e615f855376d20
+  data.tar.gz: b61577f89976eabc074146be11a9b8800aeaefdda100c98d4d5abd51a6dba688
 SHA512:
-  metadata.gz: 81fe1f8e49f5a706a8a357b5a071513f2f14e83d072e18300e7ec3fd7c15e18280302b77817b0b5f29d123bca871d136df086310cef6c1f5183410a35ff18309
-  data.tar.gz: 3baeb218d6423e04a2ccb86d02e5717c48c92af3e30833d2ff909ae480681c28db79e5586c7f5fa84691142d94960eeec7f1b2a9a2e26325bcd5e2ca10219036
+  metadata.gz: ef6de7a925ffe5b06c44bdca42efb852016dcab80bb52d8c41646e6ef6a306f2e73500e62840dd6d04c24d6545fdf4016e0f55161c0225abbac95ba50c4e2dae
+  data.tar.gz: 46d7a56a167241d0deed6dc5596efa2dfbe3dfa96fa1694e9c8cad5003be994f4f686c744122b71f8da4c42aa324ce77b57c6d5c3d4cd7b40061a6f2a5eae08e

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

@@ -104,7 +104,7 @@ module Kernel
         elsif log.respond_to?(mtd)
           log.__send__(mtd, msg)
         else
-          log.print("#{msg}\n")
+          log.print(msg)
         end
       end
     logit["+ #{cmd}"]
@@ -137,17 +137,17 @@ module Kernel
         sout.close
         watch.join(0.01)
         watch.kill if watch.alive?
-        begin
-          Process.getpgid(pid) # should be dead already (raising Errno::ESRCH)
+        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
-          begin
-            Process.getpgid(pid) # should be dead now (raising Errno::ESRCH)
-            raise "Process ##{pid} did not terminate after SIGTERM"
-          rescue Errno::ESRCH
-            logit["Process ##{pid} killed with SIGTERM"]
-          end
+          logit["Tried to stop ##{pid} with SIGTERM (attempt no.#{attempt}, #{since.ago}): #{cmd}"]
+          sleep(0.1)
+          attempt += 1
         rescue Errno::ESRCH
-          logit["Process ##{pid} exited gracefully"]
+          logit["Process ##{pid} gracefully reacted to SIGTERM"] if attempt > 1
+          break
         end
       else
         consume.call

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.2'
+  s.version = '0.4.4'
   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 1
-  SimpleCov.minimum_coverage_by_file 1
+  SimpleCov.minimum_coverage 95
+  SimpleCov.minimum_coverage_by_file 95
   SimpleCov.start do
     add_filter 'test/'
     add_filter 'vendor/'

data/test/test_qbash.rb

@@ -107,6 +107,16 @@ class TestQbash < Minitest::Test
     refute_includes(buf.to_s, "\n\n")
   end
 
+  def test_logs_multi_line_print
+    buf = Loog::Buffer.new
+    pid = nil
+    qbash('echo one; echo two', log: buf, accept: nil) do |i|
+      sleep(0.1)
+      pid = i
+    end
+    assert_equal(buf.to_s, "+ echo one; echo two\n##{pid}: one\n##{pid}: two\n")
+  end
+
   def test_with_both
     Dir.mktmpdir do |home|
       stdout, code = qbash("cat #{Shellwords.escape(File.join(home, 'foo.txt'))}", accept: nil, both: true)
@@ -117,18 +127,18 @@ class TestQbash < Minitest::Test
 
   def test_exists_after_background_stop
     stop = false
+    pid = nil
     t =
       Thread.new do
-        qbash('trap "" TERM; tail -f /dev/null', accept: nil) 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.1)
+    sleep(0.01)
     stop = true
-    t.join(0.01)
+    refute(t.join(0.1))
     t.kill
-    sleep(0.01)
-    refute_predicate(t, :alive?)
   end
 end

metadata

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