fix terminal width issue

Author: vicheey

samcli/cli/command.py

@@ -9,7 +9,7 @@
 import click
 from click import Group
 
-from samcli.cli.formatters import RootCommandHelpTextFormatter
+from samcli.cli.formatters import RootCommandHelpTextFormatter, get_terminal_width
 from samcli.cli.root.command_list import SAM_CLI_COMMANDS
 from samcli.cli.row_modifiers import RowDefinition, ShowcaseRowModifier
 
@@ -65,6 +65,13 @@ class CustomFormatterContext(click.Context):
         def __init__(self, *args, **kwargs):
             if "max_content_width" not in kwargs:
                 kwargs["max_content_width"] = 140
+            # Explicitly set terminal width if not provided to ensure proper text wrapping
+            # Apply right padding to prevent text from wrapping at the terminal edge
+            if "terminal_width" not in kwargs:
+                terminal_width = get_terminal_width()
+                if terminal_width is not None:
+                    # Apply padding but ensure minimum width of 60
+                    kwargs["terminal_width"] = max(terminal_width - 5, 60)
             super().__init__(*args, **kwargs)
 
     context_class = CustomFormatterContext

samcli/cli/formatters.py

@@ -2,6 +2,7 @@
 Click Help Formatter Classes that are customized for the root command.
 """
 
+import shutil
 from contextlib import contextmanager
 from typing import Iterator, Optional, Sequence
 
@@ -11,6 +12,21 @@
 from samcli.cli.row_modifiers import BaseLineRowModifier, RowDefinition
 
 
+def get_terminal_width() -> Optional[int]:
+    """
+    Get the current terminal width.
+
+    Returns
+    -------
+    Optional[int]
+        Terminal width in columns, or None if it cannot be determined.
+    """
+    try:
+        return shutil.get_terminal_size().columns
+    except (AttributeError, ValueError, OSError):
+        return None
+
+
 class RootCommandHelpTextFormatter(HelpFormatter):
     # Picked an additive constant that gives an aesthetically pleasing look.
     ADDITIVE_JUSTIFICATION = 6

samcli/commands/common/formatters.py

@@ -2,7 +2,7 @@
 Shared formatter for all SAM CLI commands.
 """
 
-from samcli.cli.formatters import RootCommandHelpTextFormatter
+from samcli.cli.formatters import RootCommandHelpTextFormatter, get_terminal_width
 from samcli.cli.row_modifiers import BaseLineRowModifier
 
 
@@ -13,7 +13,7 @@ class CommandHelpTextFormatter(RootCommandHelpTextFormatter):
 
     DEFAULT_ADDITIVE_JUSTIFICATION = 6
 
-    def __init__(self, options, additive_justification=None, *args, **kwargs):
+    def __init__(self, options, additive_justification=None, width=None, *args, **kwargs):
         """
         Initialize the formatter.
 
@@ -24,8 +24,17 @@ def __init__(self, options, additive_justification=None, *args, **kwargs):
         additive_justification : int, optional
             Override the default additive justification value.
             If not provided, uses DEFAULT_ADDITIVE_JUSTIFICATION (6).
+        width : int, optional
+            Terminal width. If None, will attempt to detect terminal width.
         """
-        super().__init__(*args, **kwargs)
+        # If width is None, try to detect terminal width and apply padding
+        if width is None:
+            detected_width = get_terminal_width()
+            if detected_width is not None:
+                # Apply padding but ensure minimum width of 60
+                width = max(detected_width - 5, 60)
+
+        super().__init__(width=width, *args, **kwargs)
         justification = (
             additive_justification if additive_justification is not None else self.DEFAULT_ADDITIVE_JUSTIFICATION
         )

samcli/commands/local/cli_common/options.py

@@ -244,15 +244,12 @@ def warm_containers_common_options(f):
             "--warm-containers",
             help="""
             \b
-            Optional. Specifies how AWS SAM CLI manages 
-            containers for each function.
+            Optional. Specifies how AWS SAM CLI manages containers for each function.'            
+            \b
             Two modes are available:
-            EAGER: Containers for all functions are 
-            loaded at startup and persist between 
-            invocations.
-            LAZY:  Containers are only loaded when each 
-            function is first invoked. Those containers 
-            persist for additional invocations.
+            EAGER: Containers for all functions are loaded at startup and persist between invocations.
+            LAZY:  Containers are only loaded when each function is first invoked. 
+                   Those containers persist for additional invocations.
             """,
             type=click.Choice(ContainersInitializationMode.__members__, case_sensitive=False),
         ),