test-cmd.rb 0.9.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5bf49f40fdbefaea05fb598e7e9fa5a12faeb72e90e8794b0a6b9366dfa8a0
-  data.tar.gz: 1b19f3a1df91a354717cc6c7862762f5ddadf72392b3bd71018ee41673accd0d
+  metadata.gz: 633be9bbfd994b7e810172560fb9f63dd2671ac77b90132d37dba6bdf55a9a2c
+  data.tar.gz: cffe23b0fab98c782c910fae748179206869740df586bd4c8e321643cb8e12ff
 SHA512:
-  metadata.gz: 28a8899a6f9f9bf941a171ced9ae694b57762eb4c24608f9243ec61dc2a17b367566baeaae9de60280af70f75ef9b0a75e08359895f6b69b37f3eda844ad30e1
-  data.tar.gz: 5d87dcebab3b423c19b4d00b90bf447aad83033b71e74e47aff5fd2c904a7289eb5890c42175df0ee35a4c29f6eb2746e9db8d7220b397b13591dc8f67d6e70b
+  metadata.gz: 38c743bb91c272ff67064b3b2c6f0e54bc62bc02876e25faf0d6876418b2001e8b77b7563ec6b4e5c14b8a7b40da43ea7399fe5bea54e158ec8773ea51d4b602
+  data.tar.gz: 632d756c4e8616cdcb619cbfa9d4cf3a1eaca19d3898dd6d54aeaa13b88975d5fc1a0ee5955eddc0fde70bf82ceffa2cf293193a309cb8a287dfe6f8dd0f6fec

data/README.md

@@ -1,7 +1,7 @@
 ## About
 
 test-cmd.rb provides an object-oriented interface for spawning
-a process.
+a command.
 
 ## Examples
 
@@ -13,7 +13,7 @@ is passed an instance of
 [Test::Cmd](https://0x1eef.github.io/x/test-cmd.rb/Test/Cmd.html):
 
 ``` ruby
-require "test/cmd"
+require "test-cmd"
 cmd("ruby", "-e", "exit 0")
   .success { print "The command [#{_1.pid}] was successful", "\n" }
   .failure { print "The command [#{_1.pid}] was unsuccessful", "\n" }
@@ -23,7 +23,7 @@ cmd("ruby", "-e", "exit 0")
 
 The following example demonstrates how tests might be written with
 test-unit from the standard library. The
-[`cmd`](https://0x1eef.github.io/x/test-cmd.rb/Test/CmdMixin.html#cmd-instance_method)
+[`cmd`](https://0x1eef.github.io/x/test-cmd.rb/Kernel.html#cmd-instance_method)
 method takes the name or path of a command, alongside any arguments:
 
 ```ruby
@@ -32,19 +32,25 @@ require "test/cmd"
 
 class CmdTest < Test::Unit::TestCase
   def test_ruby_stdout
-    assert_equal "42\n", cmd("ruby", "-e", "puts 42").stdout
+    assert_equal "42\n", ruby("puts 42").stdout
   end
 
   def test_ruby_stderr
-    assert_equal "42\n", cmd("ruby", "-e", "warn 42").stderr
+    assert_equal "42\n", ruby("warn 42").stderr
   end
 
   def test_ruby_success_exit_status
-    assert_equal 0, cmd("ruby", "-e", "exit 0").exit_status
+    assert_equal 0, ruby("exit 0").exit_status
   end
 
   def test_ruby_failure_exit_status
-    assert_equal 1, cmd("ruby", "-e", "exit 1").exit_status
+    assert_equal 1, ruby("exit 1").exit_status
+  end
+
+  private
+
+  def ruby(code)
+    cmd("ruby", "-e", code)
   end
 end
 ```

data/lib/test/cmd.rb

@@ -1,10 +1,12 @@
-require_relative "../test-cmd"
+module Test
+end unless defined?(Test)
 
 ##
 # test-cmd.rb provides an object oriented interface
 # for spawning a command.
 class Test::Cmd
   require "tempfile"
+  require "securerandom"
 
   ##
   # @param [String] cmd
@@ -39,6 +41,8 @@ class Test::Cmd
       Process.spawn(@cmd, *@argv, {out: @out_io, err: @err_io})
       Process.wait
       @status = $?
+    ensure
+      [stdout, stderr]
     end
   end
 
@@ -49,6 +53,8 @@ class Test::Cmd
     @stdout ||= begin
       spawn
       out_io.tap(&:rewind).read.tap { out_io.close }
+    rescue IOError
+      @stdout
     end
   end
 
@@ -59,6 +65,8 @@ class Test::Cmd
     @stderr ||= begin
       spawn
       err_io.tap(&:rewind).read.tap { err_io.close }
+    rescue IOError
+      @stderr
     end
   end
 
@@ -123,18 +131,38 @@ class Test::Cmd
     end
   end
 
+  ##
+  # @return [Boolean]
+  #  Returns true when a command has been spawned
+  def spawned?
+    @spawned
+  end
+
   private
 
   attr_reader :out_io, :err_io
 
   def spawn_io
     [
-      %W[#{object_id} testcmd.out],
-      %W[#{object_id} testcmd.err]
+      [".testcmd.stdout.#{ns}.", SecureRandom.alphanumeric(3)],
+      [".testcmd.stderr.#{ns}.", SecureRandom.alphanumeric(3)]
     ].map {
       file = Tempfile.new(_1)
       File.chmod(0, file.path)
       file.tap(&:unlink)
     }
   end
+
+  def ns
+    [Process.pid, object_id].join(".")
+  end
+end
+
+module Kernel
+  ##
+  # @param (see Test::Cmd#initialize)
+  # @return (see Test::Cmd#initialize)
+  def cmd(cmd, *argv)
+    Test::Cmd.new(cmd, *argv)
+  end
 end

data/lib/test-cmd.rb

@@ -1,15 +1 @@
-module Test
-end unless defined?(Test)
-
-module Test
-  require_relative "test/cmd"
-end
-
-module Kernel
-  ##
-  # @param (see Test::Cmd#initialize)
-  # @return (see Test::Cmd#initialize)
-  def cmd(cmd, *argv)
-    Test::Cmd.new(cmd, *argv)
-  end
-end
+require_relative "test/cmd"

data/test/test_cmd_test.rb

@@ -1,47 +1,55 @@
 require_relative "setup"
 
-class CmdTest < Test::Unit::TestCase
-  def test_ruby_stdout
-    assert_equal "42\n", cmd("ruby", "-e", "puts 42").stdout
+class Test::Cmd
+  class Test < Test::Unit::TestCase
+    private
+    def ruby(str)
+      cmd "ruby", "-e", str
+    end
   end
+end
 
-  def test_ruby_stderr
-    assert_equal "42\n", cmd("ruby", "-e", "warn 42").stderr
+class Test::Cmd
+  ##
+  # Test::Cmd#argv
+  class ARGVTest < Test
+    def test_ruby_argv
+      assert_equal "42\n", cmd("ruby")
+                             .argv("-e", "warn 42")
+                             .stderr
+    end
   end
 
-  def test_ruby_success_exit_status
-    assert_equal 0, cmd("ruby", "-e", "exit 0").exit_status
-  end
+  ##
+  # Test::Cmd#{exit_status, status, success?}
+  class ExitStatusTest < Test
+    def test_ruby_exit_status_success
+      assert_equal 0, ruby("exit 0").exit_status
+    end
 
-  def test_ruby_failure_exit_status
-    assert_equal 1, cmd("ruby", "-e", "exit 1").exit_status
-  end
+    def test_ruby_exit_status_failure
+      assert_equal 1, ruby("exit 1").exit_status
+    end
 
-  def test_ruby_success_status
-    assert_equal true, cmd("ruby", "-e", "exit 0").status.success?
-    assert_equal true, cmd("ruby", "-e", "exit 0").success?
+    def test_ruby_exit_status_predicates
+      assert_equal true, ruby("exit 0").status.success?
+      assert_equal true, ruby("exit 0").success?
+    end
   end
 
-  def test_ruby_success_callback
-    call_ok, call_fail = [false, false]
-    cmd("ruby", "-e", "exit 0")
-      .success { call_ok = true }
-      .failure { call_fail = true }
-    assert_equal true, call_ok
-    assert_equal false, call_fail
-  end
+  ##
+  # Test::Cmd#{stdout,stderr}
+  class OutputTest < Test
+    def test_ruby_stdout
+      assert_equal "42\n", ruby("puts 42").stdout
+    end
 
-  def test_ruby_failure_callback
-    call_ok, call_fail = [false, false]
-    cmd("ruby", "-e", "exit 1")
-      .success { call_ok = true }
-      .failure { call_fail = true }
-    assert_equal true, call_fail
-    assert_equal false, call_ok
-  end
+    def test_ruby_stderr
+      assert_equal "42\n", ruby("warn 42").stderr
+    end
 
-  def test_stdout_with_fork
-    code = <<-CODE.each_line.map { _1.chomp.strip }.join(";")
+    def test_ruby_stdout_fork
+      code = <<-CODE.each_line.map { _1.chomp.strip }.join(";")
       $stdout.sync = true
       fork do
         sleep(1)
@@ -50,12 +58,64 @@ class CmdTest < Test::Unit::TestCase
       puts "foo"
       Process.wait
     CODE
-    assert_equal "foo\nbar\n", cmd("ruby", "-e", code).stdout
+      assert_equal "foo\nbar\n", ruby(code).stdout
+    end
+  end
+
+  ##
+  # Test::Cmd#{success, failure}
+  class CallbackTest < Test
+    def test_ruby_success_callback
+      call_ok, call_fail = [false, false]
+      ruby("exit 0")
+        .success { call_ok = true }
+        .failure { call_fail = true }
+      assert_equal true, call_ok
+      assert_equal false, call_fail
+    end
+
+    def test_ruby_failure_callback
+      call_ok, call_fail = [false, false]
+      ruby("exit 1")
+        .success { call_ok = true }
+        .failure { call_fail = true }
+      assert_equal true, call_fail
+      assert_equal false, call_ok
+    end
   end
 
-  def test_cmd_with_argv
-    assert_equal "42\n", cmd("ruby")
-                           .argv("-e", "warn 42")
-                           .stderr
+  ##
+  # 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
+
+    def test_io_unlink_after_spawn
+      %i[out_io err_io].each do |io|
+        path = spawned_command.send(io).__getobj__.path
+        assert_equal false, File.exist?(path)
+      end
+    end
+
+    private
+
+    def spawned_command
+      ruby("puts 42").spawn
+    end
+  end
+
+  ##
+  # Test::Cmd#spawned?
+  class SpawnedTest < Test
+    def test_spawned_before_spawn
+      assert_equal false, ruby("puts 42").spawned?
+    end
+
+    def test_spawned_after_spawn
+      assert_equal true, ruby("puts 42").tap(&:spawn).spawned?
+    end
   end
 end

data/test-cmd.rb.gemspec

@@ -5,12 +5,12 @@ 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.9.3"
+  gem.version = "0.11.0"
   gem.required_ruby_version = ">= 3.0"
   gem.licenses = ["0BSD"]
   gem.files = `git ls-files`.split($/)
   gem.require_paths = ["lib"]
-  gem.summary = "An object-oriented interface for spawning a process"
+  gem.summary = "An object-oriented interface for spawning a command"
   gem.metadata = { "documentation_uri" => "https://0x1eef.github.io/x/test-cmd.rb/" }
   gem.description = gem.summary
   gem.add_development_dependency "test-unit", "~> 3.5.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-cmd.rb
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.11.0
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.1'
-description: An object-oriented interface for spawning a process
+description: An object-oriented interface for spawning a command
 email:
 - 0x1eef@protonmail.com
 executables: []
@@ -124,5 +124,5 @@ requirements: []
 rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
-summary: An object-oriented interface for spawning a process
+summary: An object-oriented interface for spawning a command
 test_files: []