toys-core 0.15.6 → 0.17.0

data/lib/toys/loader.rb

@@ -49,7 +49,8 @@ module Toys
                    mixin_lookup: nil,
                    middleware_lookup: nil,
                    template_lookup: nil,
-                   git_cache: nil)
+                   git_cache: nil,
+                   gems_util: nil)
       if index_file_name && ::File.extname(index_file_name) != ".rb"
         raise ::ArgumentError, "Illegal index file name #{index_file_name.inspect}"
       end
@@ -73,6 +74,7 @@ module Toys
       @middleware_stack = Middleware.stack(middleware_stack)
       @delimiter_handler = DelimiterHandler.new(extra_delimiters)
       @git_cache = git_cache
+      @gems_util = gems_util
       get_tool([], -999_999)
     end
 
@@ -204,8 +206,7 @@ module Toys
                 high_priority: false,
                 update: false,
                 context_directory: nil)
-      git_cache = @git_cache || Loader.default_git_cache
-      path = git_cache.get(git_remote, path: git_path, commit: git_commit, update: update)
+      path = resolve_git_path(git_remote, git_path, git_commit, update)
       @mutex.synchronize do
         raise "Cannot add a git source after tool loading has started" if @loading_started
         priority = high_priority ? (@max_priority += 1) : (@min_priority -= 1)
@@ -219,6 +220,43 @@ module Toys
       self
     end
 
+    ##
+    # Add a configuration gem source to the loader.
+    #
+    # @param gem_name [String] The name of the gem
+    # @param gem_version [String,Array<String>] The version requirements
+    # @param gem_path [String] The path from the gem's toys directory to the
+    #     relevant file or directory. Specify the empty string to use the
+    #     entire toys directory.
+    # @param high_priority [Boolean] If true, add this path at the top of the
+    #     priority list. Defaults to false, indicating the new path should be
+    #     at the bottom of the priority list.
+    # @param gem_toys_dir [String] The name of the toys directory. Optional.
+    #     Defaults to the directory specified in the gem's metadata, or the
+    #     value "toys".
+    # @param context_directory [String,nil] The context directory for tools
+    #     loaded from this source. You can pass a directory path as a string,
+    #     or `nil` to denote no context. Defaults to `nil`.
+    # @return [self]
+    #
+    def add_gem(gem_name, gem_version, gem_path,
+                high_priority: false,
+                gem_toys_dir: nil,
+                context_directory: nil)
+      gem_version, gem_path, path = resolve_gem_info(gem_name, gem_version, gem_toys_dir, gem_path)
+      @mutex.synchronize do
+        raise "Cannot add a gem source after tool loading has started" if @loading_started
+        priority = high_priority ? (@max_priority += 1) : (@min_priority -= 1)
+        source = SourceInfo.create_gem_root(gem_name, gem_version, gem_path, path, priority,
+                                            context_directory: context_directory,
+                                            data_dir_name: @data_dir_name,
+                                            lib_dir_name: @lib_dir_name)
+        @roots_by_priority[priority] = source
+        @worklist << [source, [], priority]
+      end
+      self
+    end
+
     ##
     # Given a list of command line arguments, find the appropriate tool to
     # handle the command, loading it from the configuration if necessary.
@@ -288,7 +326,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 +341,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|
@@ -439,8 +477,7 @@ module Toys
     #
     def load_path(parent_source, path, words, remaining_words, priority)
       if parent_source.git_remote
-        raise LoaderError,
-              "Git source #{parent_source.source_name} tried to load from the local file system"
+        raise LoaderError, "Git source #{parent_source.source_name} tried to load from the local file system"
       end
       source = parent_source.absolute_child(path)
       @mutex.synchronize do
@@ -454,16 +491,30 @@ module Toys
     #
     # @private This interface is internal and subject to change without warning.
     #
-    def load_git(parent_source, git_remote, git_path, git_commit, words, remaining_words, priority,
-                 update: false)
-      git_cache = @git_cache || Loader.default_git_cache
-      path = git_cache.get(git_remote, path: git_path, commit: git_commit, update: update)
+    def load_git(parent_source, git_remote, git_path, git_commit, update,
+                 words, remaining_words, priority)
+      path = resolve_git_path(git_remote, git_path, git_commit, update)
       source = parent_source.git_child(git_remote, git_path, git_commit, path)
       @mutex.synchronize do
         load_validated_path(source, words, remaining_words, priority)
       end
     end
 
+    ##
+    # Load configuration from the given gem. This is called from the `load_gem`
+    # directive in the DSL.
+    #
+    # @private This interface is internal and subject to change without warning.
+    #
+    def load_gem(parent_source, gem_name, gem_version, gem_toys_dir, gem_path,
+                 words, remaining_words, priority)
+      gem_version, gem_path, path = resolve_gem_info(gem_name, gem_version, gem_toys_dir, gem_path)
+      source = parent_source.gem_child(gem_name, gem_version, gem_path, path)
+      @mutex.synchronize do
+        load_validated_path(source, words, remaining_words, priority)
+      end
+    end
+
     ##
     # Load a subtool block. Called from the `tool` directive in the DSL.
     #
@@ -478,6 +529,7 @@ module Toys
 
     @git_cache_mutex = ::Mutex.new
     @default_git_cache = nil
+    @default_gems_util = nil
 
     ##
     # Get a global default GitCache.
@@ -493,6 +545,20 @@ module Toys
       end
     end
 
+    ##
+    # Get a global default Gems utility.
+    #
+    # @private This interface is internal and subject to change without warning.
+    #
+    def self.default_gems_util
+      @git_cache_mutex.synchronize do
+        @default_gems_util ||= begin
+          require "toys/utils/gems"
+          Utils::Gems.new
+        end
+      end
+    end
+
     ##
     # Determine the next setting for remaining_words, given a word.
     #
@@ -640,6 +706,28 @@ module Toys
 
     private
 
+    ##
+    # Resolve the file system path to the given object in the git cache
+    #
+    def resolve_git_path(git_remote, git_path, git_commit, update)
+      git_cache = @git_cache || Loader.default_git_cache
+      git_cache.get(git_remote, path: git_path, commit: git_commit, update: update)
+    end
+
+    ##
+    # Resolve information for a gem source.
+    #
+    def resolve_gem_info(gem_name, gem_version, gem_toys_dir, gem_path)
+      gems_util = @gems_util || Loader.default_gems_util
+      gems_util.activate(gem_name, *Array(gem_version))
+      gem_spec = ::Gem.loaded_specs[gem_name]
+      raise LoaderError, "Unable to find gem #{gem_name}" unless gem_spec&.gem_dir
+      gem_toys_dir ||= gem_spec.metadata["toys_dir"] || "toys"
+      gem_path = gem_path ? ::File.join(gem_toys_dir, gem_path) : gem_toys_dir
+      path = ::File.join(gem_spec.gem_dir, gem_path)
+      [gem_spec.version, gem_path, path]
+    end
+
     ##
     # Return a snapshot of all the current tool definitions that have been
     # loaded. No additional loading is done. The returned array is not in any

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/source_info.rb

@@ -11,6 +11,7 @@ module Toys
   # * A toys directory
   # * A single toys file
   # * A file or directory loaded from git
+  # * A file or directory loaded from a gem
   # * A config block passed directly to the CLI
   # * A tool block within a toys file
   #
@@ -143,6 +144,32 @@ module Toys
     #
     attr_reader :git_commit
 
+    ##
+    # The gem name. This is set if the source, or one of its ancestors, comes
+    # from a gem.
+    #
+    # @return [String] The gem name.
+    # @return [nil] if this source is not from a gem.
+    #
+    attr_reader :gem_name
+
+    ##
+    # The gem version. This is set if the source, or one of its ancestors,
+    # comes from a gem.
+    #
+    # @return [Gem::Version] The gem version.
+    # @return [nil] if this source is not from a gem.
+    #
+    attr_reader :gem_version
+
+    ##
+    # The path within the gem, including the toys root directory in the gem.
+    #
+    # @return [String] The path.
+    # @return [nil] if this source is not from a gem.
+    #
+    attr_reader :gem_path
+
     ##
     # A user-visible name of this source.
     #
@@ -191,8 +218,10 @@ module Toys
     #
     # @private This interface is internal and subject to change without warning.
     #
-    def initialize(parent, priority, context_directory, source_type, source_path, source_proc,
-                   git_remote, git_path, git_commit, source_name, data_dir_name, lib_dir_name)
+    def initialize(parent, priority, context_directory,
+                   source_type, source_path, source_proc,
+                   git_remote, git_path, git_commit, gem_name, gem_version, gem_path,
+                   source_name, data_dir_name, lib_dir_name)
       @parent = parent
       @root = parent&.root || self
       @priority = priority
@@ -204,7 +233,10 @@ module Toys
       @git_remote = git_remote
       @git_path = git_path
       @git_commit = git_commit
-      @source_name = source_name
+      @gem_name = gem_name
+      @gem_version = gem_version
+      @gem_path = gem_path
+      @source_name = source_name || default_source_name
       @data_dir_name = data_dir_name
       @lib_dir_name = lib_dir_name
       @data_dir = find_special_dir(data_dir_name)
@@ -220,18 +252,12 @@ module Toys
       unless source_type == :directory
         raise LoaderError, "relative_child is valid only on a directory source"
       end
-      child_path = ::File.join(source_path, filename)
-      child_path, type = SourceInfo.check_path(child_path, true)
+      child_path, type = SourceInfo.check_path(::File.join(source_path, filename), true)
       return nil unless child_path
-      child_git_path = ::File.join(git_path, filename) if git_path
-      source_name ||=
-        if git_path
-          "git(remote=#{git_remote} path=#{child_git_path} commit=#{git_commit})"
-        else
-          child_path
-        end
+      child_git_path = git_path.empty? ? filename : ::File.join(git_path, filename) if git_path
+      child_gem_path = gem_path.empty? ? filename : ::File.join(gem_path, filename) if gem_path
       SourceInfo.new(self, priority, context_directory, type, child_path, nil,
-                     git_remote, child_git_path, git_commit,
+                     git_remote, child_git_path, git_commit, gem_name, gem_version, child_gem_path,
                      source_name, @data_dir_name, @lib_dir_name)
     end
 
@@ -242,8 +268,8 @@ module Toys
     #
     def absolute_child(child_path, source_name: nil)
       child_path, type = SourceInfo.check_path(child_path, false)
-      source_name ||= child_path
-      SourceInfo.new(self, priority, context_directory, type, child_path, nil, nil, nil, nil,
+      SourceInfo.new(self, priority, context_directory, type, child_path, nil,
+                     nil, nil, nil, nil, nil, nil,
                      source_name, @data_dir_name, @lib_dir_name)
     end
 
@@ -252,13 +278,22 @@ module Toys
     #
     # @private This interface is internal and subject to change without warning.
     #
-    def git_child(child_git_remote, child_git_path, child_git_commit, child_path,
-                  source_name: nil)
+    def git_child(child_git_remote, child_git_path, child_git_commit, child_path, source_name: nil)
+      child_path, type = SourceInfo.check_path(child_path, false)
+      SourceInfo.new(self, priority, context_directory, type, child_path, nil,
+                     child_git_remote, child_git_path, child_git_commit, nil, nil, nil,
+                     source_name, @data_dir_name, @lib_dir_name)
+    end
+
+    ##
+    # Create a child SourceInfo with a gem source.
+    #
+    # @private This interface is internal and subject to change without warning.
+    #
+    def gem_child(child_gem_name, child_gem_version, child_gem_path, child_path, source_name: nil)
       child_path, type = SourceInfo.check_path(child_path, false)
-      source_name ||=
-        "git(remote=#{child_git_remote} path=#{child_git_path} commit=#{child_git_commit})"
       SourceInfo.new(self, priority, context_directory, type, child_path, nil,
-                     child_git_remote, child_git_path, child_git_commit,
+                     nil, nil, nil, child_gem_name, child_gem_version, child_gem_path,
                      source_name, @data_dir_name, @lib_dir_name)
     end
 
@@ -270,7 +305,7 @@ module Toys
     def proc_child(child_proc, source_name: nil)
       source_name ||= self.source_name
       SourceInfo.new(self, priority, context_directory, :proc, source_path, child_proc,
-                     git_remote, git_path, git_commit,
+                     git_remote, git_path, git_commit, gem_name, gem_version, gem_path,
                      source_name, @data_dir_name, @lib_dir_name)
     end
 
@@ -291,8 +326,8 @@ module Toys
       when :path
         context_directory = source_path
       end
-      source_name ||= source_path
-      new(nil, priority, context_directory, type, source_path, nil, nil, nil, nil,
+      new(nil, priority, context_directory, type, source_path, nil,
+          nil, nil, nil, nil, nil, nil,
           source_name, data_dir_name, lib_dir_name)
     end
 
@@ -307,9 +342,25 @@ module Toys
                              lib_dir_name: nil,
                              source_name: nil)
       source_path, type = check_path(source_path, false)
-      source_name ||= "git(remote=#{git_remote} path=#{git_path} commit=#{git_commit})"
-      new(nil, priority, context_directory, type, source_path, nil, git_remote,
-          git_path, git_commit, source_name, data_dir_name, lib_dir_name)
+      new(nil, priority, context_directory, type, source_path, nil,
+          git_remote, git_path, git_commit, nil, nil, nil,
+          source_name, data_dir_name, lib_dir_name)
+    end
+
+    ##
+    # Create a root source info for a loaded gem.
+    #
+    # @private This interface is internal and subject to change without warning.
+    #
+    def self.create_gem_root(gem_name, gem_version, gem_path, source_path, priority,
+                             context_directory: nil,
+                             data_dir_name: nil,
+                             lib_dir_name: nil,
+                             source_name: nil)
+      source_path, type = check_path(source_path, false)
+      new(nil, priority, context_directory, type, source_path, nil,
+          nil, nil, nil, gem_name, gem_version, gem_path,
+          source_name, data_dir_name, lib_dir_name)
     end
 
     ##
@@ -322,9 +373,9 @@ module Toys
                               data_dir_name: nil,
                               lib_dir_name: nil,
                               source_name: nil)
-      source_name ||= "(code block #{source_proc.object_id})"
-      new(nil, priority, context_directory, :proc, nil, source_proc, nil, nil,
-          nil, source_name, data_dir_name, lib_dir_name)
+      new(nil, priority, context_directory, :proc, nil, source_proc,
+          nil, nil, nil, nil, nil, nil,
+          source_name, data_dir_name, lib_dir_name)
     end
 
     ##
@@ -354,6 +405,18 @@ module Toys
 
     private
 
+    def default_source_name
+      if @git_remote
+        "git(remote=#{@git_remote} path=#{@git_path} commit=#{@git_commit})"
+      elsif @gem_name
+        "gem(name=#{@gem_name} version=#{@gem_version} path=#{@gem_path})"
+      elsif @source_type == :proc
+        "(code block #{@source_proc.object_id})"
+      else
+        @source_path
+      end
+    end
+
     def find_special_dir(dir_name)
       return nil if @source_type != :directory || dir_name.nil?
       dir = ::File.join(@source_path, dir_name)

data/lib/toys/standard_mixins/gems.rb

@@ -22,8 +22,8 @@ module Toys
     #
     #     tool "my_tool" do
     #       include :gems
-    #       gem "nokogiri", "~> 1.15"
     #       def run
+    #         gem "nokogiri", "~> 1.15"
     #         # Do stuff with Nokogiri
     #       end
     #     end
@@ -33,6 +33,18 @@ module Toys
     #
     #     include :gems, on_missing: :error
     #
+    # You can also pass options to the {#gem} mixin method itself:
+    #
+    #     tool "my_tool" do
+    #       include :gems
+    #       def run
+    #         # If the gem is not installed, error out instead of asking to
+    #         # install it.
+    #         gem "nokogiri", "~> 1.15", on_missing: :error
+    #         # Do stuff with Nokogiri
+    #       end
+    #     end
+    #
     # See {Toys::Utils::Gems#initialize} for a list of supported options.
     #
     module Gems
@@ -54,8 +66,8 @@ module Toys
       # @param requirements [String...] Version requirements
       # @return [void]
       #
-      def gem(name, *requirements)
-        self.class.gems.activate(name, *requirements)
+      def gem(name, *requirements, **options)
+        self.class.gem(name, *requirements, **options)
       end
 
       on_include do |**opts|
@@ -76,8 +88,15 @@ module Toys
         ##
         # @private
         #
-        def self.gem(name, *requirements)
-          gems.activate(name, *requirements)
+        def self.gem(name, *requirements, **options)
+          gems_util =
+            if options.empty?
+              gems
+            else
+              require "toys/utils/gems"
+              Utils::Gems.new(**options)
+            end
+          gems_util.activate(name, *requirements)
         end
       end
     end

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
 
     ##
@@ -1014,15 +1012,16 @@ module Toys
     # @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
     #     line. Defaults to `nil`.
-    # @param handler [Proc,nil,:set,:push] An optional handler for
-    #     setting/updating the value. A handler is a proc taking two
-    #     arguments, the given value and the previous value, returning the
-    #     new value that should be set. You may also specify a predefined
-    #     named handler. The `:set` handler (the default) replaces the
-    #     previous value (effectively `-> (val, _prev) { val }`). The
-    #     `:push` handler expects the previous value to be an array and
-    #     pushes the given value onto it; it should be combined with setting
-    #     `default: []` and is intended for "multi-valued" flags.
+    # @param handler [Proc,nil,:set,:push] An optional handler that customizes
+    #     how a value is set or updated. A handler is a proc that takes up to
+    #     three arguments: the given value, the previous value, and a hash
+    #     containing all the data collected so far during argument parsing. It
+    #     must return the new value that should be set. You may also specify a
+    #     predefined named handler. The `:set` handler (the default) replaces
+    #     the previous value (effectively `-> (val) { val }`). The `:push`
+    #     handler expects the previous value to be an array and pushes the
+    #     given value onto it; it should be combined with setting `default: []`
+    #     and is intended for "multi-valued" flags.
     # @param complete_flags [Object] A specifier for shell tab completion
     #     for flag names associated with this flag. By default, a
     #     {Toys::Flag::DefaultCompletion} is used, which provides the flag's
@@ -1347,15 +1346,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 +1387,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 +1487,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