test-cmd.rb 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0790a7e8e68709204aeb42611543db79e3575615d6ed77ee0b166fff7827825
-  data.tar.gz: 7965cd9baf53560ff8648f0652876b3d31a969528b1419b5b975406ec37c13fc
+  metadata.gz: 8f3880288c628fc25dc0a16dcee05222dc776ffb8cab098d2fad3610534ebded
+  data.tar.gz: 39573f323c733d4fef70b3e784c3b6c4f956f7da60e0c1bbe7e454d51487f003
 SHA512:
-  metadata.gz: f0f7c63d381cbbd8c603c8fc7a1c22e7c73509b0a51965107c2fe2c23adf3c2b8cf5f243712b4f297f90aeb0535c01477ddd4518c10be6afd6a29b248c30af18
-  data.tar.gz: aee5d21c5948e17b29f0df43636bb18d396d6919efdc3a0fe6c03628ba85d5f3ae0e04cd03e61e51c33ad30aa88a2e7a840051cc704d3ac384957ea75d6f1cd1
+  metadata.gz: 3b8e25c54804ac4cfa14f4356a2ea9f3e7b97f994792ae3f77b60e19151d3ee66d84959a40347b82adf1e0b5c277c3d28ef81b85992a5a496881db8e695ca867
+  data.tar.gz: face7b9c865c69666ff8eb29393af0ce856777bdf70d617889021f3a8496c0d331be88c527eec3f861b606773d93b1ca70e634c7e08e4a12f60320d57777e5bd

data/.github/workflows/specs.yml

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

data/README.md

@@ -34,7 +34,6 @@ test-cmd.rb can be installed via rubygems.org:
 
 ### Commands
 
-
 ```ruby
 require "test-cmd"
 
@@ -63,7 +62,7 @@ p Test::Command
 
 ##
 # Limit how much data is read from stdout and
-# stderr. At most 20k chars is read from both:
+# stderr. At most 20k bytes is read from both:
 p Test::Command
   .new("git")
   .limit(stdout: 20_000, stderr: 20_000)
@@ -75,13 +74,35 @@ p Test::Command
 <summary>Environment</summary>
 <br>
 
+A command that is not given an environment inherits the parent's
+environment. When `env` is called, only the variables that are
+given to `env` are set on the spawned process, alongside `$PATH`
+which is always inherited. `$PATH` is inherited so that the
+command can still be found via path lookup.
+
 ```ruby
-require "test-cmd"
+##
+# Inherit the parent's environment. All variables
+# from the parent process are available.
+p Test::Command
+  .new("env")
+  .stdout
 
+##
+# Only $FOO and $BAR are set, plus the inherited
+# $PATH. Everything else is left behind.
+p Test::Command
+  .new("env")
+  .env("FOO" => "42", "BAR" => "7")
+  .stdout
+
+##
+# An empty hash yields only $PATH and the rest of
+# environment is left empty.
 p Test::Command
-  .new("ruby", "-e", "puts ENV['FOO']")
-  .env("FOO" => "42")
-  .stdout  # => "42\n"
+    .new("env")
+    .env({})
+    .stdout
 ```
 </details>
 

data/lib/test/command/version.rb

@@ -4,5 +4,5 @@ end unless defined?(Test)
 class Test::Command
   ##
   # @string [String]
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

data/lib/test/command.rb

@@ -28,7 +28,7 @@ class Test::Command
   def initialize(cmd, *argv)
     @cmd = cmd
     @argv = argv.dup
-    @env = {}
+    @env = nil
     @status = nil
     @spawned = false
     @stdout = ""
@@ -50,7 +50,7 @@ class Test::Command
   #  Environment variables to set for the spawned command
   # @return [Test::Command]
   def env(env)
-    tap { @env.merge!(env) }
+    tap { (@env ||= {}).merge!(env) }
   end
 
   ##
@@ -91,7 +91,7 @@ class Test::Command
       @spawned = true
       @out, @err = Pipe.pair, Pipe.pair
       @pid = Process.spawn(
-        @env,
+        envp,
         @cmd, *@argv.map(&:to_s),
         {in: @in_r, out: @out.w, err: @err.w}
       )
@@ -246,6 +246,29 @@ class Test::Command
 
   private
 
+  ##
+  # Builds the environment passed to Process.spawn.
+  # The spawned process receives only the variables
+  # set with #env: every inherited variable is
+  # cleared, so an empty @env spawns with an empty
+  # environment.
+  # @return [Hash{String => String}]
+  def envp
+    if @env.nil?
+      ##
+      # Inherit the parent's environment
+      ENV.to_h
+    else
+      ##
+      # Clear all environment variables except those
+      # that are set by `@env`. Always inherit ${PATH}.
+      envp = ENV.except("PATH")
+                .each_key
+                .to_h { |key| [key, nil] }
+      envp.merge!(@env)
+    end
+  end
+
   ##
   # Reads up to +max+ bytes from a stream, then drains
   # the remainder so a child writing more than the limit

data/test/cmd_test.rb

@@ -38,6 +38,41 @@ class Test::Command
                      .env("FOO" => "42")
                      .stdout
     end
+
+    def test_ruby_env_only_given_keys
+      assert_equal "BAR\nFOO\nPATH\n",
+                  ::Test::Command.new("ruby", "-e", "puts ENV.keys.sort")
+                  .env("FOO" => "42", "BAR" => "7")
+                  .stdout
+    end
+
+    def test_ruby_env_empty_is_empty_env
+      assert_equal "PATH",
+                  ::Test::Command.new("ruby", "-e", "print ENV.keys.sort.join(\",\")")
+                  .env({})
+                  .stdout
+    end
+
+    def test_ruby_env_does_not_leak_inherited
+      assert_equal "true",
+                    ::Test::Command.new("ruby", "-e", "print ENV.key?('PATH')")
+                    .stdout
+    end
+
+    def test_ruby_env_path_carries_over_inherited
+      parent_path = ENV["PATH"]
+      assert_equal parent_path,
+                   ::Test::Command.new("ruby", "-e", "print ENV['PATH']")
+                     .stdout
+    end
+
+    def test_ruby_env_path_carries_over_empty
+      parent_path = ENV["PATH"]
+      assert_equal parent_path,
+                   ::Test::Command.new("ruby", "-e", "print ENV['PATH']")
+                     .env({})
+                     .stdout
+    end
   end
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-cmd.rb
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Robert Gleeson