shipthis 0.1.10 → 0.1.12

package/dist/commands/game/job/status.js

@@ -3,24 +3,24 @@ import { Args, Flags } from '@oclif/core';
 import { measureElement, Box, Text, render } from 'ink';
 import { p as getAuthedHeaders, q as API_URL, K as castArrayObjectDates, F as castObjectDates, a4 as getShortTime, c as BaseGameCommand, a5 as getJob, J as JobStatus } from '../../../index-BB7X1Pqp.js';
 import { useState, useEffect, useRef } from 'react';
-import { C as Command } from '../../../Command-D6rWEZRM.js';
+import { C as Command } from '../../../Command-BiB9MqbJ.js';
 import Spinner from 'ink-spinner';
 import '@inkjs/ui';
 import axios from 'axios';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import 'open';
-import 'crypto';
 import 'fs';
+import 'uuid';
+import 'yazl';
+import 'crypto';
 import 'readline-sync';
 import 'node:readline';
 import 'node:path';
 import 'node:url';
 import 'luxon';
-import 'uuid';
 import 'fast-glob';
-import 'yazl';
 import 'socket.io-client';
 import 'isomorphic-git';
+import 'open';
 import { N as NextSteps } from '../../../NextSteps-CK9zHOCt.js';
 import 'qrcode';
 import stringLength from 'string-length';
@@ -30,14 +30,14 @@ import 'crypto-js';
 import { c as cacheKeys } from '../../../useAndroidServiceAccountTestResult-Ce1x0Eh8.js';
 import { u as useWebSocket } from '../../../useWebSocket-CBqsjHbt.js';
 import { T as Title } from '../../../Title-BCQtayg6.js';
-import { J as JobStatusTable } from '../../../JobStatusTable-ByW0bN6c.js';
+import { J as JobStatusTable } from '../../../JobStatusTable-DqoppRro.js';
 import 'path';
 import '@expo/apple-utils/build/index.js';
 import 'ini';
 import 'deepmerge';
 import 'marked';
 import 'marked-terminal';
-import '../../../useJobWatching-D-YzSlK8.js';
+import '../../../useJobWatching-I_A3b36f.js';
 import '../../../StatusTable-Dm5St4g-.js';
 
 async function queryJobLogs({

package/dist/commands/game/list.js

@@ -3,22 +3,22 @@ import { render, Text, Box } from 'ink';
 import { Flags } from '@oclif/core';
 import { B as BaseAuthenticatedCommand, g as getProjects, b as getShortDate } from '../../index-BB7X1Pqp.js';
 import 'react';
-import { C as Command } from '../../Command-D6rWEZRM.js';
+import { C as Command } from '../../Command-BiB9MqbJ.js';
 import 'ink-spinner';
 import '@inkjs/ui';
 import 'axios';
 import '@tanstack/react-query';
-import 'open';
+import 'fs';
+import 'uuid';
+import 'yazl';
 import { g as getShortUUID } from '../../index-Cz_KLwWf.js';
+import 'open';
 import 'qrcode';
 import { T as Table } from '../../Table-CvM6pccN.js';
 import 'string-length';
 import 'strip-ansi';
 import 'luxon';
-import 'uuid';
 import 'fast-glob';
-import 'fs';
-import 'yazl';
 import 'socket.io-client';
 import 'path';
 import '@expo/apple-utils/build/index.js';

package/dist/commands/game/ship.js

@@ -2,7 +2,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { c as BaseGameCommand } from '../../index-BB7X1Pqp.js';
 import { useContext, useState, useEffect } from 'react';
 import { Box, Text, render } from 'ink';
-import { c as CommandContext } from '../../Command-D6rWEZRM.js';
+import { c as CommandContext } from '../../Command-BiB9MqbJ.js';
 import 'ink-spinner';
 import 'axios';
 import 'crypto-js';
@@ -11,23 +11,23 @@ import 'luxon';
 import 'fs';
 import '@inkjs/ui';
 import '@tanstack/react-query';
-import 'open';
+import 'yazl';
 import 'crypto';
 import 'readline-sync';
 import 'node:readline';
 import 'node:path';
 import 'node:url';
 import 'fast-glob';
-import 'yazl';
 import 'socket.io-client';
 import 'isomorphic-git';
 import '@oclif/core';
+import 'open';
 import 'qrcode';
 import 'string-length';
 import 'strip-ansi';
-import { C as CommandGame } from '../../CommandGame-cPaTk1wh.js';
-import { u as useShip, J as JobProgress } from '../../JobProgress-jmGAzvxS.js';
-import { J as JobStatusTable } from '../../JobStatusTable-ByW0bN6c.js';
+import { C as CommandGame } from '../../CommandGame-C1oTlfdb.js';
+import { u as useShip, J as JobProgress } from '../../JobProgress-W0QQR49T.js';
+import { J as JobStatusTable } from '../../JobStatusTable-DqoppRro.js';
 import 'path';
 import '@expo/apple-utils/build/index.js';
 import 'ini';
@@ -38,7 +38,7 @@ import 'marked';
 import 'marked-terminal';
 import '../../git-DREGq-jc.js';
 import '../../ProgressSpinner-6pw1T8Iw.js';
-import '../../useJobWatching-D-YzSlK8.js';
+import '../../useJobWatching-I_A3b36f.js';
 import '../../useWebSocket-CBqsjHbt.js';
 import '../../Title-BCQtayg6.js';
 import '../../StatusTable-Dm5St4g-.js';

package/dist/commands/game/status.js

@@ -2,24 +2,24 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { Flags } from '@oclif/core';
 import 'react';
-import { C as Command } from '../../Command-D6rWEZRM.js';
+import { C as Command } from '../../Command-BiB9MqbJ.js';
 import { B as BaseAuthenticatedCommand, H as getProject, P as Platform, k as getProjectPlatformProgress, b as getShortDate } from '../../index-BB7X1Pqp.js';
 import 'ink-spinner';
 import '@inkjs/ui';
 import 'axios';
 import '@tanstack/react-query';
-import 'open';
+import 'fs';
+import 'uuid';
+import 'yazl';
 import { g as getShortUUID, m as makeHumanReadable } from '../../index-Cz_KLwWf.js';
+import 'open';
 import { N as NextSteps } from '../../NextSteps-CK9zHOCt.js';
 import 'qrcode';
 import { S as StatusTable } from '../../StatusTable-Dm5St4g-.js';
 import 'string-length';
 import 'strip-ansi';
 import 'luxon';
-import 'uuid';
 import 'fast-glob';
-import 'fs';
-import 'yazl';
 import 'socket.io-client';
 import '../../useAndroidServiceAccountTestResult-Ce1x0Eh8.js';
 import 'marked';

package/dist/commands/game/wizard.js

@@ -1,35 +1,36 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { Args } from '@oclif/core';
-import { Text, Box, render } from 'ink';
+import { Text, Box, useInput, render } from 'ink';
 import { p as getAuthedHeaders, q as API_URL, K as castArrayObjectDates, $ as queryClient, a8 as updateProject, u as getGodotVersion, t as GameEngine, v as createProject, w as DEFAULT_IGNORED_FILES_GLOBS, x as DEFAULT_SHIPPED_FILES_GLOBS, P as Platform, J as JobStatus, X as WEB_URL, H as getProject, C as CredentialsType, Q as getGoogleStatus, B as BaseAuthenticatedCommand, j as isCWDGodotGame } from '../../index-BB7X1Pqp.js';
 import React, { useState, useContext, useEffect, useRef } from 'react';
-import { c as CommandContext, b as GameContext, d as useBuilds, M as Markdown, q as queryBuilds, G as GameProvider, e as CreateGooglePlayGame, C as Command } from '../../Command-D6rWEZRM.js';
+import { c as CommandContext, b as GameContext, M as Markdown, d as useBuilds, q as queryBuilds, G as GameProvider, e as CreateGooglePlayGame, C as Command } from '../../Command-BiB9MqbJ.js';
 import Spinner from 'ink-spinner';
 import { Alert, TextInput } from '@inkjs/ui';
 import axios from 'axios';
 import 'crypto-js';
 import 'uuid';
 import 'luxon';
-import 'fs';
+import fs__default from 'fs';
 import { useQuery, useMutation } from '@tanstack/react-query';
-import 'open';
+import 'yazl';
 import 'crypto';
 import 'readline-sync';
 import 'node:readline';
 import 'node:path';
 import 'node:url';
 import 'fast-glob';
-import 'yazl';
 import 'socket.io-client';
 import 'isomorphic-git';
+import 'open';
 import 'qrcode';
 import 'string-length';
 import 'strip-ansi';
-import { C as CreateKeystore } from '../../CreateKeystore-g1z6DsU5.js';
-import { C as ConnectGoogle } from '../../index-DgbQBx6x.js';
-import { C as CreateServiceAccountKey } from '../../index-m4HTrJ5J.js';
+import { C as CreateKeystore } from '../../Create-DIaSKUpl.js';
+import { I as ImportKeystore } from '../../Import-BIOsf8AA.js';
+import { C as ConnectGoogle } from '../../index-o9Y-84Rj.js';
+import { C as CreateServiceAccountKey } from '../../index-D6BH5UAM.js';
 import { c as cacheKeys, f as fetchKeyTestResult, K as KeyTestStatus, a as KeyTestError } from '../../useAndroidServiceAccountTestResult-Ce1x0Eh8.js';
-import { u as useShip, J as JobProgress } from '../../JobProgress-jmGAzvxS.js';
+import { u as useShip, J as JobProgress } from '../../JobProgress-W0QQR49T.js';
 import { a as getProjectCredentials } from '../../index-DOgF4dFK.js';
 import { T as Title } from '../../Title-BCQtayg6.js';
 import 'path';
@@ -40,11 +41,12 @@ import '../../index-Cz_KLwWf.js';
 import 'marked';
 import 'marked-terminal';
 import '../../RunWithSpinner-BVXNWGD3.js';
+import '../../import-v54PM_Qg.js';
 import '../../useWebSocket-CBqsjHbt.js';
 import '../../useProjectCredentials-vjedBbKl.js';
 import '../../ProgressSpinner-6pw1T8Iw.js';
 import '../../git-DREGq-jc.js';
-import '../../useJobWatching-D-YzSlK8.js';
+import '../../useJobWatching-I_A3b36f.js';
 
 async function queryJobs({ projectId, ...pageAndSortParams }) {
   try {
@@ -230,6 +232,103 @@ const FormTextInput = ({ label, labelProps, ...rest }) => /* @__PURE__ */ jsxs(B
   /* @__PURE__ */ jsx(TextInput, { ...rest })
 ] });
 
+const ImportForm = ({ importKeystoreProps, onSubmit }) => {
+  const [activeInput, setActiveInput] = useState("jksFilePath" /* jksFilePath */);
+  const [error, setError] = useState(null);
+  const [jksFilePath, setJksFilePath] = useState(importKeystoreProps.jksFilePath);
+  const [password, setPassword] = useState(importKeystoreProps.keyPassword);
+  const handleSubmitJksFilePath = () => {
+    setError(null);
+    if (!jksFilePath || jksFilePath.length === 0) {
+      setError("Please enter a path to your jks file");
+      return;
+    }
+    if (!fs__default.existsSync(jksFilePath)) {
+      setError("The file does not exist");
+      return;
+    }
+    setActiveInput("password" /* password */);
+  };
+  const handleSubmitPassword = () => {
+    setError(null);
+    if (!password || password.length === 0) {
+      setError("Please enter a password");
+      return;
+    }
+    onSubmit({
+      ...importKeystoreProps,
+      jksFilePath,
+      keyPassword: password,
+      keystorePassword: password
+    });
+  };
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    error && /* @__PURE__ */ jsx(Alert, { variant: "error", children: error }),
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginLeft: 1, children: [
+      /* @__PURE__ */ jsx(
+        FormTextInput,
+        {
+          label: "Path to your jks file:",
+          isDisabled: activeInput !== "jksFilePath" /* jksFilePath */,
+          defaultValue: jksFilePath,
+          placeholder: "Enter the path to your jks file...",
+          onChange: setJksFilePath,
+          onSubmit: handleSubmitJksFilePath
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        FormTextInput,
+        {
+          label: "Password:",
+          isDisabled: activeInput !== "password" /* password */,
+          defaultValue: password,
+          placeholder: "Enter the password for your jks file...",
+          onChange: setPassword,
+          onSubmit: handleSubmitPassword
+        }
+      )
+    ] })
+  ] });
+};
+
+const CreateOrImport = ({ onComplete, onError, ...boxProps }) => {
+  const [stage, setStage] = useState(0 /* Choose */);
+  const [importKeystoreProps, setImportKeystoreProps] = useState({
+    jksFilePath: "",
+    keyPassword: "",
+    keystorePassword: ""
+  });
+  useInput(async (input) => {
+    if (stage !== 0 /* Choose */) return;
+    if (input === "c") return setStage(1 /* Create */);
+    if (input === "i") return setStage(2 /* ImportForm */);
+  });
+  const handleImportFormSubmit = (newImportProps) => {
+    setImportKeystoreProps(newImportProps);
+    setStage(3 /* ImportKeystore */);
+  };
+  const renderStage = () => {
+    switch (stage) {
+      case 0 /* Choose */:
+        return /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Text, { children: "Would you like to create a new keystore or import an existing one?" }),
+          /* @__PURE__ */ jsx(Text, { bold: true, children: "Press C to create a new keystore" }),
+          /* @__PURE__ */ jsx(Text, { bold: true, children: "Press I to import an existing keystore" })
+        ] });
+      case 1 /* Create */:
+        return /* @__PURE__ */ jsx(CreateKeystore, { onComplete, onError });
+      case 2 /* ImportForm */:
+        return /* @__PURE__ */ jsx(ImportForm, { onSubmit: handleImportFormSubmit, importKeystoreProps });
+      case 3 /* ImportKeystore */:
+        return /* @__PURE__ */ jsx(ImportKeystore, { onComplete, onError, importKeystoreProps });
+    }
+  };
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, ...boxProps, children: [
+    /* @__PURE__ */ jsx(Markdown, { filename: "create-or-import-keystore.md", templateVars: {} }),
+    renderStage()
+  ] });
+};
+
 const CreateInitialBuild = (props) => {
   const { gameId } = useContext(GameContext);
   return /* @__PURE__ */ jsx(Fragment, { children: gameId && /* @__PURE__ */ jsx(CreateForGame, { gameId, ...props }) });
@@ -252,8 +351,10 @@ const CreateForGame = ({ onComplete, onError, gameId, ...boxProps }) => {
     const hasAndroidBuild = buildData.data.some((build) => build.platform === Platform.ANDROID);
     if (!prevHasBuild.current && hasAndroidBuild) return onComplete();
     prevHasBuild.current = hasAndroidBuild;
-    const hasAndroidJob = jobData.data.some((job) => job.type === Platform.ANDROID);
-    const shouldRun = !hasAndroidBuild && !hasAndroidJob;
+    const hasRunningAndroidJob = jobData.data.some(
+      (job) => job.type === Platform.ANDROID && [JobStatus.PENDING, JobStatus.PROCESSING].includes(job.status)
+    );
+    const shouldRun = !hasAndroidBuild && !hasRunningAndroidJob;
     if (shouldRun)
       shipMutation.mutateAsync({
         command,
@@ -357,9 +458,7 @@ const getStepInitialStatus = (step, statusFlags) => {
     createKeystore: statusFlags.hasAndroidKeystore,
     createServiceAccount: statusFlags.hasServiceAccountKey,
     createGooglePlayGame: statusFlags.hasGooglePlayGame,
-    inviteServiceAccount: statusFlags.hasInvitedServiceAccount,
-    connectGoogle: false,
-    createInitialBuild: false
+    inviteServiceAccount: statusFlags.hasInvitedServiceAccount
   };
   return base[step] ? "SUCCESS" /* SUCCESS */ : "PENDING" /* PENDING */;
 };
@@ -399,7 +498,7 @@ const getStatusFlags = async (cmd) => {
 
 const StepLabels = {
   createGame: "Create game in ShipThis",
-  createKeystore: "Create an Android Keystore",
+  createKeystore: "Create or import an Android Keystore",
   connectGoogle: "Connect ShipThis with Google",
   createServiceAccount: "Create a Service Account & API Key",
   createInitialBuild: "Create an initial build",
@@ -438,7 +537,7 @@ const StepStatusTable = ({ stepStatuses }) => {
 
 const stepComponentMap = {
   createGame: CreateGame,
-  createKeystore: CreateKeystore,
+  createKeystore: CreateOrImport,
   connectGoogle: ConnectGoogle,
   createServiceAccount: CreateServiceAccountKey,
   createInitialBuild: CreateInitialBuild,

package/dist/commands/status.js

@@ -2,7 +2,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { render } from 'ink';
 import { T as BaseCommand, j as isCWDGodotGame } from '../index-BB7X1Pqp.js';
 import 'react';
-import { C as Command } from '../Command-D6rWEZRM.js';
+import { C as Command } from '../Command-BiB9MqbJ.js';
 import 'ink-spinner';
 import 'axios';
 import 'crypto-js';
@@ -11,17 +11,17 @@ import 'luxon';
 import 'fs';
 import '@inkjs/ui';
 import '@tanstack/react-query';
-import 'open';
+import 'yazl';
 import 'crypto';
 import 'readline-sync';
 import 'node:readline';
 import 'node:path';
 import 'node:url';
 import 'fast-glob';
-import 'yazl';
 import 'socket.io-client';
 import { i as isCWDGitRepo } from '../git-DREGq-jc.js';
 import '@oclif/core';
+import 'open';
 import { N as NextSteps } from '../NextSteps-CK9zHOCt.js';
 import 'qrcode';
 import { S as StatusTable } from '../StatusTable-Dm5St4g-.js';

package/dist/{import-7T3J63j2.js → import-v54PM_Qg.js}

@@ -12,7 +12,12 @@ async function getNewImportTicket(projectId) {
   });
   return importInfo;
 }
-async function importCredential({ projectId, zipPath, type, platform }) {
+async function importCredential({
+  projectId,
+  zipPath,
+  type,
+  platform
+}) {
   const importTicket = await getNewImportTicket(projectId);
   const zipBuffer = await promises.readFile(zipPath);
   await axios.put(importTicket.url, zipBuffer, {
@@ -23,7 +28,7 @@ async function importCredential({ projectId, zipPath, type, platform }) {
   });
   const headers = getAuthedHeaders();
   const url = projectId ? `${API_URL}/projects/${projectId}/credentials/import` : `${API_URL}/credentials/import`;
-  return await axios({
+  const { data: publicCredential } = await axios({
     method: "post",
     url,
     headers,
@@ -33,6 +38,10 @@ async function importCredential({ projectId, zipPath, type, platform }) {
       platform
     }
   });
+  if (projectId) {
+    return publicCredential;
+  }
+  return publicCredential;
 }
 
 export { importCredential as i };

package/dist/{index-m4HTrJ5J.js → index-D6BH5UAM.js}

@@ -2,7 +2,7 @@ import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Box, Text } from 'ink';
 import { useState, useRef, useEffect, useContext } from 'react';
 import Spinner from 'ink-spinner';
-import { b as GameContext } from './Command-D6rWEZRM.js';
+import { b as GameContext } from './Command-BiB9MqbJ.js';
 import { p as getAuthedHeaders, q as API_URL, F as castObjectDates, P as Platform, C as CredentialsType, Q as getGoogleStatus } from './index-BB7X1Pqp.js';
 import axios from 'axios';
 import 'crypto-js';
@@ -11,7 +11,7 @@ import 'luxon';
 import 'fs';
 import '@inkjs/ui';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import 'open';
+import 'yazl';
 import 'crypto';
 import 'readline-sync';
 import 'node:readline';
@@ -19,12 +19,12 @@ import 'node:path';
 import 'node:url';
 import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Ce1x0Eh8.js';
 import 'fast-glob';
-import 'yazl';
 import 'socket.io-client';
 import 'isomorphic-git';
 import '@oclif/core';
 import { u as useWebSocket } from './useWebSocket-CBqsjHbt.js';
 import { u as useProjectCredentials } from './useProjectCredentials-vjedBbKl.js';
+import 'open';
 import { P as ProgressSpinner } from './ProgressSpinner-6pw1T8Iw.js';
 import 'qrcode';
 import 'string-length';

package/dist/{index-DgbQBx6x.js → index-o9Y-84Rj.js}

@@ -21,7 +21,7 @@ import { u as useWebSocket } from './useWebSocket-CBqsjHbt.js';
 import { c as cacheKeys } from './useAndroidServiceAccountTestResult-Ce1x0Eh8.js';
 import 'isomorphic-git';
 import '@oclif/core';
-import { b as GameContext, M as Markdown } from './Command-D6rWEZRM.js';
+import { b as GameContext, M as Markdown } from './Command-BiB9MqbJ.js';
 import 'ink-spinner';
 import '@inkjs/ui';
 import 'string-length';

package/dist/{useJobWatching-D-YzSlK8.js → useJobWatching-I_A3b36f.js}

@@ -1,4 +1,4 @@
-import { u as useJob } from './Command-D6rWEZRM.js';
+import { u as useJob } from './Command-BiB9MqbJ.js';
 import { useState, useEffect } from 'react';
 import { u as useWebSocket } from './useWebSocket-CBqsjHbt.js';
 import { E as castJobDates, F as castObjectDates } from './index-BB7X1Pqp.js';

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "shipthis",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shipthis",
-      "version": "0.1.10",
+      "version": "0.1.12",
       "license": "MIT",
       "dependencies": {
         "@expo/apple-utils": "2.0.3",

package/oclif.manifest.json

@@ -1028,88 +1028,6 @@
         "status.js"
       ]
     },
-    "game:android:wizard": {
-      "aliases": [],
-      "args": {},
-      "description": "Prototype Android Wizard",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {
-        "name": {
-          "char": "n",
-          "description": "The name of the game",
-          "name": "name",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "buildNumber": {
-          "char": "b",
-          "description": "Set the build number",
-          "name": "buildNumber",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "semanticVersion": {
-          "char": "s",
-          "description": "Set the semantic version",
-          "name": "semanticVersion",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "gameEngine": {
-          "char": "e",
-          "description": "Set the game engine",
-          "name": "gameEngine",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "gameEngineVersion": {
-          "char": "v",
-          "description": "Set the game engine version",
-          "name": "gameEngineVersion",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "iosBundleId": {
-          "char": "i",
-          "description": "Set the iOS bundle ID",
-          "name": "iosBundleId",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "androidPackageName": {
-          "char": "a",
-          "description": "Set the Android package name",
-          "name": "androidPackageName",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "game:android:wizard",
-      "pluginAlias": "shipthis",
-      "pluginName": "shipthis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "game",
-        "android",
-        "wizard.js"
-      ]
-    },
     "game:build:download": {
       "aliases": [],
       "args": {
@@ -1827,14 +1745,15 @@
       "aliases": [],
       "args": {
         "file": {
-          "description": "Name of the ZIP file to import (must be in the same format as the export)",
+          "description": "Path to the ZIP file to import (must be in the same format as the export)",
           "name": "file",
-          "required": true
+          "required": false
         }
       },
       "description": "Imports an Android Keystore to your ShipThis account for the specified game.",
       "examples": [
-        "<%= config.bin %> <%= command.id %>"
+        "<%= config.bin %> <%= command.id %> path/to/import.zip -g abfd5b00",
+        "<%= config.bin %> <%= command.id %> --jksFile path/to/file.jks --keystorePassword yourpass --keyPassword yourkeypass"
       ],
       "flags": {
         "gameId": {
@@ -1845,8 +1764,30 @@
           "multiple": false,
           "type": "option"
         },
+        "jksFile": {
+          "description": "Path to the JKS file to import (requires passwords)",
+          "name": "jksFile",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "keystorePassword": {
+          "description": "Keystore password (required when using --jksFile)",
+          "name": "keystorePassword",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "keyPassword": {
+          "description": "Key alias password (required when using --jksFile)",
+          "name": "keyPassword",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "force": {
           "char": "f",
+          "description": "Overwrite any existing keystore without confirmation",
           "name": "force",
           "allowNo": false,
           "type": "boolean"
@@ -2297,5 +2238,5 @@
       ]
     }
   },
-  "version": "0.1.10"
+  "version": "0.1.12"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shipthis",
   "description": "ShipThis manages building and uploading your Godot games to the App Store and Google Play.",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "author": "Hello Invent Ltd",
   "bin": {
     "shipthis": "./bin/run.js"