Various rush and rush-lib refactors.

Author: iclanton

apps/rush-lib/src/cli/executeCli.ts

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import { EOL } from 'os';
+import * as colors from 'colors';
+
+import rushVersion from './rushVersion';
+import RushCommandLineParser from './cli/actions/RushCommandLineParser';
+
+// tslint:disable-next-line:export-name
+export function executeCli(wrapperVersion: string, isManaged: boolean = false): void {
+  console.log(
+    EOL +
+    colors.bold(`Rush Multi-Package Build Tool ${rushVersion}` + colors.yellow(isManaged ? '' : '(unmanaged)')) +
+    colors.cyan(' - http://aka.ms/rush') +
+    EOL
+  );
+
+  const parser: RushCommandLineParser = new RushCommandLineParser();
+
+  parser.execute();
+}

apps/rush-lib/src/start.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../lib/rush.js')
+require('../lib/start.js')

apps/rush/bin/rush

@@ -1,3 +1,3 @@
 @ECHO OFF
 @SETLOCAL
-cmd /c "(cd ..\.. && node-debug "%~dp0lib\rush.js" %*)"
+cmd /c "(cd ..\.. && node-debug "%~dp0lib\start.js" %*)"

apps/rush/rush-debug.cmd

@@ -13,17 +13,17 @@ export default class MinimalRushConfiguration {
   private _rushVersion: string;
   private _homeFolder: string;
 
-  public static loadFromDefaultLocation(): MinimalRushConfiguration {
+  public static loadFromDefaultLocation(): MinimalRushConfiguration | undefined {
     const rushJsonLocation: string = RushConfiguration.findRushJsonLocation();
     return MinimalRushConfiguration.loadFromConfigurationFile(rushJsonLocation);
   }
 
-  public static loadFromConfigurationFile(rushJsonFilename: string): MinimalRushConfiguration {
+  public static loadFromConfigurationFile(rushJsonFilename: string): MinimalRushConfiguration | undefined {
     try {
       const minimalRushConfigurationJson: IMinimalRushConfigurationJson = JsonFile.load(rushJsonFilename);
       return new MinimalRushConfiguration(minimalRushConfigurationJson);
     } catch (e) {
-      throw new Error(`Failed to load rush.json: ${e}`);
+      return undefined;
     }
   }
 

apps/rush/src/MinimalRushConfiguration.ts

@@ -4,22 +4,22 @@
 import * as path from 'path';
 import * as fsx from 'fs-extra';
 import * as semver from 'semver';
+
 import { Utilities } from '@microsoft/rush-lib';
+import * as rushLibCli from '@microsoft/rush-lib/lib/start';
 
 import RushWrapper from './RushWrapper';
 
 const RUSH_TRANSITIONAL_VERSION: string = '4.0.0';
 const MAX_INSTALL_ATTEMPTS: number = 5;
 
-interface IRushCliEntrypoint {
-  executeCli(): void;
-}
-
 export default class RushVersionManager {
   private _rushDirectory: string;
+  private _currentPackageVersion: string;
 
-  constructor(homeDirectory: string) {
+  constructor(homeDirectory: string, currentPackageVersion: string) {
     this._rushDirectory = path.join(homeDirectory, '.rush');
+    this._currentPackageVersion = currentPackageVersion;
   }
 
   public ensureRushVersionInstalled(version: string): RushWrapper {
@@ -50,16 +50,15 @@ export default class RushVersionManager {
       });
     } else {
       return new RushWrapper(() => {
-        const rushCliEntrypoint: IRushCliEntrypoint = require(path.join(
+        const rushCliEntrypoint: typeof rushLibCli = require(path.join(
           expectedRushPath,
           'node_modules',
           '@microsoft',
           'rush-lib',
           'lib',
-          'cli',
-          'executeCli'
+          'start'
         ));
-        rushCliEntrypoint.executeCli();
+        rushCliEntrypoint.executeCli(this._currentPackageVersion, true);
       });
     }
   }

apps/rush/src/RushVersionManager.ts

@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import * as path from 'path';
+import { JsonFile } from '@microsoft/node-core-library';
+
+import { IPackageJson } from '@microsoft/rush-lib';
+import { executeCli } from '@microsoft/rush-lib/lib/start';
+
+import MinimalRushConfiguration from './MinimalRushConfiguration';
+import RushVersionManager from './RushVersionManager';
+import RushWrapper from './RushWrapper';
+
+const currentPackageJson: IPackageJson = JsonFile.load(path.join(__dirname, '..', 'package.json'));
+
+// Load the configuration
+const configuration: MinimalRushConfiguration | undefined = MinimalRushConfiguration.loadFromDefaultLocation();
+
+if (configuration) {
+  const versionManager: RushVersionManager = new RushVersionManager(
+    configuration.homeFolder,
+    currentPackageJson.version
+  );
+  const rushWrapper: RushWrapper = versionManager.ensureRushVersionInstalled(configuration.rushVersion);
+  rushWrapper.invokeRush();
+} else {
+  executeCli(currentPackageJson.version);
+}

apps/rush/src/rush.ts

@@ -24,18 +24,20 @@ describe('MinimalRushConfiguration', () => {
     });
 
     it('correctly loads the rush.json file', () => {
-      const config: MinimalRushConfiguration = MinimalRushConfiguration.loadFromDefaultLocation();
+      const config: MinimalRushConfiguration =
+        MinimalRushConfiguration.loadFromDefaultLocation() as MinimalRushConfiguration;
       assert.equal(config.rushVersion, '2.5.0');
     });
   });
 
-  describe('legacy rush config', () => {
+  describe('non-legacy rush config', () => {
     beforeEach(() => {
       sandbox.stub(process, 'cwd', () => path.join(__dirname, 'sandbox', 'repo', 'project'));
     });
 
     it('correctly loads the rush.json file', () => {
-      const config: MinimalRushConfiguration = MinimalRushConfiguration.loadFromDefaultLocation();
+      const config: MinimalRushConfiguration =
+        MinimalRushConfiguration.loadFromDefaultLocation() as MinimalRushConfiguration;
       assert.equal(config.rushVersion, '4.0.0');
     });
   });