toys-core 0.7.0 → 0.8.0

data/lib/toys/utils/gems.rb

@@ -1,38 +1,33 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Daniel Azuma
+# Copyright 2019 Daniel Azuma
 #
-# All rights reserved.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
 ;
 
 module Toys
   module Utils
     ##
-    # A helper module that activates and installs gems
+    # A helper module that activates and installs gems.
+    #
+    # This class is not loaded by default. Before using it directly, you should
+    # `require "toys/utils/gems"`
     #
     class Gems
       ##
@@ -51,6 +46,12 @@ module Toys
       # Need to add a gem to the bundle.
       #
       class GemfileUpdateNeededError < ActivationFailedError
+        ##
+        # Create a GemfileUpdateNeededError.
+        #
+        # @param requirements_text [String] Gems and versions missing.
+        # @param gemfile_path [String] Path to the offending Gemfile.
+        #
         def initialize(requirements_text, gemfile_path)
           super("Required gem not available in the bundle: #{requirements_text}.\n" \
                 "Please update your Gemfile #{gemfile_path.inspect}.")
@@ -61,8 +62,9 @@ module Toys
       # Activate the given gem. If it is not present, attempt to install it (or
       # inform the user to update the bundle).
       #
-      # @param [String] name Name of the gem
-      # @param [String...] requirements Version requirements
+      # @param name [String] Name of the gem
+      # @param requirements [String...] Version requirements
+      # @return [void]
       #
       def self.activate(name, *requirements)
         new.activate(name, *requirements)
@@ -71,20 +73,22 @@ module Toys
       ##
       # Create a new gem activator.
       #
-      # @param [IO] input Input IO
-      # @param [IO] output Output IO
-      # @param [Boolean] suppress_confirm Suppress the confirmation prompt and
+      # @param input [IO] Input IO
+      # @param output [IO] Output IO
+      # @param suppress_confirm [Boolean] Suppress the confirmation prompt and
       #     just use the given `default_confirm` value. Default is false,
       #     indicating the confirmation prompt appears by default.
-      # @param [Boolean] default_confirm Default response for the confirmation
+      # @param default_confirm [Boolean] Default response for the confirmation
       #     prompt. Default is true.
       #
       def initialize(input: $stdin,
                      output: $stderr,
                      suppress_confirm: false,
                      default_confirm: true)
-        @terminal = Terminal.new(input: input, output: output)
-        @exec = Exec.new
+        require "toys/utils/terminal"
+        require "toys/utils/exec"
+        @terminal = Utils::Terminal.new(input: input, output: output)
+        @exec = Utils::Exec.new
         @suppress_confirm = suppress_confirm ? true : false
         @default_confirm = default_confirm ? true : false
       end
@@ -93,32 +97,37 @@ module Toys
       # Activate the given gem. If it is not present, attempt to install it (or
       # inform the user to update the bundle).
       #
-      # @param [String] name Name of the gem
-      # @param [String...] requirements Version requirements
+      # @param name [String] Name of the gem
+      # @param requirements [String...] Version requirements
+      # @return [void]
       #
       def activate(name, *requirements)
         gem(name, *requirements)
-      rescue ::Gem::LoadError => e1
+      rescue ::Gem::LoadError => e
+        handle_activation_error(e, name, requirements)
+      end
+
+      private
+
+      def handle_activation_error(error, name, requirements)
         is_missing_spec =
           if defined?(::Gem::MissingSpecError)
-            e1.is_a?(::Gem::MissingSpecError)
+            error.is_a?(::Gem::MissingSpecError)
           else
-            e1.message.include?("Could not find")
-          end
-        if is_missing_spec
-          install_gem(name, requirements)
-          begin
-            gem(name, *requirements)
-          rescue ::Gem::LoadError => e2
-            report_error(name, requirements, e2)
+            error.message.include?("Could not find")
           end
-        else
-          report_error(name, requirements, e1)
+        unless is_missing_spec
+          report_error(name, requirements, error)
+          return
+        end
+        install_gem(name, requirements)
+        begin
+          gem(name, *requirements)
+        rescue ::Gem::LoadError => e
+          report_error(name, requirements, e)
         end
       end
 
-      private
-
       def gem_requirements_text(name, requirements)
         "#{name.inspect}, #{requirements.map(&:inspect).join(', ')}"
       end

data/lib/toys/utils/help_text.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Daniel Azuma
+# Copyright 2019 Daniel Azuma
 #
-# All rights reserved.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
 ;
 
 module Toys
@@ -38,6 +30,9 @@ module Toys
     # flags, and arguments. It is used by middleware that implements help
     # and related options.
     #
+    # This class is not loaded by default. Before using it directly, you should
+    # `require "toys/utils/help_text"`
+    #
     class HelpText
       ##
       # Default width of first column
@@ -52,44 +47,49 @@ module Toys
       DEFAULT_INDENT = 4
 
       ##
-      # Create a usage helper given an executable tool.
+      # Create a usage helper given an execution context.
       #
-      # @param [Toys::Tool] tool The current tool.
+      # @param context [Toys::Context] The current context.
       # @return [Toys::Utils::HelpText]
       #
-      def self.from_tool(tool)
-        new(tool[Tool::Keys::TOOL_DEFINITION], tool[Tool::Keys::LOADER],
-            tool[Tool::Keys::BINARY_NAME])
+      def self.from_context(context)
+        cli = context[Context::Key::CLI]
+        new(context[Context::Key::TOOL], cli.loader, cli.executable_name)
       end
 
       ##
       # Create a usage helper.
       #
-      # @param [Toys::Tool] tool The tool for which to generate documentation.
-      # @param [Toys::Loader] loader A loader that can provide subcommands.
-      # @param [String] binary_name The name of the binary. e.g. `"toys"`.
+      # @param tool [Toys::Tool] The tool to document.
+      # @param loader [Toys::Loader] A loader that can provide subcommands.
+      # @param executable_name [String] The name of the executable.
+      #     e.g. `"toys"`.
       #
       # @return [Toys::Utils::HelpText]
       #
-      def initialize(tool, loader, binary_name)
+      def initialize(tool, loader, executable_name)
         @tool = tool
         @loader = loader
-        @binary_name = binary_name
+        @executable_name = executable_name
       end
 
+      ##
+      # The Tool being documented.
+      # @return [Toys::Tool]
+      #
       attr_reader :tool
 
       ##
       # Generate a short usage string.
       #
-      # @param [Boolean] recursive If true, and the tool is a namespace,
+      # @param recursive [Boolean] If true, and the tool is a namespace,
       #     display all subtools recursively. Defaults to false.
-      # @param [Boolean] include_hidden Include hidden subtools (i.e. whose
+      # @param include_hidden [Boolean] Include hidden subtools (i.e. whose
       #     names begin with underscore.) Default is false.
-      # @param [Integer] left_column_width Width of the first column. Default
+      # @param left_column_width [Integer] Width of the first column. Default
       #     is {DEFAULT_LEFT_COLUMN_WIDTH}.
-      # @param [Integer] indent Indent width. Default is {DEFAULT_INDENT}.
-      # @param [Integer,nil] wrap_width Overall width to wrap to. Default is
+      # @param indent [Integer] Indent width. Default is {DEFAULT_INDENT}.
+      # @param wrap_width [Integer,nil] Overall width to wrap to. Default is
       #     `nil` indicating no wrapping.
       #
       # @return [String] A usage string.
@@ -99,7 +99,7 @@ module Toys
         left_column_width ||= DEFAULT_LEFT_COLUMN_WIDTH
         indent ||= DEFAULT_INDENT
         subtools = find_subtools(recursive, nil, include_hidden)
-        assembler = UsageStringAssembler.new(@tool, @binary_name, subtools,
+        assembler = UsageStringAssembler.new(@tool, @executable_name, subtools,
                                              indent, left_column_width, wrap_width)
         assembler.result
       end
@@ -107,20 +107,20 @@ module Toys
       ##
       # Generate a long help string.
       #
-      # @param [Boolean] recursive If true, and the tool is a namespace,
+      # @param recursive [Boolean] If true, and the tool is a namespace,
       #     display all subtools recursively. Defaults to false.
-      # @param [String,nil] search An optional string to search for when
+      # @param search [String,nil] An optional string to search for when
       #     listing subtools. Defaults to `nil` which finds all subtools.
-      # @param [Boolean] include_hidden Include hidden subtools (i.e. whose
+      # @param include_hidden [Boolean] Include hidden subtools (i.e. whose
       #     names begin with underscore.) Default is false.
-      # @param [Boolean] show_source_path If true, shows the source path
+      # @param show_source_path [Boolean] If true, shows the source path
       #     section. Defaults to false.
-      # @param [Integer] indent Indent width. Default is {DEFAULT_INDENT}.
-      # @param [Integer] indent2 Second indent width. Default is
+      # @param indent [Integer] Indent width. Default is {DEFAULT_INDENT}.
+      # @param indent2 [Integer] Second indent width. Default is
       #     {DEFAULT_INDENT}.
-      # @param [Integer,nil] wrap_width Wrap width of the column, or `nil` to
+      # @param wrap_width [Integer,nil] Wrap width of the column, or `nil` to
       #     disable wrap. Default is `nil`.
-      # @param [Boolean] styled Output ansi styles. Default is `true`.
+      # @param styled [Boolean] Output ansi styles. Default is `true`.
       #
       # @return [String] A usage string.
       #
@@ -130,24 +130,24 @@ module Toys
         indent ||= DEFAULT_INDENT
         indent2 ||= DEFAULT_INDENT
         subtools = find_subtools(recursive, search, include_hidden)
-        assembler = HelpStringAssembler.new(@tool, @binary_name, subtools, search, show_source_path,
-                                            indent, indent2, wrap_width, styled)
+        assembler = HelpStringAssembler.new(@tool, @executable_name, subtools, search,
+                                            show_source_path, indent, indent2, wrap_width, styled)
         assembler.result
       end
 
       ##
       # Generate a subtool list string.
       #
-      # @param [Boolean] recursive If true, and the tool is a namespace,
+      # @param recursive [Boolean] If true, and the tool is a namespace,
       #     display all subtools recursively. Defaults to false.
-      # @param [String,nil] search An optional string to search for when
+      # @param search [String,nil] An optional string to search for when
       #     listing subtools. Defaults to `nil` which finds all subtools.
-      # @param [Boolean] include_hidden Include hidden subtools (i.e. whose
+      # @param include_hidden [Boolean] Include hidden subtools (i.e. whose
       #     names begin with underscore.) Default is false.
-      # @param [Integer] indent Indent width. Default is {DEFAULT_INDENT}.
-      # @param [Integer,nil] wrap_width Wrap width of the column, or `nil` to
+      # @param indent [Integer] Indent width. Default is {DEFAULT_INDENT}.
+      # @param wrap_width [Integer,nil] Wrap width of the column, or `nil` to
       #     disable wrap. Default is `nil`.
-      # @param [Boolean] styled Output ansi styles. Default is `true`.
+      # @param styled [Boolean] Output ansi styles. Default is `true`.
       #
       # @return [String] A usage string.
       #
@@ -174,10 +174,10 @@ module Toys
 
       ## @private
       class UsageStringAssembler
-        def initialize(tool, binary_name, subtools,
+        def initialize(tool, executable_name, subtools,
                        indent, left_column_width, wrap_width)
           @tool = tool
-          @binary_name = binary_name
+          @executable_name = executable_name
           @subtools = subtools
           @indent = indent
           @left_column_width = left_column_width
@@ -212,41 +212,43 @@ module Toys
         end
 
         def tool_synopsis
-          synopsis = [@binary_name] + @tool.full_name
-          synopsis << "[FLAGS...]" unless @tool.flag_definitions.empty?
-          @tool.arg_definitions.each do |arg_info|
+          synopsis = [@executable_name] + @tool.full_name
+          synopsis << "[FLAGS...]" unless @tool.flags.empty?
+          @tool.positional_args.each do |arg_info|
             synopsis << arg_name(arg_info)
           end
           synopsis.join(" ")
         end
 
         def namespace_synopsis
-          ([@binary_name] + @tool.full_name + ["TOOL", "[ARGUMENTS...]"]).join(" ")
+          ([@executable_name] + @tool.full_name + ["TOOL", "[ARGUMENTS...]"]).join(" ")
         end
 
         def add_flag_group_sections
           @tool.flag_groups.each do |group|
             next if group.empty?
             @lines << ""
-            @lines << group.desc.to_s + ":"
-            group.flag_definitions.each do |flag|
+            desc_str = group.desc.to_s
+            desc_str = "Flags" if desc_str.empty?
+            @lines << desc_str + ":"
+            group.flags.each do |flag|
               add_flag(flag)
             end
           end
         end
 
         def add_flag(flag)
-          flags = flag.single_flag_syntax + flag.double_flag_syntax
+          flags = flag.short_flag_syntax + flag.long_flag_syntax
           last_index = flags.size - 1
           flags_str = flags.each_with_index.map do |fs, i|
             i == last_index ? fs.canonical_str : fs.str_without_value
           end.join(", ")
-          flags_str = "    #{flags_str}" if flag.single_flag_syntax.empty?
+          flags_str = "    #{flags_str}" if flag.short_flag_syntax.empty?
           add_right_column_desc(flags_str, wrap_desc(flag.desc))
         end
 
         def add_positional_arguments_section
-          args_to_display = @tool.arg_definitions
+          args_to_display = @tool.positional_args
           return if args_to_display.empty?
           @lines << ""
           @lines << "Positional arguments:"
@@ -263,7 +265,7 @@ module Toys
           @subtools.each do |subtool|
             tool_name = subtool.full_name.slice(name_len..-1).join(" ")
             desc =
-              if subtool.is_a?(Definition::Alias)
+              if subtool.is_a?(Alias)
                 ["(Alias of #{subtool.display_target})"]
               else
                 wrap_desc(subtool.desc)
@@ -298,7 +300,7 @@ module Toys
         end
 
         def wrap_desc(desc)
-          Utils::WrappableString.wrap_lines(desc, @right_column_wrap_width)
+          WrappableString.wrap_lines(desc, @right_column_wrap_width)
         end
 
         def indent_str(str)
@@ -308,10 +310,11 @@ module Toys
 
       ## @private
       class HelpStringAssembler
-        def initialize(tool, binary_name, subtools, search_term, show_source_path,
+        def initialize(tool, executable_name, subtools, search_term, show_source_path,
                        indent, indent2, wrap_width, styled)
+          require "toys/utils/terminal"
           @tool = tool
-          @binary_name = binary_name
+          @executable_name = executable_name
           @subtools = subtools
           @search_term = search_term
           @show_source_path = show_source_path
@@ -339,17 +342,17 @@ module Toys
 
         def add_name_section
           @lines << bold("NAME")
-          name_str = ([@binary_name] + @tool.full_name).join(" ")
+          name_str = ([@executable_name] + @tool.full_name).join(" ")
           add_prefix_with_desc(name_str, @tool.desc)
         end
 
         def add_prefix_with_desc(prefix, desc)
           if desc.empty?
             @lines << indent_str(prefix)
-          elsif !desc.is_a?(Utils::WrappableString)
+          elsif !desc.is_a?(WrappableString)
             @lines << indent_str("#{prefix} - #{desc}")
           else
-            desc = wrap_indent_indent2(Utils::WrappableString.new(["#{prefix} -"] + desc.fragments))
+            desc = wrap_indent_indent2(WrappableString.new(["#{prefix} -"] + desc.fragments))
             @lines << indent_str(desc[0])
             desc[1..-1].each do |line|
               @lines << indent2_str(line)
@@ -374,36 +377,36 @@ module Toys
         end
 
         def tool_synopsis
-          synopsis = [full_binary_name]
+          synopsis = [full_executable_name]
           @tool.flag_groups.each do |flag_group|
             case flag_group
-            when Definition::FlagGroup::Required
+            when FlagGroup::Required
               add_required_group_to_synopsis(flag_group, synopsis)
-            when Definition::FlagGroup::ExactlyOne
+            when FlagGroup::ExactlyOne
               add_exactly_one_group_to_synopsis(flag_group, synopsis)
-            when Definition::FlagGroup::AtMostOne
+            when FlagGroup::AtMostOne
               add_at_most_one_group_to_synopsis(flag_group, synopsis)
-            when Definition::FlagGroup::AtLeastOne
+            when FlagGroup::AtLeastOne
               add_at_least_one_group_to_synopsis(flag_group, synopsis)
             else
               add_ordinary_group_to_synopsis(flag_group, synopsis)
             end
           end
-          @tool.arg_definitions.each do |arg_info|
+          @tool.positional_args.each do |arg_info|
             synopsis << arg_name(arg_info)
           end
-          wrap_indent_indent2(Utils::WrappableString.new(synopsis))
+          wrap_indent_indent2(WrappableString.new(synopsis))
         end
 
         def add_ordinary_group_to_synopsis(flag_group, synopsis)
-          flag_group.flag_definitions.each do |flag_def|
-            synopsis << "[#{flag_spec_string(flag_def, true)}]"
+          flag_group.flags.each do |flag|
+            synopsis << "[#{flag_spec_string(flag, true)}]"
           end
         end
 
         def add_required_group_to_synopsis(flag_group, synopsis)
-          flag_group.flag_definitions.each do |flag_def|
-            synopsis << "(#{flag_spec_string(flag_def, true)})"
+          flag_group.flags.each do |flag|
+            synopsis << "(#{flag_spec_string(flag, true)})"
           end
         end
 
@@ -411,13 +414,13 @@ module Toys
           return if flag_group.empty?
           synopsis << "("
           first = true
-          flag_group.flag_definitions.each do |flag_def|
+          flag_group.flags.each do |flag|
             if first
               first = false
             else
               synopsis << "|"
             end
-            synopsis << flag_spec_string(flag_def, true)
+            synopsis << flag_spec_string(flag, true)
           end
           synopsis << ")"
         end
@@ -426,13 +429,13 @@ module Toys
           return if flag_group.empty?
           synopsis << "["
           first = true
-          flag_group.flag_definitions.each do |flag_def|
+          flag_group.flags.each do |flag|
             if first
               first = false
             else
               synopsis << "|"
             end
-            synopsis << flag_spec_string(flag_def, true)
+            synopsis << flag_spec_string(flag, true)
           end
           synopsis << "]"
         end
@@ -440,19 +443,19 @@ module Toys
         def add_at_least_one_group_to_synopsis(flag_group, synopsis)
           return if flag_group.empty?
           synopsis << "("
-          flag_group.flag_definitions.each do |flag_def|
-            synopsis << "[#{flag_spec_string(flag_def, true)}]"
+          flag_group.flags.each do |flag|
+            synopsis << "[#{flag_spec_string(flag, true)}]"
           end
           synopsis << ")"
         end
 
         def namespace_synopsis
-          synopsis = [full_binary_name, underline("TOOL"), "[#{underline('ARGUMENTS')}...]"]
-          wrap_indent_indent2(Utils::WrappableString.new(synopsis))
+          synopsis = [full_executable_name, underline("TOOL"), "[#{underline('ARGUMENTS')}...]"]
+          wrap_indent_indent2(WrappableString.new(synopsis))
         end
 
-        def full_binary_name
-          bold(([@binary_name] + @tool.full_name).join(" "))
+        def full_executable_name
+          bold(([@executable_name] + @tool.full_name).join(" "))
         end
 
         def add_source_section
@@ -476,7 +479,9 @@ module Toys
           @tool.flag_groups.each do |group|
             next if group.empty?
             @lines << ""
-            @lines << bold(group.desc.to_s.upcase)
+            desc_str = group.desc.to_s.upcase
+            desc_str = "FLAGS" if desc_str.empty?
+            @lines << bold(desc_str)
             precede_with_blank = false
             unless group.long_desc.empty?
               wrap_indent(group.long_desc).each do |line|
@@ -484,7 +489,7 @@ module Toys
               end
               precede_with_blank = true
             end
-            group.flag_definitions.each do |flag|
+            group.flags.each do |flag|
               add_indented_section(flag_spec_string(flag), flag, precede_with_blank)
               precede_with_blank = true
             end
@@ -505,7 +510,7 @@ module Toys
         end
 
         def add_positional_arguments_section
-          args_to_display = @tool.arg_definitions
+          args_to_display = @tool.positional_args
           return if args_to_display.empty?
           @lines << ""
           @lines << bold("POSITIONAL ARGUMENTS")
@@ -528,7 +533,7 @@ module Toys
           @subtools.each do |subtool|
             tool_name = subtool.full_name.slice(name_len..-1).join(" ")
             desc =
-              if subtool.is_a?(Definition::Alias)
+              if subtool.is_a?(Alias)
                 "(Alias of #{subtool.display_target})"
               else
                 subtool.desc
@@ -562,19 +567,19 @@ module Toys
         end
 
         def wrap_indent(input)
-          return Utils::WrappableString.wrap_lines(input, nil) unless @wrap_width
-          Utils::WrappableString.wrap_lines(input, @wrap_width - @indent)
+          return WrappableString.wrap_lines(input, nil) unless @wrap_width
+          WrappableString.wrap_lines(input, @wrap_width - @indent)
         end
 
         def wrap_indent2(input)
-          return Utils::WrappableString.wrap_lines(input, nil) unless @wrap_width
-          Utils::WrappableString.wrap_lines(input, @wrap_width - @indent - @indent2)
+          return WrappableString.wrap_lines(input, nil) unless @wrap_width
+          WrappableString.wrap_lines(input, @wrap_width - @indent - @indent2)
         end
 
         def wrap_indent_indent2(input)
-          return Utils::WrappableString.wrap_lines(input, nil) unless @wrap_width
-          Utils::WrappableString.wrap_lines(input, @wrap_width - @indent,
-                                            @wrap_width - @indent - @indent2)
+          return WrappableString.wrap_lines(input, nil) unless @wrap_width
+          WrappableString.wrap_lines(input, @wrap_width - @indent,
+                                     @wrap_width - @indent - @indent2)
         end
 
         def bold(str)
@@ -597,6 +602,7 @@ module Toys
       ## @private
       class ListStringAssembler
         def initialize(tool, subtools, recursive, search_term, indent, wrap_width, styled)
+          require "toys/utils/terminal"
           @tool = tool
           @subtools = subtools
           @recursive = recursive
@@ -637,7 +643,7 @@ module Toys
           @subtools.each do |subtool|
             tool_name = subtool.full_name.slice(name_len..-1).join(" ")
             desc =
-              if subtool.is_a?(Definition::Alias)
+              if subtool.is_a?(Alias)
                 "(Alias of #{subtool.display_target})"
               else
                 subtool.desc
@@ -649,10 +655,10 @@ module Toys
         def add_prefix_with_desc(prefix, desc)
           if desc.empty?
             @lines << prefix
-          elsif !desc.is_a?(Utils::WrappableString)
+          elsif !desc.is_a?(WrappableString)
             @lines << "#{prefix} - #{desc}"
           else
-            desc = wrap_indent(Utils::WrappableString.new(["#{prefix} -"] + desc.fragments))
+            desc = wrap_indent(WrappableString.new(["#{prefix} -"] + desc.fragments))
             @lines << desc[0]
             desc[1..-1].each do |line|
               @lines << indent_str(line)
@@ -661,8 +667,8 @@ module Toys
         end
 
         def wrap_indent(input)
-          return Utils::WrappableString.wrap_lines(input, nil) unless @wrap_width
-          Utils::WrappableString.wrap_lines(input, @wrap_width, @wrap_width - @indent)
+          return WrappableString.wrap_lines(input, nil) unless @wrap_width
+          WrappableString.wrap_lines(input, @wrap_width, @wrap_width - @indent)
         end
 
         def bold(str)