Merge pull request #198 from RedHatProductSecurity/fix-text-crop

GRIF-73: add terminal --width option

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Added
+- add terminal --width flag
 ### Changed
 - bumped python requests module in tests, dev and lint requirements to address vuln
 

griffon/cli.py

@@ -110,6 +110,12 @@ def plugins_grp(ctx):
 @click.option("--no-progress-bar", is_flag=True, help="Disable progress bar.")
 @click.option("--no-color", is_flag=True, help="Disable output of color ansi esc sequences.")
 @click.option("--no-wrap", is_flag=True, help="Disable wrapping of text output.")
+@click.option(
+    "--width",
+    "terminal_width",
+    default=get_config_option("default", "terminal_width", 1000),
+    help="Terminal width (default is 1000).",
+)
 @click.option(
     "--profile",
     "profile",
@@ -122,7 +128,9 @@ def plugins_grp(ctx):
 )
 @click.option("--editor/--no-editor", default=True, help="Allow text editor prompt.")
 @click.pass_context
-def cli(ctx, debug, format, verbose, no_progress_bar, no_color, no_wrap, profile, editor):
+def cli(
+    ctx, debug, format, verbose, no_progress_bar, no_color, no_wrap, terminal_width, profile, editor
+):
     """Red Hat product security CLI"""
 
     if ctx.invoked_subcommand is None:
@@ -145,6 +153,9 @@ def cli(ctx, debug, format, verbose, no_progress_bar, no_color, no_wrap, profile
     ctx.obj["NO_WRAP"] = get_config_option("default", "no_wrap", False)
     if no_wrap:
         ctx.obj["NO_WRAP"] = no_wrap
+    ctx.obj["TERMINAL_WIDTH"] = get_config_option("default", "width", 1000)
+    if terminal_width:
+        ctx.obj["TERMINAL_WIDTH"] = terminal_width
     ctx.obj["PROFILE"] = profile
     ctx.obj["SHORT_VERSION_VALUES"] = True
     ctx.obj["EDITOR"] = editor

griffon/output.py

@@ -1041,6 +1041,8 @@ def cprint(
         format = OUTPUT_FORMAT(ctx.obj["FORMAT"])
     if format is OUTPUT_FORMAT.TEXT:
         no_wrap = ctx.obj["NO_WRAP"]
+        terminal_width = ctx.obj["TERMINAL_WIDTH"]
+        console.width = int(terminal_width)
         if ctx.info_name == "product-summary":
             text_output_product_summary(ctx, output, format, exclude_products, no_wrap=no_wrap)
         if ctx.info_name == "products-contain-component":

griffon/static/default_griffonrc

@@ -3,7 +3,8 @@ format = text
 history_log = ~/.griffon/history.log
 profile = default
 verbosity = 0
-no_wrap = True
+no_wrap = False
+terminal_width = 1000
 sfm2_api_url = http://localhost:5600
 custom_plugin_dir = ~/.griffon/plugins/
 editor = vi