Merge pull request #715 from atsign-foundation/usage-line-length

atsign-foundation · Jan 23, 2024 · faedf8c · faedf8c
2 parents 2404c99 + cb8a401
commit faedf8c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/dart/noports_core/lib/src/sshnp/models/sshnp_arg.dart b/packages/dart/noports_core/lib/src/sshnp/models/sshnp_arg.dart
@@ -140,8 +140,9 @@ class SshnpArg {
     bool withDefaults = true,
     Iterable<String>? includeList,
     Iterable<String>? excludeList,
+    int? usageLineLength,
   }) {
-    var parser = ArgParser();
+    var parser = ArgParser(usageLineLength: usageLineLength);
     // Basic arguments
     for (SshnpArg arg in SshnpArg.args) {
       if (!parserType.shouldParse(arg.parseWhen)) {

diff --git a/packages/dart/sshnoports/bin/sshnp.dart b/packages/dart/sshnoports/bin/sshnp.dart
@@ -18,7 +18,9 @@ void main(List<String> args) async {
   AtSignLogger.root_level = 'SHOUT';
   AtSignLogger.defaultLoggingHandler = AtSignLogger.stdErrLoggingHandler;
 
-  ExtendedArgParser parser = ExtendedArgParser();
+  ExtendedArgParser parser = ExtendedArgParser(
+    usageLineLength: stdout.hasTerminal ? stdout.terminalColumns : null,
+  );
 
   // Create the printUsage closure
   void printUsage({Object? error}) {

diff --git a/packages/dart/sshnoports/lib/src/extended_arg_parser.dart b/packages/dart/sshnoports/lib/src/extended_arg_parser.dart
@@ -14,8 +14,11 @@ const legacyDaemonFlag = 'legacy-daemon';
 const outputExecutionCommandFlag = 'output-execution-command';
 
 class ExtendedArgParser {
-  static ArgParser createArgParser() {
-    final parser = SshnpArg.createArgParser(parserType: ParserType.commandLine);
+  static ArgParser createArgParser({int? usageLineLength}) {
+    final parser = SshnpArg.createArgParser(
+      parserType: ParserType.commandLine,
+      usageLineLength: usageLineLength,
+    );
 
     parser.addOption(
       sshClientOption,
@@ -45,7 +48,8 @@ class ExtendedArgParser {
   final ArgParser parser;
   ArgResults? results;
 
-  ExtendedArgParser() : parser = createArgParser();
+  ExtendedArgParser({int? usageLineLength})
+      : parser = createArgParser(usageLineLength: usageLineLength);
 
   ArgResults parse(Iterable<String> args) {
     return results = parser.parse(args);