toys-core 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de679852961f700752c16ccbec8b08bf28390070ce6e7a29f6d34bf6dd9a1ba3
-  data.tar.gz: b149a5af7458b8ef26bb2a12dcc3ede565af9450780e8de7d132576550c65217
+  metadata.gz: 98a66e07f9f052b2011ab3d960dd8b8bff11f3f03a3c6de67e0d14b1507421ee
+  data.tar.gz: c6712de855eb63cb80eba5b32c956590a2b50d2944079df0ad4e58c9c8e7c8c4
 SHA512:
-  metadata.gz: f7dc86145d43b4c778da09c6f31195a89aa62eab6a2bb4ef2efe1100b18863b17854540f07711c255c9eb95f8f2232c53808bdef87e0237fd8ec541c0bbc79cd
-  data.tar.gz: 50f4c29636dca1fe75c94a7d53dc23315ba6f49e5f7e1ac39e13cd4f0459fbdf57b3eccee159558476042f9a8aaa831f7bcf3c86bb2dd976b02f63e029fe67a8
+  metadata.gz: e6be869c95ca6a9c4a7451581b04a656fe8d11f4b10d7a9197c4719fda776720bc07124295683d21bf81a19a0d5a3366fb0b31f5ffd92dd6b518aab3a18cc6d8
+  data.tar.gz: 0f48bdb37ce11ee8f3ece13b7ba8e4f85633b566b68d2ba15cd18ef26ddcd9b0455b49e2f56bef7b0f240cfde4d5e461b81a05965ec77928cd4d09a974794c8d

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+### v0.14.4 / 2023-01-23
+
+* FIXED: Fixed missing require when "toys/utils/xdg" or "toys/utils/git_cache" is required without the rest of toys-core
+
+### v0.14.3 / 2022-12-29
+
+* FIXED: Exit with a code -1 if a non-integer exit code is thrown
+* FIXED: The sh command in the Exec utility returns -1 if the exit code cannot be determined
+* FIXED: Update Bundler integration to support Bundler 2.4 and Ruby 3.2
+* FIXED: Fix for installing bundler on older Rubies
+* FIXED: Fixed XDG defaults on JRuby 9.4
+
 ### v0.14.2 / 2022-10-09
 
 * ADDED: The tool directive supports the delegate_relative argument, as a preferred alternative over alias_tool.

data/lib/toys/context.rb

@@ -309,7 +309,7 @@ module Toys
     # @return [void]
     #
     def exit(code = 0)
-      throw :result, code
+      Context.exit(code)
     end
 
     ##
@@ -321,6 +321,7 @@ module Toys
     # @return [void]
     #
     def self.exit(code = 0)
+      code = -1 unless code.is_a?(::Integer)
       throw :result, code
     end
 

data/lib/toys/core.rb

@@ -9,7 +9,7 @@ module Toys
     # Current version of Toys core.
     # @return [String]
     #
-    VERSION = "0.14.2"
+    VERSION = "0.14.4"
   end
 
   ##

data/lib/toys/utils/exec.rb

@@ -427,7 +427,7 @@ module Toys
       #
       def sh(cmd, **opts, &block)
         opts = opts.merge(background: false)
-        exec(cmd, **opts, &block).exit_code
+        exec(cmd, **opts, &block).exit_code || -1
       end
 
       ##

data/lib/toys/utils/gems.rb

@@ -188,7 +188,7 @@ module Toys
         gemfile_path = ::File.absolute_path(gemfile_path)
         Gems.synchronize do
           if configure_gemfile(gemfile_path)
-            activate("bundler", "~> 2.2")
+            activate("bundler", *bundler_version_requirements)
             require "bundler"
             setup_bundle(gemfile_path, groups: groups, retries: retries)
           end
@@ -309,7 +309,7 @@ module Toys
         modified_gemfile_path = create_modified_gemfile(gemfile_path)
         begin
           attempt_setup_bundle(modified_gemfile_path, groups)
-        rescue ::Bundler::GemNotFound, ::Bundler::VersionConflict
+        rescue *bundler_exceptions
           ::Bundler.reset!
           restore_toys_libs
           install_bundle(modified_gemfile_path, retries: retries)
@@ -321,6 +321,25 @@ module Toys
         restore_toys_libs
       end
 
+      def bundler_exceptions
+        @bundler_exceptions ||= begin
+          exceptions = [::Bundler::GemNotFound]
+          exceptions << ::Bundler::VersionConflict if ::Bundler.const_defined?(:VersionConflict)
+          exceptions << ::Bundler::SolveFailure if ::Bundler.const_defined?(:SolveFailure)
+          exceptions
+        end
+      end
+
+      def bundler_version_requirements
+        if ::RUBY_VERSION < "2.6"
+          [">= 2.2", "< 2.4"]
+        elsif ::RUBY_VERSION < "3"
+          [">= 2.2", "< 2.5"]
+        else
+          ["~> 2.2"]
+        end
+      end
+
       def attempt_setup_bundle(modified_gemfile_path, groups)
         ::ENV["BUNDLE_GEMFILE"] = modified_gemfile_path
         ::Bundler.configure

data/lib/toys/utils/git_cache.rb

@@ -3,6 +3,7 @@
 require "digest"
 require "fileutils"
 require "json"
+require "toys/compat"
 require "toys/utils/exec"
 require "toys/utils/xdg"
 

data/lib/toys/utils/xdg.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "toys/compat"
+
 module Toys
   module Utils
     ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-09 00:00:00.000000000 Z
+date: 2023-01-23 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.
@@ -78,10 +78,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.14.2/file.CHANGELOG.html
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.14.4/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.14.2
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.14.4
 post_install_message: 
 rdoc_options: []
 require_paths: