chore: rename deviceInstallAppService and deviceRefreshAppService so the same convention is used for both classes

Fatme · Fatme · commit 73ee30649e41 · 2019-05-03T23:53:17.000+03:00
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -41,8 +41,8 @@ $injector.require("platformValidationService", "./services/platform/platform-val
 $injector.require("platformCommandsService", "./services/platform/platform-commands-service");
 $injector.require("platformWatcherService", "./services/platform/platform-watcher-service");
 
-$injector.require("deviceInstallationService", "./services/device/device-installation-service");
-$injector.require("deviceRefreshApplicationService", "./services/device/device-refresh-application-service");
+$injector.require("deviceInstallAppService", "./services/device/device-install-app-service");
+$injector.require("deviceRefreshAppService", "./services/device/device-refresh-app-service");
 
 $injector.require("workflowDataService", "./services/workflow/workflow-data-service");
 
diff --git a/lib/controllers/main-controller.ts b/lib/controllers/main-controller.ts
@@ -1,10 +1,11 @@
-import { INITIAL_SYNC_EVENT_NAME, FILES_CHANGE_EVENT_NAME, LiveSyncEvents } from "../constants";
-import { WorkflowDataService } from "../services/workflow/workflow-data-service";
 import { AddPlatformService } from "../services/platform/add-platform-service";
 import { BuildPlatformService } from "../services/platform/build-platform-service";
-import { PreparePlatformService } from "../services/platform/prepare-platform-service";
+import { DeviceInstallAppService } from "../services/device/device-install-app-service";
+import { DeviceRefreshAppService } from "../services/device/device-refresh-app-service";
 import { EventEmitter } from "events";
-import { DeviceRefreshApplicationService } from "../services/device/device-refresh-application-service";
+import { FILES_CHANGE_EVENT_NAME, INITIAL_SYNC_EVENT_NAME, LiveSyncEvents } from "../constants";
+import { PreparePlatformService } from "../services/platform/prepare-platform-service";
+import { WorkflowDataService } from "../services/workflow/workflow-data-service";
 
 const deviceDescriptorPrimaryKey = "identifier";
 
@@ -14,8 +15,8 @@ export class MainController extends EventEmitter {
 	constructor(
 		private $addPlatformService: AddPlatformService,
 		private $buildPlatformService: BuildPlatformService,
-		private $deviceInstallationService: IDeviceInstallationService,
-		private $deviceRefreshApplicationService: DeviceRefreshApplicationService,
+		private $deviceInstallAppService: DeviceInstallAppService,
+		private $deviceRefreshAppService: DeviceRefreshAppService,
 		private $devicesService: Mobile.IDevicesService,
 		private $errors: IErrors,
 		private $hooksService: IHooksService,
@@ -55,7 +56,7 @@ export class MainController extends EventEmitter {
 		const executeAction = async (device: Mobile.IDevice) => {
 			const { nativePlatformData, projectData, buildPlatformData } = this.$workflowDataService.createWorkflowData(device.deviceInfo.platform, projectDir, liveSyncInfo);
 			await this.$buildPlatformService.buildPlatformIfNeeded(nativePlatformData, projectData, buildPlatformData);
-			await this.$deviceInstallationService.installOnDeviceIfNeeded(device, nativePlatformData, projectData, buildPlatformData);
+			await this.$deviceInstallAppService.installOnDeviceIfNeeded(device, nativePlatformData, projectData, buildPlatformData);
 		};
 
 		await this.$devicesService.execute(executeAction, (device: Mobile.IDevice) => true);
@@ -110,14 +111,14 @@ export class MainController extends EventEmitter {
 			const outputPath = deviceDescriptor.outputPath || platformData.getBuildOutputPath(buildPlatformData);
 			const packageFilePath = await this.$buildPlatformService.buildPlatformIfNeeded(platformData, projectData, buildPlatformData, outputPath);
 
-			await this.$deviceInstallationService.installOnDeviceIfNeeded(device, platformData, projectData, buildPlatformData, packageFilePath, outputPath);
+			await this.$deviceInstallAppService.installOnDeviceIfNeeded(device, platformData, projectData, buildPlatformData, packageFilePath, outputPath);
 
 			// TODO: Consider to improve this
 			const platformLiveSyncService = this.getLiveSyncService(platformData.platformNameLowerCase);
 			const { force, useHotModuleReload, skipWatcher } = liveSyncInfo;
 			const liveSyncResultInfo = await platformLiveSyncService.fullSync({ force, useHotModuleReload, projectData, device, watch: !skipWatcher, liveSyncDeviceInfo: deviceDescriptor });
 
-			await this.$deviceRefreshApplicationService.refreshApplication(deviceDescriptor, projectData, liveSyncResultInfo, platformLiveSyncService, this);
+			await this.$deviceRefreshAppService.refreshApplication(deviceDescriptor, projectData, liveSyncResultInfo, platformLiveSyncService, this);
 		} catch (err) {
 			this.$logger.warn(`Unable to apply changes on device: ${device.deviceInfo.identifier}. Error is: ${err.message}.`);
 
@@ -213,7 +214,7 @@ export class MainController extends EventEmitter {
 			connectTimeout: 1000
 		});
 
-		await this.$deviceRefreshApplicationService.refreshApplication(deviceDescriptor, projectData, liveSyncResultInfo, platformLiveSyncService, this);
+		await this.$deviceRefreshAppService.refreshApplication(deviceDescriptor, projectData, liveSyncResultInfo, platformLiveSyncService, this);
 	}
 
 	public getLiveSyncDeviceDescriptors(projectDir: string): ILiveSyncDeviceInfo[] {
diff --git a/lib/services/device/device-install-app-service.ts b/lib/services/device/device-install-app-service.ts
@@ -6,7 +6,7 @@ import { BuildPlatformService } from "../platform/build-platform-service";
 
 const buildInfoFileName = ".nsbuildinfo";
 
-export class DeviceInstallationService implements IDeviceInstallationService {
+export class DeviceInstallAppService {
 	constructor(
 		private $analyticsService: IAnalyticsService,
 		private $buildArtefactsService: IBuildArtefactsService,
@@ -109,4 +109,4 @@ export class DeviceInstallationService implements IDeviceInstallationService {
 		}
 	}
 }
-$injector.register("deviceInstallationService", DeviceInstallationService);
+$injector.register("deviceInstallAppService", DeviceInstallAppService);
diff --git a/lib/services/device/device-refresh-app-service.ts b/lib/services/device/device-refresh-app-service.ts
@@ -3,7 +3,7 @@ import { EventEmitter } from "events";
 import { DEBUGGER_DETACHED_EVENT_NAME, USER_INTERACTION_NEEDED_EVENT_NAME, LiveSyncEvents, DEBUGGER_ATTACHED_EVENT_NAME } from "../../constants";
 import { EOL } from "os";
 
-export class DeviceRefreshApplicationService {
+export class DeviceRefreshAppService {
 
 	constructor(
 		// private $buildArtefactsService: IBuildArtefactsService,
@@ -177,4 +177,4 @@ export class DeviceRefreshApplicationService {
 		}
 	}
 }
-$injector.register("deviceRefreshApplicationService", DeviceRefreshApplicationService);
+$injector.register("deviceRefreshAppService", DeviceRefreshAppService);
diff --git a/lib/services/webpack/webpack.d.ts b/lib/services/webpack/webpack.d.ts
@@ -40,12 +40,6 @@ declare global {
 		hasNativeChanges: boolean;
 	}
 
-	interface IDeviceInstallationService {
-		installOnDevice(device: Mobile.IDevice, platformData: IPlatformData, projectData: IProjectData, buildConfig: IBuildConfig, packageFile?: string, outputFilePath?: string): Promise<void>;
-		installOnDeviceIfNeeded(device: Mobile.IDevice, platformData: IPlatformData, projectData: IProjectData, buildConfig: IBuildConfig, packageFile?: string, outputFilePath?: string): Promise<void>;
-		getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string>;
-	}
-
 	interface IDeviceRestartApplicationService {
 		restartOnDevice(deviceDescriptor: ILiveSyncDeviceInfo, projectData: IProjectData, liveSyncResultInfo: ILiveSyncResultInfo, platformLiveSyncService: IPlatformLiveSyncService): Promise<IRestartApplicationInfo | IDebugInformation>;
 	}
diff --git a/test/controllers/main-controller.ts b/test/controllers/main-controller.ts
@@ -134,8 +134,8 @@ describe("MainController", () => {
 						actualAddedPlatforms.push(platformData);
 					};
 
-					const bundleWorkflowService: IBundleWorkflowService = injector.resolve("bundleWorkflowService");
-					await bundleWorkflowService.runPlatform(projectDir, testCase.connectedDevices, liveSyncInfo);
+					const mainController = injector.resolve("mainController");
+					await mainController.runPlatform(projectDir, testCase.connectedDevices, liveSyncInfo);
 
 					assert.deepEqual(actualAddedPlatforms.map(pData => pData.platformNameLowerCase), testCase.expectedAddedPlatforms);
 				});
@@ -165,8 +165,8 @@ describe("MainController", () => {
 			// 		const platformWatcherService: IPlatformWatcherService = injector.resolve("platformWatcherService");
 			// 		platformWatcherService.emit(INITIAL_SYNC_EVENT_NAME, { platform, hasNativeChanges: true });
 
-			// 		const bundleWorkflowService: IBundleWorkflowService = injector.resolve("bundleWorkflowService");
-			// 		await bundleWorkflowService.start(projectDir, [iOSDeviceDescriptor], liveSyncInfo);
+			// 		const mainController: MainController = injector.resolve("mainController");
+			// 		await mainController.start(projectDir, [iOSDeviceDescriptor], liveSyncInfo);
 
 			// 		assert.isTrue(isBuildPlatformCalled);
 			// 	});

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { BuildPlatformService } from "../platform/build-platform-service";`
`6`	`6`
`7`	`7`	`const buildInfoFileName = ".nsbuildinfo";`
`8`	`8`
`9`		`-export class DeviceInstallationService implements IDeviceInstallationService {`
	`9`	`+export class DeviceInstallAppService {`
`10`	`10`	`constructor(`
`11`	`11`	`private $analyticsService: IAnalyticsService,`
`12`	`12`	`private $buildArtefactsService: IBuildArtefactsService,`
`@@ -109,4 +109,4 @@ export class DeviceInstallationService implements IDeviceInstallationService {`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
`112`		`-$injector.register("deviceInstallationService", DeviceInstallationService);`
	`112`	`+$injector.register("deviceInstallAppService", DeviceInstallAppService);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { EventEmitter } from "events";`
`3`	`3`	`import { DEBUGGER_DETACHED_EVENT_NAME, USER_INTERACTION_NEEDED_EVENT_NAME, LiveSyncEvents, DEBUGGER_ATTACHED_EVENT_NAME } from "../../constants";`
`4`	`4`	`import { EOL } from "os";`
`5`	`5`
`6`		`-export class DeviceRefreshApplicationService {`
	`6`	`+export class DeviceRefreshAppService {`
`7`	`7`
`8`	`8`	`constructor(`
`9`	`9`	`// private $buildArtefactsService: IBuildArtefactsService,`
`@@ -177,4 +177,4 @@ export class DeviceRefreshApplicationService {`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`}`
`180`		`-$injector.register("deviceRefreshApplicationService", DeviceRefreshApplicationService);`
	`180`	`+$injector.register("deviceRefreshAppService", DeviceRefreshAppService);`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,6 @@ declare global {`
`40`	`40`	`hasNativeChanges: boolean;`
`41`	`41`	`}`
`42`	`42`
`43`		`- interface IDeviceInstallationService {`
`44`		`- installOnDevice(device: Mobile.IDevice, platformData: IPlatformData, projectData: IProjectData, buildConfig: IBuildConfig, packageFile?: string, outputFilePath?: string): Promise<void>;`
`45`		`- installOnDeviceIfNeeded(device: Mobile.IDevice, platformData: IPlatformData, projectData: IProjectData, buildConfig: IBuildConfig, packageFile?: string, outputFilePath?: string): Promise<void>;`
`46`		`- getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string>;`
`47`		`- }`
`48`		`-`
`49`	`43`	`interface IDeviceRestartApplicationService {`
`50`	`44`	`restartOnDevice(deviceDescriptor: ILiveSyncDeviceInfo, projectData: IProjectData, liveSyncResultInfo: ILiveSyncResultInfo, platformLiveSyncService: IPlatformLiveSyncService): Promise<IRestartApplicationInfo \| IDebugInformation>;`
`51`	`45`	`}`