Merge pull request #5 from devicecloud-dev/better-space-handling

Better space handling

Author: riglar

dist/index.js

@@ -32548,7 +32548,6 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
             async,
             'device-locale': deviceLocale,
             'download-artifacts': downloadArtifacts,
-            env,
             'exclude-flows': excludeFlows,
             'exclude-tags': excludeTags,
             flows: workspaceFolder,
@@ -32560,9 +32559,24 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
             name,
             orientation,
         };
-        const paramsString = Object.keys(params).reduce((acc, key) => {
-            return params[key] ? `${acc} --${key} "${params[key]}"` : acc;
+        let paramsString = Object.keys(params).reduce((acc, key) => {
+            if (!params[key])
+                return acc;
+            const needsQuotes = typeof params[key] === 'string' &&
+                '"' !== params[key][0] &&
+                params[key].includes(' ');
+            const value = needsQuotes ? `"${params[key]}"` : params[key];
+            return `${acc} --${key} ${value}`;
         }, '');
+        if (env && env.length > 0) {
+            env.forEach((e) => {
+                let [key, value] = e.split('=');
+                const needsQuotes = '"' !== value[0] && value.includes(' ');
+                if (needsQuotes)
+                    value = `"${value}"`;
+                paramsString += ` --env ${key}=${value}`;
+            });
+        }
         (0, child_process_1.execSync)(`npx --yes @devicecloud.dev/dcd cloud  ${paramsString} --quiet`, {
             stdio: 'inherit',
         });
@@ -32745,9 +32759,7 @@ function getParameters() {
         if (!(appFilePath !== '') !== (appBinaryId !== '')) {
             throw new Error('Either app-file or app-binary-id must be used');
         }
-        const env = core
-            .getMultilineInput('env', { required: false })
-            .join(' --env ');
+        const env = core.getMultilineInput('env', { required: false });
         const androidApiLevel = getAndroidApiLevel(androidApiLevelString);
         const iOSVersion = getIOSVersion(iOSVersionString);
         return {

package.json

@@ -2,7 +2,7 @@
   "name": "dcd-github-action",
   "description": "run maestro tests on devicecloud.dev",
   "author": "devicecloud.dev",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "src/index.ts",
   "license": "MIT",
   "engines": {

src/index.ts

@@ -41,7 +41,6 @@ const run = async (): Promise<void> => {
       async,
       'device-locale': deviceLocale,
       'download-artifacts': downloadArtifacts,
-      env,
       'exclude-flows': excludeFlows,
       'exclude-tags': excludeTags,
       flows: workspaceFolder,
@@ -54,10 +53,25 @@ const run = async (): Promise<void> => {
       orientation,
     };
 
-    const paramsString = Object.keys(params).reduce((acc, key) => {
-      return params[key] ? `${acc} --${key} "${params[key]}"` : acc;
+    let paramsString = Object.keys(params).reduce((acc, key) => {
+      if (!params[key]) return acc;
+      const needsQuotes =
+        typeof params[key] === 'string' &&
+        '"' !== params[key][0] &&
+        params[key].includes(' ');
+      const value = needsQuotes ? `"${params[key]}"` : params[key];
+      return `${acc} --${key} ${value}`;
     }, '');
 
+    if (env && env.length > 0) {
+      env.forEach((e) => {
+        let [key, value] = e.split('=');
+        const needsQuotes = '"' !== value[0] && value.includes(' ');
+        if (needsQuotes) value = `"${value}"`;
+        paramsString += ` --env ${key}=${value}`;
+      });
+    }
+
     execSync(`npx --yes @devicecloud.dev/dcd cloud  ${paramsString} --quiet`, {
       stdio: 'inherit',
     });

src/methods/params.ts

@@ -6,7 +6,7 @@ export type Params = {
   apiUrl: string;
   appFilePath: string;
   workspaceFolder: string | null;
-  env?: string;
+  env?: string[];
   async?: boolean;
   androidApiLevel?: number;
   iOSVersion?: number;
@@ -186,9 +186,7 @@ export async function getParameters(): Promise<Params> {
     throw new Error('Either app-file or app-binary-id must be used');
   }
 
-  const env = core
-    .getMultilineInput('env', { required: false })
-    .join(' --env ');
+  const env = core.getMultilineInput('env', { required: false });
 
   const androidApiLevel = getAndroidApiLevel(androidApiLevelString);
   const iOSVersion = getIOSVersion(iOSVersionString);