@invarn/cibuild 2.7.5 → 2.7.6

package/dist/src/yaml/steps/cocoapods-install-emits-valid-bash.test.js

@@ -0,0 +1,97 @@
+/**
+ * Every way of telling `cocoapods-install` where to look must emit shell that
+ * bash will actually parse.
+ *
+ * `podfile_path` did not. One stray quote —
+ *
+ *   WORK_DIR="$(dirname '/path/to/Podfile')""
+ *
+ * — opened a double-quoted string that never closed, so bash swallowed the
+ * following line and died with `unexpected EOF while looking for matching '"'`.
+ * The input is documented in SPEC.md and in `steps/cocoapods-install.yml`, and
+ * it could never have worked. Nothing in Invarn's templates passes it, which is
+ * why no build ever reported it.
+ *
+ * No string assertion could have caught this, and the existing tests for the
+ * input asserted only that the rendered script *mentioned* the path. So this
+ * file parses the script instead of reading it, and it does so for **all four**
+ * working-directory branches rather than the one that was broken — the bug was
+ * in a branch nobody exercised, and the next one will be too.
+ */
+import { execFileSync } from 'node:child_process';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { describe, test, expect } from '@jest/globals';
+import { CocoapodsInstallStepExecutor } from './ios-deps.js';
+import { testConfig } from './test-config.js';
+const render = async (inputs) => {
+    const result = await new CocoapodsInstallStepExecutor().execute(inputs, {}, testConfig);
+    return result.script;
+};
+/** Throws with bash's own diagnostic if the script does not parse. */
+const parses = (script) => {
+    const dir = mkdtempSync(join(tmpdir(), 'cibuild-pods-syntax-'));
+    const path = join(dir, 'step.sh');
+    writeFileSync(path, script);
+    try {
+        execFileSync('bash', ['-n', path], { stdio: 'pipe' });
+    }
+    finally {
+        rmSync(dir, { recursive: true, force: true });
+    }
+};
+// The precedence the step documents: podfile_path, source_root_path,
+// project_path, then $CIBUILD_SOURCE_DIR. One case per branch.
+const branches = [
+    ['podfile_path', { podfile_path: '/path/to/Podfile' }],
+    ['source_root_path', { source_root_path: 'ios' }],
+    ['project_path', { project_path: 'ios/MyApp.xcworkspace' }],
+    ['neither — falls back to CIBUILD_SOURCE_DIR', {}],
+];
+describe('cocoapods-install emits bash that parses, on every path to a directory', () => {
+    for (const [name, inputs] of branches) {
+        test(name, async () => {
+            parses(await render(inputs));
+        });
+    }
+    // skip_if_absent rewrites the body of the `if [ ! -f "Podfile" ]` branch, so
+    // it is a second dimension over the same generated shell.
+    for (const [name, inputs] of branches) {
+        test(`${name}, with skip_if_absent`, async () => {
+            parses(await render({ ...inputs, skip_if_absent: true }));
+        });
+    }
+    test('pod update rather than install', async () => {
+        parses(await render({ source_root_path: 'ios', command: 'update' }));
+    });
+    test('a trailing flag on the command', async () => {
+        parses(await render({ project_path: 'ios/MyApp.xcodeproj', command: 'install --repo-update' }));
+    });
+    // A directory with a space in it is the case that makes quoting matter, and
+    // it is ordinary on iOS — "My App.xcworkspace".
+    test('a path containing a space', async () => {
+        parses(await render({ project_path: 'ios/My App.xcworkspace' }));
+        parses(await render({ podfile_path: '/Users/me/My Project/Podfile' }));
+        parses(await render({ source_root_path: 'My iOS Dir' }));
+    });
+    test('verbose logging', async () => {
+        parses(await render({ source_root_path: 'ios', verbose: true }));
+    });
+});
+describe('podfile_path still names the directory it was given', () => {
+    // Guarding the fix rather than only its syntax: the stray quote could have
+    // been "fixed" by deleting the line.
+    test('cds into the dirname of the Podfile', async () => {
+        const script = await render({ podfile_path: '/path/to/Podfile' });
+        expect(script).toContain(`WORK_DIR="$(dirname '/path/to/Podfile')"`);
+        expect(script).toContain('cd "$WORK_DIR"');
+    });
+    test('does not leave an unbalanced quote on the assignment', async () => {
+        const script = await render({ podfile_path: '/path/to/Podfile' });
+        const line = script.split('\n').find((l) => l.startsWith('WORK_DIR='));
+        expect(line).toBeDefined();
+        expect(line.split('"').length - 1).toBe(2);
+    });
+});
+//# sourceMappingURL=cocoapods-install-emits-valid-bash.test.js.map

package/dist/src/yaml/steps/ios-deps.js

@@ -29,7 +29,7 @@ export class CocoapodsInstallStepExecutor extends BaseStepExecutor {
         // Determine working directory
         if (podfilePath) {
             commands.push(`# Use directory from explicit Podfile path`);
-            commands.push(`WORK_DIR="$(dirname '${this.escapeBash(podfilePath)}')""`);
+            commands.push(`WORK_DIR="$(dirname '${this.escapeBash(podfilePath)}')"`);
             commands.push(`cd "$WORK_DIR"`);
         }
         else if (sourceRootPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",