cocoapods-podgenerate 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6d26a277c924f83166f71d24a5c4268faac627ec35aa125b7771ba4f962d035
-  data.tar.gz: cf7d5a1740bcce3e2d9b55301ed07ae1a73a33083a1199e0027824eaf7c13e18
+  metadata.gz: fcab1469dbb21e1af1ff2024d9ba7f7761719a51c5e55c3b2bef9d36bf5ac991
+  data.tar.gz: 2bba05f649c9e47cf55974b53d894428fcdd252d8ae456c638f563704bbd769f
 SHA512:
-  metadata.gz: 2bf8fcda7f3bd691211959324e96bc61fa74172675ff1c93a518727513299104108689d844059e446510d07bc7b1a52a229032bd7c3e1483502df83ebe15e8ae
-  data.tar.gz: 50eae7e57d1883adf0dd706b1a67e31760670e088de0c2d45aeee22491243f44e6e00d8fd8ce592f1fe858e01c8d393bc69b62c98894e28b97efafea05a8683e
+  metadata.gz: 6d92ebe86345558f686219e98fcb9685c9955794d2dbdcc508832460966ff65b79203144c70738789499f2b9ab883ecea5f8f5eca051da40146892ad05587c36
+  data.tar.gz: efee76fa98a79f2088d641f0819bf659d4cae5182d31a5f7e7fa20af8a87c6dfb25c7d51750e27553e29b1956eab2590dd9a60c9a586152220108127273bbca5

data/lib/cocoapods-podgenerate/patches/analyzer_patch.rb

@@ -242,41 +242,45 @@ module Pod
           # @param cache_key [String] 缓存键，写入文件头部供下次 load 验证
           # @param result [Hash{TargetDefinition => Array<Specification>}] Molinillo 解析结果
           def save_cached_result(cache_key, result)
-            path = cache_path
+            begin
+              path = cache_path
 
-            # 提取纯数据：从 Specification 对象中只取名称和版本号
-            # Specification.root.name 返回 pod 的根名称（不含 subspec 后缀）
-            # Specification.version.to_s 返回版本号字符串（如 "1.2.3"）
-            targets_data = {}
-            result.each do |target_def, specs|
-              pod_list = specs.map do |spec|
-                {
-                  'pod_name' => spec.root.name,
-                  'version' => spec.version.to_s,
-                }
+              # 提取纯数据：从 Specification 对象中只取名称和版本号
+              # 使用 respond_to? 安全检查确保 result 是预期的格式
+              targets_data = {}
+              if result.respond_to?(:each)
+                result.each do |target_def, specs|
+                  next unless specs.respond_to?(:map)
+                  pod_list = specs.map do |spec|
+                    next unless spec.respond_to?(:root) && spec.root.respond_to?(:name) &&
+                                spec.respond_to?(:version)
+                    {
+                      'pod_name' => spec.root.name,
+                      'version' => spec.version.to_s,
+                    }
+                  end.compact
+                  pod_list.uniq! { |entry| entry['pod_name'] }
+                  target_name = target_def.respond_to?(:name) ? target_def.name : target_def.to_s
+                  targets_data[target_name] = pod_list unless pod_list.empty?
+                end
               end
-              # 去重：同一个 pod 的多个 subspec 共享相同的 root.name
-              pod_list.uniq! { |entry| entry['pod_name'] }
-              targets_data[target_def.name] = pod_list unless pod_list.empty?
-            end
 
-            # 组装缓存数据
-            data = {
-              'cache_key' => cache_key,
-              'timestamp' => Time.now.to_s,
-              'cocoaPods_version' => Pod::VERSION,
-              'pod_count' => targets_data.values.flatten.size,
-              'targets' => targets_data,
-            }
+              # 组装缓存数据
+              data = {
+                'cache_key' => cache_key,
+                'timestamp' => Time.now.to_s,
+                'cocoaPods_version' => Pod::VERSION,
+                'pod_count' => targets_data.values.flatten.size,
+                'targets' => targets_data,
+              }
 
-            # 原子写入：先写临时文件，成功后再 rename
-            tmp_path = "#{path}.tmp"
-            File.write(tmp_path, YAML.dump(data))
-            File.rename(tmp_path, path)
-          rescue StandardError => e
-            # 缓存保存失败不应中断 pod install 主流程
-            # 最坏情况：下次运行时缓存 MISS → 正常 Molinillo 解析
-            Pod::UI.warn "[cocoapods-podgenerate] 保存解析缓存失败: #{e.message}"
+              # 原子写入：先写临时文件，成功后再 rename
+              tmp_path = "#{path}.tmp"
+              File.write(tmp_path, YAML.dump(data))
+              File.rename(tmp_path, path)
+            rescue StandardError => e
+              Pod::UI.warn "[cocoapods-podgenerate] 保存解析缓存失败: #{e.message}"
+            end
           end
         end
       end

data/lib/cocoapods-podgenerate/patches/installer_patch.rb

@@ -22,7 +22,10 @@
 # v0.1.4 修复:
 #   - C2: 快速跳过路径设置缺失的 @pods_project/@pod_target_subprojects/@generated_projects
 #         并确保 run_podfile_post_install_hooks 被调用（即使在跳过路径上）
-#   - H1: 跳过路径不再传入空 InstallationResults，而是保留上次的 @target_installation_results
+#   - H1: 跳过路径不再调用 update_project_cache（@target_installation_results 在跳过路径
+#         上始终为 nil，回退到空 InstallationResults 会清除 metadata_cache 导致下次全量重建）
+#   - L3: parallel_configure_schemes 用 defined?(Concurrent::FixedThreadPool) 替代
+#         宽泛的 rescue NameError（NameError 可能吞掉无关的未定义常量/变量错误）
 #   - M1: wait_for_termination 使用 ThreadPool::DEFAULT_TIMEOUT
 #   - M3: integrate_targets 改用 Concurrent::FixedThreadPool（限制并发数，避免 200 线程）
 #
@@ -94,9 +97,12 @@ module Pod
               # C2 修复: 初始化所有实例变量（避免下游代码获得 nil）
               @generated_aggregate_targets = aggregate_targets
               @generated_pod_targets = []
-              @pods_project = nil
+              # 修复: 创建空项目替代 nil，避免 post-install hooks 中
+              # installer.pods_project 返回 nil 导致 .targets 等调用崩溃
+              # （例如 Flutter podhelper.rb 访问 pods_project.targets）
+              @pods_project = Pod::Project.new(sandbox.project_path)
               @pod_target_subprojects = []
-              @generated_projects = []
+              @generated_projects = [@pods_project]
 
               # C2 修复: 确保 post-install hooks 被调用
               run_podfile_post_install_hooks
@@ -104,10 +110,13 @@ module Pod
               # 清理沙盒中残留的文件
               Pod::Installer::SandboxDirCleaner.new(sandbox, pod_targets, aggregate_targets).clean!
 
-              # H1 修复: 使用上次的安装结果（而非空结果）更新缓存
-              prev_results = @target_installation_results ||
-                Pod::Installer::Xcode::PodsProjectGenerator::InstallationResults.new({}, {})
-              update_project_cache(cache_analysis_result, prev_results)
+              # H1 修复: 当没有目标需要生成时，跳过 update_project_cache 调用
+              # @target_installation_results 仅在 create_and_save_projects 内设置，
+              # 在跳过路径上始终为 nil，回退到空 InstallationResults.new({}, {})
+              # 会导致 metadata_cache 中所有 pod target 的安装结果被清除，
+              # 下次运行时触发全量重建（cache 损坏）。
+              # 跳过路径的正确行为：不更新任何缓存，因为没有任何变化，
+              # 已有的缓存状态仍然有效。
               return
             end
 
@@ -154,6 +163,16 @@ module Pod
               projects_writer = Pod::Installer::Xcode::PodsProjectWriter.new(sandbox, generated_projects,
                                                              target_installation_results.pod_target_installation_results,
                                                              installation_options)
+
+              # 解析跨项目依赖：当 generate_multiple_pod_projects 启用后，
+              # 主项目的 aggregate target 通过 PBXContainerItemProxy 引用子项目的 pod target。
+              # Xcodeproj 无法解析这些跨项目引用，PBXTargetDependency#target 返回 nil。
+              # 这会导致递归遍历依赖链的工具（如 Flutter podhelper.rb 的
+              # depends_on_flutter）在访问 nil.target 时崩溃。
+              # 解决方法：在 post-install hooks 运行前，将子项目 target 的引用
+              # 直接挂载到主项目的 PBXTargetDependency.target 上。
+              resolve_cross_project_dependencies
+
               projects_writer.write! do
                 run_podfile_post_install_hooks
               end
@@ -178,40 +197,86 @@ module Pod
 
           private
 
-          # 并行配置所有项目的 scheme 文件
+          # 解析跨项目 target 依赖关系
+          #
+          # generate_multiple_pod_projects 启用时，每个 pod target 位于独立的
+          # .xcodeproj 子项目中。主项目（Pods.xcodeproj）中的 aggregate target
+          # 通过 PBXTargetDependency + PBXContainerItemProxy 引用子项目中的目标。
+          # Xcodeproj 在读取主项目时不会自动加载子项目，因此
+          # PBXTargetDependency#target 对于跨项目引用返回 nil。
+          #
+          # 在 post-install hooks 执行前，将子项目中实际的 target 对象关联到
+          # 主项目的 PBXTargetDependency.target 上，使得依赖链遍历可以正常工作。
+          # 这对于 Flutter podhelper.rb 的 depends_on_flutter 递归函数尤为重要。
+          def resolve_cross_project_dependencies
+            return unless @pods_project && @pod_target_subprojects
+            return if @pod_target_subprojects.empty?
+
+            # 构建 UUID → target 查找表（从所有子项目中）
+            remote_targets = {}
+            @pod_target_subprojects.each do |sub_project|
+              sub_project.targets.each do |target|
+                remote_targets[target.uuid] = target
+              end
+            end
+
+            return if remote_targets.empty?
+
+            resolved = 0
+            # 遍历主项目中所有 target 的依赖
+            @pods_project.targets.each do |target|
+              target.dependencies.each do |dependency|
+                # 已解析的（同一项目内）跳过
+                next if dependency.target
+                # 无 proxy 引用说明不是跨项目依赖，也跳过
+                next unless dependency.target_proxy
+
+                remote_uuid = dependency.target_proxy.remote_global_id_string
+                next unless remote_uuid
+
+                remote_target = remote_targets[remote_uuid]
+                next unless remote_target
+
+                dependency.target = remote_target
+                resolved += 1
+              end
+            end
+
+            return unless resolved > 0
+
+            Pod::UI.message "[cocoapods-podgenerate] Resolved #{resolved} cross-project target dependencies"
+          end
+
+          # ── 并行配置 scheme ──
           #
           # 每个 scheme 文件是独立的 .xcscheme，存储在不同 xcodeproj 的
           # xcuserdata 目录中。每个 project 完全独立 → 无锁并行。
-          #
-          # v0.1.4: rescue 范围缩小到只包裹 Concurrent::FixedThreadPool 创建
           def parallel_configure_schemes(projects_by_pod_targets, generator, generation_result)
             pool_size = [[Etc.nprocessors - 1, 2].max, 16].min
             Pod::UI.message "- Configuring schemes across #{projects_by_pod_targets.size} projects (pool: #{pool_size})"
 
-            pool = begin
-              Concurrent::FixedThreadPool.new(pool_size)
-            rescue NameError
-              nil # concurrent-ruby 不可用，回退到串行
-            end
-
-            if pool
+            # L3 修复: defined? 精确检查类可用性，替代 rescue NameError
+            unless defined?(Concurrent::FixedThreadPool)
+              # 回退到顺序执行（concurrent-ruby 中的 FixedThreadPool 不可用）
               projects_by_pod_targets.each do |project, pts|
-                pool.post do
-                  generator.configure_schemes(project, pts, generation_result)
-                rescue StandardError => e
-                  Pod::UI.warn "[cocoapods-podgenerate] Scheme configuration error: #{e.message}"
-                end
-              end
-              pool.shutdown
-              unless pool.wait_for_termination(Pod::PodGenerate::Parallel::ThreadPool::DEFAULT_TIMEOUT)
-                Pod::UI.warn '[cocoapods-podgenerate] Scheme configuration timed out'
-                pool.kill
+                generator.configure_schemes(project, pts, generation_result)
               end
-            else
-              projects_by_pod_targets.each do |project, pts|
+              return
+            end
+
+            pool = Concurrent::FixedThreadPool.new(pool_size)
+            projects_by_pod_targets.each do |project, pts|
+              pool.post do
                 generator.configure_schemes(project, pts, generation_result)
+              rescue StandardError => e
+                Pod::UI.warn "[cocoapods-podgenerate] Scheme configuration error: #{e.message}"
               end
             end
+            pool.shutdown
+            unless pool.wait_for_termination(Pod::PodGenerate::Parallel::ThreadPool::DEFAULT_TIMEOUT)
+              Pod::UI.warn '[cocoapods-podgenerate] Scheme configuration timed out'
+              pool.kill
+            end
           end
         end
 

data/lib/cocoapods-podgenerate/patches/project_writer_patch.rb

@@ -141,9 +141,11 @@ module Pod
 
             if pool
               projects.each do |project|
-                pool.post { cleanup_single_project(project) }
-              rescue StandardError => e
-                Pod::UI.warn "[cocoapods-podgenerate] Cleanup error: #{e.message}"
+                pool.post do
+                  cleanup_single_project(project)
+                rescue StandardError => e
+                  Pod::UI.warn "[cocoapods-podgenerate] Cleanup error: #{e.message}"
+                end
               end
               pool.shutdown
               pool.wait_for_termination(Pod::PodGenerate::Parallel::ThreadPool::DEFAULT_TIMEOUT) || pool.kill
@@ -186,9 +188,9 @@ module Pod
               projects.each do |project|
                 pool.post do
                   recreate_schemes_for_project(project, library_product_types, results_by_native_target)
+                rescue StandardError => e
+                  Pod::UI.warn "[cocoapods-podgenerate] Scheme recreation error: #{e.message}"
                 end
-              rescue StandardError => e
-                Pod::UI.warn "[cocoapods-podgenerate] Scheme recreation error: #{e.message}"
               end
               pool.shutdown
               pool.wait_for_termination(Pod::PodGenerate::Parallel::ThreadPool::DEFAULT_TIMEOUT) || pool.kill

data/lib/cocoapods-podgenerate/patches/user_integrator_patch.rb

@@ -64,6 +64,8 @@ module Pod
               threads = groups.map do |project, integrators|
                 Thread.new do
                   integrators.each(&:integrate!)
+                rescue StandardError => e
+                  Pod::UI.warn "[cocoapods-podgenerate] Integrate error for #{project.path}: #{e.message}"
                 end
               end
               threads.each(&:join)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-podgenerate
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.8
 platform: ruby
 authors:
 - PodGenerate Team