PR feedback

pgonzal · pgonzal · commit 639b4e915a4e · 2018-06-07T18:17:17.000-07:00
diff --git a/apps/rush-lib/src/cli/actions/CustomCommandFactory.ts b/apps/rush-lib/src/cli/actions/CustomCommandFactory.ts
@@ -21,7 +21,7 @@ export class CustomCommandFactory {
       parser.rushConfiguration.commonRushConfigFolder, RushConstants.commandLineFilename
     );
     const commandLineConfiguration: CommandLineConfiguration
-      = CommandLineConfiguration.tryLoadFromFile(commandLineConfigFile);
+      = CommandLineConfiguration.loadFromFileOrDefault(commandLineConfigFile);
 
     const documentationForBuild: string = 'The Rush build command assumes that the package.json file for each'
       + ' project contains a "scripts" entry for "npm run build".  It invokes'
diff --git a/apps/rush-lib/src/data/CommandLineConfiguration.ts b/apps/rush-lib/src/data/CommandLineConfiguration.ts
@@ -28,7 +28,12 @@ export class CommandLineConfiguration {
   public readonly commands: CommandJson[] = [];
   public readonly parameters: ParameterJson[] = [];
 
-  public static tryLoadFromFile(jsonFilename: string): CommandLineConfiguration {
+  /**
+   * Loads the configuration from the specified file.  If the file does not exist,
+   * then an empty default instance is returned.  If the file contains errors, then
+   * an exception is thrown.
+   */
+  public static loadFromFileOrDefault(jsonFilename: string): CommandLineConfiguration {
     let commandLineJson: ICommandLineJson | undefined = undefined;
     if (fs.existsSync(jsonFilename)) {
       commandLineJson = JsonFile.loadAndValidate(jsonFilename, CommandLineConfiguration._jsonSchema);
