Fix update - copy correctly TNSDebugging.framework and Metadata folder

Author: Fatme Havaluova

lib/definitions/platform.d.ts

@@ -27,6 +27,8 @@ interface IPlatformData {
 	validPackageNamesForDevice: string[];
 	validPackageNamesForEmulator?: string[];
 	frameworkFilesExtensions: string[];
+	frameworkDirectoriesExtensions?: string[];
+	frameworkDirectoriesNames?: string[];
 	targetedOS?: string[];
 }
 

lib/node-package-manager.ts

@@ -30,7 +30,14 @@ export class NodePackageManager implements INodePackageManager {
 	}
 
 	public addToCache(packageName: string, version: string): IFuture<void> {
-		return this.addToCacheCore(packageName, version);
+		return (() => {
+			this.addToCacheCore(packageName, version).wait();
+
+			var packagePath = path.join(npm.cache, packageName, version, "package");
+			if(!this.isPackageUnpacked(packagePath).wait()) {
+				this.cacheUnpack(packageName, version).wait();
+			}
+		}).future<void>()();
 	}
 
 	public load(config?: any): IFuture<void> {
@@ -84,7 +91,7 @@ export class NodePackageManager implements INodePackageManager {
 				}
 				return options.frameworkPath;
 			} else {
-				var version: string = version || this.getLatestVersion(packageName).wait();
+				version = version || this.getLatestVersion(packageName).wait();
 				var packagePath = path.join(npm.cache, packageName, version, "package");
 				if (!this.isPackageCached(packagePath).wait()) {
 					this.addToCacheCore(packageName, version).wait();

lib/services/android-project-service.ts

@@ -23,7 +23,6 @@ class AndroidProjectService implements IPlatformProjectService {
 		private $logger: ILogger,
 		private $projectData: IProjectData,
 		private $propertiesParser: IPropertiesParser) {
-
 	}
 
 	public get platformData(): IPlatformData {
@@ -38,7 +37,7 @@ class AndroidProjectService implements IPlatformProjectService {
 				util.format("%s-%s.%s", this.$projectData.projectName, "debug", "apk"),
 				util.format("%s-%s.%s", this.$projectData.projectName, "release", "apk")
 			],
-			frameworkFilesExtensions: [".jar", ".dat"]
+			frameworkFilesExtensions: [".jar", ".dat", ".so"]
 		};
 	}
 

lib/services/ios-project-service.ts

@@ -37,7 +37,9 @@ class IOSProjectService implements  IPlatformProjectService {
 			validPackageNamesForEmulator: [
 				this.$projectData.projectName + ".app"
 			],
-			frameworkFilesExtensions: [".a", ".h", ".bin"],
+			frameworkFilesExtensions: [".a", ".framework", ".bin"],
+			frameworkDirectoriesExtensions: [".framework"],
+			frameworkDirectoriesNames: ["Metadata"],
 			targetedOS: ['darwin']
 		};
 	}

lib/services/platform-service.ts

@@ -464,16 +464,36 @@ export class PlatformService implements IPlatformService {
 	private updatePlatformCore(platformData: IPlatformData, currentVersion: string, newVersion: string): IFuture<void> {
 		return (() => {
 			// Remove old framework files
-			var oldFrameworkFiles =  this.getFrameworkFiles(platformData, currentVersion).wait();
-			_.each(oldFrameworkFiles, file => {
-				this.$fs.deleteFile(path.join(platformData.projectRoot, file)).wait();
+			var oldFrameworkData =  this.getFrameworkFiles(platformData, currentVersion).wait();
+
+			_.each(oldFrameworkData.frameworkFiles, file => {
+				var fileToDelete = path.join(platformData.projectRoot, file);
+				this.$logger.trace("Deleting %s", fileToDelete);
+				this.$fs.deleteFile(fileToDelete).wait();
+			});
+
+			_.each(oldFrameworkData.frameworkDirectories, dir => {
+				var dirToDelete = path.join(platformData.projectRoot, dir);
+				this.$logger.trace("Deleting %s", dirToDelete);
+				this.$fs.deleteDirectory(dirToDelete).wait();
 			});
 
 			// Add new framework files
-			var newFrameworkFiles = this.getFrameworkFiles(platformData, newVersion).wait();
+			var newFrameworkData = this.getFrameworkFiles(platformData, newVersion).wait();
 			var cacheDirectoryPath = this.getNpmCacheDirectoryCore(platformData.frameworkPackageName, newVersion);
-			_.each(newFrameworkFiles, file => {
-				shell.cp("-f", path.join(cacheDirectoryPath, file), path.join(platformData.projectRoot, file));
+
+			_.each(newFrameworkData.frameworkFiles, file => {
+				var sourceFile = path.join(cacheDirectoryPath, constants.PROJECT_FRAMEWORK_FOLDER_NAME, file);
+				var destinationFile = path.join(platformData.projectRoot, file);
+				this.$logger.trace("Replacing %s with %s", sourceFile, destinationFile);
+				shell.cp("-f", sourceFile, destinationFile);
+			});
+
+			_.each(newFrameworkData.frameworkDirectories, dir => {
+				var sourceDirectory = path.join(cacheDirectoryPath, constants.PROJECT_FRAMEWORK_FOLDER_NAME, dir);
+				var destinationDirectory = path.join(platformData.projectRoot, dir);
+				this.$logger.trace("Copying %s to %s", sourceDirectory, destinationDirectory);
+				shell.cp("-fR", path.join(sourceDirectory, "*"), destinationDirectory);
 			});
 
 			// Update .tnsproject file
@@ -485,16 +505,22 @@ export class PlatformService implements IPlatformService {
 		}).future<void>()();
 	}
 
-	private getFrameworkFiles(platformData: IPlatformData, version: string): IFuture<string[]> {
+	private getFrameworkFiles(platformData: IPlatformData, version: string): IFuture<any> {
 		return (() => {
 			var npmCacheDirectoryPath = this.getNpmCacheDirectory(platformData.frameworkPackageName, version).wait();
+
 			var allFiles = this.$fs.enumerateFilesInDirectorySync(npmCacheDirectoryPath);
 			var filteredFiles = _.filter(allFiles, file => _.contains(platformData.frameworkFilesExtensions, path.extname(file)));
-			var relativeToCacheFiles = _.map(filteredFiles, file => file.substr(npmCacheDirectoryPath.length));
 
-			return relativeToCacheFiles;
+			var allFrameworkDirectories = _.map(this.$fs.readDirectory(path.join(npmCacheDirectoryPath, constants.PROJECT_FRAMEWORK_FOLDER_NAME)).wait(), dir => path.join(npmCacheDirectoryPath, constants.PROJECT_FRAMEWORK_FOLDER_NAME, dir));
+			var filteredFrameworkDirectories = _.filter(allFrameworkDirectories, dir => this.$fs.getFsStats(dir).wait().isDirectory() && (_.contains(platformData.frameworkFilesExtensions, path.extname(dir)) || _.contains(platformData.frameworkDirectoriesNames, path.basename(dir))));
 
-		}).future<string[]>()();
+			return {
+				frameworkFiles: this.mapFrameworkFiles(npmCacheDirectoryPath, filteredFiles),
+				frameworkDirectories: this.mapFrameworkFiles(npmCacheDirectoryPath, filteredFrameworkDirectories)
+			}
+
+		}).future<any>()();
 	}
 
 	private getNpmCacheDirectory(packageName: string, version: string): IFuture<string> {
@@ -512,5 +538,9 @@ export class PlatformService implements IPlatformService {
 	private getNpmCacheDirectoryCore(packageName: string, version: string): string {
 		return path.join(this.$npm.getCacheRootPath(), packageName, version, "package");
 	}
+
+	private mapFrameworkFiles(npmCacheDirectoryPath: string, files: string[]): string[] {
+		return _.map(files, file => file.substr(npmCacheDirectoryPath.length + constants.PROJECT_FRAMEWORK_FOLDER_NAME.length + 1))
+	}
 }
 $injector.register("platformService", PlatformService);