test-cmd.rb 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d794fcd3192700e47d0964074f19732cd9ebc6881804d267cdb182fd31c19f4a
-  data.tar.gz: 139a5dda07f237f60918421a1ceefddb75f31807aaa9bb394c1f5e8680001a86
+  metadata.gz: 67a69e56d58ed586edecb9b4792bbc54913f2044a6468ce6d098744142cf78a0
+  data.tar.gz: 713bd38cbe6812e61e8847e156e16732cdcfc72026f206bd9df70c03c6d8a946
 SHA512:
-  metadata.gz: ad22764743a6f3e5d7a15457c8fe495f3f03598ca145cdb31754e69ce24a8a7c59bc76d74eb6022b2231b1ec311439e70da3bbfdc8c240cdcabb9f7c595d8fbf
-  data.tar.gz: 9cb6ed663a9c544a8a6d1b83781251a36eddf114d821f26d2f79c705d8945ea7d69215d77e627d8b44e8b82db203029bc4d28fa0eb161f541291259a66ea76fc
+  metadata.gz: b8f1e8928b018372d5d6247300509f249bb3f7934a04b4a7356beff15d9c223a396657e1bb5e050bb7777b36185f2cf106618330f73df6939204c430a25eb584
+  data.tar.gz: 1f76220a3ab003bf434ab2dd7d604f7abe0577543abd5d86afee3b0a1fb82c3f164f8e6ba62489c1cacb9193c44860cd3fb152e93c3bcf4491400584805dde41

data/.github/workflows/specs.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [3.1, 3.2]
+        ruby: [3.1, 3.2, 3.3]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/lib/test/cmd.rb

@@ -7,6 +7,18 @@ end
 # test-cmd.rb provides an object oriented interface
 # for spawning a command.
 class Test::Cmd
+  ##
+  # @api private
+  class Pipe < Struct.new(:r, :w)
+    def self.pair
+      new(*IO.pipe)
+    end
+
+    def close
+      [r, w].each(&:close)
+    end
+  end
+
   ##
   # @param [String] cmd
   #  A command to spawn
@@ -18,6 +30,8 @@ class Test::Cmd
     @argv = argv.dup
     @status = nil
     @spawned = false
+    @stdout = ""
+    @stderr = ""
   end
 
   ##
@@ -35,15 +49,21 @@ class Test::Cmd
     return self if @spawned
 
     tap do
+      out, err = Pipe.pair, Pipe.pair
       @spawned = true
-      @out_io, out = IO.pipe
-      @err_io, err = IO.pipe
-      Process.spawn(@cmd, *@argv, {out:, err:})
-      Process.wait
-      @status = $?
+      t = Thread.new do
+        Process.spawn(@cmd, *@argv, {out: out.w, err: err.w})
+        Process.wait
+        @status = $?
+      end
+      loop do
+        break unless t.alive?
+        io, _ = IO.select([out.r, err.r], nil, nil, 0.01)
+        io&.include?(out.r) ? @stdout << out.r.read(1) : nil
+        io&.include?(err.r) ? @stderr << err.r.read(1) : nil
+      end
     ensure
       [out, err].each(&:close)
-      [stdout, stderr]
     end
   end
 
@@ -51,24 +71,16 @@ class Test::Cmd
   # @return [String]
   #  Returns the contents of stdout
   def stdout
-    @stdout ||= begin
-      spawn
-      out_io.read.tap { out_io.close }
-    rescue IOError
-      @stdout
-    end
+    spawn
+    @stdout
   end
 
   ##
   # @return [String]
   #  Returns the contents of stderr
   def stderr
-    @stderr ||= begin
-      spawn
-      err_io.read.tap { err_io.close }
-    rescue IOError
-      @stderr
-    end
+    spawn
+    @stderr
   end
 
   ##
@@ -138,10 +150,6 @@ class Test::Cmd
   def spawned?
     @spawned
   end
-
-  private
-
-  attr_reader :out_io, :err_io
 end
 
 module Kernel

data/test/cmd_test.rb

@@ -85,22 +85,6 @@ class Test::Cmd
     end
   end
 
-  ##
-  # Test::Cmd#spawn
-  class SpawnTest < Test
-    def test_io_closed_after_spawn
-      %i[out_io err_io].each do |io|
-        assert_equal true, spawned_command.send(io).closed?
-      end
-    end
-
-    private
-
-    def spawned_command
-      ruby("puts 42").spawn
-    end
-  end
-
   ##
   # Test::Cmd#spawned?
   class SpawnedTest < Test

data/test-cmd.rb.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors = ["0x1eef"]
   gem.email = ["0x1eef@protonmail.com"]
   gem.homepage = "https://github.com/0x1eef/test-cmd.rb#readme"
-  gem.version = "0.12.0"
+  gem.version = "0.12.1"
   gem.required_ruby_version = ">= 3.0"
   gem.licenses = ["0BSD"]
   gem.files = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-cmd.rb
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit