toys-core 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf20d64fb78cfa559000a8007d3f0567db38d1c66ea220daaf8a33f1275fcad
-  data.tar.gz: da6b5f0f2e7d7bef30ded0a45b17014e0adc623583b7221f67b6b44fc9ca3805
+  metadata.gz: ae396604e3a0005b460ad94f95187b603f36e8d10d1147da2a78b069232f7963
+  data.tar.gz: 267209d6e7ab4575053219eee5fb1c6be47b9bd6ac6468b6da5c9abb9ed227c2
 SHA512:
-  metadata.gz: e429973defa957eb444c1395c9d6c235052f7f365978d216e7fc4633ebbb7361242ce649845304cd96c47d5227e563d79021c41bd0d2529e9d9b4695edb09ae6
-  data.tar.gz: 4cc2e28b0309130bd8c524a6ab3c17018e9160db4251225ad88aa082cf1ab1226eabda6d0e1ba8691d7ee2c107e8c6b4ea661265422d045a3a27692ce4b5745a
+  metadata.gz: 527f51e0e679f93786ecd671ff14386615e2014e0dbd4995fd4bb6e58040cb00b27d83d3721c412eb8cc83fdc82fe7dff63c97e0e3d8bca8f8b8d7b04a5d9f41
+  data.tar.gz: 07c617895710b6f5dd69c6fdb16613c2ed7474361a1cbd8617ae1d271eca647ffa457e77bec7e1b30915b1e01ad25173c74251f1728f261a5d5565ca29b80d68

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Release History
 
-### 0.11.0 / 2020-08-21
+### v0.11.5 / 2021-03-28
+
+* BREAKING CHANGE: The exit_on_nonzero_status option to exec now exits on signals and failures to spawn, in addition to error codes.
+* ADDED: Support retries in the bundler integration.
+* FIXED: Fix a bundler 2.2 integration issue that fails install in certain cases when an update is needed.
+
+### v0.11.4 / 2020-10-11
+
+* FIXED: Doesn't modify bundler lockfiles when adding Toys to a bundle
+
+### 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
+
+### v0.11.1 / 2020-08-24
+
+* DOCS: Minor documentation tweaks.
+
+### v0.11.0 / 2020-08-21
 
 * ADDED: The load path can be truncated using the `truncate_load_path!` directive.
 * IMPROVED: Generated help for delegates now includes the information for the target tool, plus subtools of the delegate.
@@ -10,7 +32,7 @@
 * FIXED: Exec::Result correctly reports processes that terminated due to signals.
 * FIXED: Fixed a rare Exec capture failure that resulted from a race condition when closing streams.
 
-### 0.10.5 / 2020-07-18
+### v0.10.5 / 2020-07-18
 
 * IMPROVED: The bundler mixin silences bundler output during bundle setup.
 * IMPROVED: The bundler mixin allows toys and toys-core to be in the Gemfile. It checks their version requirements against the running Toys version, and either adds the corret version to the bundle or raises IncompatibleToysError.
@@ -18,24 +40,24 @@
 * FIXED: Some cases of transitive dependency handling by the bundler mixin.
 * FIXED: Fixed a crash when computing suggestions, when running with a bundle on Ruby 2.6 or earlier.
 
-### 0.10.4 / 2020-07-11
+### v0.10.4 / 2020-07-11
 
 * IMPROVED: Bundler integration can now handle Toys itself being in the bundle, as long as the version requirements cover the running Toys version.
 * IMPROVED: Passing `static: true` to the `:bundler` mixin installs the bundle at definition rather than execution time.
 
-### 0.10.3 / 2020-07-04
+### v0.10.3 / 2020-07-04
 
 * FIXED: The `exec_separate_tool` method in the `:exec` mixin no longer throws ENOEXEC on Windows.
 
-### 0.10.2 / 2020-07-03
+### v0.10.2 / 2020-07-03
 
 * FIXED: The load path no longer loses the toys and toys-core directories after a bundle install.
 
-### 0.10.1 / 2020-03-07
+### v0.10.1 / 2020-03-07
 
 * FIXED: Setting `:exit_on_nonzero_status` explicitly to false now works as expected.
 
-### 0.10.0 / 2020-02-24
+### v0.10.0 / 2020-02-24
 
 Functional changes:
 
@@ -65,16 +87,16 @@ Internal interface changes:
 * CHANGED: `Toys::CLI.default_logger` removed and replaced with `Toys::CLI.default_logger_factory`. In general, global loggers for CLI are now discouraged because they are not thread-safe.
 * CHANGED: `Toys::Loader` uses an internal monitor rather than including `MonitorMixin`.
 
-### 0.9.4 / 2020-01-26
+### v0.9.4 / 2020-01-26
 
 * FIXED: Crash in the loader when a non-ruby file appears in a toys directory
 
-### 0.9.3 / 2020-01-05
+### v0.9.3 / 2020-01-05
 
 * FIXED: `delegate_to` directive could crash if an overriding tool has already been defined.
 * FIXED: A Ruby 2.7 warning when reporting a Toys file syntax error.
 
-### 0.9.2 / 2020-01-03
+### v0.9.2 / 2020-01-03
 
 * IMPROVED: Mixins can now take real keyword arguments, and will pass them on properly to `on_initialize` and `on_include` blocks.
 * CHANGED: `Toys::Utils::Exec` and the `:exec` mixin methods now take real keyword arguments rather than an `opts` hash. This means you should use keywords (or the double-splat operator) to avoid a deprecation warning on Ruby 2.7.
@@ -82,11 +104,11 @@ Internal interface changes:
 * IMPROVED: `Toys::Loader` is now thread-safe. This means it is now possible for a single `Toys::CLI` to run multiple tools in different threads.
 * IMPROVED: There is now a class for middleware specs, making possible a nicer syntax for building a middleware stack.
 
-### 0.9.1 / 2019-12-22
+### v0.9.1 / 2019-12-22
 
 * IMPROVED: `delegate_to` and `alias_tool` can take symbols as well as strings.
 
-### 0.9.0 / 2019-12-02
+### v0.9.0 / 2019-12-02
 
 Functional changes:
 
@@ -109,12 +131,12 @@ Internal interface changes:
 * ADDED: `Toys::Tool#delegate_to` causes the tool to delegate to another tool.
 * ADDED: The `Toys::Context::Key::DELEGATED_FROM` key provides the delegating context, if any.
 
-### 0.8.1 / 2019-11-19
+### v0.8.1 / 2019-11-19
 
 * FIXED: Listing subtools would crash if a broken alias was present.
 * DOCUMENTATION: Switched from redcarpet to kramdown, and tried to make some structural fixes.
 
-### 0.8.0 / 2019-06-20
+### v0.8.0 / 2019-06-20
 
 This is a major update with significant new features and a bunch of fixes. It also includes a significant amount of internal reorganization and cleanup, some of which resulted in backward incompatible changes. Basic use should not be affected. All signifiant features planned for beta are now implemented.
 
@@ -213,17 +235,17 @@ Changes to internal interfaces:
     * ADDED: Range acceptor (`Acceptor::Range`) which validates against a range.
     * ADDED: Class methods `Acceptor.create` and `Acceptor.lookup_well_known`.
 
-### 0.7.0 / 2019-01-23
+### v0.7.0 / 2019-01-23
 
 * ADDED: Flag groups, which enforce policies around which flags are required.
 * CHANGED: Flags within a group are sorted in help screens.
 * CHANGED: Canonical flag within a flag definition is now the first rather than the last.
 
-### 0.6.1 / 2019-01-07
+### v0.6.1 / 2019-01-07
 
 * FIXED: The presence of aliases caused subtool listing to crash.
 
-### 0.6.0 / 2018-10-22
+### v0.6.0 / 2018-10-22
 
 * CHANGED: Replaced Toys::Definition::DataFinder with Toys::Definition::SourceInfo.
 * CHANGED: Removed Toys::Definition#find_data. Use Toys::Definition#source_info and call find_data.
@@ -232,7 +254,7 @@ Changes to internal interfaces:
   from subtool lists.
 * IMPROVED: Optionally omit non-runnable namespaces from recursive subtool lists.
 
-### 0.5.0 / 2018-10-07
+### v0.5.0 / 2018-10-07
 
 * FIXED: Template instantiation was failing if the hosting tool was priority-masked.
 * ADDED: Several additional characters can optionally be used as tool path delimiters.
@@ -242,31 +264,31 @@ Changes to internal interfaces:
 * IMPROVED: The tool directive can now take an array as the tool name.
 * IMPROVED: The tool directive can now take an `if_defined` argument.
 
-### 0.4.5 / 2018-08-05
+### v0.4.5 / 2018-08-05
 
 * CHANGED: Dropped preload file feature
 
-### 0.4.4 / 2018-07-21
+### v0.4.4 / 2018-07-21
 
 * FIXED: Utils::Exec wasn't closing streams after copying.
 * IMPROVED: Utils::Exec::Controller can capture or redirect the remainder of a controlled stream.
 * ADDED: Terminal#ask
 
-### 0.4.3 / 2018-07-13
+### v0.4.3 / 2018-07-13
 
 * IMPROVED: Utils::Exec methods can now spawn subprocesses in the background
 * IMPROVED: Utils::Exec capture methods can now yield a controller
 
-### 0.4.2 / 2018-07-08
+### v0.4.2 / 2018-07-08
 
 * FIXED: Raise an error rather than cause unexpected behavior if a mixin is included twice.
 * IMPROVED: The `include?` method extended to support mixin names in a tool dsl.
 
-### 0.4.1 / 2018-07-03
+### v0.4.1 / 2018-07-03
 
 * FIXED: Terminal#confirm uppercased "N" for the wrong default.
 
-### 0.4.0 / 2018-07-03
+### v0.4.0 / 2018-07-03
 
 Now declaring this alpha quality. Backward-incompatible changes are still
 possible from this point, but I'll try to avoid them.
@@ -278,13 +300,13 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Utils::Gems installation is now much faster.
 * FIXED: Utils::Gems didn't reset the specifications on Ruby 2.3.
 
-### 0.3.11 / 2018-07-02
+### v0.3.11 / 2018-07-02
 
 * CHANGED: Require Ruby 2.3 or later
 * CHANGED: Renamed "set" directive to "static" to reduce confusion with Tool#set.
 * ADDED: Convenience methods for getting option values
 
-### 0.3.10 / 2018-06-30
+### v0.3.10 / 2018-06-30
 
 * CHANGED: Dropped Tool#option. Use Tool#get instead.
 * CHANGED: "run" directive renamed to "to_run"
@@ -293,11 +315,11 @@ possible from this point, but I'll try to avoid them.
 * ADDED: Mixins can provide initializers
 * ADDED: Loader can load an inline block
 
-### 0.3.9.1 / 2018-06-24
+### v0.3.9.1 / 2018-06-24
 
 * FIXED: Built-in flags were interfering with disable_argument_parsing
 
-### 0.3.9 / 2018-06-24
+### v0.3.9 / 2018-06-24
 
 * CHANGED: Cli#add_search_path_hierarchy changed the behavior of the base/terminate param
 * CHANGED: Removed alias_as directive since it's incompatible with selective loading.
@@ -306,7 +328,7 @@ possible from this point, but I'll try to avoid them.
 * ADDED: Exec#exec_proc and Exec#exec_tool that supports all the stream redirects
 * IMPROVED: Acceptors can be looked up recursively in the same way as mixins and templates
 
-### 0.3.8 / 2018-06-10
+### v0.3.8 / 2018-06-10
 
 * CHANGED: Renamed helpers to mixins.
 * CHANGED: ModuleLookup is now a customizable class and can have multiple sources.
@@ -316,11 +338,11 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Exec raises an error if passed an unknown option.
 * IMPROVED: Exec now accepts nearly all the same stream specifications as Process#spawn.
 
-### 0.3.7.1 / 2018-05-30
+### v0.3.7.1 / 2018-05-30
 
 * No changes.
 
-### 0.3.7 / 2018-05-30
+### v0.3.7 / 2018-05-30
 
 * CHANGED: Execution runs in the same scope as the DSL, which lets us use normal methods instead of helper-blocks.
 * CHANGED: Renamed "script" to "run", and allow setting of runnable by defining a "run" method
@@ -333,7 +355,7 @@ possible from this point, but I'll try to avoid them.
 * ADDED: Helper modules scoped to the tool hierarchy
 * ADDED: Utility that installs and activates third-party gems.
 
-### 0.3.6 / 2018-05-21
+### v0.3.6 / 2018-05-21
 
 * CHANGED: Renamed show_version middleware to show_root_version.
 * CHANGED: Reworked set_default_descriptions interface for more flexibility.
@@ -345,14 +367,14 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Support custom acceptors.
 * IMPROVED: Highline helper automatically sets use_color based on the type of stdout.
 
-### 0.3.5 / 2018-05-15
+### v0.3.5 / 2018-05-15
 
 * CHANGED: Exec logic now lives in a utils class.
 * CHANGED: Moved flag and arg blocks from Tool into the DSL.
 * CHANGED: Renamed `execute do` to `script do`, and Tool#executor to Tool#script.
 * IMPROVED: Help display can use `less` if available.
 
-### 0.3.4 / 2018-05-14
+### v0.3.4 / 2018-05-14
 
 * CHANGED: Renamed switch to flag
 * CHANGED: Renamed Utils::Usage to Utils::HelpText
@@ -374,7 +396,7 @@ possible from this point, but I'll try to avoid them.
 * ADDED: Alias DSL methods `required`, `optional`, and `remaining`.
 * FIXED: Finish definitions for subtools since the desc may depend on it
 
-### 0.3.3 / 2018-05-09
+### v0.3.3 / 2018-05-09
 
 * CHANGED: Renamed file_utils helper to fileutils.
 * CHANGED: Renamed `doc:` parameter to `docs:`.
@@ -387,7 +409,7 @@ possible from this point, but I'll try to avoid them.
 * IMPROVED: Usage can now customize the left column width and indent
 * IMPROVED: Newlines in documentation are properly indented
 
-### 0.3.2 / 2018-05-07
+### v0.3.2 / 2018-05-07
 
 * CHANGED: Split core engine out into "toys-core" from the "toys" gem.
 * CHANGED: Renamed path types to "search" and "config" paths, and restricted the former to the CLI.

data/lib/toys/acceptor.rb

@@ -498,7 +498,7 @@ module Toys
       #     well-known acceptor.
       #
       # @param spec [Object] See the description for recognized values.
-      # @param options [Hash] Additional options to pass to the completion.
+      # @param options [Hash] Additional options to pass to the acceptor.
       # @param block [Proc] See the description for recognized forms.
       # @return [Toys::Acceptor::Base,Proc]
       #

data/lib/toys/core.rb

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

data/lib/toys/dsl/flag.rb

@@ -75,8 +75,8 @@ module Toys
       #     string (e.g. `"foo"`) is taken as the value. Otherwise, the
       #     following argument is taken as the value (e.g. for `--abc foo`, the
       #     value is set to `"foo"`.) The following argument is treated as the
-      #     value even if it looks like a flag (e.g. `--abc --abc` causes the
-      #     string `"--abc"` to be taken as the value.)
+      #     value even if it looks like a flag (e.g. `--abc --def` causes the
+      #     string `"--def"` to be taken as the value.)
       #  *  `--abc[=VAL]` : A long flag that takes an optional value. If this
       #     argument appears with a value attached (e.g. `--abc=foo`), the
       #     attached string (e.g. `"foo"`) is taken as the value. Otherwise,

data/lib/toys/dsl/flag_group.rb

@@ -79,8 +79,8 @@ module Toys
       #     string (e.g. `"foo"`) is taken as the value. Otherwise, the
       #     following argument is taken as the value (e.g. for `--abc foo`, the
       #     value is set to `"foo"`.) The following argument is treated as the
-      #     value even if it looks like a flag (e.g. `--abc --abc` causes the
-      #     string `"--abc"` to be taken as the value.)
+      #     value even if it looks like a flag (e.g. `--abc --def` causes the
+      #     string `"--def"` to be taken as the value.)
       #  *  `--abc[=VAL]` : A long flag that takes an optional value. If this
       #     argument appears with a value attached (e.g. `--abc=foo`), the
       #     attached string (e.g. `"foo"`) is taken as the value. Otherwise,

data/lib/toys/dsl/tool.rb

@@ -814,8 +814,8 @@ module Toys
       #     string (e.g. `"foo"`) is taken as the value. Otherwise, the
       #     following argument is taken as the value (e.g. for `--abc foo`, the
       #     value is set to `"foo"`.) The following argument is treated as the
-      #     value even if it looks like a flag (e.g. `--abc --abc` causes the
-      #     string `"--abc"` to be taken as the value.)
+      #     value even if it looks like a flag (e.g. `--abc --def` causes the
+      #     string `"--def"` to be taken as the value.)
       #  *  `--abc[=VAL]` : A long flag that takes an optional value. If this
       #     argument appears with a value attached (e.g. `--abc=foo`), the
       #     attached string (e.g. `"foo"`) is taken as the value. Otherwise,
@@ -884,7 +884,8 @@ module Toys
       # @param flags [String...] The flags in OptionParser format.
       # @param accept [Object] An acceptor that validates and/or converts the
       #     value. You may provide either the name of an acceptor you have
-      #     defined, or one of the default acceptors provided by OptionParser.
+      #     defined, one of the default acceptors provided by OptionParser, or
+      #     any other specification recognized by {Toys::Acceptor.create}.
       #     Optional. If not specified, accepts any value as a string.
       # @param default [Object] The default value. This is the value that will
       #     be set in the context if this flag is not provided on the command
@@ -979,7 +980,8 @@ module Toys
       #     the execution context.
       # @param accept [Object] An acceptor that validates and/or converts the
       #     value. You may provide either the name of an acceptor you have
-      #     defined, or one of the default acceptors provided by OptionParser.
+      #     defined, one of the default acceptors provided by OptionParser, or
+      #     any other specification recognized by {Toys::Acceptor.create}.
       #     Optional. If not specified, accepts any value as a string.
       # @param complete [Object] A specifier for shell tab completion for
       #     values of this arg. This is the empty completion by default. To
@@ -1050,7 +1052,8 @@ module Toys
       #     line. Defaults to `nil`.
       # @param accept [Object] An acceptor that validates and/or converts the
       #     value. You may provide either the name of an acceptor you have
-      #     defined, or one of the default acceptors provided by OptionParser.
+      #     defined, one of the default acceptors provided by OptionParser, or
+      #     any other specification recognized by {Toys::Acceptor.create}.
       #     Optional. If not specified, accepts any value as a string.
       # @param complete [Object] A specifier for shell tab completion for
       #     values of this arg. This is the empty completion by default. To
@@ -1121,7 +1124,8 @@ module Toys
       #     command line. Defaults to the empty array `[]`.
       # @param accept [Object] An acceptor that validates and/or converts the
       #     value. You may provide either the name of an acceptor you have
-      #     defined, or one of the default acceptors provided by OptionParser.
+      #     defined, one of the default acceptors provided by OptionParser, or
+      #     any other specification recognized by {Toys::Acceptor.create}.
       #     Optional. If not specified, accepts any value as a string.
       # @param complete [Object] A specifier for shell tab completion for
       #     values of this arg. This is the empty completion by default. To

data/lib/toys/standard_mixins/bundler.rb

@@ -57,6 +57,9 @@ module Toys
     #      *  `:ignore` - just silently proceed without bundling again.
     #      *  `:warn` - print a warning and proceed without bundling again.
     #
+    #  *  `:retries` (Integer) Number of times to retry bundler operations
+    #     (optional)
+    #
     #  *  `:terminal` (Toys::Utils::Terminal) Terminal to use (optional)
     #  *  `:input` (IO) Input IO (optional, defaults to STDIN)
     #  *  `:output` (IO) Output IO (optional, defaults to STDOUT)
@@ -100,6 +103,7 @@ module Toys
                             groups: nil,
                             on_missing: nil,
                             on_conflict: nil,
+                            retries: nil,
                             terminal: nil,
                             input: nil,
                             output: nil)
@@ -111,7 +115,7 @@ module Toys
         end
         gems = ::Toys::Utils::Gems.new(on_missing: on_missing, on_conflict: on_conflict,
                                        terminal: terminal, input: input, output: output)
-        gems.bundle(groups: groups, gemfile_path: gemfile_path)
+        gems.bundle(groups: groups, gemfile_path: gemfile_path, retries: retries)
       end
 
       # @private

data/lib/toys/standard_mixins/exec.rb

@@ -708,7 +708,16 @@ module Toys
 
       ## @private
       def self._interpret_e(value, context)
-        value ? proc { |r| context.exit(r.exit_code) if r.error? } : nil
+        return nil unless value
+        proc do |result|
+          if result.failed?
+            context.exit(127)
+          elsif result.signaled?
+            context.exit(result.signal_code + 128)
+          elsif result.error?
+            context.exit(result.exit_code)
+          end
+        end
       end
 
       ## @private

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
@@ -492,7 +493,8 @@ module Toys
       #
       class Controller
         ## @private
-        def initialize(name, controller_streams, captures, pid, join_threads, result_callback)
+        def initialize(name, controller_streams, captures, pid, join_threads,
+                       result_callback, mutex)
           @name = name
           @in = controller_streams[:in]
           @out = controller_streams[:out]
@@ -508,6 +510,7 @@ module Toys
           end
           @join_threads = join_threads
           @result_callback = result_callback
+          @mutex = mutex
           @result = nil
         end
 
@@ -575,7 +578,10 @@ module Toys
           stream = stream_for(which)
           @join_threads << ::Thread.new do
             begin
-              @captures[which] = stream.read
+              data = stream.read
+              @mutex.synchronize do
+                @captures[which] = data
+              end
             ensure
               stream.close
             end
@@ -791,7 +797,7 @@ module Toys
       #     {Result#success?} or {Result#error?} will return true, and
       #     {Result.exit_code} will return the numeric exit code.
       #  *  The process executed but was terminated by an uncaught signal.
-      #     {Result#signaled?} will return true, and {Result#term_signal} will
+      #     {Result#signaled?} will return true, and {Result#signal_code} will
       #     return the numeric signal code.
       #
       class Result
@@ -843,6 +849,8 @@ module Toys
         # The exception raised if a process couldn't be started.
         #
         # Exactly one of {#exception} and {#status} will be non-nil.
+        # Exactly one of {#exception}, {#exit_code}, or {#signal_code} will be
+        # non-nil.
         #
         # @return [Exception] The exception raised from process start.
         # @return [nil] if the process started successfully.
@@ -852,7 +860,7 @@ module Toys
         ##
         # The numeric status code for a process that exited normally,
         #
-        # Exactly one of {#exception}, {#exit_code}, and {#term_signal} will be
+        # Exactly one of {#exception}, {#exit_code}, or {#signal_code} will be
         # non-nil.
         #
         # @return [Integer] the numeric status code, if the process started
@@ -867,16 +875,17 @@ module Toys
         ##
         # The numeric signal code that caused process termination.
         #
-        # Exactly one of {#exception}, {#exit_code}, and {#term_signal} will be
+        # Exactly one of {#exception}, {#exit_code}, or {#signal_code} will be
         # non-nil.
         #
         # @return [Integer] The signal that caused the process to terminate.
         # @return [nil] if the process did not start successfully, or executed
         #     and exited with a normal exit code.
         #
-        def term_signal
+        def signal_code
           status&.termsig
         end
+        alias term_signal signal_code
 
         ##
         # Returns true if the subprocess failed to start, or false if the
@@ -895,7 +904,7 @@ module Toys
         # @return [Boolean]
         #
         def signaled?
-          !term_signal.nil?
+          !signal_code.nil?
         end
 
         ##
@@ -940,6 +949,7 @@ module Toys
           @parent_streams = []
           @block = block
           @default_stream = @config_opts[:background] ? :null : :inherit
+          @mutex = ::Mutex.new
         end
 
         def execute
@@ -962,12 +972,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
@@ -977,7 +994,7 @@ module Toys
             end
           @child_streams.each(&:close)
           Controller.new(@config_opts[:name], @controller_streams, @captures, pid,
-                         @join_threads, @config_opts[:result_callback])
+                         @join_threads, @config_opts[:result_callback], @mutex)
         end
 
         def start_process
@@ -1284,13 +1301,27 @@ module Toys
           stream = make_out_pipe(key)
           @join_threads << ::Thread.new do
             begin
-              @captures[key] = stream.read
+              data = stream.read
+              @mutex.synchronize do
+                @captures[key] = data
+              end
             ensure
               stream.close
             end
           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

data/lib/toys/utils/gems.rb

@@ -170,12 +170,16 @@ module Toys
       #     recognized as Gemfiles, when searching because gemfile_path is not
       #     given. Defaults to {DEFAULT_GEMFILE_NAMES}.
       #
+      # @param retries [Integer] Number of times to retry bundler operations.
+      #     Optional.
+      #
       # @return [void]
       #
       def bundle(groups: nil,
                  gemfile_path: nil,
                  search_dirs: nil,
-                 gemfile_names: nil)
+                 gemfile_names: nil,
+                 retries: nil)
         Array(search_dirs).each do |dir|
           break if gemfile_path
           gemfile_path = Gems.find_gemfile(dir, gemfile_names: gemfile_names)
@@ -185,7 +189,8 @@ module Toys
           if configure_gemfile(gemfile_path)
             activate("bundler", "~> 2.1")
             require "bundler"
-            setup_bundle(gemfile_path, groups || [])
+            lockfile_path = find_lockfile_path(gemfile_path)
+            setup_bundle(gemfile_path, lockfile_path, groups: groups, retries: retries)
           end
         end
       end
@@ -287,21 +292,47 @@ module Toys
         true
       end
 
-      def setup_bundle(gemfile_path, groups)
+      def find_lockfile_path(gemfile_path)
+        if ::File.basename(gemfile_path) == "gems.rb"
+          ::File.join(::File.dirname(gemfile_path), "gems.locked")
+        else
+          gemfile_path + ".lock"
+        end
+      end
+
+      def setup_bundle(gemfile_path, lockfile_path, groups: nil, retries: nil)
+        groups = Array(groups)
+        old_lockfile_contents = save_old_lockfile(lockfile_path)
         begin
-          modify_bundle_definition(gemfile_path)
+          modify_bundle_definition(gemfile_path, lockfile_path)
           ::Bundler.ui.silence { ::Bundler.setup(*groups) }
         rescue ::Bundler::GemNotFound, ::Bundler::VersionConflict
           restore_toys_libs
-          install_bundle(gemfile_path)
+          install_bundle(gemfile_path, retries: retries)
+          old_lockfile_contents = save_old_lockfile(lockfile_path)
           ::Bundler.reset!
-          modify_bundle_definition(gemfile_path)
+          modify_bundle_definition(gemfile_path, lockfile_path)
           ::Bundler.ui.silence { ::Bundler.setup(*groups) }
         end
         restore_toys_libs
+      ensure
+        restore_old_lockfile(lockfile_path, old_lockfile_contents)
+      end
+
+      def save_old_lockfile(lockfile_path)
+        return nil unless ::File.readable?(lockfile_path) && ::File.writable?(lockfile_path)
+        ::File.read(lockfile_path)
+      end
+
+      def restore_old_lockfile(lockfile_path, contents)
+        if contents
+          ::File.open(lockfile_path, "w") do |file|
+            file.write(contents)
+          end
+        end
       end
 
-      def modify_bundle_definition(gemfile_path)
+      def modify_bundle_definition(gemfile_path, lockfile_path)
         builder = ::Bundler::Dsl.new
         builder.eval_gemfile(gemfile_path)
         toys_gems = ["toys-core"]
@@ -312,7 +343,7 @@ module Toys
           add_gem_to_definition(builder, "toys")
           toys_gems << "toys"
         end
-        definition = builder.to_definition(gemfile_path + ".lock", { gems: toys_gems })
+        definition = builder.to_definition(lockfile_path, { gems: toys_gems })
         ::Bundler.instance_variable_set(:@definition, definition)
       end
 
@@ -357,19 +388,21 @@ module Toys
         end
       end
 
-      def install_bundle(gemfile_path)
+      def install_bundle(gemfile_path, retries: nil)
         gemfile_dir = ::File.dirname(gemfile_path)
         unless permission_to_bundle?
           raise BundleNotInstalledError,
                 "Your bundle is not installed. Consider running" \
                   " `cd #{gemfile_dir} && bundle install`"
         end
+        retries = retries.to_i
+        args = retries.positive? ? ["--retry=#{retries}"] : []
         require "bundler/cli"
         begin
-          ::Bundler::CLI.start(["install"])
-        rescue ::Bundler::GemNotFound, ::Bundler::InstallError
+          ::Bundler::CLI.start(["install"] + args)
+        rescue ::Bundler::GemNotFound, ::Bundler::InstallError, ::Bundler::VersionConflict
           terminal.puts("Failed to install. Trying update...")
-          ::Bundler::CLI.start(["update"])
+          ::Bundler::CLI.start(["update"] + args)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-03-28 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.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/dazuma/toys
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.5/file.CHANGELOG.html
+  source_code_uri: https://github.com/dazuma/toys/tree/main/toys-core
   bug_tracker_uri: https://github.com/dazuma/toys/issues
-  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.0
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.5
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Framework for creating command line executables