toys-core 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 387c4a7088a856603e671a0c6156982eaa5639a41d1168a7912892b6ca9ca822
-  data.tar.gz: f47e0683edea4d3fcfa848e0517299648c0d6a0564b7d9316405487ed2e6d4dd
+  metadata.gz: ae396604e3a0005b460ad94f95187b603f36e8d10d1147da2a78b069232f7963
+  data.tar.gz: 267209d6e7ab4575053219eee5fb1c6be47b9bd6ac6468b6da5c9abb9ed227c2
 SHA512:
-  metadata.gz: f1a9e2501458d1c8cebeafc044a6fe9f4de131c687df533e73a8567aa81afef2a5ed02fbb769e0da9ed7f4632c2c4f9046efec21281a3bc8c8072437d4ecb844
-  data.tar.gz: f9c22a3b8d531825353d9eebc70735b3bdfddfc8f22ce55bc8bf62685bbbf9443fbb6d875b7671d70f8ee2ca1eb0990238d2b35b92289b5c1c3b7e392bae9537
+  metadata.gz: 527f51e0e679f93786ecd671ff14386615e2014e0dbd4995fd4bb6e58040cb00b27d83d3721c412eb8cc83fdc82fe7dff63c97e0e3d8bca8f8b8d7b04a5d9f41
+  data.tar.gz: 07c617895710b6f5dd69c6fdb16613c2ed7474361a1cbd8617ae1d271eca647ffa457e77bec7e1b30915b1e01ad25173c74251f1728f261a5d5565ca29b80d68

data/CHANGELOG.md

@@ -1,16 +1,22 @@
 # Release History
 
+### 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 
+* 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 
+* FIXED: Fix a JRuby-specific race condition when capturing exec streams
 
 ### v0.11.1 / 2020-08-24
 

data/lib/toys/core.rb

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

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

@@ -797,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
@@ -849,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.
@@ -858,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
@@ -873,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
@@ -901,7 +904,7 @@ module Toys
         # @return [Boolean]
         #
         def signaled?
-          !term_signal.nil?
+          !signal_code.nil?
         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)
@@ -186,7 +190,7 @@ module Toys
             activate("bundler", "~> 2.1")
             require "bundler"
             lockfile_path = find_lockfile_path(gemfile_path)
-            setup_bundle(gemfile_path, lockfile_path, groups || [])
+            setup_bundle(gemfile_path, lockfile_path, groups: groups, retries: retries)
           end
         end
       end
@@ -296,14 +300,15 @@ module Toys
         end
       end
 
-      def setup_bundle(gemfile_path, lockfile_path, groups)
+      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, 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, lockfile_path)
@@ -383,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.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-11 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.4/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.4
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.11.5
 post_install_message: 
 rdoc_options: []
 require_paths: