Change to use configurable width for usage display

piotrmurach · May 2, 2020 · 595bec5 · 595bec5
1 parent 31617c4
commit 595bec5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/lib/tty/option/formatter.rb b/lib/tty/option/formatter.rb
@@ -5,6 +5,8 @@
 module TTY
   module Option
     class Formatter
+      include UsageWrapper
+
       SHORT_OPT_LENGTH = 4
       DEFAULT_WIDTH = 80
       NEWLINE = "\n"
@@ -111,7 +113,7 @@ def format_usage
         output << " [#{@param_display.("environment")}]" if @parameters.environments?
         output << " #{format_arguments_usage}" if @parameters.arguments?
         output << " #{format_keywords_usage}" if @parameters.keywords?
-        usage + UsageWrapper.wrap(output.join, indent: usage.length)
+        usage + wrap(output.join, indent: usage.length, width: width)
       end
 
       # Format arguments
@@ -238,7 +240,7 @@ def format_section_parameter(param, longest_param, name_selector)
           desc << default
         end
 
-        line << UsageWrapper.wrap(desc.join, indent: indent)
+        line << wrap(desc.join, indent: indent, width: width)
         line.join
       end
 
@@ -310,7 +312,7 @@ def format_option(option, longest_length, any_short)
           desc << default
         end
 
-        line << UsageWrapper.wrap(desc.join, indent: indent)
+        line << wrap(desc.join, indent: indent, width: width)
 
         line.join
       end
@@ -343,7 +345,7 @@ def format_multiline(lines, indent)
         lines.map.with_index do |line, i|
           line.map do |part|
             part.split(NEWLINE).map do |p|
-              UsageWrapper.wrap(p, indent: indent, width: width, indent_first: true)
+              wrap(p, indent: indent, width: width, indent_first: true)
             end.join(NEWLINE)
           end.join(NEWLINE) + (last_index != i ? NEWLINE : "")
         end.join(NEWLINE)

diff --git a/spec/unit/help_spec.rb b/spec/unit/help_spec.rb
@@ -176,19 +176,19 @@ def new_command(&block)
              [BAR-SUPER-LONG-ARGUMENT-NAME] [QUX-LONG-NAME]
 
       Arguments:
-        bar-super-long-argument-name  Some description that goes on and on and never
-                                      finishes explaining (default
+        bar-super-long-argument-name  Some description that goes on and on and
+                                      never finishes explaining (default
                                       "default-is-way-too-long-as-well")
         foo-long-argument-name        Some multiline
                                       description with newlines
         qux-long-name                 Some description that
                                       breaks into multiline
                                       on newlines (permitted:
-                                      one,two,three,four,five,six) (default "some
-                                      long default on many lines")
+                                      one,two,three,four,five,six) (default
+                                      "some long default on many lines")
       EOS
 
-      expect(cmd.help).to eq(expected_output)
+      expect(cmd.help(width: 75)).to eq(expected_output)
     end
 
     it "formats banner with any arguments and options" do