cocoapods-bb-PodAssistant 0.3.15.1 → 0.3.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76613430484281c489857dca49640b225d66d912b05c2feb488e0c7efab5bf30
-  data.tar.gz: f310bc2ab0fac4f48a728a812fe487e26efe958b12a8042794e20512e2c6ce48
+  metadata.gz: 0356b0d9093281386d9cf59a6764965aced7e97d319e64b7efc7f087291f6140
+  data.tar.gz: 5b2af0ffd94d23af9654d1de3174ede20b7e53f97d00f3f95b7ca90f4410b571
 SHA512:
-  metadata.gz: da38a902099ce6249365e29f537c39b20998670bfcd3271b561ad10789eaf148e131b1384608b7ade608a658ef9e4e26ab8055fef345d2dcefcbf1812684fa45
-  data.tar.gz: d107c8364b31827bf08850e75248557a4fe24a0dd898f7d1ed4d25182fdac46eb0193fb7f27ff987246e757fd49f227654f7d6945f2bed5890efa8f421a20712
+  metadata.gz: 94e339e85bc22fbe2a0070ceef07848d897745c4e06b0f3fc66120946273ad229ca0d80962345d03b93370a106ea5079195db8a3b7d9d8a3623a35d83086686b
+  data.tar.gz: 5a42db8d7e28f3fc70ca02f950d6b2830a8a56f256b4953dd1cd7410f1b6d0cba74dcdd4b4c285269a502ec7a75a88938965067f246d1e168ccc2283afcbe576

data/lib/cocoapods-bb-PodAssistant/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.15.1"
+  VERSION = "0.3.15.2"
 end

data/lib/cocoapods-bb-PodAssistant/tools/docc_generator.rb

@@ -6,9 +6,9 @@ require "timeout"
 module BBItools
   class DocCGenerator
     PODSPEC_REPO = "babybus-babybus-ios-specs-babybus-specs"
+    PODSPEC_REPO_URL = "https://git.babybus.co/babybus/ios/Specs/babybus-specs.git"
     DESTINATION = "generic/platform=iOS Simulator"
     CONFIGURATION = "Debug"
-    KEYCHAIN_HOST = "git.babybus.co"
 
     def self.generate(options)
       new(options).run
@@ -26,7 +26,6 @@ module BBItools
       @output = options[:output]
       @logs = options[:logs]
       @derived_data = options[:derived_data]
-      @lint_root = options[:lint_root]
       @hosting_base_path = options[:hosting_base_path]
       @subspec = options[:subspec]
     end
@@ -133,9 +132,9 @@ module BBItools
       derived_data_root = File.join(local_work_root, "DerivedData")
       FileUtils.mkdir_p(derived_data_root)
       
-      lint_root = File.join(local_work_root, "Lint")
-      FileUtils.mkdir_p(lint_root)
-      lint_root_rel = lint_root
+      pod_install_root = File.join(local_work_root, "PodInstall")
+      FileUtils.rm_rf(pod_install_root)
+      FileUtils.mkdir_p(pod_install_root)
 
       # 最终生成的站点先放在本地
       local_site_output = File.join(local_work_root, "site_output")
@@ -207,80 +206,86 @@ module BBItools
         require_cmd!("git")
 
         # ---------------------------------------------------------
-        # 4. 执行 Pod Lib Lint
+        # 4. 创建临时 Podfile + 最小 Xcode 工程，然后执行 pod install
         # ---------------------------------------------------------
-        lint_log = File.join(logs_dir, "pod-lib-lint.log")
-        lint_log_rel = rel_path(lint_log, base_dir: base_dir)
-        lint_cmd = [
-          "pod", "lib", "lint", podspec_basename,
-          "--verbose", "--no-clean", "--skip-tests", "--skip-import-validation",
-          "--use-modular-headers", "--use-static-frameworks",
-          "--allow-warnings",
-          "--sources=#{PODSPEC_REPO}"
-        ]
-        
-        # 如果指定了 subspec，添加到 lint 命令
-        lint_cmd << "--subspec=#{@subspec}" if @subspec
+        write_minimal_xcodeproj(File.join(pod_install_root, "App.xcodeproj"), deployment_target)
 
-        File.open(status_md, "a") { |f| f.puts "- lint: #{lint_cmd.join(" ")}" }
+        pod_dep = @subspec ? "#{scheme}/#{@subspec}" : scheme
 
-        log "执行 lint: #{podspec_basename}#{ @subspec ? " (subspec: #{@subspec})" : "" }（cwd=#{rel_path(podspec_dir_abs, base_dir: base_dir)}）"
-        lint_env = {
-          "HOME" => real_home,
-          "TMPDIR" => lint_root
-        }
+        # Symbol graph 输出目录（swiftc -emit-symbol-graph 直接写这里，不经过 clang -extract-api）
+        symbol_graph_out = File.join(pod_install_root, "symbol-graphs")
+        FileUtils.mkdir_p(symbol_graph_out)
 
-        if ENV["BB_DOCC_ALLOW_PROMPT"] != "1"
-          lint_env["GIT_TERMINAL_PROMPT"] = "0"
-        end
+        pod_install_podfile = <<~PODFILE
+          platform :ios, '#{deployment_target}'
+          inhibit_all_warnings!
+          use_frameworks! :linkage => :static
 
-        lint_exit = run_to_file(lint_cmd, cwd: podspec_dir_abs, env: lint_env, log_path: lint_log)
+          source '#{PODSPEC_REPO_URL}'
 
-        File.open(status_md, "a") do |f|
-          if lint_exit.zero?
-            f.puts "- lint: 成功"
-          else
-            f.puts "- lint: 失败（exit=#{lint_exit}）"
+          target 'App' do
+            pod '#{pod_dep}', :path => '#{podspec_dir_abs}'
           end
-          f.puts
-          f.puts "**pod lib lint 日志（尾部）**"
-          f.puts "```"
-          tail_lines(lint_log, 200).each { |line| f.puts line }
-          f.puts "```"
-        end
 
-        # ---------------------------------------------------------
-        # 5. Lint 失败处理 (软失败)
-        # ---------------------------------------------------------
-        unless lint_exit.zero?
-          log "⚠️ Lint 失败 (exit=#{lint_exit})，尝试继续执行 docbuild..."
-          log "失败日志: #{lint_log_rel}"
-          
-          # 打印关键错误信息
-          puts "[docc] -------- pod lib lint 日志（尾部 200 行）--------"
-          puts tail_lines(lint_log, 200).join("\n")
-          
-          # 检查是否是 Git 认证问题
-          if safe_read_text(lint_log).include?("Authentication failed for 'https://#{KEYCHAIN_HOST}/")
-            puts "[docc] 提示: 检测到 git clone 认证失败（#{KEYCHAIN_HOST}）"
+          post_install do |installer|
+            installer.pods_project.targets.each do |target|
+              target.build_configurations.each do |config|
+                config.build_settings['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES'
+                # 所有 target 都禁用 clang -extract-api（docbuild 会强制开它，我们不用 docbuild）
+                config.build_settings['BUILD_DOCUMENTATION_DURING_EACH_BUILD'] = 'NO'
+                next unless target.name == '#{scheme}'
+                # 只对主 Pod 注入 -emit-symbol-graph，让 swiftc 在编译时直接输出 symbol graph
+                # 比 BUILD_DOCUMENTATION_DURING_EACH_BUILD=YES 更精准，不触发 clang -extract-api
+                config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -emit-symbol-graph -emit-symbol-graph-dir #{symbol_graph_out}'
+              end
+            end
           end
-          
-          # 注意：这里不 return，继续尝试寻找 workspace
+        PODFILE
+
+        File.write(File.join(pod_install_root, "Podfile"), pod_install_podfile)
+
+        pod_install_log = File.join(logs_dir, "pod-install.log")
+        pod_install_cmd = ["pod", "install", "--no-repo-update"]
+
+        File.open(status_md, "a") { |f| f.puts "- pod_install: #{pod_install_cmd.join(" ")}" }
+
+        log "执行 pod install: #{pod_dep} (cwd=#{rel_path(pod_install_root, base_dir: base_dir)})"
+        pod_install_env = { "HOME" => real_home }
+        pod_install_env["GIT_TERMINAL_PROMPT"] = "0" if ENV["BB_DOCC_ALLOW_PROMPT"].to_s.strip != "1"
+
+        pod_install_exit = run_to_file(pod_install_cmd, cwd: pod_install_root, env: pod_install_env, log_path: pod_install_log)
+
+        unless pod_install_exit.zero?
+          File.open(status_md, "a") do |f|
+            f.puts "- pod_install: 失败（exit=#{pod_install_exit}）"
+            f.puts
+            f.puts "**pod install 日志（尾部）**"
+            f.puts "```"
+            tail_lines(pod_install_log, 200).each { |line| f.puts line }
+            f.puts "```"
+          end
+          puts "[docc] -------- pod install 日志（尾部 200 行）--------"
+          puts tail_lines(pod_install_log, 200).join("\n")
+          fail!("pod install 失败 (exit=#{pod_install_exit})")
         end
 
+        File.open(status_md, "a") { |f| f.puts "- pod_install: 成功" }
+
+        # pod install 后，清理依赖 Pod 中多余的 .docc 目录
+        # xcodebuild docbuild 要求每个 target 只能有一个 .docc catalog
+        cleaned_docc = remove_extra_docc_catalogs(File.join(pod_install_root, "Pods"))
+        File.open(status_md, "a") { |f| f.puts "- cleaned_extra_docc_catalogs: #{cleaned_docc.join(', ')}" } if cleaned_docc.any?
+
         # ---------------------------------------------------------
-        # 6. 查找 Workspace 并执行 DocBuild
+        # 5. 查找 Workspace 并执行 DocBuild
         # ---------------------------------------------------------
-        workspace_path_abs = find_workspace_from_lint_log(lint_log, lint_root)
-        
-        if workspace_path_abs.to_s.strip.empty?
-          fail!("未找到 *.xcworkspace（lint_root=#{lint_root_rel}），无法继续")
-        end
-        
-        workspace_path_rel = rel_path(workspace_path_abs.to_s, base_dir: base_dir)
+        workspace_path_abs = Dir.glob(File.join(pod_install_root, "*.xcworkspace")).first.to_s
+        fail!("未找到 *.xcworkspace（pod_install_root=#{pod_install_root}）") if workspace_path_abs.strip.empty?
+
+        workspace_path_rel = rel_path(workspace_path_abs, base_dir: base_dir)
         fail!("workspace 不存在: #{workspace_path_rel}") unless File.directory?(workspace_path_abs)
 
-        validation_dir_abs = File.dirname(workspace_path_abs)
+        validation_dir_abs = pod_install_root
         File.open(status_md, "a") do |f|
           f.puts "- validation_dir: #{rel_path(validation_dir_abs, base_dir: base_dir)}"
           f.puts "- workspace: #{workspace_path_rel}"
@@ -314,20 +319,19 @@ module BBItools
         FileUtils.mkdir_p(derived_dir)
         derived_dir_rel = rel_path(derived_dir, base_dir: base_dir)
 
-        docbuild_log = File.join(logs_dir, "xcodebuild-docbuild.log")
+        build_log = File.join(logs_dir, "xcodebuild-build.log")
 
-        workspace_for_docbuild = rel_path(workspace_path_abs, base_dir: podspec_dir_abs)
-        derived_dir_for_docbuild = rel_path(derived_dir, base_dir: podspec_dir_abs)
-        
-        # DocBuild Command
-        docbuild_cmd = [
-          "xcodebuild", "docbuild",
-          "-workspace", workspace_for_docbuild,
-          "-scheme", scheme, # 通常 Subspec 的 Scheme 还是主 Pod 名
+        # 使用 xcodebuild build（非 docbuild）
+        # docbuild 会在命令行层面强制对所有 target 开启 ExtractAPI，无视项目里的 BUILD_DOCUMENTATION_DURING_EACH_BUILD=NO
+        # build 只对项目里明确设置了 YES 的 target（主 Pod）执行 ExtractAPI，依赖不受影响
+        build_cmd = [
+          "xcodebuild", "build",
+          "-workspace", workspace_path_abs,
+          "-scheme", scheme,
           "-destination", DESTINATION,
           "-configuration", CONFIGURATION,
-          "-derivedDataPath", derived_dir_for_docbuild,
-          "ENABLE_USER_SCRIPT_SANDBOXING=NO" # 尝试解决 Swift Macro 权限问题
+          "-derivedDataPath", derived_dir,
+          "ENABLE_USER_SCRIPT_SANDBOXING=NO"
         ]
 
         docc_catalog_abs = resolve_docc_catalog_abs(podspec_dir_abs, scheme)
@@ -336,45 +340,55 @@ module BBItools
           from_sources = path_inside_dir?(docc_catalog_abs, File.join(podspec_dir_abs, "Sources"))
           File.open(status_md, "a") do |f|
             f.puts "- docc_catalog: #{docc_catalog_rel_for_status}"
-            if from_sources
-              f.puts "- docc_catalog_source: sources(auto, 未依赖 podspec DOCC_CATALOGS)"
-            else
-              f.puts "- docc_catalog_source: root(auto)"
-            end
+            f.puts "- docc_catalog_source: #{from_sources ? 'sources' : 'root'}"
           end
-          docbuild_cmd << "DOCC_CATALOGS=#{docc_catalog_abs}"
         else
           File.open(status_md, "a") { |f| f.puts "- docc_catalog: 未找到（将使用工程默认配置）" }
         end
 
         if deployment_target && !deployment_target.strip.empty?
-          docbuild_cmd << "IPHONEOS_DEPLOYMENT_TARGET=#{deployment_target}"
-          docbuild_cmd << "SWIFT_VERSION=5.0"
+          build_cmd << "IPHONEOS_DEPLOYMENT_TARGET=#{deployment_target}"
+          build_cmd << "SWIFT_VERSION=5.0"
         end
-        docbuild_cmd += ["CODE_SIGNING_ALLOWED=NO", "CODE_SIGNING_REQUIRED=NO", "CODE_SIGN_IDENTITY="]
+        build_cmd += ["CODE_SIGNING_ALLOWED=NO", "CODE_SIGNING_REQUIRED=NO", "CODE_SIGN_IDENTITY="]
+
+        build_cmd_report = build_cmd.map { |arg| arg == workspace_path_abs ? workspace_path_rel : (arg == derived_dir ? derived_dir_rel : arg) }
+        File.open(status_md, "a") { |f| f.puts "- build: #{build_cmd_report.join(" ")}" }
 
-        docbuild_cmd_report = docbuild_cmd.dup
-        docbuild_cmd_report[docbuild_cmd_report.index(workspace_for_docbuild) || 0] = workspace_path_rel
-        docbuild_cmd_report[docbuild_cmd_report.index(derived_dir_for_docbuild) || 0] = derived_dir_rel
-        File.open(status_md, "a") { |f| f.puts "- docbuild: #{docbuild_cmd_report.join(" ")}" }
+        log "执行 build (ExtractAPI 仅对 #{scheme}): #{component_name}"
+        build_exit = run_to_file(build_cmd, cwd: pod_install_root, env: { "HOME" => real_home }, log_path: build_log)
 
-        log "执行 docbuild: #{scheme} (target: #{component_name})"
-        docbuild_exit = run_to_file(docbuild_cmd, cwd: podspec_dir_abs, env: { "HOME" => real_home }, log_path: docbuild_log)
+        # 自动检测 arm64 模拟器不兼容问题（预编译 SDK 无 arm64 simulator slice）
+        # 失败后检查日志，有 "unsupported Swift architecture" 时排除 arm64 重试
+        if !build_exit.zero? && safe_read_text(build_log).include?("unsupported Swift architecture")
+          log "⚠️ 检测到依赖 SDK 不支持 arm64 模拟器，自动切换 x86_64 重试 (EXCLUDED_ARCHS[sdk=iphonesimulator*]=arm64)..."
+          File.open(status_md, "a") { |f| f.puts "- build_retry: excluded arm64 for simulator" }
 
-        unless docbuild_exit.zero?
+          build_log_retry = File.join(logs_dir, "xcodebuild-build-x86_64.log")
+          build_cmd_retry = build_cmd + ["EXCLUDED_ARCHS[sdk=iphonesimulator*]=arm64"]
+
+          build_exit = run_to_file(build_cmd_retry, cwd: pod_install_root, env: { "HOME" => real_home }, log_path: build_log_retry)
+          build_log = build_log_retry
+        end
+
+        unless build_exit.zero?
           File.open(status_md, "a") do |f|
-            f.puts "- docbuild: 失败（exit=#{docbuild_exit}）"
+            f.puts "- build: 失败（exit=#{build_exit}）"
             f.puts
             f.puts "**xcodebuild 日志（尾部）**"
             f.puts "```"
-            tail_lines(docbuild_log, 200).each { |line| f.puts line }
+            tail_lines(build_log, 200).each { |line| f.puts line }
             f.puts "```"
           end
-          fail!("docbuild 失败")
+          puts "[docc] -------- build 日志（尾部 200 行）--------"
+          puts tail_lines(build_log, 200).join("\n")
+          fail!("build 失败")
         end
 
-        File.open(status_md, "a") { |f| f.puts "- docbuild: 成功" }
+        File.open(status_md, "a") { |f| f.puts "- build: 成功" }
 
+        # xcodebuild build + BUILD_DOCUMENTATION_DURING_EACH_BUILD=YES 会直接生成 .doccarchive
+        # 先尝试找现成的 archive
         archives = []
         Find.find(derived_dir) do |p|
           next unless File.directory?(p)
@@ -390,43 +404,58 @@ module BBItools
             .reverse
             .find { |p| File.basename(p) == "#{scheme}.doccarchive" } || archives.max_by { |p| File.mtime(p) }
 
-        fail!("未找到 .doccarchive（derivedData=#{derived_dir_rel}）") if doccarchive_path.to_s.strip.empty?
+        # 若 build 没直接产出 .doccarchive，则找 symbol-graph 目录手动跑 xcrun docc convert
+        if doccarchive_path.to_s.strip.empty?
+          log "build 未直接生成 .doccarchive，尝试手动 docc convert..."
 
-        want_tutorials = false
-        if docc_catalog_abs && File.directory?(docc_catalog_abs)
-          has_tutorial = Dir.glob(File.join(docc_catalog_abs, "**", "*.tutorial")).any?
-          want_tutorials = has_tutorial
-        end
+          # 优先使用 -emit-symbol-graph-dir 指定的目录（swiftc 直接写入）
+          symbol_graph_dir = nil
+          if Dir.glob(File.join(symbol_graph_out, "*.symbols.json")).any?
+            symbol_graph_dir = symbol_graph_out
+            log "使用 swiftc -emit-symbol-graph 输出: #{symbol_graph_dir}"
+          end
 
-        if want_tutorials
-          has_in_archive = File.directory?(File.join(doccarchive_path, "tutorials")) || File.directory?(File.join(doccarchive_path, "data", "tutorials"))
-          unless has_in_archive
-            symbol_graph_dir = Dir.glob(File.join(derived_dir, "Build", "Intermediates.noindex", "**", "#{scheme}.build", "symbol-graph")).sort.first
-            fail!("未找到 symbol-graph 目录，无法按官方 docc convert 生成教程") if symbol_graph_dir.to_s.strip.empty?
-
-            manual_archive_dir = File.join(derived_data_root, ".manual_doccarchive", component_name, "#{scheme}.doccarchive")
-            FileUtils.rm_rf(manual_archive_dir)
-            FileUtils.mkdir_p(File.dirname(manual_archive_dir))
-
-            manual_log = File.join(logs_dir, "docc-convert-manual.log")
-            manual_diag = File.join(logs_dir, "docc-convert-manual-diagnostics.json")
-
-            manual_cmd = [
-              "xcrun", "docc", "convert", docc_catalog_abs,
-              "--emit-lmdb-index",
-              "--fallback-display-name", scheme,
-              "--fallback-bundle-identifier", "org.cocoapods.#{scheme}",
-              "--output-dir", manual_archive_dir,
-              "--additional-symbol-graph-dir", symbol_graph_dir,
-              "--ide-console-output",
-              "--diagnostics-file", manual_diag
-            ]
-
-            manual_exit = run_to_file(manual_cmd, cwd: podspec_dir_abs, env: { "HOME" => real_home }, log_path: manual_log)
-            fail!("docc convert 失败（exit=#{manual_exit}）") unless manual_exit.zero? && File.directory?(manual_archive_dir)
-
-            doccarchive_path = manual_archive_dir
+          # 备用：Xcode 中间目录（BUILD_DOCUMENTATION_DURING_EACH_BUILD=YES 生成的路径）
+          if symbol_graph_dir.to_s.strip.empty?
+            symbol_graph_dir = Dir.glob(
+              File.join(derived_dir, "Build", "Intermediates.noindex", "**", "#{scheme}.build", "symbol-graph")
+            ).sort.first
           end
+
+          fail!("未找到 symbol-graph 文件（#{symbol_graph_out} 和 #{scheme}.build/symbol-graph 均为空）：确认 pod 有 Swift 源码且 OTHER_SWIFT_FLAGS 已生效") if symbol_graph_dir.to_s.strip.empty?
+
+          manual_archive_dir = File.join(derived_data_root, ".manual_doccarchive", component_name, "#{scheme}.doccarchive")
+          FileUtils.rm_rf(manual_archive_dir)
+          FileUtils.mkdir_p(File.dirname(manual_archive_dir))
+
+          docc_convert_log = File.join(logs_dir, "docc-convert.log")
+          docc_convert_diag = File.join(logs_dir, "docc-convert-diagnostics.json")
+
+          docc_convert_cmd = [
+            "xcrun", "docc", "convert",
+            "--emit-lmdb-index",
+            "--fallback-display-name", scheme,
+            "--fallback-bundle-identifier", "org.cocoapods.#{scheme}",
+            "--fallback-bundle-version", spec_version.to_s.strip.empty? ? "1.0" : spec_version,
+            "--output-dir", manual_archive_dir,
+            "--additional-symbol-graph-dir", symbol_graph_dir,
+            "--ide-console-output",
+            "--diagnostics-file", docc_convert_diag
+          ]
+          docc_convert_cmd.insert(3, docc_catalog_abs) if docc_catalog_abs
+
+          log "执行 docc convert: #{scheme}"
+          File.open(status_md, "a") { |f| f.puts "- docc_convert: #{docc_convert_cmd.join(" ")}" }
+
+          docc_convert_exit = run_to_file(docc_convert_cmd, cwd: pod_install_root, env: { "HOME" => real_home }, log_path: docc_convert_log)
+
+          unless docc_convert_exit.zero? && File.directory?(manual_archive_dir)
+            puts "[docc] -------- docc-convert 日志（尾部 100 行）--------"
+            puts tail_lines(docc_convert_log, 100).join("\n")
+            fail!("docc convert 失败（exit=#{docc_convert_exit}）")
+          end
+
+          doccarchive_path = manual_archive_dir
         end
 
         doccarchive_rel = rel_path(doccarchive_path, base_dir: base_dir)
@@ -437,23 +466,19 @@ module BBItools
 
         export_log = File.join(logs_dir, "docc-transform.log")
 
-        doccarchive_for_export = rel_path(doccarchive_path, base_dir: podspec_dir_abs)
         export_staging_dir = File.join(derived_data_root, ".docc-site", scheme)
         FileUtils.rm_rf(export_staging_dir)
         FileUtils.mkdir_p(export_staging_dir)
-        site_out_for_export = rel_path(export_staging_dir, base_dir: podspec_dir_abs)
-        
-        # Export Command
+
+        # Export Command (使用绝对路径)
         export_cmd = [
           "xcrun", "docc", "process-archive", "transform-for-static-hosting",
-          doccarchive_for_export,
-          "--output-path", site_out_for_export,
-          "--hosting-base-path", hosting_base_path # 关键参数
+          doccarchive_path,
+          "--output-path", export_staging_dir,
+          "--hosting-base-path", hosting_base_path
         ]
 
-        export_cmd_report = export_cmd.dup
-        export_cmd_report[export_cmd_report.index(doccarchive_for_export) || 0] = doccarchive_rel
-        export_cmd_report[export_cmd_report.index(site_out_for_export) || 0] = rel_path(site_out, base_dir: base_dir)
+        export_cmd_report = export_cmd.map { |arg| arg == doccarchive_path ? doccarchive_rel : (arg == export_staging_dir ? rel_path(site_out, base_dir: base_dir) : arg) }
         File.open(status_md, "a") { |f| f.puts "- export: #{export_cmd_report.join(" ")}" }
 
         log "导出静态站点: #{component_dir_rel} (hosting-base-path: #{hosting_base_path})"
@@ -470,7 +495,7 @@ module BBItools
 
         File.open(status_md, "a") { |f| f.puts "- docc_html_dir: #{docc_html_dir.empty? ? '(builtin)' : docc_html_dir}" }
 
-        export_exit = run_to_file(export_cmd, cwd: podspec_dir_abs, env: export_env, log_path: export_log)
+        export_exit = run_to_file(export_cmd, cwd: pod_install_root, env: export_env, log_path: export_log)
         unless export_exit.zero?
           warn tail_lines(export_log, 200).join("\n")
           fail!("docc 导出失败")
@@ -582,6 +607,201 @@ module BBItools
       exit 1
     end
 
+    # 扫描 pods_dir 下每个 Pod，找出拥有多个 .docc catalog 的 target
+    # 保留与 Pod 名同名的那个（或第一个），删除其余的，同时从 Pods.xcodeproj/project.pbxproj 移除对应引用
+    def remove_extra_docc_catalogs(pods_dir)
+      removed = []
+      return removed unless File.directory?(pods_dir)
+
+      pbxproj_path = File.join(pods_dir, "Pods.xcodeproj", "project.pbxproj")
+
+      Dir.children(pods_dir).each do |pod_name|
+        pod_path = File.join(pods_dir, pod_name)
+        next unless File.directory?(pod_path)
+        next if pod_name.start_with?(".")
+
+        docc_dirs = []
+        Find.find(pod_path) do |p|
+          if File.directory?(p) && p.end_with?(".docc")
+            docc_dirs << p
+            Find.prune
+          end
+        end
+
+        next if docc_dirs.size <= 1
+
+        # 优先保留与 Pod 名同名的 catalog，否则保留第一个
+        preferred = docc_dirs.find { |p| File.basename(p, ".docc").casecmp(pod_name).zero? }
+        preferred ||= docc_dirs.first
+
+        docc_dirs.each do |d|
+          next if d == preferred
+          log "🗑  删除多余 .docc catalog: #{d}"
+          FileUtils.rm_rf(d)
+          # pbxproj 里仍有文件引用，xcodebuild 会从项目文件读 catalog 列表，必须一并清理
+          remove_docc_from_pbxproj(pbxproj_path, File.basename(d)) if File.file?(pbxproj_path)
+          removed << d
+        end
+      end
+
+      removed
+    rescue StandardError => e
+      log "⚠️ remove_extra_docc_catalogs 异常: #{e.message}"
+      []
+    end
+
+    # 从 project.pbxproj 中删除对指定 .docc catalog 的所有引用
+    # 通过 GUID 匹配，移除 PBXFileReference / PBXBuildFile / group children / build phase files 各行
+    def remove_docc_from_pbxproj(pbxproj_path, docc_basename)
+      text = safe_read_text(pbxproj_path)
+      return if text.empty?
+
+      # 找 PBXFileReference GUID
+      file_ref_guids = []
+      text.scan(/(\h{32})\s+\/\*\s+#{Regexp.escape(docc_basename)}\s+\*\/\s*=\s*\{isa\s*=\s*PBXFileReference/) do
+        file_ref_guids << $1
+      end
+      return if file_ref_guids.empty?
+
+      # 找引用这些 fileRef 的 PBXBuildFile GUID
+      build_file_guids = []
+      file_ref_guids.each do |ref_guid|
+        text.scan(/(\h{32})\s+\/\*[^*]*\*\/\s*=\s*\{isa\s*=\s*PBXBuildFile;\s*fileRef\s*=\s*#{ref_guid}/) do
+          build_file_guids << $1
+        end
+      end
+
+      all_guids = (file_ref_guids + build_file_guids).uniq
+
+      # 删除所有包含这些 GUID 的行（覆盖 definition / children / files 引用）
+      new_text = text.lines.reject { |line| all_guids.any? { |guid| line.include?(guid) } }.join
+      File.write(pbxproj_path, new_text) unless new_text == text
+    rescue StandardError => e
+      log "⚠️ remove_docc_from_pbxproj 异常: #{e.message}"
+    end
+
+    def write_minimal_xcodeproj(xcodeproj_dir, deployment_target)
+      FileUtils.mkdir_p(xcodeproj_dir)
+      pbxproj = <<~PBXPROJ
+        // !$*UTF8*$!
+        {
+        	archiveVersion = 1;
+        	classes = {
+        	};
+        	objectVersion = 56;
+        	objects = {
+        		/* Begin PBXFileReference section */
+        		00000001 /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
+        		/* End PBXFileReference section */
+
+        		/* Begin PBXGroup section */
+        		00000002 = {
+        			isa = PBXGroup;
+        			children = (
+        				00000003,
+        			);
+        			sourceTree = "<group>";
+        		};
+        		00000003 /* Products */ = {
+        			isa = PBXGroup;
+        			children = (
+        				00000001,
+        			);
+        			name = Products;
+        			sourceTree = "<group>";
+        		};
+        		/* End PBXGroup section */
+
+        		/* Begin PBXNativeTarget section */
+        		00000004 /* App */ = {
+        			isa = PBXNativeTarget;
+        			buildConfigurationList = 00000005;
+        			buildPhases = ();
+        			buildRules = ();
+        			dependencies = ();
+        			name = App;
+        			productName = App;
+        			productReference = 00000001;
+        			productType = "com.apple.product-type.application";
+        		};
+        		/* End PBXNativeTarget section */
+
+        		/* Begin PBXProject section */
+        		00000006 /* Project object */ = {
+        			isa = PBXProject;
+        			buildConfigurationList = 00000007;
+        			compatibilityVersion = "Xcode 14.0";
+        			developmentRegion = en;
+        			hasScannedForEncodings = 0;
+        			knownRegions = (en, Base);
+        			mainGroup = 00000002;
+        			productRefGroup = 00000003;
+        			projectDirPath = "";
+        			projectRoot = "";
+        			targets = (00000004);
+        		};
+        		/* End PBXProject section */
+
+        		/* Begin XCBuildConfiguration section */
+        		00000008 /* Debug */ = {
+        			isa = XCBuildConfiguration;
+        			buildSettings = {
+        				ALWAYS_SEARCH_USER_PATHS = NO;
+        				IPHONEOS_DEPLOYMENT_TARGET = #{deployment_target};
+        				SDKROOT = iphoneos;
+        			};
+        			name = Debug;
+        		};
+        		00000009 /* Release */ = {
+        			isa = XCBuildConfiguration;
+        			buildSettings = {
+        				ALWAYS_SEARCH_USER_PATHS = NO;
+        				IPHONEOS_DEPLOYMENT_TARGET = #{deployment_target};
+        				SDKROOT = iphoneos;
+        			};
+        			name = Release;
+        		};
+        		0000000A /* Debug */ = {
+        			isa = XCBuildConfiguration;
+        			buildSettings = {
+        				INFOPLIST_FILE = "";
+        				PRODUCT_BUNDLE_IDENTIFIER = org.example.App;
+        				PRODUCT_NAME = App;
+        			};
+        			name = Debug;
+        		};
+        		0000000B /* Release */ = {
+        			isa = XCBuildConfiguration;
+        			buildSettings = {
+        				INFOPLIST_FILE = "";
+        				PRODUCT_BUNDLE_IDENTIFIER = org.example.App;
+        				PRODUCT_NAME = App;
+        			};
+        			name = Release;
+        		};
+        		/* End XCBuildConfiguration section */
+
+        		/* Begin XCConfigurationList section */
+        		00000005 = {
+        			isa = XCConfigurationList;
+        			buildConfigurations = (0000000A, 0000000B);
+        			defaultConfigurationIsVisible = 0;
+        			defaultConfigurationName = Release;
+        		};
+        		00000007 = {
+        			isa = XCConfigurationList;
+        			buildConfigurations = (00000008, 00000009);
+        			defaultConfigurationIsVisible = 0;
+        			defaultConfigurationName = Release;
+        		};
+        		/* End XCConfigurationList section */
+        	};
+        	rootObject = 00000006 /* Project object */;
+        }
+      PBXPROJ
+      File.write(File.join(xcodeproj_dir, "project.pbxproj"), pbxproj)
+    end
+
     def abs_path(path, base_dir:)
       return "" if path.nil? || path.empty?
       return File.expand_path(path) if path.start_with?("/")
@@ -968,38 +1188,6 @@ module BBItools
       push_exit
     end
 
-    def find_workspace_from_lint_log(lint_log, lint_root)
-      workspace_path = nil
-
-      File.foreach(lint_log, encoding: "UTF-8", invalid: :replace, undef: :replace, replace: "?") do |line|
-        if (m = line.match(/Pods workspace available at `([^`]+)`/))
-          workspace_path = m[1].to_s.strip
-        elsif (m = line.match(%r{(/[^ ]+App\.xcworkspace)}))
-          workspace_path = m[1].to_s.strip
-        end
-      end
-
-      if workspace_path && File.directory?(workspace_path)
-        return workspace_path
-      end
-
-      candidates = []
-      root = File.expand_path(lint_root)
-      root_depth = root.split(File::SEPARATOR).length
-
-      Find.find(root) do |p|
-        if File.directory?(p) && p.end_with?(".xcworkspace")
-          depth = p.split(File::SEPARATOR).length - root_depth
-          candidates << p if depth <= 4
-          Find.prune
-        end
-      end
-
-      candidates
-        .select { |p| File.directory?(p) }
-        .max_by { |p| File.mtime(p) }
-    end
-
     def bump_deployment_targets_in_validation_dir(validation_dir, min_target)
       min_v = parse_version(min_target)
       pattern = /(IPHONEOS_DEPLOYMENT_TARGET\s*=\s*)([0-9]+(?:\.[0-9]+)?)(\s*;?)/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.3.15.1
+  version: 0.3.15.2
 platform: ruby
 authors:
 - humin