PR feedback

pgonzal · pgonzal · commit c700f2b8ac84 · 2018-04-26T16:26:23.000-07:00
diff --git a/libraries/ts-command-line/src/CommandLineParameter.ts b/libraries/ts-command-line/src/CommandLineParameter.ts
@@ -220,8 +220,9 @@ export class CommandLineChoiceParameter extends CommandLineParameter {
       const environmentValue: string | undefined = process.env[this.environmentVariable];
       if (environmentValue !== undefined && environmentValue !== '') {
         if (this.alternatives.indexOf(environmentValue) < 0) {
-          throw new Error(`Invalid value for the environment variable ${this.environmentVariable}. Valid choices are: "`
-            + this.alternatives.join('", "')) + '"';
+          const choices: string = '"' + this.alternatives.join('", "') + '"';
+          throw new Error(`Invalid value "${environmentValue}" for the environment variable`
+            + ` ${this.environmentVariable}.  Valid choices are: ${choices}`);
         }
         this._value = environmentValue;
         return;
@@ -284,8 +285,8 @@ export class CommandLineFlagParameter extends CommandLineParameter {
       const environmentValue: string | undefined = process.env[this.environmentVariable];
       if (environmentValue !== undefined && environmentValue !== '') {
         if (environmentValue !== '0' && environmentValue !== '1') {
-          throw new Error(`Invalid value for the environment variable ${this.environmentVariable}.`
-            + ` Valid choices are 0 or 1.`);
+          throw new Error(`Invalid value "${environmentValue}" for the environment variable`
+            + ` ${this.environmentVariable}.  Valid choices are 0 or 1.`);
         }
         this._value = environmentValue === '1';
         return;
@@ -349,8 +350,8 @@ export class CommandLineIntegerParameter extends CommandLineParameterWithArgumen
       if (environmentValue !== undefined && environmentValue !== '') {
         const parsed: number = parseInt(environmentValue, 10);
         if (isNaN(parsed) || environmentValue.indexOf('.') >= 0) {
-          throw new Error(`Invalid value for the environment variable ${this.environmentVariable}.`
-            + ' It must be an integer value.');
+          throw new Error(`Invalid value "${environmentValue}" for the environment variable`
+            + ` ${this.environmentVariable}.  It must be an integer value.`);
         }
         this._value = parsed;
         return;
diff --git a/libraries/ts-command-line/src/CommandLineParser.ts b/libraries/ts-command-line/src/CommandLineParser.ts
@@ -41,11 +41,6 @@ export class CommandLineParserExitError extends Error {
 }
 
 class CustomArgumentParser extends argparse.ArgumentParser {
-
-  constructor(options: argparse.ArgumentParserOptions | undefined) {
-    super(options);
-  }
-
   public exit(status: number, message: string): void { // override
     throw new CommandLineParserExitError(status, message);
   }

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,6 @@ export class CommandLineParserExitError extends Error {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`class CustomArgumentParser extends argparse.ArgumentParser {`
`44`		`-`
`45`		`- constructor(options: argparse.ArgumentParserOptions \| undefined) {`
`46`		`- super(options);`
`47`		`- }`
`48`		`-`
`49`	`44`	`public exit(status: number, message: string): void { // override`
`50`	`45`	`throw new CommandLineParserExitError(status, message);`
`51`	`46`	`}`