cocoapods-podgenerate 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff95024148a86a27ad23b6b884f1bfda2b1bac59e4c0274ac6b53dac16504fa
-  data.tar.gz: 6a1fbb763cc83d3dd9245eaa2ae38877f4a4e784fef6651f6003e13b69ab0759
+  metadata.gz: 6a0fb718ed83348848126cbcb90a580683859fec7c0f9e82afefe69e58ab67cd
+  data.tar.gz: 6f26fbc0e1c1e842dbbbe0d97747d883939a583c9792f7d9988c779bb6236025
 SHA512:
-  metadata.gz: 8b5840fbee3dac260a6673f870dfc7ce1bd1f57c47b71e055b9eee7bdbd1cb5361fe65c06702f9f4589fe3aae4475e31b9cc167c34708d49770c56aecacaa4ab
-  data.tar.gz: a74db8fc1218a2ae364bb15bb200c8b51692515bffe57322295567d9e971680a59efa60f46ce380db1a9982ff545255ba049df9efa034bfd1f3d0f3811a25227
+  metadata.gz: b33b6753e7a3852c344b26b5f3c74e994e8e0eec5428f6749f775de1d1367fb79920d35bec4df8662cc80406155ffc05486e9f8ae5021ca61e88f92ca75df13a
+  data.tar.gz: a5dfb1691904f9f018660759adbc0de1d15e4865994f43f7174233812cabb8462b59cc515b33f4fbfbfdcc8936f8b99c684aac88943f2df797f4505d18687a94

data/lib/cocoapods-podgenerate/parallel/thread_pool.rb

@@ -13,14 +13,16 @@ module Pod
         DEFAULT_TIMEOUT = 120
 
         class << self
-          # 计算适合当前机器的线程池大小
-          # 使用 nproc - 1（为主线程留一个核心），最小 2，最大 16
-          # @return [Integer] 推荐的线程池大小
-          def pool_size
-            [[Etc.nprocessors - 1, 2].max, 16].min
-          rescue NameError
-            4
-          end
+         # 计算适合当前机器的线程池大小
+         # 使用 nproc - 1（为主线程留一个核心），最小 2，最大 16
+          # 同时提供 pool_size 和 compute_pool_size 两个名称，供各 patch 文件统一使用。
+         # @return [Integer] 推荐的线程池大小
+         def pool_size
+           [[Etc.nprocessors - 1, 2].max, 16].min
+         rescue NameError
+           4
+         end
+          alias compute_pool_size pool_size
         end
       end
     end

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

@@ -32,7 +32,6 @@
 #   - lib/cocoapods/installer/project_cache/project_cache_analyzer.rb
 
 require 'concurrent'
-require 'etc'
 
 module Pod
   module PodGenerate
@@ -59,7 +58,7 @@ module Pod
           #   target 标签到缓存键的映射
           def create_cache_key_mappings(target_by_label)
             UI.message '- Creating cache key mappings (parallel)' do
-              pool_size = compute_pool_size
+              pool_size = Pod::PodGenerate::Parallel::ThreadPool.compute_pool_size
               pool = Concurrent::FixedThreadPool.new(pool_size)
               mutex = Mutex.new
               results = {}
@@ -115,12 +114,6 @@ module Pod
             end
           end
 
-          # 计算线程池大小
-          def compute_pool_size
-            [[Etc.nprocessors - 1, 2].max, 16].min
-          rescue NameError
-            4
-          end
         end
       end
     end

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

@@ -38,7 +38,6 @@
 #   - lib/cocoapods/installer/xcode/pods_project_generator.rb
 
 require 'concurrent'
-require 'etc'
 
 module Pod
   module PodGenerate
@@ -88,10 +87,25 @@ module Pod
             stage_sandbox(sandbox, pod_targets)
 
             cache_analysis_result = analyze_project_cache
-            ptg = cache_analysis_result.pod_targets_to_generate
-            atg = cache_analysis_result.aggregate_targets_to_generate
+            ptg = cache_analysis_result.pod_targets_to_generate || []
+            atg = cache_analysis_result.aggregate_targets_to_generate || []
+
+            # ── 本地开发 pod 文件级变更检测 ──
+            # CocoaPods 的 TargetCacheKey 使用 spec attributes_hash（如
+            # source_files 的 glob 模式字符串）做哈希，不检查 glob 展开后的
+            # 实际文件列表。当本地开发 pod（:path）中源文件有增删时，
+            # glob 模式不变 → cache key 不变 → ptg 为空 → "No changes" 跳过。
+            # 解决方法：为每个开发 pod 计算当前源文件列表的 SHA256，
+            # 与上次运行的清单比较，有差异时强制加入 ptg。
+            unless sandbox.development_pods.empty?
+              dev_changed = detect_dev_pod_file_changes
+              unless dev_changed.empty?
+                Pod::UI.puts "[cocoapods-podgenerate] Dev pod files changed: #{dev_changed.map(&:pod_name).join(', ')} — forcing regeneration"
+                ptg = (ptg + dev_changed).uniq
+              end
+            end
 
-            if ptg.empty? && (atg.nil? || atg.empty?)
+            if ptg.empty? && atg.empty?
               Pod::UI.puts "[cocoapods-podgenerate] No changes — skipping project generation"
 
               # C2 修复: 初始化所有实例变量（避免下游代码获得 nil）
@@ -162,7 +176,7 @@ module Pod
               # 创建空项目降级，避免 post-install hook 中 nil.targets 崩溃
               # 参考：v0.1.11 — undefined method 'targets' for nil
               unless @pods_project
-                Pod::UI.message '[cocoapods-podgenerate] pods_project is nil — creating empty fallback'
+                Pod::UI.warn "[cocoapods-podgenerate] pods_project is nil from PodsProjectGenerator — creating empty fallback. This may indicate a CocoaPods internal error or an incompatible version."
                 @pods_project = Pod::Project.new(sandbox.project_path)
               end
               @pod_target_subprojects = pod_project_generation_result.projects_by_pod_targets.keys
@@ -275,7 +289,7 @@ module Pod
           # 每个 scheme 文件是独立的 .xcscheme，存储在不同 xcodeproj 的
           # xcuserdata 目录中。每个 project 完全独立 → 无锁并行。
           def parallel_configure_schemes(projects_by_pod_targets, generator, generation_result)
-            pool_size = [[Etc.nprocessors - 1, 2].max, 16].min
+            pool_size = Pod::PodGenerate::Parallel::ThreadPool.compute_pool_size
             Pod::UI.message "- Configuring schemes across #{projects_by_pod_targets.size} projects (pool: #{pool_size})"
 
             # L3 修复: defined? 精确检查类可用性，替代 rescue NameError
@@ -301,6 +315,92 @@ module Pod
               pool.kill
             end
           end
+
+          # ── 本地开发 pod 文件级变更检测 ──
+          #
+          # CocoaPods 的 TargetCacheKey 使用 pod_target.root_spec.attributes_hash
+          # 作为缓存键的一部分。attributes_hash 中包含 source_files 等 glob 模式
+          # 字符串（如 "lib/**/*.rb"），而不是实际展开后的文件列表。
+          # 当本地开发 pod 的源文件在文件系统层面发生增删时，glob 模式不变，
+          # 缓存键也就不会变化，导致 "No changes — skipping project generation"
+          # 漏掉文件级变更。
+          #
+          # 解决方法：为每个开发 pod 维护一个 SHA256 清单文件，记录其 source_files
+          # glob 展开后的实际文件列表的哈希值。每次 pod install 时重新计算并比较。
+          # 清单存储在 Pods/.cocoapods-podgenerate-devpod-manifest.yaml 中。
+          DEV_POD_FILE_MANIFEST = '.cocoapods-podgenerate-devpod-manifest.yaml'
+
+          # 检测开发 pod 中源文件是否有增删
+          # 返回需要重新生成的 PodTarget 数组
+          def detect_dev_pod_file_changes
+            dev_pods = sandbox.development_pods
+            return [] if dev_pods.empty?
+
+            manifest_path = File.join(sandbox.root.to_s, DEV_POD_FILE_MANIFEST)
+
+            # 读取上次记录的 hash 值
+            previous = {}
+            if File.exist?(manifest_path)
+              begin
+                data = YAML.safe_load(File.read(manifest_path))
+                previous = data if data.is_a?(Hash)
+              rescue => e
+                Pod::UI.warn "[cocoapods-podgenerate] Failed to read dev pod manifest: #{e.message}"
+              end
+            end
+
+            current = {}
+            changed = []
+
+            pod_targets.each do |pt|
+              name = pt.pod_name
+              next unless dev_pods.key?(name)
+
+              current[name] = compute_dev_pod_file_digest(pt)
+              if previous[name] != current[name]
+                changed << pt
+              end
+            end
+
+            # 持久化当前清单
+            begin
+              File.write(manifest_path, YAML.dump(current))
+            rescue => e
+              Pod::UI.warn "[cocoapods-podgenerate] Failed to write dev pod manifest: #{e.message}"
+            end
+
+            changed
+          end
+
+          # 计算开发 pod 当前源文件列表的 SHA256
+          # 使用 podspec 中的 source_files/headers glob 模式，
+          # 在文件系统层面展开后对相对路径排序做哈希。
+          # @return [String] 十六进制 SHA256（空文件列表则是空字符串哈希）
+          def compute_dev_pod_file_digest(pod_target)
+            pod_name = pod_target.pod_name
+            pod_dir = sandbox.pod_dir(pod_name)
+            return '' unless pod_dir && File.directory?(pod_dir)
+
+            pod_dir_str = pod_dir.to_s
+            files = []
+
+            pod_target.spec_consumers.each do |consumer|
+              patterns = []
+              patterns.concat(Array(consumer.source_files))
+              patterns.concat(Array(consumer.public_header_files))
+              patterns.concat(Array(consumer.private_header_files))
+
+              patterns.each do |pattern|
+                full_pattern = File.join(pod_dir_str, pattern)
+                Dir.glob(full_pattern).each do |f|
+                  next unless File.file?(f)
+                  files << f.sub("#{pod_dir_str}/", '')
+                end
+              end
+            end
+
+            Digest::SHA256.hexdigest(files.uniq.sort.join("\n"))
+          end
         end
 
         # ── 优化 3: 并行化 PodTargetIntegrator（修复 M3）──
@@ -338,7 +438,7 @@ module Pod
             end
 
             # 多 target: 使用线程池并行集成（M3 修复）
-            pool_size = [[Etc.nprocessors - 1, 2].max, 16].min
+            pool_size = Pod::PodGenerate::Parallel::ThreadPool.compute_pool_size
             pool = Concurrent::FixedThreadPool.new(pool_size)
 
             pods_to_integrate.each do |result|

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

@@ -25,7 +25,6 @@
 #   - lib/cocoapods/installer/xcode/pods_project_generator.rb
 
 require 'concurrent'
-require 'etc'
 
 module Pod
   module PodGenerate
@@ -53,7 +52,7 @@ module Pod
           #   pod target 名称到安装结果的映射
           def install_all_pod_targets(projects_by_pod_targets)
             UI.message '- Installing Pod Targets (parallel)' do
-              pool_size = compute_pool_size
+              pool_size = Pod::PodGenerate::Parallel::ThreadPool.compute_pool_size
               mutex = Mutex.new
               all_results = {}
               errors = [] # v0.1.4: 收集错误而不是静默吞掉
@@ -90,14 +89,6 @@ module Pod
 
           private
 
-          # 计算适合当前机器的线程池大小
-          # 使用 CPU 核心数 - 1（为主线程留一个），最小 2，最大 16
-          # @return [Integer]
-          def compute_pool_size
-            [[Etc.nprocessors - 1, 2].max, 16].min
-          rescue NameError
-            4 # Etc 不可用时的安全回退
-          end
         end
       end
     end

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

@@ -33,7 +33,6 @@
 
 require 'digest'
 require 'concurrent'
-require 'etc'
 
 module Pod
   module PodGenerate
@@ -142,7 +141,7 @@ module Pod
           # 每个 project 独立，使用 Concurrent::FixedThreadPool 并行执行。
           # 如果 concurrent-ruby 不可用（NameError），回退到串行处理。
           def parallel_cleanup_projects(projects)
-            pool_size = compute_pool_size
+            pool_size = Pod::PodGenerate::Parallel::ThreadPool.compute_pool_size
             Pod::UI.message "- Cleaning up #{projects.size} projects (pool: #{pool_size})"
 
             pool = begin
@@ -187,7 +186,7 @@ module Pod
             # 预构建 native target → InstallationResult 的查找缓存（只读、线程安全）
             results_by_native_target = build_native_target_cache
 
-            pool_size = compute_pool_size
+            pool_size = Pod::PodGenerate::Parallel::ThreadPool.compute_pool_size
             Pod::UI.message "- Recreating user schemes for #{projects.size} projects (pool: #{pool_size})"
 
             pool = begin
@@ -292,12 +291,6 @@ module Pod
             nil
           end
 
-          # 计算线程池大小
-          def compute_pool_size
-            [[Etc.nprocessors - 1, 2].max, 16].min
-          rescue NameError
-            4
-          end
         end
       end
     end

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

@@ -15,7 +15,6 @@
 #   - lib/cocoapods/installer/user_project_integrator.rb
 
 require 'concurrent'
-require 'etc'
 
 module Pod
   module PodGenerate
@@ -83,7 +82,8 @@ module Pod
             projects = projects.uniq
 
             if projects.size <= 1
-              projects.each do |project|
+              project = projects.first
+              if project
                 if project.dirty?
                   project.save
                 else
@@ -133,7 +133,7 @@ module Pod
               return
             end
 
-            pool_size = compute_pool_size
+            pool_size = Pod::PodGenerate::Parallel::ThreadPool.compute_pool_size
             Pod::UI.message "- Checking xcconfig overrides for #{targets.size} targets (pool: #{pool_size})"
             pool = Concurrent::FixedThreadPool.new(pool_size)
             targets.each do |aggregate_target|
@@ -187,11 +187,6 @@ module Pod
             end
           end
 
-          def compute_pool_size
-            [[Etc.nprocessors - 1, 2].max, 16].min
-          rescue NameError
-            4
-          end
         end
       end
     end

data/lib/cocoapods-podgenerate.rb

@@ -23,7 +23,6 @@ require 'cocoapods-podgenerate/patches/user_integrator_patch'
 require 'cocoapods-podgenerate/patches/multi_project_generator_patch'
 require 'cocoapods-podgenerate/patches/cache_analyzer_patch'
 require 'cocoapods-podgenerate/parallel/thread_pool'
-require 'cocoapods-podgenerate/parallel/batch_processor'
 require 'cocoapods-podgenerate/benchmark/profiler'
 
 module Pod

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-podgenerate
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - PodGenerate Team
@@ -90,7 +90,6 @@ files:
 - lib/cocoapods-podgenerate/benchmark/profiler.rb
 - lib/cocoapods-podgenerate/command.rb
 - lib/cocoapods-podgenerate/hooks.rb
-- lib/cocoapods-podgenerate/parallel/batch_processor.rb
 - lib/cocoapods-podgenerate/parallel/thread_pool.rb
 - lib/cocoapods-podgenerate/patches/analyzer_patch.rb
 - lib/cocoapods-podgenerate/patches/cache_analyzer_patch.rb

data/lib/cocoapods-podgenerate/parallel/batch_processor.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-# [cocoapods-podgenerate]
-# 批处理器 — 将工作项在线程池中并行分配处理。
-#
-# 用于将需要并行化的批量任务分配到 Concurrent::FixedThreadPool，
-# 保持结果的输入顺序（通过索引数组）。
-#
-# v0.1.4 改进：
-#   - wait_for_termination 添加超时（120s）防止死锁
-#   - 移除未使用的 batch_size 和 completed 变量
-
-require 'concurrent'
-require_relative 'thread_pool'
-
-module Pod
-  module PodGenerate
-    module Parallel
-      module BatchProcessor
-        # 在线程池中并行处理项目，保持结果的输入顺序
-        #
-        # @param items [Array] 要处理的项目列表
-        # @param pool [Concurrent::FixedThreadPool] 线程池实例
-        # @yield [item] 处理每个项目的代码块
-        # @return [Array] 结果列表，顺序与输入相同（nil 表示处理失败的项目）
-        def self.process(items, pool:, &block)
-          return [] if items.empty?
-
-          results = Array.new(items.size)
-          mutex = Mutex.new
-
-          items.each_with_index do |item, idx|
-            pool.post do
-              result = block.call(item)
-              mutex.synchronize { results[idx] = result }
-            rescue StandardError => e
-              Pod::UI.warn "[cocoapods-podgenerate] BatchProcessor error on item #{idx}: #{e.message}"
-            end
-          end
-
-          # v0.1.4: 带超时的等待
-          pool.shutdown
-          unless pool.wait_for_termination(Pod::PodGenerate::Parallel::ThreadPool::DEFAULT_TIMEOUT)
-            Pod::UI.warn '[cocoapods-podgenerate] BatchProcessor timed out after 120s'
-            pool.kill
-          end
-
-          results
-        end
-      end
-    end
-  end
-end