toys-core 0.15.6 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7afb8f468a42a9d5eb626646212238c656e9be93d7a29601631f4e3059975eaf
-  data.tar.gz: d1b66149b911a8f4a9eab94c459f15cc7400ee871f8f3db1f473d7eddbd2ba61
+  metadata.gz: c3713d359e1b03fc22968ed9e3254c82c92e157c92146c6d5728d514eb88dc1c
+  data.tar.gz: d96baedc494f78a534a9f0a00ca64409bdbd25e1cf33ec48d2a16f59824c72b9
 SHA512:
-  metadata.gz: ec09f204706004b5d6a914c1b2b1eabaaa0bd3d7accbbde8fe9e5d00aae3fba389676400b54abff33fb7cb79f5cb530577d099d0095838523ce9165b6659c52a
-  data.tar.gz: f47170aecd0ffe9072a6c022a9def134e88114d52c8d8f57fdc4b11aeae68971bb7ee0ad7234ddc7df8f41d2c788e2f723a241f4fb0f0dd67c62281e3a2a6da4
+  metadata.gz: 4ca769a0b88654941c7369f9fdcf22c532ae53358c554e38817beea217d9d544d20324cd2288c8d961cd37ab2527a22e82289a3726e6d5113a7c6d42f6502a56
+  data.tar.gz: c50ff7f52713c42eed61ea3e2e81e7b53d1a75ccc89b8ceaff6f4114d71d647018ecf80c529d4254234501108dd5e9f95406e297a64d5064d3f7fa88e8297b47

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Release History
 
+### v0.16.0 / 2025-10-31
+
+* ADDED: Updated minimum Ruby version to 2.7
+* FIXED: ToolDefinition#includes_arguments no longer returns true if only default data is set
+
 ### v0.15.6 / 2024-05-15
 
-* FIXED: Fixed argument parsing to allow a flag value with a newline delimited by =
+* FIXED: Fixed argument parsing so flags with value delimited by "=" will support values containing newlines
 
 ### v0.15.5 / 2024-01-31
 

data/README.md

@@ -338,7 +338,7 @@ Detailed usage information can be found in the
 
 ## System requirements
 
-Toys-Core requires Ruby 2.4 or later.
+Toys-Core requires Ruby 2.7 or later.
 
 Most parts of Toys-Core work on JRuby. However, JRuby is not recommended
 because of JVM boot latency, lack of support for Kernel#fork, and other issues.
@@ -348,7 +348,7 @@ recommended because it has a few known bugs that affect Toys.
 
 ## License
 
-Copyright 2019-2023 Daniel Azuma and the Toys contributors
+Copyright 2019-2025 Daniel Azuma and the Toys contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/toys/arg_parser.rb

@@ -465,7 +465,7 @@ module Toys
 
     def handle_single_flags(str)
       until str.empty?
-        str = handle_plain_flag("-#{str[0]}", str[1..-1])
+        str = handle_plain_flag("-#{str[0]}", str[1..])
       end
     end
 
@@ -521,7 +521,7 @@ module Toys
 
     def find_flag(name)
       flag_result = @tool.resolve_flag(name)
-      if flag_result.not_found? || @require_exact_flag_match && !flag_result.found_exact?
+      if flag_result.not_found? || (@require_exact_flag_match && !flag_result.found_exact?)
         @errors << FlagUnrecognizedError.new(
           value: name, suggestions: Compat.suggestions(name, @tool.used_flags)
         )

data/lib/toys/cli.rb

@@ -628,17 +628,15 @@ module Toys
 
     def build_executor(tool, context)
       executor = proc do
-        begin
-          if !context[Context::Key::USAGE_ERRORS].empty?
-            handle_usage_errors(context, tool)
-          elsif !tool.runnable?
-            raise NotRunnableError, "No implementation for tool #{tool.display_name.inspect}"
-          else
-            yield context
-          end
-        rescue ::SignalException => e
-          handle_signal_by_tool(context, tool, e)
+        if !context[Context::Key::USAGE_ERRORS].empty?
+          handle_usage_errors(context, tool)
+        elsif !tool.runnable?
+          raise NotRunnableError, "No implementation for tool #{tool.display_name.inspect}"
+        else
+          yield context
         end
+      rescue ::SignalException => e
+        handle_signal_by_tool(context, tool, e)
       end
       tool.built_middleware.reverse_each do |middleware|
         executor = make_executor(middleware, context, executor)

data/lib/toys/compat.rb

@@ -4,13 +4,17 @@ require "rbconfig"
 
 module Toys
   ##
-  # Compatibility wrappers for older Ruby versions.
+  # Compatibility wrappers for certain Ruby implementations and versions, and
+  # other environment differences.
   #
   # @private
   #
   module Compat
     parts = ::RUBY_VERSION.split(".")
-    ruby_version = parts[0].to_i * 10000 + parts[1].to_i * 100 + parts[2].to_i
+    ruby_version = (parts[0].to_i * 10000) + (parts[1].to_i * 100) + parts[2].to_i
+
+    # @private
+    RUBY_VERSION_CODE = ruby_version
 
     # @private
     def self.jruby?
@@ -27,6 +31,11 @@ module Toys
       ::RbConfig::CONFIG["host_os"] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
     end
 
+    # @private
+    def self.macos?
+      ::RbConfig::CONFIG["host_os"] =~ /darwin/
+    end
+
     # @private
     def self.allow_fork?
       !jruby? && !truffleruby? && !windows?
@@ -58,86 +67,5 @@ module Toys
         []
       end
     end
-
-    # The :base argument to Dir.glob requires Ruby 2.5 or later.
-    if ruby_version >= 20500
-      # @private
-      def self.glob_in_dir(glob, dir)
-        ::Dir.glob(glob, base: dir)
-      end
-    else
-      # @private
-      def self.glob_in_dir(glob, dir)
-        ::Dir.chdir(dir) { ::Dir.glob(glob) }
-      end
-    end
-
-    # Dir.children requires Ruby 2.5 or later.
-    if ruby_version >= 20500
-      # @private
-      def self.dir_children(dir)
-        ::Dir.children(dir)
-      end
-    else
-      # @private
-      def self.dir_children(dir)
-        ::Dir.entries(dir) - [".", ".."]
-      end
-    end
-
-    # Due to a bug in Ruby < 2.7, passing an empty **kwargs splat to
-    # initialize will fail if there are no formal keyword args.
-    # This also hits TruffleRuby
-    # (see https://github.com/oracle/truffleruby/issues/2567)
-    if ruby_version >= 20700 && !truffleruby?
-      # @private
-      def self.instantiate(klass, args, kwargs, block)
-        klass.new(*args, **kwargs, &block)
-      end
-    else
-      # @private
-      def self.instantiate(klass, args, kwargs, block)
-        formals = klass.instance_method(:initialize).parameters
-        if kwargs.empty? && formals.all? { |arg| arg.first != :key && arg.first != :keyrest }
-          klass.new(*args, &block)
-        else
-          klass.new(*args, **kwargs, &block)
-        end
-      end
-    end
-
-    # File.absolute_path? requires Ruby 2.7 or later. For earlier Rubies, use
-    # an ad-hoc mechanism.
-    if ruby_version >= 20700
-      # @private
-      def self.absolute_path?(path)
-        ::File.absolute_path?(path)
-      end
-    elsif ::Dir.getwd =~ /^[a-zA-Z]:/
-      # @private
-      def self.absolute_path?(path)
-        /^[a-zA-Z]:/.match?(path)
-      end
-    else
-      # @private
-      def self.absolute_path?(path)
-        path.start_with?("/")
-      end
-    end
-
-    # The second argument to method_defined? and private_method_defined?
-    # requires Ruby 2.6 or later.
-    if ruby_version >= 20600
-      # @private
-      def self.method_defined_without_ancestors?(klass, name)
-        klass.method_defined?(name, false) || klass.private_method_defined?(name, false)
-      end
-    else
-      # @private
-      def self.method_defined_without_ancestors?(klass, name)
-        klass.instance_methods(false).include?(name) ||
-          klass.private_instance_methods(false).include?(name)
-      end
-    end
   end
 end

data/lib/toys/completion.rb

@@ -49,7 +49,7 @@ module Toys
       # @return [Toys::Completion::Context]
       #
       def with(**delta_params)
-        Context.new(**@params.merge(delta_params))
+        Context.new(**@params, **delta_params)
       end
 
       ##
@@ -195,7 +195,7 @@ module Toys
       # @private
       #
       def hash
-        string.hash ^ (partial? ? 1 : 0)
+        [@string, @partial].hash
       end
 
       ##
@@ -295,7 +295,7 @@ module Toys
         return [] unless ::File.directory?(dir)
         prefix = nil if [".", ""].include?(prefix)
         omits = [".", "..", ""]
-        children = Compat.glob_in_dir(name, dir).find_all do |child|
+        children = ::Dir.glob(name, base: dir).find_all do |child|
           !omits.include?(child)
         end
         children += ::Dir.entries(dir).find_all do |child|

data/lib/toys/core.rb

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

data/lib/toys/dsl/internal.rb

@@ -12,8 +12,8 @@ module Toys
       # @private A list of method names to avoid using as getters
       #
       AVOID_GETTERS = (::Object.instance_methods + [:run, :initialize])
-                      .find_all { |name| /^[a-z]\w*$/.match?(name) }
-                      .map { |name| [name, true] }.to_h
+                      .grep(/^[a-z]\w*$/)
+                      .to_h { |name| [name, true] }
                       .freeze
 
       class << self
@@ -109,7 +109,8 @@ module Toys
           when nil
             return if !/^[a-zA-Z]\w*[!?]?$/.match?(key.to_s) ||
                       AVOID_GETTERS.key?(key) ||
-                      Compat.method_defined_without_ancestors?(tool_class, key)
+                      tool_class.method_defined?(key, false) ||
+                      tool_class.private_method_defined?(key, false)
           end
           tool_class.class_eval do
             define_method(key) do

data/lib/toys/dsl/tool.rb

@@ -504,7 +504,7 @@ module Toys
         if template_class.nil?
           raise ToolDefinitionError, "Template not found: #{name.inspect}"
         end
-        template = Compat.instantiate(template_class, args, kwargs, nil)
+        template = template_class.new(*args, **kwargs)
         yield template if block_given?
         class_exec(template, &template_class.expansion)
         self

data/lib/toys/input_file.rb

@@ -14,7 +14,7 @@ module Toys::InputFile # rubocop:disable Style/ClassAndModuleChildren
   def self.evaluate(tool_class, words, priority, remaining_words, source, loader)
     namespace = ::Module.new
     namespace.module_eval do
-      include ::Toys::Context::Key
+      include ::Toys::Context::Key # rubocop:disable Layout/EmptyLinesAfterModuleInclusion
       @__tool_class = tool_class
     end
     path = source.source_path
@@ -25,9 +25,7 @@ module Toys::InputFile # rubocop:disable Style/ClassAndModuleChildren
       const_set(name, namespace)
       ::Toys::DSL::Internal.prepare(tool_class, words, priority, remaining_words, source, loader) do
         ::Toys::ContextualError.capture_path("Error while loading Toys config!", path) do
-          # rubocop:disable Security/Eval
-          eval(str, __binding, path)
-          # rubocop:enable Security/Eval
+          eval(str, __binding, path) # rubocop:disable Security/Eval
         end
       end
     end
@@ -48,7 +46,7 @@ module Toys::InputFile # rubocop:disable Style/ClassAndModuleChildren
     return nil if index.nil?
     "#{string[0, index]}" \
       "module #{module_name}; @__tool_class.class_eval do; " \
-      "#{string[index..-1]}\n" \
+      "#{string[index..]}\n" \
       "end; end\n"
   end
 end

data/lib/toys/loader.rb

@@ -288,7 +288,7 @@ module Toys
       found_tools = all_cur_definitions.find_all do |tool|
         name = tool.full_name
         name.length > len && name.slice(0, len) == words &&
-          (include_hidden || name[len..-1].none? { |word| word.start_with?("_") })
+          (include_hidden || name[len..].none? { |word| word.start_with?("_") })
       end
       found_tools.sort_by!(&:full_name)
       found_tools = filter_non_runnable_tools(found_tools, include_namespaces, include_non_runnable)
@@ -303,7 +303,7 @@ module Toys
     # @param words [Array<String>] The name of the parent tool
     # @return [Boolean]
     #
-    def has_subtools?(words) # rubocop:disable Naming/PredicateName
+    def has_subtools?(words) # rubocop:disable Naming/PredicatePrefix
       load_for_prefix(words)
       len = words.length
       all_cur_definitions.any? do |tool|

data/lib/toys/middleware.rb

@@ -204,7 +204,7 @@ module Toys
         else
           klass = @name
         end
-        Compat.instantiate(klass, @args, @kwargs, @block)
+        klass.new(*@args, **@kwargs, &@block)
       end
 
       ##

data/lib/toys/settings.rb

@@ -769,10 +769,19 @@ module Toys
       attr_reader :default
       attr_reader :group_class
 
+      ##
+      # @return [boolean] Whether the field is a group
+      #
       def group?
         !@group_class.nil?
       end
 
+      ##
+      # Validate the given value.
+      #
+      # @return [Object] The validated value
+      # @raise [FieldError] If the value cannot be validated
+      #
       def validate(value)
         validated_value = @type.call(value)
         if validated_value == ILLEGAL_VALUE
@@ -877,8 +886,8 @@ module Toys
           raise ::ArgumentError, "Illegal settings field name: #{name}"
         end
         existing = public_instance_methods(false)
-        if existing.include?(name.to_sym) || existing.include?("#{name}=".to_sym) ||
-           existing.include?("#{name}_set?".to_sym) || existing.include?("#{name}_unset!".to_sym)
+        if existing.include?(name.to_sym) || existing.include?(:"#{name}=") ||
+           existing.include?(:"#{name}_set?") || existing.include?(:"#{name}_unset!")
           raise ::ArgumentError, "Settings field already exists: #{name}"
         end
         name.to_sym

data/lib/toys/standard_mixins/highline.rb

@@ -48,43 +48,43 @@ module Toys
       ##
       # Calls [HighLine#agree](https://www.rubydoc.info/gems/highline/HighLine:agree)
       #
-      def agree(*args, &block)
-        self[KEY].agree(*args, &block)
+      def agree(...)
+        self[KEY].agree(...)
       end
 
       ##
       # Calls [HighLine#ask](https://www.rubydoc.info/gems/highline/HighLine:ask)
       #
-      def ask(*args, &block)
-        self[KEY].ask(*args, &block)
+      def ask(...)
+        self[KEY].ask(...)
       end
 
       ##
       # Calls [HighLine#choose](https://www.rubydoc.info/gems/highline/HighLine:choose)
       #
-      def choose(*args, &block)
-        self[KEY].choose(*args, &block)
+      def choose(...)
+        self[KEY].choose(...)
       end
 
       ##
       # Calls [HighLine#list](https://www.rubydoc.info/gems/highline/HighLine:list)
       #
-      def list(*args, &block)
-        self[KEY].list(*args, &block)
+      def list(...)
+        self[KEY].list(...)
       end
 
       ##
       # Calls [HighLine#say](https://www.rubydoc.info/gems/highline/HighLine:say)
       #
-      def say(*args, &block)
-        self[KEY].say(*args, &block)
+      def say(...)
+        self[KEY].say(...)
       end
 
       ##
       # Calls [HighLine#indent](https://www.rubydoc.info/gems/highline/HighLine:indent)
       #
-      def indent(*args, &block)
-        self[KEY].indent(*args, &block)
+      def indent(...)
+        self[KEY].indent(...)
       end
 
       ##

data/lib/toys/tool_definition.rb

@@ -552,9 +552,8 @@ module Toys
     # @return [true,false]
     #
     def runnable?
-      @run_handler.is_a?(::Symbol) &&
-        tool_class.public_instance_methods(false).include?(@run_handler) ||
-        @run_handler.is_a?(::Proc)
+      @run_handler.is_a?(::Proc) ||
+        (@run_handler.is_a?(::Symbol) && tool_class.public_instance_methods(false).include?(@run_handler))
     end
 
     ##
@@ -608,8 +607,7 @@ module Toys
     # @return [true,false]
     #
     def includes_arguments?
-      !default_data.empty? || !flags.empty? ||
-        !required_args.empty? || !optional_args.empty? ||
+      !flags.empty? || !required_args.empty? || !optional_args.empty? ||
         !remaining_arg.nil? || flags_before_args_enforced?
     end
 
@@ -619,7 +617,7 @@ module Toys
     #
     def includes_definition?
       includes_arguments? || runnable? || argument_parsing_disabled? ||
-        includes_modules? || includes_description?
+        includes_modules? || includes_description? || !default_data.empty?
     end
 
     ##
@@ -690,7 +688,7 @@ module Toys
     # @return [nil] if no acceptor of the given name is found.
     #
     def lookup_acceptor(name)
-      @acceptors.fetch(name.to_s) { |k| @parent ? @parent.lookup_acceptor(k) : nil }
+      @acceptors.fetch(name.to_s) { |k| @parent&.lookup_acceptor(k) }
     end
 
     ##
@@ -701,7 +699,7 @@ module Toys
     # @return [nil] if no template of the given name is found.
     #
     def lookup_template(name)
-      @templates.fetch(name.to_s) { |k| @parent ? @parent.lookup_template(k) : nil }
+      @templates.fetch(name.to_s) { |k| @parent&.lookup_template(k) }
     end
 
     ##
@@ -712,7 +710,7 @@ module Toys
     # @return [nil] if no mixin of the given name is found.
     #
     def lookup_mixin(name)
-      @mixins.fetch(name.to_s) { |k| @parent ? @parent.lookup_mixin(k) : nil }
+      @mixins.fetch(name.to_s) { |k| @parent&.lookup_mixin(k) }
     end
 
     ##
@@ -723,7 +721,7 @@ module Toys
     # @return [nil] if no completion of the given name is found.
     #
     def lookup_completion(name)
-      @completions.fetch(name.to_s) { |k| @parent ? @parent.lookup_completion(k) : nil }
+      @completions.fetch(name.to_s) { |k| @parent&.lookup_completion(k) }
     end
 
     ##
@@ -1347,15 +1345,10 @@ module Toys
               "Cannot delegate tool #{display_name.inspect} to #{target.join(' ')} because it" \
               " already delegates to \"#{@delegate_target.join(' ')}\"."
       end
-      if includes_arguments?
-        raise ToolDefinitionError,
-              "Cannot delegate tool #{display_name.inspect} because" \
-              " arguments have already been defined."
-      end
-      if runnable?
+      if includes_arguments? || runnable? || includes_modules? || !default_data.empty?
         raise ToolDefinitionError,
               "Cannot delegate tool #{display_name.inspect} because" \
-              " the run method has already been defined."
+              " some implementation has already been created for it."
       end
       disable_argument_parsing
       self.run_handler = make_delegation_run_handler(target)
@@ -1393,7 +1386,7 @@ module Toys
     def finish_definition(loader)
       unless @definition_finished
         ContextualError.capture("Error installing tool middleware!", tool_name: full_name) do
-          config_proc = proc { nil }
+          config_proc = proc {}
           @built_middleware.reverse_each do |middleware|
             config_proc = make_config_proc(middleware, loader, config_proc)
           end
@@ -1493,7 +1486,7 @@ module Toys
       case signal
       when ::String, ::Symbol
         sigstr = signal.to_s
-        sigstr = sigstr[3..-1] if sigstr.start_with?("SIG")
+        sigstr = sigstr[3..] if sigstr.start_with?("SIG")
         signo = ::Signal.list[sigstr]
         return signo if signo
       when ::Integer

data/lib/toys/utils/exec.rb

@@ -304,7 +304,7 @@ module Toys
           if cmd.is_a?(::Array)
             if cmd.size > 1
               binary = canonical_binary_spec(cmd.first, exec_opts)
-              [binary] + cmd[1..-1].map(&:to_s)
+              [binary] + cmd[1..].map(&:to_s)
             else
               [canonical_binary_spec(Array(cmd.first), exec_opts)]
             end
@@ -521,14 +521,12 @@ module Toys
         def capture(which)
           stream = stream_for(which)
           @join_threads << ::Thread.new do
-            begin
-              data = stream.read
-              @mutex.synchronize do
-                @captures[which] = data
-              end
-            ensure
-              stream.close
+            data = stream.read
+            @mutex.synchronize do
+              @captures[which] = data
             end
+          ensure
+            stream.close
           end
           self
         end
@@ -577,16 +575,14 @@ module Toys
           end
           stream = stream_for(which, allow_in: true)
           @join_threads << ::Thread.new do
-            begin
-              if which == :in
-                ::IO.copy_stream(io, stream)
-              else
-                ::IO.copy_stream(stream, io)
-              end
-            ensure
-              stream.close
-              io.close
+            if which == :in
+              ::IO.copy_stream(io, stream)
+            else
+              ::IO.copy_stream(stream, io)
             end
+          ensure
+            stream.close
+            io.close
           end
           self
         end
@@ -1065,7 +1061,7 @@ module Toys
             else
               cmd_binary = @spawn_cmd.first
               cmd_binary = cmd_binary.first if cmd_binary.is_a?(::Array)
-              "exec: #{([cmd_binary] + @spawn_cmd[1..-1]).inspect}"
+              "exec: #{([cmd_binary] + @spawn_cmd[1..]).inspect}"
             end
           end
         end
@@ -1218,7 +1214,7 @@ module Toys
 
         def interpret_in_array(setting)
           if setting.first.is_a?(::Symbol)
-            setup_in_stream_of_type(setting.first, setting[1..-1])
+            setup_in_stream_of_type(setting.first, setting[1..])
           elsif setting.first.is_a?(::String)
             setup_in_stream_of_type(:file, setting)
           elsif setting.size == 2 && setting.first.is_a?(::IO) && setting.last.is_a?(::IO)
@@ -1292,7 +1288,7 @@ module Toys
 
         def interpret_out_array(key, setting)
           if setting.first.is_a?(::Symbol)
-            setup_out_stream_of_type(key, setting.first, setting[1..-1])
+            setup_out_stream_of_type(key, setting.first, setting[1..])
           elsif setting.first.is_a?(::String)
             setup_out_stream_of_type(key, :file, setting)
           elsif setting.size == 2 && setting.first.is_a?(::IO) && setting.last.is_a?(::IO)
@@ -1381,7 +1377,7 @@ module Toys
              (arg.first == :autoclose || arg.first.is_a?(::IO))
             [arg.last, :close]
           else
-            arg = arg[1..-1] if arg.first == :file
+            arg = arg[1..] if arg.first == :file
             if arg.empty? || !arg.first.is_a?(::String)
               raise "Expected file name for #{key} tee argument"
             end
@@ -1498,49 +1494,41 @@ module Toys
         def write_string_thread(string)
           stream = make_in_pipe
           @join_threads << ::Thread.new do
-            begin
-              stream.write string
-            ensure
-              stream.close
-            end
+            stream.write string
+          ensure
+            stream.close
           end
         end
 
         def copy_to_in_thread(io)
           stream = make_in_pipe
           @join_threads << ::Thread.new do
-            begin
-              ::IO.copy_stream(io, stream)
-            ensure
-              stream.close
-              io.close
-            end
+            ::IO.copy_stream(io, stream)
+          ensure
+            stream.close
+            io.close
           end
         end
 
         def copy_from_out_thread(key, io)
           stream = make_out_pipe(key)
           @join_threads << ::Thread.new do
-            begin
-              ::IO.copy_stream(stream, io)
-            ensure
-              stream.close
-              io.close
-            end
+            ::IO.copy_stream(stream, io)
+          ensure
+            stream.close
+            io.close
           end
         end
 
         def capture_stream_thread(key)
           stream = make_out_pipe(key)
           @join_threads << ::Thread.new do
-            begin
-              data = stream.read
-              @mutex.synchronize do
-                @captures[key] = data
-              end
-            ensure
-              stream.close
+            data = stream.read
+            @mutex.synchronize do
+              @captures[key] = data
             end
+          ensure
+            stream.close
           end
         end
       end

data/lib/toys/utils/gems.rb

@@ -146,11 +146,9 @@ module Toys
       #
       def activate(name, *requirements)
         Gems.synchronize do
-          begin
-            gem(name, *requirements)
-          rescue ::Gem::LoadError => e
-            handle_activation_error(e, name, requirements)
-          end
+          gem(name, *requirements)
+        rescue ::Gem::LoadError => e
+          handle_activation_error(e, name, requirements)
         end
       end
 
@@ -395,7 +393,7 @@ module Toys
         modified_lockfile_path = find_lockfile_path(modified_gemfile_path)
         if ::File.readable?(lockfile_path)
           lockfile_content = ::File.read(lockfile_path)
-          ::File.open(modified_lockfile_path, "w") { |file| file.write(lockfile_content) }
+          ::File.write(modified_lockfile_path, lockfile_content)
         end
         modified_gemfile_path
       end
@@ -423,9 +421,11 @@ module Toys
       end
 
       def delete_modified_gemfile(modified_gemfile_path)
+        # rubocop:disable Lint/NonAtomicFileOperation
         ::File.delete(modified_gemfile_path) if ::File.exist?(modified_gemfile_path)
         modified_lockfile_path = find_lockfile_path(modified_gemfile_path)
         ::File.delete(modified_lockfile_path) if ::File.exist?(modified_lockfile_path)
+        # rubocop:enable Lint/NonAtomicFileOperation
       end
 
       def restore_toys_libs
@@ -465,7 +465,7 @@ module Toys
         return if result.success?
         terminal.puts("Failed to update. Trying update with clean lockfile...")
         lockfile_path = find_lockfile_path(gemfile_path)
-        ::File.delete(lockfile_path) if ::File.exist?(lockfile_path)
+        ::File.delete(lockfile_path) if ::File.exist?(lockfile_path) # rubocop:disable Lint/NonAtomicFileOperation
         result = exec_util.exec_ruby([bundler_bin, "update"] + args)
         return if result.success?
         raise ::Bundler::InstallError, "Failed to install or update bundle: #{gemfile_path}"

data/lib/toys/utils/git_cache.rb

@@ -545,7 +545,7 @@ module Toys
         repo_dir = ::File.join(dir, REPO_DIR_NAME)
         is_sha = commit =~ /^[0-9a-f]{40}$/
         update = repo_lock.ref_stale?(commit, update) unless is_sha
-        if update && !is_sha || !commit_exists?(repo_dir, local_commit)
+        if (update && !is_sha) || !commit_exists?(repo_dir, local_commit)
           git(repo_dir, ["fetch", "--depth=1", "--force", "origin", "#{commit}:#{local_commit}"],
               error_message: "Unable to fetch commit: #{commit}")
           repo_lock.update_ref!(commit)
@@ -579,7 +579,7 @@ module Toys
         repo_path = ::File.join(dir, REPO_DIR_NAME)
         ::FileUtils.mkdir_p(into)
         ::FileUtils.chmod_R("u+w", into, force: true)
-        Compat.dir_children(into).each { |child| ::FileUtils.rm_rf(::File.join(into, child)) }
+        ::Dir.children(into).each { |child| ::FileUtils.rm_rf(::File.join(into, child)) }
         result = copy_from_repo(repo_path, into, sha, path)
         repo_lock.access_repo!
         result
@@ -588,7 +588,7 @@ module Toys
       def copy_from_repo(repo_dir, into, sha, path)
         git(repo_dir, ["checkout", sha])
         if path == "."
-          Compat.dir_children(repo_dir).each do |entry|
+          ::Dir.children(repo_dir).each do |entry|
             next if entry == ".git"
             to_path = ::File.join(into, entry)
             unless ::File.exist?(to_path)
@@ -746,6 +746,9 @@ module Toys
           @data["sources"][sha]&.fetch(path, nil)
         end
 
+        ##
+        # @private
+        #
         def find_sources(paths: nil, shas: nil)
           results = []
           @data["sources"].each do |sha, sha_data|

data/lib/toys/utils/help_text.rb

@@ -312,7 +312,7 @@ module Toys
           remaining_doc = desc
           if initial.size <= @indent + @left_column_width
             @lines << "#{initial} #{desc.first}"
-            remaining_doc = desc[1..-1] || []
+            remaining_doc = desc[1..] || []
           else
             @lines << initial
           end
@@ -398,7 +398,7 @@ module Toys
           else
             desc = wrap_indent_indent2(WrappableString.new(["#{prefix} -"] + desc.fragments))
             @lines << indent_str(desc[0])
-            desc[1..-1].each do |line|
+            desc[1..].each do |line|
               @lines << indent2_str(line)
             end
           end
@@ -523,7 +523,7 @@ module Toys
               desc += delegate.long_desc
             end
           end
-          desc = desc[1..-1] if desc.first == ""
+          desc = desc[1..] if desc.first == ""
           desc = wrap_indent(desc)
           return if desc.empty?
           @lines << ""
@@ -728,7 +728,7 @@ module Toys
           else
             desc = wrap_indent(WrappableString.new(["#{prefix} -"] + desc.fragments))
             @lines << desc[0]
-            desc[1..-1].each do |line|
+            desc[1..].each do |line|
               @lines << indent_str(line)
             end
           end

data/lib/toys/utils/pager.rb

@@ -64,11 +64,9 @@ module Toys
       def start
         if @command
           result = @exec_service.exec(@command, in: :controller) do |controller|
-            begin
-              yield controller.in if controller.pid
-            rescue ::Errno::EPIPE => e
-              raise e unless @rescue_broken_pipes
-            end
+            yield controller.in if controller.pid
+          rescue ::Errno::EPIPE => e
+            raise e unless @rescue_broken_pipes
           end
           return result.exit_code unless result.failed?
         end

data/lib/toys/utils/terminal.rb

@@ -155,12 +155,10 @@ module Toys
       #
       def write(str = "", *styles)
         @output_mutex.synchronize do
-          begin
-            output&.write(apply_styles(str.to_s, *styles))
-            output&.flush
-          rescue ::IOError
-            nil
-          end
+          output&.write(apply_styles(str.to_s, *styles))
+          output&.flush
+        rescue ::IOError
+          nil
         end
         self
       end
@@ -173,11 +171,9 @@ module Toys
       #
       def readline
         @input_mutex.synchronize do
-          begin
-            input&.gets
-          rescue ::IOError
-            nil
-          end
+          input&.gets
+        rescue ::IOError
+          nil
         end
       end
 
@@ -470,7 +466,7 @@ module Toys
                 @terminal.write(@frames[@cur_frame][0])
                 @cond.wait(@frame_length)
                 size = @frames[@cur_frame][1]
-                @terminal.write("\b" * size + " " * size + "\b" * size)
+                @terminal.write(("\b" * size) + (" " * size) + ("\b" * size))
                 @cur_frame += 1
                 @cur_frame = 0 if @cur_frame >= @frames.size
               end

data/lib/toys/utils/xdg.rb

@@ -260,7 +260,7 @@ module Toys
 
       def validate_dir_env(name)
         path = @env[name].to_s
-        !path.empty? && Compat.absolute_path?(path) ? path : nil
+        !path.empty? && ::File.absolute_path?(path) ? path : nil
       end
 
       def validate_dirs_env(name)
@@ -268,7 +268,7 @@ module Toys
       end
 
       def validate_dirs(paths)
-        paths = paths.find_all { |path| Compat.absolute_path?(path) }
+        paths = paths.find_all { |path| ::File.absolute_path?(path) }
         paths.empty? ? nil : paths
       end
 

data/lib/toys-core.rb

@@ -120,10 +120,11 @@ module Toys
   CORE_LIB_PATH = __dir__
 end
 
+require "toys/compat"
+
 require "toys/acceptor"
 require "toys/arg_parser"
 require "toys/cli"
-require "toys/compat"
 require "toys/completion"
 require "toys/context"
 require "toys/core"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: toys-core
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.16.0
 platform: ruby
 authors:
 - Daniel Azuma
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 1980-01-02 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.
@@ -79,11 +78,10 @@ homepage: https://github.com/dazuma/toys
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.15.6/file.CHANGELOG.html
+  changelog_uri: https://dazuma.github.io/toys/gems/toys-core/v0.16.0/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.15.6
-post_install_message: 
+  documentation_uri: https://dazuma.github.io/toys/gems/toys-core/v0.16.0
 rdoc_options: []
 require_paths:
 - lib
@@ -91,15 +89,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Framework for creating command line executables
 test_files: []