fix(cocoapods): add activesupport workaround (#1548)

containerbase · Oct 9, 2023 · 33eff6e · 33eff6e
1 parent 80f6e73
commit 33eff6e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 7 deletions.
diff --git a/src/cli/tools/ruby/gem.ts b/src/cli/tools/ruby/gem.ts
@@ -1,5 +1,7 @@
+import { join } from 'node:path';
 import { execa } from 'execa';
 import { injectable } from 'inversify';
+import { satisfies } from 'semver';
 import { InstallRubyBaseService } from './utils';
 
 @injectable()
@@ -14,4 +16,46 @@ export class InstallCocoapodsService extends InstallRubyBaseService {
   override async test(_version: string): Promise<void> {
     await execa('pod', ['--version', '--allow-root'], { stdio: 'inherit' });
   }
+
+  protected override async _postInstall(
+    gem: string,
+    version: string,
+    prefix: string,
+    env: NodeJS.ProcessEnv,
+  ): Promise<void> {
+    // https://github.com/containerbase/base/issues/1547
+    if (!satisfies(version, '1.12.0 - 1.13.0')) {
+      return;
+    }
+
+    await execa(
+      gem,
+      [
+        'install',
+        'activesupport',
+        '--install-dir',
+        prefix,
+        '--bindir',
+        join(prefix, 'bin'),
+        '--version',
+        '<7.1.0',
+      ],
+      { stdio: ['inherit', 'inherit', 1], env, cwd: this.pathSvc.installDir },
+    );
+
+    await execa(
+      gem,
+      [
+        'uninstall',
+        'activesupport',
+        '--install-dir',
+        prefix,
+        '--bindir',
+        join(prefix, 'bin'),
+        '--version',
+        '>=7.1.0',
+      ],
+      { stdio: ['inherit', 'inherit', 1], env, cwd: this.pathSvc.installDir },
+    );
+  }
 }
diff --git a/src/cli/tools/ruby/utils.ts b/src/cli/tools/ruby/utils.ts
@@ -58,6 +58,8 @@ export abstract class InstallRubyBaseService extends InstallToolBaseService {
       ],
       { stdio: ['inherit', 'inherit', 1], env, cwd: this.pathSvc.installDir },
     );
+
+    await this._postInstall(gem, version, prefix, env);
   }
 
   override async isInstalled(version: string): Promise<boolean> {
@@ -105,6 +107,13 @@ export abstract class InstallRubyBaseService extends InstallToolBaseService {
     return (await this.versionSvc.find('ruby')) !== null;
   }
 
+  protected _postInstall(
+    _gem: string,
+    _version: string,
+    _prefix: string,
+    _env: NodeJS.ProcessEnv,
+  ): Promise<void> | void {}
+
   private async getRubyGem(): Promise<string> {
     const rubyVersion = await this.getRubyVersion();
 

diff --git a/test/ruby/Dockerfile b/test/ruby/Dockerfile
@@ -146,7 +146,7 @@ ENV BUNDLER_VERSION=2.4.20
 RUN install-tool bundler
 
 #--------------------------------------
-# test: cocoapods
+# test: cocoapods (gem install)
 #--------------------------------------
 FROM build as test-cocoapods-a
 
@@ -158,16 +158,22 @@ RUN gem install cocoapods -v 1.9.1
 
 RUN set -ex; \
   cd b/Project; \
-  gem install cocoapods-acknowledgements; \
   pod install;
 
 #--------------------------------------
-# test: unused
+# test: cocoapods v1.11.3 (install-tool)
 #--------------------------------------
 FROM build3 as test-cocoapods-b
 
-# unused
+USER 1000
+
+RUN install-tool cocoapods 1.11.3
+
+RUN pod env
 
+RUN set -ex; \
+  cd b/Project; \
+  pod install;
 
 #--------------------------------------
 # test: cocoapods (install-tool)
@@ -183,7 +189,6 @@ RUN pod env
 
 RUN set -ex; \
   cd b/Project; \
-  gem install cocoapods-acknowledgements; \
   pod install;
 
 #--------------------------------------
@@ -209,6 +214,6 @@ COPY --from=test-bundler-b /.dummy /.dummy
 COPY --from=test-bundler-c /.dummy /.dummy
 COPY --from=test-bundler-d /.dummy /.dummy
 COPY --from=test-cocoapods-a /.dummy /.dummy
-# COPY --from=test-cocoapods-b /.dummy /.dummy
+COPY --from=test-cocoapods-b /.dummy /.dummy
 COPY --from=test-cocoapods-c /.dummy /.dummy
 COPY --from=test-gem /.dummy /.dummy
diff --git a/test/ruby/test/b/Project/Podfile b/test/ruby/test/b/Project/Podfile
@@ -1,4 +1,4 @@
-plugin 'cocoapods-acknowledgements'
+#plugin 'cocoapods-acknowledgements'
 
 target "Demo Project" do
 	pod "CPDAcknowledgements", :path => "../CPDAcknowledgements.podspec"