toys-core 0.3.4 → 0.3.5

data/lib/toys/loader.rb

@@ -86,7 +86,7 @@ module Toys
     # handle the command, loading it from the configuration if necessary, and
     # following aliases.
     # This always returns a tool. If the specific tool path is not defined and
-    # cannot be found in any configuration, it finds the nearest group that
+    # cannot be found in any configuration, it finds the nearest namespace that
     # _would_ contain that tool, up to the root tool.
     #
     # Returns a tuple of the found tool, and the array of remaining arguments

data/lib/toys/middleware/add_verbosity_flags.rb

@@ -88,7 +88,7 @@ module Toys
                                                       DEFAULT_VERBOSE_FLAGS)
         unless verbose_flags.empty?
           long_desc = "Increase verbosity, causing additional logging levels to display."
-          tool.add_flag(Context::VERBOSITY, *verbose_flags,
+          tool.add_flag(Context::VERBOSITY, verbose_flags,
                         desc: "Increase verbosity",
                         long_desc: long_desc,
                         handler: ->(_val, cur) { cur + 1 },
@@ -101,7 +101,7 @@ module Toys
                                                     DEFAULT_QUIET_FLAGS)
         unless quiet_flags.empty?
           long_desc = "Decrease verbosity, causing fewer logging levels to display."
-          tool.add_flag(Context::VERBOSITY, *quiet_flags,
+          tool.add_flag(Context::VERBOSITY, quiet_flags,
                         desc: "Decrease verbosity",
                         long_desc: long_desc,
                         handler: ->(_val, cur) { cur - 1 },

data/lib/toys/middleware/set_default_descriptions.rb

@@ -34,7 +34,7 @@ module Toys
     ##
     # This middleware sets default description fields for tools that do not
     # have them set otherwise. You can set separate descriptions for tools,
-    # groups, and the root.
+    # namespaces, and the root.
     #
     class SetDefaultDescriptions < Base
       ##
@@ -44,10 +44,10 @@ module Toys
       DEFAULT_TOOL_DESC = "(No tool description available)".freeze
 
       ##
-      # The default description for groups.
+      # The default description for namespaces.
       # @return [String]
       #
-      DEFAULT_GROUP_DESC = "(A group of tools)".freeze
+      DEFAULT_NAMESPACE_DESC = "(A namespace of tools)".freeze
 
       ##
       # The default description for the root tool.
@@ -92,16 +92,16 @@ module Toys
       # Create a SetDefaultDescriptions middleware given default descriptions.
       #
       # @param [String,nil] default_tool_desc The default short description for
-      #     tools with an executor, or `nil` not to set one. Defaults to
+      #     tools with an script, or `nil` not to set one. Defaults to
       #     {DEFAULT_TOOL_DESC}.
       # @param [String,nil] default_tool_long_desc The default long description
-      #     for tools with an executor, or `nil` not to set one. Defaults to
+      #     for tools with an script, or `nil` not to set one. Defaults to
       #     `nil`.
-      # @param [String,nil] default_group_desc The default short description
-      #     for tools with no executor, or `nil` not to set one. Defaults to
-      #     {DEFAULT_TOOL_DESC}.
-      # @param [String,nil] default_group_long_desc The default long
-      #     description for tools with no executor, or `nil` not to set one.
+      # @param [String,nil] default_namespace_desc The default short
+      #     description for tools with no script, or `nil` not to set one.
+      #     Defaults to {DEFAULT_TOOL_DESC}.
+      # @param [String,nil] default_namespace_long_desc The default long
+      #     description for tools with no script, or `nil` not to set one.
       #     Defaults to `nil`.
       # @param [String,nil] default_root_desc The default short description for
       #     the root tool, or `nil` not to set one. Defaults to
@@ -134,8 +134,8 @@ module Toys
       #
       def initialize(default_tool_desc: DEFAULT_TOOL_DESC,
                      default_tool_long_desc: nil,
-                     default_group_desc: DEFAULT_GROUP_DESC,
-                     default_group_long_desc: nil,
+                     default_namespace_desc: DEFAULT_NAMESPACE_DESC,
+                     default_namespace_long_desc: nil,
                      default_root_desc: DEFAULT_ROOT_DESC,
                      default_root_long_desc: DEFAULT_ROOT_LONG_DESC,
                      default_flag_desc: DEFAULT_FLAG_DESC,
@@ -148,8 +148,8 @@ module Toys
                      default_remaining_arg_long_desc: nil)
         @default_tool_desc = default_tool_desc
         @default_tool_long_desc = default_tool_long_desc
-        @default_group_desc = default_group_desc
-        @default_group_long_desc = default_group_long_desc
+        @default_namespace_desc = default_namespace_desc
+        @default_namespace_long_desc = default_namespace_long_desc
         @default_root_desc = default_root_desc
         @default_root_long_desc = default_root_long_desc
         @default_flag_desc = default_flag_desc
@@ -168,10 +168,10 @@ module Toys
       def config(tool, _loader)
         if tool.root?
           config_descs(tool, @default_root_desc, @default_root_long_desc)
-        elsif tool.includes_executor?
+        elsif tool.includes_script?
           config_descs(tool, @default_tool_desc, @default_tool_long_desc)
         else
-          config_descs(tool, @default_group_desc, @default_group_long_desc)
+          config_descs(tool, @default_namespace_desc, @default_namespace_long_desc)
         end
         tool.flag_definitions.each do |flag|
           config_descs(flag, @default_flag_desc, @default_flag_long_desc)

data/lib/toys/middleware/show_help.rb

@@ -30,6 +30,7 @@
 require "highline"
 
 require "toys/middleware/base"
+require "toys/utils/exec"
 require "toys/utils/help_text"
 require "toys/utils/line_output"
 
@@ -38,9 +39,9 @@ module Toys
     ##
     # A middleware that shows help text for the tool when a flag (typically
     # `--help`) is provided. It can also be configured to show help by
-    # default if the tool is a group with no executor.
+    # default if the tool is a namespace with no script.
     #
-    # If a tool has no executor, this middleware can also add a
+    # If a tool has no script, this middleware can also add a
     # `--[no-]recursive` flag, which, when set to `true` (the default), shows
     # all subtools recursively rather than only immediate subtools. This
     # middleware can also search for keywords in its subtools.
@@ -102,13 +103,15 @@ module Toys
       # @param [Boolean] default_recursive Whether to search recursively for
       #     subtools by default. Default is `false`.
       # @param [Boolean] fallback_execution Cause the tool to display its own
-      #     help text if it does not otherwise have an executor. This is
-      #     mostly useful for groups, which have children but no executor.
-      #     Default is `false`.
+      #     help text if it does not otherwise have an script. This is mostly
+      #     useful for namespaces, which have children but no script. Default
+      #     is `false`.
       # @param [Boolean] allow_root_args If the root tool includes flags for
       #     help or usage, and doesn't otherwise use positional arguments,
       #     then a tool name can be passed as arguments to display help for
       #     that tool.
+      # @param [Boolean] use_less If the `less` tool is available, and the
+      #     output stream is a tty, then use `less` to display help text.
       # @param [IO] stream Output stream to write to. Default is stdout.
       # @param [Boolean,nil] styled_output Cause the tool to display help text
       #     with ansi styles. If `nil`, display styles if the output stream is
@@ -121,6 +124,7 @@ module Toys
                      default_recursive: false,
                      fallback_execution: false,
                      allow_root_args: false,
+                     use_less: false,
                      stream: $stdout,
                      styled_output: nil)
         @help_flags = help_flags
@@ -132,6 +136,7 @@ module Toys
         @allow_root_args = allow_root_args
         @stream = stream
         @styled_output = styled_output
+        @use_less = use_less
       end
 
       ##
@@ -161,13 +166,13 @@ module Toys
           help_text = get_help_text(context)
           str = help_text.usage_string(wrap_width: output_cols)
           output.puts(str)
-        elsif @fallback_execution && !context[Context::TOOL].includes_executor? ||
+        elsif @fallback_execution && !context[Context::TOOL].includes_script? ||
               context[:_show_help]
           help_text = get_help_text(context)
           str = help_text.help_string(recursive: context[:_recursive_subtools],
                                       search: context[:_search_subtools],
                                       wrap_width: output_cols)
-          output.puts(str)
+          output_help(str)
         else
           yield
         end
@@ -183,6 +188,25 @@ module Toys
         @output ||= Utils::LineOutput.new(@stream, styled: @styled_output)
       end
 
+      def output_help(str)
+        if less_path
+          Utils::Exec.new.exec([less_path, "-R"], in_from: str)
+        else
+          output.puts(str)
+        end
+      end
+
+      def less_path
+        unless defined? @less_path
+          @less_path =
+            if @use_less && @stream.tty?
+              path = `which less`.strip
+              path.empty? ? nil : path
+            end
+        end
+        @less_path
+      end
+
       def get_help_text(context)
         tool_name = context[:_tool_name]
         return Utils::HelpText.from_context(context) if tool_name.nil? || tool_name.empty?
@@ -204,7 +228,7 @@ module Toys
         help_flags = Middleware.resolve_flags_spec(@help_flags, tool,
                                                    DEFAULT_HELP_FLAGS)
         unless help_flags.empty?
-          tool.add_flag(:_show_help, *help_flags,
+          tool.add_flag(:_show_help, help_flags,
                         desc: "Display help for this tool", only_unique: true)
         end
         help_flags
@@ -214,7 +238,7 @@ module Toys
         usage_flags = Middleware.resolve_flags_spec(@usage_flags, tool,
                                                     DEFAULT_USAGE_FLAGS)
         unless usage_flags.empty?
-          tool.add_flag(:_show_usage, *usage_flags,
+          tool.add_flag(:_show_usage, usage_flags,
                         desc: "Display a brief usage string for this tool", only_unique: true)
         end
         usage_flags
@@ -224,7 +248,7 @@ module Toys
         recursive_flags = Middleware.resolve_flags_spec(@recursive_flags, tool,
                                                         DEFAULT_RECURSIVE_FLAGS)
         unless recursive_flags.empty?
-          tool.add_flag(:_recursive_subtools, *recursive_flags,
+          tool.add_flag(:_recursive_subtools, recursive_flags,
                         default: @default_recursive,
                         desc: "Show all subtools recursively (default is #{@default_recursive})",
                         only_unique: true)
@@ -235,7 +259,7 @@ module Toys
         search_flags = Middleware.resolve_flags_spec(@search_flags, tool,
                                                      DEFAULT_SEARCH_FLAGS)
         unless search_flags.empty?
-          tool.add_flag(:_search_subtools, *search_flags,
+          tool.add_flag(:_search_subtools, search_flags,
                         desc: "Search subtools for the given regular expression",
                         only_unique: true)
         end

data/lib/toys/middleware/show_version.rb

@@ -80,7 +80,7 @@ module Toys
       def config(tool, _loader)
         version = @version_displayer.call(tool)
         if version
-          tool.add_flag(:_show_version, *@version_flags,
+          tool.add_flag(:_show_version, @version_flags,
                         desc: "Display the version",
                         handler: ->(_val, _prev) { version },
                         only_unique: true)

data/lib/toys/template.rb

@@ -77,7 +77,7 @@ module Toys
   #       to_expand do |template|
   #         desc "Prints a greeting to #{template.name}"
   #         tool "templated-greeting" do
-  #           execute do
+  #           script do
   #             puts "Hello, #{template.name}!"
   #           end
   #         end

data/lib/toys/templates/clean.rb

@@ -63,7 +63,7 @@ module Toys
 
           use :fileutils
 
-          execute do
+          script do
             files = []
             patterns = Array(template.paths)
             patterns.each do |pattern|

data/lib/toys/templates/gem_build.rb

@@ -94,7 +94,7 @@ module Toys
           use :fileutils
           use :highline
 
-          execute do
+          script do
             configure_exec(exit_on_nonzero_status: true)
             gemspec = ::Gem::Specification.load "#{template.gem_name}.gemspec"
             version = gemspec.version

data/lib/toys/templates/minitest.rb

@@ -92,7 +92,7 @@ module Toys
 
           remaining_args :tests, desc: "Paths to the tests to run (defaults to all tests)"
 
-          execute do
+          script do
             ruby_args = []
             unless template.libs.empty?
               lib_path = template.libs.join(::File::PATH_SEPARATOR)

data/lib/toys/templates/rubocop.rb

@@ -69,7 +69,7 @@ module Toys
 
           use :exec
 
-          execute do
+          script do
             require "rubocop"
             cli = ::RuboCop::CLI.new
             logger.info "Running RuboCop..."

data/lib/toys/templates/yardoc.rb

@@ -73,7 +73,7 @@ module Toys
 
           use :exec
 
-          execute do
+          script do
             require "yard"
             files = []
             patterns = Array(template.files)

data/lib/toys/tool.rb

@@ -63,7 +63,7 @@ module Toys
 
       @helpers = {}
       @modules = []
-      @executor = nil
+      @script = nil
     end
 
     ##
@@ -129,10 +129,10 @@ module Toys
     attr_reader :helpers
 
     ##
-    # Return the executor block, or `nil` if not present.
+    # Return the script block, or `nil` if not present.
     # @return [Proc,nil]
     #
-    attr_reader :executor
+    attr_reader :script
 
     ##
     # Returns the middleware stack
@@ -172,11 +172,11 @@ module Toys
     end
 
     ##
-    # Returns true if this tool has an executor defined.
+    # Returns true if this tool has an script defined.
     # @return [Boolean]
     #
-    def includes_executor?
-      executor.is_a?(::Proc)
+    def includes_script?
+      script.is_a?(::Proc)
     end
 
     ##
@@ -212,7 +212,7 @@ module Toys
     # @return [Boolean]
     #
     def includes_definition?
-      includes_arguments? || includes_executor? || includes_helpers?
+      includes_arguments? || includes_script? || includes_helpers?
     end
 
     ##
@@ -342,22 +342,22 @@ module Toys
 
     ##
     # Add a flag to the current tool. Each flag must specify a key which
-    # the executor may use to obtain the flag value from the context.
+    # the script may use to obtain the flag value from the context.
     # You may then provide the flags themselves in `OptionParser` form.
     #
     # @param [Symbol] key The key to use to retrieve the value from the
     #     execution context.
-    # @param [String...] flags The flags in OptionParser format.
+    # @param [Array<String>] flags The flags in OptionParser format.
     # @param [Object,nil] accept An OptionParser acceptor. Optional.
     # @param [Object] default 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 [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] desc Short description
-    #     for the flag. Defaults to empty array.
-    # @param [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] long_desc Long
-    #     description for the flag. Defaults to empty array.
+    # @param [String,Array<String>,Toys::Utils::WrappableString] desc Short
+    #     description for the flag. See {Toys::Tool#desc=} for a description of
+    #     allowed formats. Defaults to the empty string.
+    # @param [Array<String,Array<String>,Toys::Utils::WrappableString>] long_desc
+    #     Long description for the flag. See {Toys::Tool#long_desc=} for a
+    #     description of allowed formats. Defaults to the empty array.
     # @param [Boolean] only_unique If true, any flags that are already
     #     defined in this tool are removed from this flag. For example, if
     #     an earlier flag uses `-a`, and this flag wants to use both
@@ -369,27 +369,20 @@ module Toys
     #     should be set. The default handler simply replaces the previous
     #     value. i.e. the default is effectively `-> (val, _prev) { val }`.
     #
-    def add_flag(key, *flags,
-                 accept: nil, default: nil, desc: nil, long_desc: nil,
-                 only_unique: false, handler: nil)
+    def add_flag(key, flags = [],
+                 accept: nil, default: nil, handler: nil, desc: nil, long_desc: nil,
+                 only_unique: false)
       check_definition_state
-      flag_def = FlagDefinition.new(self, key)
-      flag_def.add_flags(flags)
-      flag_def.accept = accept
-      flag_def.handler = handler
-      flag_def.default = default
-      flag_def.desc = desc unless desc.nil?
-      flag_def.long_desc = long_desc unless long_desc.nil?
-      yield flag_def if block_given?
-      flag_def.create_default_flag_if_needed
+      flag_def = FlagDefinition.new(key, flags, accept, handler, desc, long_desc, default)
       flag_def.remove_flags(used_flags) if only_unique
       @flag_definitions << flag_def if flag_def.active?
+      @default_data[key] = default
       self
     end
 
     ##
     # Add a required positional argument to the current tool. You must specify
-    # a key which the executor may use to obtain the argument value from the
+    # a key which the script may use to obtain the argument value from the
     # context.
     #
     # @param [Symbol] key The key to use to retrieve the value from the
@@ -397,29 +390,23 @@ module Toys
     # @param [Object,nil] accept An OptionParser acceptor. Optional.
     # @param [String] display_name A name to use for display (in help text and
     #     error reports). Defaults to the key in upper case.
-    # @param [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] desc Short description
-    #     for the arg. Defaults to empty array.
-    # @param [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] long_desc Long
-    #     description for the arg. Defaults to empty array.
+    # @param [String,Array<String>,Toys::Utils::WrappableString] desc Short
+    #     description for the flag. See {Toys::Tool#desc=} for a description of
+    #     allowed formats. Defaults to the empty string.
+    # @param [Array<String,Array<String>,Toys::Utils::WrappableString>] long_desc
+    #     Long description for the flag. See {Toys::Tool#long_desc=} for a
+    #     description of allowed formats. Defaults to the empty array.
     #
     def add_required_arg(key, accept: nil, display_name: nil, desc: nil, long_desc: nil)
       check_definition_state
-      arg_def = ArgDefinition.new(self, key, :required)
-      arg_def.accept = accept
-      arg_def.default = nil
-      arg_def.display_name = display_name unless display_name.nil?
-      arg_def.desc = desc unless desc.nil?
-      arg_def.long_desc = long_desc unless long_desc.nil?
-      yield arg_def if block_given?
+      arg_def = ArgDefinition.new(key, :required, accept, desc, long_desc, display_name)
       @required_arg_definitions << arg_def
       self
     end
 
     ##
     # Add an optional positional argument to the current tool. You must specify
-    # a key which the executor may use to obtain the argument value from the
+    # a key which the script may use to obtain the argument value from the
     # context. If an optional argument is not given on the command line, the
     # value is set to the given default.
     #
@@ -431,30 +418,25 @@ module Toys
     # @param [Object,nil] accept An OptionParser acceptor. Optional.
     # @param [String] display_name A name to use for display (in help text and
     #     error reports). Defaults to the key in upper case.
-    # @param [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] desc Short description
-    #     for the arg. Defaults to empty array.
-    # @param [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] long_desc Long
-    #     description for the arg. Defaults to empty array.
+    # @param [String,Array<String>,Toys::Utils::WrappableString] desc Short
+    #     description for the flag. See {Toys::Tool#desc=} for a description of
+    #     allowed formats. Defaults to the empty string.
+    # @param [Array<String,Array<String>,Toys::Utils::WrappableString>] long_desc
+    #     Long description for the flag. See {Toys::Tool#long_desc=} for a
+    #     description of allowed formats. Defaults to the empty array.
     #
     def add_optional_arg(key, default: nil, accept: nil, display_name: nil,
                          desc: nil, long_desc: nil)
       check_definition_state
-      arg_def = ArgDefinition.new(self, key, :optional)
-      arg_def.accept = accept
-      arg_def.default = default
-      arg_def.display_name = display_name unless display_name.nil?
-      arg_def.desc = desc unless desc.nil?
-      arg_def.long_desc = long_desc unless long_desc.nil?
-      yield arg_def if block_given?
+      arg_def = ArgDefinition.new(key, :optional, accept, desc, long_desc, display_name)
       @optional_arg_definitions << arg_def
+      @default_data[key] = default
       self
     end
 
     ##
     # Specify what should be done with unmatched positional arguments. You must
-    # specify a key which the executor may use to obtain the remaining args
+    # specify a key which the script may use to obtain the remaining args
     # from the context.
     #
     # @param [Symbol] key The key to use to retrieve the value from the
@@ -465,36 +447,31 @@ module Toys
     # @param [Object,nil] accept An OptionParser acceptor. Optional.
     # @param [String] display_name A name to use for display (in help text and
     #     error reports). Defaults to the key in upper case.
-    # @param [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] desc Short description
-    #     for the arg. Defaults to empty array.
-    # @param [String,Toys::Utils::WrappableString,
-    #     Array<String,Toys::Utils::WrappableString>] long_desc Long
-    #     description for the arg. Defaults to empty array.
+    # @param [String,Array<String>,Toys::Utils::WrappableString] desc Short
+    #     description for the flag. See {Toys::Tool#desc=} for a description of
+    #     allowed formats. Defaults to the empty string.
+    # @param [Array<String,Array<String>,Toys::Utils::WrappableString>] long_desc
+    #     Long description for the flag. See {Toys::Tool#long_desc=} for a
+    #     description of allowed formats. Defaults to the empty array.
     #
     def set_remaining_args(key, default: [], accept: nil, display_name: nil,
                            desc: nil, long_desc: nil)
       check_definition_state
-      arg_def = ArgDefinition.new(self, key, :remaining)
-      arg_def.accept = accept
-      arg_def.default = default
-      arg_def.display_name = display_name unless display_name.nil?
-      arg_def.desc = desc unless desc.nil?
-      arg_def.long_desc = long_desc unless long_desc.nil?
-      yield arg_def if block_given?
+      arg_def = ArgDefinition.new(key, :remaining, accept, desc, long_desc, display_name)
       @remaining_args_definition = arg_def
+      @default_data[key] = default
       self
     end
 
     ##
-    # Set the executor for this tool. This is a proc that will be called,
+    # Set the script for this tool. This is a proc that will be called,
     # with `self` set to a {Toys::Context}.
     #
-    # @param [Proc] executor The executor for this tool.
+    # @param [Proc] script The script for this tool.
     #
-    def executor=(executor)
+    def script=(script)
       check_definition_state
-      @executor = executor
+      @script = script
     end
 
     ##
@@ -591,14 +568,16 @@ module Toys
       #
       # @param [Symbol] key This flag will set the given context key.
       #
-      def initialize(tool, key)
-        @tool = tool
+      def initialize(key, flags, accept, handler, desc, long_desc, default)
         @key = key
-        @flag_syntax = []
-        @accept = nil
-        @handler = DEFAULT_HANDLER
-        @desc = ""
-        @long_desc = []
+        @flag_syntax = flags.map { |s| FlagSyntax.new(s) }
+        @accept = accept
+        @handler = handler || DEFAULT_HANDLER
+        @desc = Tool.canonicalize_desc(desc)
+        @long_desc = Tool.canonicalize_long_desc(long_desc)
+        @needs_val = !@accept.nil? ||
+                     (!default.nil? && default != true && default != false)
+        create_default_flag_if_needed
         reset_data
       end
 
@@ -638,87 +617,6 @@ module Toys
       #
       attr_reader :handler
 
-      ##
-      # Adds the given flags.
-      # @param [Array<String>] flags Flags in OptionParser format
-      #
-      def add_flags(flags)
-        @flag_syntax.concat(flags.map { |s| FlagSyntax.new(s) })
-        reset_data
-        self
-      end
-
-      ##
-      # Set the acceptor.
-      # @param [Object] accept Acceptor. May be `nil` for the default.
-      #
-      def accept=(accept)
-        @accept = accept
-        reset_data
-      end
-
-      ##
-      # Set the default.
-      # @param [Object] default The default value.
-      #
-      def default=(default)
-        @tool.default_data[@key] = default
-      end
-
-      ##
-      # Set the handler for setting/updating the value.
-      # @param [Proc,nil] handler The handler for setting/updating the value.
-      #     The handler should take two arguments, the new given value and the
-      #     previous value, and it should return the new value that should be
-      #     set. If `nil`, uses {DEFAULT_HANDLER}.
-      #
-      def handler=(handler)
-        @handler = handler || DEFAULT_HANDLER
-      end
-
-      ##
-      # Set the short description string.
-      #
-      # The description may be provided as a {Toys::Utils::WrappableString}, a
-      # single string (which will be wrapped), or an array of strings, which
-      # will be interpreted as string fragments that will be concatenated and
-      # wrapped.
-      #
-      # @param [Toys::Utils::WrappableString,String,Array<String>] desc
-      #
-      def desc=(desc)
-        @desc = Tool.canonicalize_desc(desc)
-      end
-
-      ##
-      # Set the long description strings.
-      #
-      # Each string may be provided as a {Toys::Utils::WrappableString}, a
-      # single string (which will be wrapped), or an array of strings, which
-      # will be interpreted as string fragments that will be concatenated and
-      # wrapped.
-      #
-      # @param [Array<Toys::Utils::WrappableString,String,Array<String>>] descs
-      #
-      def long_desc=(descs)
-        @long_desc = Tool.canonicalize_long_desc(descs)
-      end
-
-      ##
-      # Set the long description strings.
-      #
-      # Each string may be provided as a {Toys::Utils::WrappableString}, a
-      # single string (which will be wrapped), or an array of strings, which
-      # will be interpreted as string fragments that will be concatenated and
-      # wrapped.
-      #
-      # @param [Toys::Utils::WrappableString,String,Array<String>...] descs
-      #
-      def populate_long_desc(*descs)
-        @long_desc = Tool.canonicalize_long_desc(descs)
-        self
-      end
-
       ##
       # Returns an array of FlagSyntax including only single-dash flags
       # @return [Array<FlagSyntax>]
@@ -785,6 +683,22 @@ module Toys
         @value_delim
       end
 
+      ##
+      # Set description
+      # @param [String,Array<String>,Toys::Utils::WrappableString] desc
+      #
+      def desc=(desc)
+        @desc = Tool.canonicalize_desc(desc)
+      end
+
+      ##
+      # Set long description
+      # @param [Array<String,Array<String>,Toys::Utils::WrappableString>] long_desc
+      #
+      def long_desc=(long_desc)
+        @long_desc = Tool.canonicalize_long_desc(long_desc)
+      end
+
       ## @private
       def remove_flags(flags)
         flags = flags.map { |f| FlagSyntax.new(f).flags }.flatten
@@ -792,18 +706,6 @@ module Toys
           ss.flags.all? { |s| !flags.include?(s) }
         end
         reset_data
-        self
-      end
-
-      ## @private
-      def create_default_flag_if_needed
-        return unless @flag_syntax.empty?
-        canonical_flag = key.to_s.downcase.tr("_", "-").gsub(/[^a-z0-9-]/, "").sub(/^-+/, "")
-        unless canonical_flag.empty?
-          flag = @accept ? "--#{canonical_flag}=VALUE" : "--#{canonical_flag}"
-          @flag_syntax << FlagSyntax.new(flag)
-        end
-        reset_data
       end
 
       private
@@ -817,10 +719,19 @@ module Toys
         @value_delim = nil
       end
 
+      def create_default_flag_if_needed
+        return unless @flag_syntax.empty?
+        canonical_flag = key.to_s.downcase.tr("_", "-").gsub(/[^a-z0-9-]/, "").sub(/^-+/, "")
+        unless canonical_flag.empty?
+          flag = @needs_val ? "--#{canonical_flag}=VALUE" : "--#{canonical_flag}"
+          @flag_syntax << FlagSyntax.new(flag)
+        end
+      end
+
       def find_canonical_value_label
         return if @value_delim
-        @value_label = @accept ? "VALUE" : nil
-        @value_delim = @accept ? " " : ""
+        @value_label = @needs_val ? "VALUE" : nil
+        @value_delim = @needs_val ? " " : ""
         single_flag_syntax.each do |ss|
           next unless ss.value_label
           @value_label = ss.value_label
@@ -845,14 +756,13 @@ module Toys
       # @param [Symbol] key This argument will set the given context key.
       # @param [:required,:optional,:remaining] type Type of this argument
       #
-      def initialize(tool, key, type)
-        @tool = tool
+      def initialize(key, type, accept, desc, long_desc, display_name)
         @key = key
         @type = type
-        @accept = nil
-        @desc = ""
-        @long_desc = []
-        @display_name = key.to_s.tr("-", "_").gsub(/\W/, "").upcase
+        @accept = accept
+        @desc = Tool.canonicalize_desc(desc)
+        @long_desc = Tool.canonicalize_long_desc(long_desc)
+        @display_name = display_name || key.to_s.tr("-", "_").gsub(/\W/, "").upcase
       end
 
       ##
@@ -891,57 +801,6 @@ module Toys
       #
       attr_accessor :display_name
 
-      ##
-      # Set the default.
-      # @param [Object] default The default value.
-      #
-      def default=(default)
-        @tool.default_data[@key] = default
-      end
-
-      ##
-      # Set the short description string.
-      #
-      # The description may be provided as a {Toys::Utils::WrappableString}, a
-      # single string (which will be wrapped), or an array of strings, which
-      # will be interpreted as string fragments that will be concatenated and
-      # wrapped.
-      #
-      # @param [Toys::Utils::WrappableString,String,Array<String>] desc
-      #
-      def desc=(desc)
-        @desc = Tool.canonicalize_desc(desc)
-      end
-
-      ##
-      # Set the long description strings.
-      #
-      # Each string may be provided as a {Toys::Utils::WrappableString}, a
-      # single string (which will be wrapped), or an array of strings, which
-      # will be interpreted as string fragments that will be concatenated and
-      # wrapped.
-      #
-      # @param [Array<Toys::Utils::WrappableString,String,Array<String>>] descs
-      #
-      def long_desc=(descs)
-        @long_desc = Tool.canonicalize_long_desc(descs)
-      end
-
-      ##
-      # Set the long description strings.
-      #
-      # Each string may be provided as a {Toys::Utils::WrappableString}, a
-      # single string (which will be wrapped), or an array of strings, which
-      # will be interpreted as string fragments that will be concatenated and
-      # wrapped.
-      #
-      # @param [Toys::Utils::WrappableString,String,Array<String>...] descs
-      #
-      def populate_long_desc(*descs)
-        @long_desc = Tool.canonicalize_long_desc(descs)
-        self
-      end
-
       ##
       # Process the given value through the acceptor.
       # May raise an exception if the acceptor rejected the input.
@@ -957,6 +816,22 @@ module Toys
         optparse.parse(["--abc", input])
         result
       end
+
+      ##
+      # Set description
+      # @param [String,Array<String>,Toys::Utils::WrappableString] desc
+      #
+      def desc=(desc)
+        @desc = Tool.canonicalize_desc(desc)
+      end
+
+      ##
+      # Set long description
+      # @param [Array<String,Array<String>,Toys::Utils::WrappableString>] long_desc
+      #
+      def long_desc=(long_desc)
+        @long_desc = Tool.canonicalize_long_desc(long_desc)
+      end
     end
 
     private
@@ -1061,7 +936,7 @@ module Toys
       def parse_remaining_args(remaining, args)
         return if remaining.empty?
         unless @tool.remaining_args_definition
-          if @tool.includes_executor?
+          if @tool.includes_script?
             raise create_parse_error(remaining, "Extra arguments provided")
           else
             raise create_parse_error(@tool.full_name + args, "Tool not found")
@@ -1089,8 +964,8 @@ module Toys
 
       def perform_execution(context)
         executor = proc do
-          if @tool.includes_executor?
-            context.instance_eval(&@tool.executor)
+          if @tool.includes_script?
+            context.instance_eval(&@tool.script)
           else
             context.logger.fatal("No implementation for tool #{@tool.display_name.inspect}")
             context.exit(-1)