toys-core 0.11.5 → 0.13.0

data/lib/toys/flag_group.rb

@@ -17,11 +17,12 @@ module Toys
     #
     # @param type [Symbol] The type of group. Default is `:optional`.
     # @param desc [String,Array<String>,Toys::WrappableString] Short
-    #     description for the group. See {Toys::Tool#desc=} for a description
-    #     of allowed formats. Defaults to `"Flags"`.
+    #     description for the group. See {Toys::ToolDefinition#desc} for a
+    #     description of allowed formats. Defaults to `"Flags"`.
     # @param long_desc [Array<String,Array<String>,Toys::WrappableString>]
-    #     Long description for the flag group. See {Toys::Tool#long_desc=} for
-    #     a description of allowed formats. Defaults to the empty array.
+    #     Long description for the flag group. See
+    #     {Toys::ToolDefinition#long_desc} for a description of allowed
+    #     formats. Defaults to the empty array.
     # @param name [String,Symbol,nil] The name of the group, or nil for no
     #     name.
     # @return [Toys::FlagGroup::Base] A flag group of the correct subclass.
@@ -55,6 +56,7 @@ module Toys
       # Create a flag group.
       # This argument list is subject to change. Use {Toys::FlagGroup.create}
       # instead for a more stable interface.
+      #
       # @private
       #
       def initialize(name, desc, long_desc)
@@ -167,12 +169,16 @@ module Toys
         self
       end
 
-      ## @private
+      ##
+      # @private
+      #
       def <<(flag)
         flags << flag
       end
 
-      ## @private
+      ##
+      # @private
+      #
       def validation_errors(_seen)
         []
       end
@@ -182,7 +188,9 @@ module Toys
     # A FlagGroup containing all required flags
     #
     class Required < Base
-      ## @private
+      ##
+      # @private
+      #
       def validation_errors(seen)
         results = []
         flags.each do |flag|
@@ -205,7 +213,9 @@ module Toys
     # A FlagGroup in which exactly one flag must be set
     #
     class ExactlyOne < Base
-      ## @private
+      ##
+      # @private
+      #
       def validation_errors(seen)
         seen_names = []
         flags.each do |flag|
@@ -228,7 +238,9 @@ module Toys
     # A FlagGroup in which at most one flag must be set
     #
     class AtMostOne < Base
-      ## @private
+      ##
+      # @private
+      #
       def validation_errors(seen)
         seen_names = []
         flags.each do |flag|
@@ -248,7 +260,9 @@ module Toys
     # A FlagGroup in which at least one flag must be set
     #
     class AtLeastOne < Base
-      ## @private
+      ##
+      # @private
+      #
       def validation_errors(seen)
         flags.each do |flag|
           return [] if seen.include?(flag.key)

data/lib/toys/input_file.rb

@@ -5,17 +5,21 @@
 # is parsed, a module is created under this parent for that file's constants.
 #
 module Toys::InputFile # rubocop:disable Style/ClassAndModuleChildren
-  ## @private
+  ##
+  # @private
+  #
   def self.__binding
     binding
   end
 
-  ## @private
-  def self.evaluate(tool_class, remaining_words, source)
+  ##
+  # @private
+  #
+  def self.evaluate(tool_class, words, priority, remaining_words, source, loader)
     namespace = ::Module.new
     namespace.module_eval do
       include ::Toys::Context::Key
-      @tool_class = tool_class
+      @__tool_class = tool_class
     end
     path = source.source_path
     basename = ::File.basename(path).tr(".-", "_").gsub(/\W/, "")
@@ -23,7 +27,7 @@ module Toys::InputFile # rubocop:disable Style/ClassAndModuleChildren
     str = build_eval_string(name, ::IO.read(path))
     if str
       const_set(name, namespace)
-      ::Toys::DSL::Tool.prepare(tool_class, remaining_words, source) do
+      ::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, -2)
@@ -33,13 +37,15 @@ module Toys::InputFile # rubocop:disable Style/ClassAndModuleChildren
     end
   end
 
-  ## @private
+  ##
+  # @private
+  #
   def self.build_eval_string(module_name, string)
     index = string.index(/^\s*[^#\s]/)
     return nil if index.nil?
     "#{string[0, index]}\n" \
       "module #{module_name}\n" \
-      "@tool_class.class_eval do\n" \
+      "@__tool_class.class_eval do\n" \
       "#{string[index..-1]}\n" \
       "end\n" \
       "end\n"