toys-core 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37117af06be544465a07f95706310e3b8de1ad4dbc58f53e113b2595eed70e47
-  data.tar.gz: 6e27a716c74435ff2060838dbde56af35b4df93dcdc671051397755f478cc233
+  metadata.gz: 2345d22178ad2ca256a6099f3b359abaf6641248c3a29256000e40204c618802
+  data.tar.gz: e9874795dd5057d7eca70164f221ec923c0ac17862146f1a9f15cba3c1cfc4e8
 SHA512:
-  metadata.gz: a9dc2dc2e8287fbdb1c7695ed9111360d7bfcfc17167c6b790b170843988acb198daa8d99050d910ee5ea41876b2bb6c2e22cbab9629e322c9e7687f90a34c99
-  data.tar.gz: '03283300b1140b477ae56276a066953eb4fc6c71aa2a14b2e0fbe66cc9934c3afbd30862349ee922d98c4e0b9e80e74e50ba180bddc939dec99ead630eb7ddf2'
+  metadata.gz: 852717f2545a44143185d168c374d871ba9495ccece98161b880d8fdf75b0f5929a97998f3d193c700963717c406567f3f365d73f9c6ad5af13270317b2a5a74
+  data.tar.gz: 3c2bb70a9512f058a9ead3feb55c4c658f7ac3357c51f39c47cb9bef081c1c5f876d08f8f45a2d0d716e6a884d22b156c64664177306041e85e411a18075ebd0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History
 
+### v0.11.3 / 2020-09-13
+
+* FIXED: The Exec library recognizes the argv0 option, and logs it appropriately 
+
 ### v0.11.2 / 2020-09-06
 
 * FIXED: Fix a JRuby-specific race condition when capturing exec streams 

data/lib/toys/core.rb

@@ -9,7 +9,7 @@ module Toys
     # Current version of Toys core.
     # @return [String]
     #
-    VERSION = "0.11.2"
+    VERSION = "0.11.3"
   end
 
   ## @private deprecated

data/lib/toys/utils/exec.rb

@@ -250,13 +250,14 @@ module Toys
         exec_opts = Opts.new(@default_opts).add(opts)
         spawn_cmd =
           if cmd.is_a?(::Array)
-            if cmd.size == 1 && cmd.first.is_a?(::String)
-              [[cmd.first, exec_opts.config_opts[:argv0] || cmd.first]]
+            if cmd.size > 1
+              binary = canonical_binary_spec(cmd.first, exec_opts)
+              [binary] + cmd[1..-1].map(&:to_s)
             else
-              cmd
+              [canonical_binary_spec(Array(cmd.first), exec_opts)]
             end
           else
-            [cmd]
+            [cmd.to_s]
           end
         executor = Executor.new(exec_opts, spawn_cmd, block)
         executor.execute
@@ -968,12 +969,19 @@ module Toys
         def log_command
           logger = @config_opts[:logger]
           if logger && @config_opts[:log_level] != false
-            cmd_str = @config_opts[:log_cmd]
-            cmd_str ||= @spawn_cmd.size == 1 ? @spawn_cmd.first : @spawn_cmd.inspect if @spawn_cmd
+            cmd_str = @config_opts[:log_cmd] || default_log_str(@spawn_cmd)
             logger.add(@config_opts[:log_level] || ::Logger::INFO, cmd_str) if cmd_str
           end
         end
 
+        def default_log_str(spawn_cmd)
+          return nil unless spawn_cmd
+          return spawn_cmd.first if spawn_cmd.size == 1 && spawn_cmd.first.is_a?(::String)
+          cmd_binary = spawn_cmd.first
+          cmd_binary = cmd_binary.first if cmd_binary.is_a?(::Array)
+          ([cmd_binary] + spawn_cmd[1..-1]).inspect
+        end
+
         def start_with_controller
           pid =
             begin
@@ -1300,6 +1308,17 @@ module Toys
           end
         end
       end
+
+      private
+
+      def canonical_binary_spec(cmd, exec_opts)
+        config_argv0 = exec_opts.config_opts[:argv0]
+        return cmd.to_s if !config_argv0 && !cmd.is_a?(::Array)
+        cmd = Array(cmd)
+        actual_cmd = cmd.first
+        argv0 = cmd[1] || config_argv0 || actual_cmd
+        [actual_cmd.to_s, argv0.to_s]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies: []
 description: Toys-Core is the command line tool framework underlying Toys. It can
   be used to create command line executables using the Toys DSL and classes.
@@ -69,10 +69,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.2/file.CHANGELOG.html
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.3/file.CHANGELOG.html
   source_code_uri: https://github.com/dazuma/toys
   bug_tracker_uri: https://github.com/dazuma/toys/issues
-  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.2
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.3
 post_install_message: 
 rdoc_options: []
 require_paths: