toys-core 0.10.5 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0e62a1c71082677fd2c257f95adec476cd8c1f5d83a8f42854e48cfe52d1bf
-  data.tar.gz: d5940e36d77ce386ce7be949b2e16af08454095300a5beb3ffafdf4f691abe26
+  metadata.gz: 387c4a7088a856603e671a0c6156982eaa5639a41d1168a7912892b6ca9ca822
+  data.tar.gz: f47e0683edea4d3fcfa848e0517299648c0d6a0564b7d9316405487ed2e6d4dd
 SHA512:
-  metadata.gz: a59b68df5403e100330518056d0e8d9b8792f9e01e36792b445413300e40e2637a86847af9afe565084a55e3bf3b332f1eff15cacc42a56c95597c94a47bd27a
-  data.tar.gz: a8d943e4ccb7a2b9f3278a0eabf4c33485fb09d2fce2440d3f3c3cdc605a30977a0d43da993018b6affb51933686f69e038b5bf1847df54e1cdfab981af77309
+  metadata.gz: f1a9e2501458d1c8cebeafc044a6fe9f4de131c687df533e73a8567aa81afef2a5ed02fbb769e0da9ed7f4632c2c4f9046efec21281a3bc8c8072437d4ecb844
+  data.tar.gz: f9c22a3b8d531825353d9eebc70735b3bdfddfc8f22ce55bc8bf62685bbbf9443fbb6d875b7671d70f8ee2ca1eb0990238d2b35b92289b5c1c3b7e392bae9537

data/CHANGELOG.md

@@ -1,31 +1,57 @@
 # Release History
 
-### 0.10.5 / 2020-07-18
+### 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.
+* IMPROVED: The `:bundler` mixin searches for `gems.rb` and `.gems.rb` in addition to `Gemfile`.
+* IMPROVED: The `:budnler` mixin can load a specific Gemfile path.
+* FIXED: The loader can now find data and lib directories at the root level of a Toys directory.
+* 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.
+
+### 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.
-* IMPROVED: The bundler mixin utomatically updates the bundle if install fails (typically because a transitive dependency has been explicitly updated.)
+* IMPROVED: The bundler mixin automatically updates the bundle if install fails (typically because a transitive dependency has been explicitly updated.)
 * 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:
 
@@ -55,16 +81,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.
@@ -72,11 +98,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:
 
@@ -99,12 +125,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.
 
@@ -203,17 +229,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.
@@ -222,7 +248,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.
@@ -232,31 +258,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.
@@ -268,13 +294,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"
@@ -283,11 +309,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.
@@ -296,7 +322,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.
@@ -306,11 +332,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
@@ -323,7 +349,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.
@@ -335,14 +361,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
@@ -364,7 +390,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:`.
@@ -377,7 +403,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/docs/guide.md

@@ -1,4 +1,6 @@
+<!--
 # @title Toys-Core User Guide
+-->
 
 # Toys-Core User Guide
 

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.10.5"
+    VERSION = "0.11.4"
   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
@@ -1619,6 +1623,23 @@ module Toys
         self
       end
 
+      ##
+      # Remove lower-priority sources from the load path. This prevents lower-
+      # priority sources (such as Toys files from parent or global directories)
+      # from executing or defining tools.
+      #
+      # This works only if no such sources have already loaded yet.
+      #
+      # @raise [Toys::ToolDefinitionError] if any lower-priority tools have
+      #     already been loaded.
+      #
+      def truncate_load_path!
+        unless @__loader.stop_loading_at_priority(@__priority)
+          raise ToolDefinitionError,
+                "Cannot truncate load path because tools have already been loaded"
+        end
+      end
+
       ##
       # Determines whether the current Toys version satisfies the given
       # requirements.

data/lib/toys/loader.rb

@@ -8,6 +8,9 @@ module Toys
   # appropriate tool given a set of command line arguments.
   #
   class Loader
+    # @private
+    BASE_PRIORITY = -999_999
+
     ##
     # Create a Loader
     #
@@ -69,9 +72,11 @@ module Toys
       @worklist = []
       @tool_data = {}
       @max_priority = @min_priority = 0
+      @stop_priority = BASE_PRIORITY
+      @min_loaded_priority = 999_999
       @middleware_stack = Middleware.stack(middleware_stack)
       @delimiter_handler = DelimiterHandler.new(extra_delimiters)
-      get_tool([], -999_999)
+      get_tool([], BASE_PRIORITY)
     end
 
     ##
@@ -89,7 +94,7 @@ module Toys
         raise "Cannot add a path after tool loading has started" if @loading_started
         priority = high_priority ? (@max_priority += 1) : (@min_priority -= 1)
         paths.each do |path|
-          source = SourceInfo.create_path_root(path)
+          source = SourceInfo.create_path_root(path, @data_dir_name, @lib_dir_name)
           @worklist << [source, [], priority]
         end
       end
@@ -114,7 +119,7 @@ module Toys
       @mutex.synchronize do
         raise "Cannot add a block after tool loading has started" if @loading_started
         priority = high_priority ? (@max_priority += 1) : (@min_priority -= 1)
-        source = SourceInfo.create_proc_root(block, name)
+        source = SourceInfo.create_proc_root(block, name, @data_dir_name, @lib_dir_name)
         @worklist << [source, [], priority]
       end
       self
@@ -178,15 +183,15 @@ module Toys
       load_for_prefix(words)
       found_tools = []
       len = words.length
-      tool_data_snapshot.each do |n, td|
-        next if n.empty?
+      all_cur_definitions.each do |tool|
+        name = tool.full_name
+        next if name.empty?
         if recursive
-          next if n.length <= len || n.slice(0, len) != words
+          next if name.length <= len || name.slice(0, len) != words
         else
-          next unless n.slice(0..-2) == words
+          next unless name.slice(0..-2) == words
         end
-        tool = td.cur_definition
-        found_tools << tool unless tool.nil?
+        found_tools << tool
       end
       sort_tools_by_name(found_tools)
       include_hidden ? found_tools : filter_hidden_subtools(found_tools)
@@ -202,8 +207,9 @@ module Toys
     def has_subtools?(words) # rubocop:disable Naming/PredicateName
       load_for_prefix(words)
       len = words.length
-      tool_data_snapshot.each do |n, td|
-        if !n.empty? && n.length > len && n.slice(0, len) == words && !td.empty?
+      all_cur_definitions.each do |tool|
+        name = tool.full_name
+        if !name.empty? && name.length > len && name.slice(0, len) == words
           return true
         end
       end
@@ -267,6 +273,20 @@ module Toys
       Tool.new(self, parent, words, priority, middleware_stack, @middleware_lookup)
     end
 
+    ##
+    # Stop search at the given priority. Returns true if successful.
+    # Called only from the DSL.
+    #
+    # @private
+    #
+    def stop_loading_at_priority(priority)
+      @mutex.synchronize do
+        return false if priority > @min_loaded_priority || priority < @stop_priority
+        @stop_priority = priority
+        true
+      end
+    end
+
     ##
     # Loads the subtree under the given prefix.
     #
@@ -278,6 +298,7 @@ module Toys
         cur_worklist = @worklist
         @worklist = []
         cur_worklist.each do |source, words, priority|
+          next if priority < @stop_priority
           remaining_words = calc_remaining_words(prefix, words)
           if source.source_proc
             load_proc(source, words, remaining_words, priority)
@@ -349,8 +370,15 @@ module Toys
 
     private
 
-    def tool_data_snapshot
-      @mutex.synchronize { @tool_data.dup }
+    def all_cur_definitions
+      result = []
+      @mutex.synchronize do
+        @tool_data.map do |_name, td|
+          tool = td.cur_definition
+          result << tool unless tool.nil?
+        end
+      end
+      result
     end
 
     def get_tool_data(words)
@@ -364,14 +392,16 @@ module Toys
     def finish_definitions_in_tree(words)
       load_for_prefix(words)
       len = words.length
-      tool_data_snapshot.each do |n, td|
-        next if n.length < len || n.slice(0, len) != words
-        td.cur_definition&.finish_definition(self)
+      all_cur_definitions.each do |tool|
+        name = tool.full_name
+        next if name.length < len || name.slice(0, len) != words
+        tool.finish_definition(self)
       end
     end
 
     def load_proc(source, words, remaining_words, priority)
       if remaining_words
+        update_min_loaded_priority(priority)
         tool_class = get_tool(words, priority).tool_class
         DSL::Tool.prepare(tool_class, remaining_words, source) do
           ContextualError.capture("Error while loading Toys config!") do
@@ -393,6 +423,7 @@ module Toys
 
     def load_relevant_path(source, words, remaining_words, priority)
       if source.source_type == :file
+        update_min_loaded_priority(priority)
         tool_class = get_tool(words, priority).tool_class
         InputFile.evaluate(tool_class, remaining_words, source)
       else
@@ -406,7 +437,7 @@ module Toys
 
     def load_index_in(source, words, remaining_words, priority)
       return unless @index_file_name
-      index_source = source.relative_child(@index_file_name, @data_dir_name, @lib_dir_name)
+      index_source = source.relative_child(@index_file_name)
       load_relevant_path(index_source, words, remaining_words, priority) if index_source
     end
 
@@ -414,7 +445,7 @@ module Toys
       return if child.start_with?(".") || child == @index_file_name ||
                 child == @preload_file_name || child == @preload_dir_name ||
                 child == @data_dir_name || child == @lib_dir_name
-      child_source = source.relative_child(child, @data_dir_name, @lib_dir_name)
+      child_source = source.relative_child(child)
       return unless child_source
       child_word = ::File.basename(child, ".rb")
       next_words = words + [child_word]
@@ -422,6 +453,10 @@ module Toys
       load_validated_path(child_source, next_words, next_remaining, priority)
     end
 
+    def update_min_loaded_priority(priority)
+      @min_loaded_priority = priority if @min_loaded_priority > priority
+    end
+
     def do_preload(path)
       if @preload_file_name
         preload_file = ::File.join(path, @preload_file_name)
@@ -483,37 +518,42 @@ module Toys
     # @private
     #
     class ToolData
-      ## @private
+      # @private
       def initialize(words)
         @words = words
         @definitions = {}
         @top_priority = @active_priority = nil
+        @mutex = ::Monitor.new
       end
 
-      ## @private
+      # @private
       def cur_definition
-        active_definition || top_definition
+        @mutex.synchronize { active_definition || top_definition }
       end
 
-      ## @private
+      # @private
       def empty?
         @definitions.empty?
       end
 
-      ## @private
+      # @private
       def get_tool(priority, loader)
-        if @top_priority.nil? || @top_priority < priority
-          @top_priority = priority
+        @mutex.synchronize do
+          if @top_priority.nil? || @top_priority < priority
+            @top_priority = priority
+          end
+          @definitions[priority] ||= loader.build_tool(@words, priority)
         end
-        @definitions[priority] ||= loader.build_tool(@words, priority)
       end
 
-      ## @private
+      # @private
       def activate_tool(priority, loader)
-        return active_definition if @active_priority == priority
-        return nil if @active_priority && @active_priority > priority
-        @active_priority = priority
-        get_tool(priority, loader)
+        @mutex.synchronize do
+          return active_definition if @active_priority == priority
+          return nil if @active_priority && @active_priority > priority
+          @active_priority = priority
+          get_tool(priority, loader)
+        end
       end
 
       private