Adds "yes" option to setup-dev

Summary: Adds "yes" option to "setup-dev" command to accept all CLI questions with yes. This includes: * Accept Android SDK licenses * Accept Android platform, system, emulator licenses * Accept to overwrite pytorch_live AVD # Example ``` npx torchlive-cli setup-dev --yes ``` The short version is ``` npx torchlive-cli setup-dev -y ``` Note: the option will be used for the GitHub Action CI that tests the setup-dev command ## Test Tested in forked repo: https://github.com/raedle/live/runs/4576829417 Reviewed By: liuyinglao Differential Revision: D33229272 fbshipit-source-id: c8d288a19a865ae809f9e4ff524c66d481bee2e2
facebookresearch · Dec 20, 2021 · 1f2e685 · 1f2e685
1 parent c1bfd39
commit 1f2e685
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/torchlive-cli/src/cli-commands/SetUpDev.ts b/torchlive-cli/src/cli-commands/SetUpDev.ts
@@ -21,7 +21,11 @@ import YarnInstaller from '../installers/YarnInstaller';
 import {print as printHeader} from '../utils/header';
 import {runTasks} from '../utils/TaskUtils';
 
-const setUpDev = async (): Promise<void> => {
+type SetupDevOptions = {
+  yes: boolean;
+};
+
+const setUpDev = async (options: SetupDevOptions): Promise<void> => {
   printHeader();
 
   const tasks: Array<IInstallerTask> = [
@@ -36,11 +40,12 @@ const setUpDev = async (): Promise<void> => {
     new CocoaPodsInstaller(),
   ];
 
-  await runTasks(tasks);
+  await runTasks(tasks, options);
 };
 
 export function makeSetUpDevCommand() {
   return new Command('setup-dev')
     .description('set up development dependencies')
+    .option('-y, --yes', 'Accept all questions')
     .action(setUpDev);
 }
diff --git a/torchlive-cli/src/installers/android/AndroidEmulatorDeviceInstaller.ts b/torchlive-cli/src/installers/android/AndroidEmulatorDeviceInstaller.ts
@@ -135,12 +135,16 @@ export default class AndroidEmulatorDeviceInstaller
   }
 
   async getUserConsentUpdate(context: TaskContext): Promise<boolean> {
-    const userConfirm = await context.task.prompt<boolean>({
-      type: 'confirm',
-      message: `The PyTorch Live Android emulator is either missing or out-of-date.
+    // Ask for user consent if accept all option is false or unset.
+    if (!context.ctx.yes) {
+      const userConfirm = await context.task.prompt<boolean>({
+        type: 'confirm',
+        message: `The PyTorch Live Android emulator is either missing or out-of-date.
 
 Would you like to create or update the PyTorch Live Android emulator?`,
-    });
-    return userConfirm;
+      });
+      return userConfirm;
+    }
+    return true;
   }
 }
diff --git a/torchlive-cli/src/installers/android/AndroidSDKInstaller.ts b/torchlive-cli/src/installers/android/AndroidSDKInstaller.ts
@@ -59,11 +59,14 @@ export default class AndroidSDKInstaller implements IInstallerTask {
 
     const sdkRoot = getDefaultSDKPath();
 
-    await getUserConsentOnInstallerOrQuit(
-      this,
-      context,
-      'https://developer.android.com/studio/terms',
-    );
+    // Ask for user consent if accept all option is false or unset.
+    if (!context.ctx.yes) {
+      await getUserConsentOnInstallerOrQuit(
+        this,
+        context,
+        'https://developer.android.com/studio/terms',
+      );
+    }
 
     const basicsCmd = `yes | ${sdkManager} --sdk_root=${sdkRoot} "tools"`;
     await execCommand(context, basicsCmd);

diff --git a/torchlive-cli/src/installers/android/AndroidSDKManagerInstaller.ts b/torchlive-cli/src/installers/android/AndroidSDKManagerInstaller.ts
@@ -71,11 +71,14 @@ export default class AndroidSDKManagerInstaller
       {encoding: 'utf-8'},
     );
 
-    await getUserConsentOnInstallerOrQuit(
-      this,
-      context,
-      'https://developer.android.com/studio/terms.',
-    );
+    // Ask for user consent if accept all option is false or unset.
+    if (!context.ctx.yes) {
+      await getUserConsentOnInstallerOrQuit(
+        this,
+        context,
+        'https://developer.android.com/studio/terms.',
+      );
+    }
 
     const licensesCmd = `yes | ${cltPath} --licenses`;
     execCommand(context, licensesCmd);

diff --git a/torchlive-cli/src/utils/TaskUtils.ts b/torchlive-cli/src/utils/TaskUtils.ts
@@ -27,7 +27,10 @@ import {getEnv} from './SystemUtils';
 const Logger = getLogger('TaskUtils');
 const NOBREAKSPACE = '‎ ';
 
-export async function runTasks(tasks: ITask[]): Promise<void> {
+export async function runTasks(
+  tasks: ITask[],
+  taskContext: ListrContext = {},
+): Promise<void> {
   const validTasks = tasks.filter(task => task.isValid());
 
   const taskList = new Listr(
@@ -92,7 +95,7 @@ export async function runTasks(tasks: ITask[]): Promise<void> {
   );
 
   try {
-    await taskList.run();
+    await taskList.run(taskContext);
   } catch (error) {
     const message = `
 🚨 💥 🚨 💥 🚨