shell_mock 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147a2390f3f6299b3da3a3e548347c97b6915d6d
-  data.tar.gz: 85433c788c0479b762fe5542030d729ddf0922e8
+  metadata.gz: 9cfb3f3cd0005a629a39cbd9dff20630b9688668
+  data.tar.gz: 7276898279f5a813f7b7678ec2e6fee5d783f1e5
 SHA512:
-  metadata.gz: 86cfdd6bb159d3731cba1759484c677269e5fd1beb3d48813451712847f90b328cb875eb104d4778811b283a164b96b84f30542fb6abadf049b9252ddb4b7c13
-  data.tar.gz: 3a6807143e3a613d86444b9cecca1c7636ba2246f80e6b64d736a1be514983f2ecbb2b9dc12180f781deb9d7c1a4d5fbf4c253e2a1290124eaee2d100bdfda7a
+  metadata.gz: 504995cd6616c844be4281b875fab4fe40c5b94e9e9b47e0ee9e2d7dc561d37cb1a6d499c12c77ea4800871b020e38daff921c59c091f60c3ca0301b06035d86
+  data.tar.gz: a3cd02b088b51cb9c72ecd6d7d28c112c47be614cc02d2403a083b83af1612d2d1d9337d61cf0ede8558e1ce8553dcac57c3cdc118b24b27a4399290231243df

data/CHANGELOG.md

@@ -10,6 +10,10 @@
 * maybe add `CommandStub#with_stdin(str)` for `spawn`?
 * maybe adding the ability to specify the order in which commands output to stdout vs. stderr (like, a sequence of outputs) would be useful? would definitely be fun to build, not sure how useful it would be though.
 
+## RELEASE 0.7.1
+
+* FIX: fixed an issue with our `spawn` monkey-patch receiving optional key-value parameters from `Open3.popen2e`.
+
 ## RELEASE 0.7.0
 
 * FEATURE: `#to_output` is an alias of `#and_output`

data/lib/shell_mock/exec_monkey_patch.rb

@@ -1,6 +1,7 @@
 require 'shell_mock/monkey_patch'
 require 'shell_mock/stub_registry'
 require 'shell_mock/no_stub_specified'
+require 'shell_mock/spawn_arguments'
 
 module ShellMock
   class ExecMonkeyPatch < MonkeyPatch
@@ -8,10 +9,8 @@ module ShellMock
       :exec
     end
 
-    def override(env, command = nil, **options)
-      env, command = {}, env if command.nil?
-
-      # other arg manipulation can go here if necessary
+    def override(*args)
+      env, command, options = SpawnArguments(*args)
 
       stub = StubRegistry.stub_matching(env, command, options)
 
@@ -23,7 +22,7 @@ module ShellMock
         __un_shell_mocked_exec(stub.to_oneliner)
       else
         if ShellMock.let_commands_run?
-          __un_shell_mocked_exec(env, command, **options)
+          __un_shell_mocked_exec(env, command, options)
         else
           raise NoStubSpecified.new(env, command, options)
         end

data/lib/shell_mock/spawn_arguments.rb

@@ -0,0 +1,49 @@
+# The method signatures for exec, system, & spawn are identical and complicated.
+# This is a helper method that extracts the env vars hash, command, and options hash components.
+# I've called it SpawnArguments even though it's the same signature for exec, spawn, and system
+# because the Ruby docs for exec and system refer to the docs for spawn, indicating that Ruby
+# considers spawn the "origin" of the signature.
+def SpawnArguments(*args)
+  # the env vars hash is either the first argument, or empty
+  env = if args.first.is_a?(Hash)
+          args.shift
+        else
+          {}
+        end
+
+  # the options hash is either the last argument, or empty
+  options = if args.last.is_a?(Hash)
+              args.pop
+            else
+              {}
+            end
+
+  raise(ArgumentError, "You must provide a command to run.") if args.empty?
+
+  command = args.shift
+
+  raise(
+    ArgumentError,
+    "Unable to recognize first command component. Expected String or Array, got #{args.first.class}."
+  ) unless command.is_a?(String) || command.is_a?(Array)
+
+  raise(
+    ArgumentError,
+    "Each command component after the first must be strings."
+  ) unless args.all? { |arg| arg.is_a?(String) }
+
+  if args.empty?
+    if command.is_a?(String) # single commandline string
+      [env, command, options]
+    elsif command.is_a?(Array)
+      [env, [command], options] # [command, argv0] pair with no other command arguments
+    end
+  else
+    # this covers
+    #   a command with multiple string arguments
+    # and
+    #   a [command, argv0] pair with multiple string arguments
+    [env, [command, *args], options]
+  end
+end
+

data/lib/shell_mock/spawn_monkey_patch.rb

@@ -1,6 +1,7 @@
 require 'shell_mock/monkey_patch'
 require 'shell_mock/stub_registry'
 require 'shell_mock/no_stub_specified'
+require 'shell_mock/spawn_arguments'
 
 module ShellMock
   class SpawnMonkeyPatch < MonkeyPatch
@@ -8,10 +9,8 @@ module ShellMock
       :spawn
     end
 
-    def override(env, command = nil, **options)
-      env, command = {}, env if command.nil?
-
-      # other arg manipulation can go here if necessary
+    def override(*args)
+      env, command, options = SpawnArguments(*args)
 
       stub = StubRegistry.stub_matching(env, command, options)
 
@@ -20,10 +19,10 @@ module ShellMock
 
         stub.side_effect.call
 
-        __un_shell_mocked_spawn(stub.to_oneliner, **options)
+        __un_shell_mocked_spawn(stub.to_oneliner, options)
       else
         if ShellMock.let_commands_run?
-          __un_shell_mocked_spawn(env, command, **options)
+          __un_shell_mocked_spawn(env, command, options)
         else
           raise NoStubSpecified.new(env, command, options)
         end

data/lib/shell_mock/system_monkey_patch.rb

@@ -1,6 +1,7 @@
 require 'shell_mock/monkey_patch'
 require 'shell_mock/stub_registry'
 require 'shell_mock/no_stub_specified'
+require 'shell_mock/spawn_arguments'
 
 module ShellMock
   class SystemMonkeyPatch < MonkeyPatch
@@ -8,10 +9,8 @@ module ShellMock
       :system
     end
 
-    def override(env, command = nil, **options)
-      env, command = {}, env if command.nil?
-
-      # other arg manipulation can go here if necessary
+    def override(*args)
+      env, command, options = SpawnArguments(*args)
 
       stub = StubRegistry.stub_matching(env, command, options)
 
@@ -23,7 +22,7 @@ module ShellMock
         __un_shell_mocked_system(stub.to_oneliner)
       else
         if ShellMock.let_commands_run?
-          __un_shell_mocked_system(env, command, **options)
+          __un_shell_mocked_system(env, command, options)
         else
           raise NoStubSpecified.new(env, command, options)
         end

data/lib/shell_mock/version.rb

@@ -1,3 +1,3 @@
 module ShellMock
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shell_mock
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chris Hoffman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-08 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,7 @@ files:
 - lib/shell_mock/rspec.rb
 - lib/shell_mock/rspec/matchers.rb
 - lib/shell_mock/run_verifier.rb
+- lib/shell_mock/spawn_arguments.rb
 - lib/shell_mock/spawn_monkey_patch.rb
 - lib/shell_mock/stub_registry.rb
 - lib/shell_mock/system_monkey_patch.rb