[turtle-cli] fix updating shell apps

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Upgrading the shell app for a given SDK version when the previous version is already downloaded (bug in `turtle-cli`).
 
 ## [0.8.4] - 2019-06-13
 ### Changed

package.json

@@ -13,6 +13,7 @@
     "prepare": "rimraf ./build && yarn build",
     "build": "ttsc",
     "build:production": "./scripts/build.sh",
+    "watch": "ttsc --watch",
     "secrets:init-private": "./scripts/initPrivateSecrets.sh",
     "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
     "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",

src/bin/setup/android/index.ts

@@ -20,6 +20,10 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
     command: 'bash',
     missingDescription: 'Please install bash',
   },
+  {
+    command: 'gulp',
+    missingDescription: 'Run `npm install -g gulp-cli` (or `yarn global add gulp-cli`) to install gulp',
+  },
   {
     command: 'javac',
     missingDescription: 'Please install JDK (version 8 or newer) - check https://jdk.java.net/',

src/bin/setup/android/ndk.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import decompress from 'decompress';
 import fs from 'fs-extra';
 
-import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
+import * as utils from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -16,9 +16,10 @@ const l = logger.child(LOGGER_FIELDS);
 
 export default async function ensureAndroidNDKIsPresent() {
   const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
+  await utils.removeDirectoryUnlessReady(androidNdkDir);
   if (!(await fs.pathExists(androidNdkDir))) {
     await fs.ensureDir(androidNdkDir);
-    const androidNdkDownloadPath = formatArtifactDownloadPath(ANDROID_NDK_URL);
+    const androidNdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_NDK_URL);
 
     try {
       l.info('Downloading Android NDK');
@@ -26,6 +27,7 @@ export default async function ensureAndroidNDKIsPresent() {
       await download(ANDROID_NDK_URL, androidNdkDownloadPath);
       l.info('Decompressing Android NDK');
       await decompress(androidNdkDownloadPath, androidNdkDir, { strip: 1 });
+      await utils.markDirectoryAsReady(androidNdkDir);
       l.info('Android NDK installed successfully');
     } catch (err) {
       await fs.remove(androidNdkDir);

src/bin/setup/android/sdk.ts

@@ -5,7 +5,7 @@ import { ExponentTools } from '@expo/xdl';
 import decompress from 'decompress';
 import fs from 'fs-extra';
 
-import { formatArtifactDownloadPath } from 'turtle/bin/setup/utils/common';
+import * as utils from 'turtle/bin/setup/utils/common';
 import download from 'turtle/bin/setup/utils/downloader';
 import config from 'turtle/config';
 import logger from 'turtle/logger';
@@ -17,9 +17,10 @@ const l = logger.child(LOGGER_FIELDS);
 
 export default async function ensureAndroidSDKIsPresent() {
   const androidSdkDir = path.join(config.directories.androidDependenciesDir, 'sdk');
+  await utils.removeDirectoryUnlessReady(androidSdkDir);
   if (!(await fs.pathExists(androidSdkDir))) {
     await fs.ensureDir(androidSdkDir);
-    const androidSdkDownloadPath = formatArtifactDownloadPath(ANDROID_SDK_URL);
+    const androidSdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_SDK_URL);
 
     try {
       l.info('Downloading Android SDK');
@@ -31,6 +32,7 @@ export default async function ensureAndroidSDKIsPresent() {
       await fs.remove(androidSdkDownloadPath);
       l.info('Configuring Android SDK, this may take a while');
       await _configureSdk(androidSdkDir);
+      await utils.markDirectoryAsReady(androidSdkDir);
       l.info('Android SDK installed and configured successfully');
     } catch (err) {
       await fs.remove(androidSdkDir);

src/bin/setup/utils/common.ts

@@ -29,6 +29,8 @@ export async function ensureShellAppIsPresent(
   postDownloadAction?: PostDownloadAction,
 ) {
   const workingdir = formatters.formatShellAppDirectory({ sdkVersion });
+  const shellAppMetadata = await _readShellAppTarballS3Uri(sdkVersion, formatters);
+  await removeDirectoryUnlessReady(workingdir, shellAppMetadata);
   if (await fs.pathExists(workingdir)) {
     return;
   }
@@ -37,6 +39,7 @@ export async function ensureShellAppIsPresent(
   if (postDownloadAction) {
     await postDownloadAction(sdkVersion, workingdir);
   }
+  await markDirectoryAsReady(workingdir, shellAppMetadata);
 }
 
 async function _downloadShellApp(sdkVersion: string, targetDirectory: string, formatters: IShellAppFormaters) {
@@ -65,3 +68,31 @@ async function _readShellAppTarballS3Uri(sdkVersion: string, formatters: IShellA
   const data = await fs.readFile(filePath, 'utf8');
   return data.trim();
 }
+
+export async function removeDirectoryUnlessReady(dir: string, metadata?: string) {
+  const readyFilePath = path.join(dir, '.ready');
+  const readyFileExists = await fs.pathExists(readyFilePath);
+  let shouldRemove = false;
+  if (readyFileExists) {
+    if (metadata !== undefined) {
+      const readyFileContents = (await fs.readFile(readyFilePath, 'utf-8')).trim();
+      if (readyFileContents !== metadata) {
+        shouldRemove = true;
+       }
+    }
+  } else {
+    shouldRemove = true;
+  }
+  if (shouldRemove) {
+    await fs.remove(dir);
+  }
+}
+
+export async function markDirectoryAsReady(dir: string, metadata?: string) {
+  const readyFilePath = path.join(dir, '.ready');
+  if (metadata === undefined) {
+    await fs.open(readyFilePath, 'w');
+  } else {
+    await fs.writeFile(readyFilePath, metadata);
+  }
+}