cocoapods-podgenerate 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27602be6d9b287c0d9b46a5ce44325a4ab1ddfcb47e2b6f0c5d40c6ec59cb904
-  data.tar.gz: 39039a26b13a8504df307e15afe77bc439541baaa5a5d27cce7b39fa7f61fb87
+  metadata.gz: aba68b23582a229140c6580a31d506a3298d8389b6946f432e6429e1fbfe5edd
+  data.tar.gz: 2cd7a8c3bf26165fcc425f00bc03a9bffd566946d58cf126ff6c0ee6e47d97aa
 SHA512:
-  metadata.gz: 74077cdbefbb30767526f247b41f17d98ae02e43d644b03bdc8993fd40c1c7b799e4c4b48bb25a18e7b5a40146d0af9dae093161839eaf019ab9970631295f60
-  data.tar.gz: 0306e59218825aae0a218cd756ef04339c53f79c3a2ab69ed255d03b8c84c13900c2cd51f9314a2cb01c1cf8eb7c4eec14e06eada6230009ab0df4b2a68d9247
+  metadata.gz: d631266d74333c37296f116a0bedb11e31989ab3a6307d531ed4c59a2a55f7f7e8e553294c87cab2eceaa22006ceda20efaa733c123566f6cdf2314b3176e42a
+  data.tar.gz: 402636b400e0db9a80b5240730063d23215ac5c58ed87c3ac044a52839eb5a4a5d15600e48a71bf1f6363de3aa85aeae6aff9c466f512f2aa49d6de9522f5621

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

@@ -37,23 +37,14 @@ module Pod
 
               target_by_label.each do |label, target|
                 pool.post do
-                  key = case target
-                        when PodTarget
-                          local = sandbox.local?(target.pod_name)
-                          checkout_options = sandbox.checkout_sources[target.pod_name]
-                          TargetCacheKey.from_pod_target(sandbox, target_by_label, target,
-                                                         :is_local_pod => local,
-                                                         :checkout_options => checkout_options)
-                        when AggregateTarget
-                          TargetCacheKey.from_aggregate_target(sandbox, target_by_label, target)
-                        else
-                          raise "[BUG] Unknown target type #{target}"
-                        end
+                  key = compute_cache_key(target, target_by_label)
                   mutex.synchronize { results[label] = key }
                 rescue StandardError => e
-                  mutex.synchronize do
-                    Pod::UI.warn "[cocoapods-podgenerate] Cache key computation error: #{e.message}"
-                  end
+                  # Bug fix v0.1.3: compute fallback key synchronously to avoid nil
+                  # entries that would crash ProjectCacheAnalyzer#analyze downstream
+                  Pod::UI.warn "[cocoapods-podgenerate] Cache key computation error, retrying sync: #{e.message}"
+                  fallback_key = compute_cache_key(target, target_by_label)
+                  mutex.synchronize { results[label] = fallback_key }
                 end
               end
 
@@ -65,6 +56,21 @@ module Pod
 
           private
 
+          def compute_cache_key(target, target_by_label)
+            case target
+            when PodTarget
+              local = sandbox.local?(target.pod_name)
+              checkout_options = sandbox.checkout_sources[target.pod_name]
+              TargetCacheKey.from_pod_target(sandbox, target_by_label, target,
+                                             :is_local_pod => local,
+                                             :checkout_options => checkout_options)
+            when AggregateTarget
+              TargetCacheKey.from_aggregate_target(sandbox, target_by_label, target)
+            else
+              raise "[BUG] Unknown target type #{target}"
+            end
+          end
+
           def compute_pool_size
             [[Etc.nprocessors - 1, 2].max, 16].min
           rescue NameError

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

@@ -94,18 +94,26 @@ module Pod
             pool_size = compute_pool_size
             Pod::UI.message "- Cleaning up #{projects.size} projects (pool: #{pool_size})"
 
-            pool = Concurrent::FixedThreadPool.new(pool_size)
-            projects.each do |project|
-              pool.post do
-                cleanup_single_project(project)
-              rescue StandardError => e
-                Pod::UI.warn "[cocoapods-podgenerate] Cleanup error: #{e.message}"
+            pool = begin
+              Concurrent::FixedThreadPool.new(pool_size)
+            rescue NameError
+              nil
+            end
+
+            if pool
+              projects.each do |project|
+                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
+            else
+              # Fallback: sequential (Concurrent not available)
+              projects.each { |p| cleanup_single_project(p) }
             end
-            pool.shutdown
-            pool.wait_for_termination
-          rescue NameError
-            cleanup_projects(projects)
           end
 
           def cleanup_single_project(project)
@@ -126,35 +134,38 @@ module Pod
             pool_size = compute_pool_size
             Pod::UI.message "- Recreating user schemes for #{projects.size} projects (pool: #{pool_size})"
 
-            pool = Concurrent::FixedThreadPool.new(pool_size)
-            projects.each do |project|
-              pool.post do
-                project.recreate_user_schemes(false) do |scheme, target|
-                  next unless target.respond_to?(:symbol_type)
-                  next unless library_product_types.include?(target.symbol_type)
-                  installation_result = results_by_native_target[target]
-                  next unless installation_result
-                  installation_result.test_native_targets.each do |test_native_target|
-                    scheme.add_test_target(test_native_target)
-                  end
+            pool = begin
+              Concurrent::FixedThreadPool.new(pool_size)
+            rescue NameError
+              nil
+            end
+
+            if pool
+              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
+            else
+              # Fallback: sequential (Concurrent not available)
+              projects.each do |project|
+                recreate_schemes_for_project(project, library_product_types, results_by_native_target)
               end
             end
-            pool.shutdown
-            pool.wait_for_termination
-          rescue NameError
-            # Fallback: sequential
-            projects.each do |project|
-              project.recreate_user_schemes(false) do |scheme, target|
-                next unless target.respond_to?(:symbol_type)
-                next unless library_product_types.include?(target.symbol_type)
-                installation_result = results_by_native_target[target]
-                next unless installation_result
-                installation_result.test_native_targets.each do |test_native_target|
-                  scheme.add_test_target(test_native_target)
-                end
+          end
+
+          def recreate_schemes_for_project(project, library_product_types, results_by_native_target)
+            project.recreate_user_schemes(false) do |scheme, target|
+              next unless target.respond_to?(:symbol_type)
+              next unless library_product_types.include?(target.symbol_type)
+              installation_result = results_by_native_target[target]
+              next unless installation_result
+              installation_result.test_native_targets.each do |test_native_target|
+                scheme.add_test_target(test_native_target)
               end
             end
           end

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

@@ -118,6 +118,10 @@ module Pod
 
           private
 
+          # Per-target xcconfig override check. Runs inside a thread pool slot.
+          # NOTE: `print_override_warning` is a private method on the original
+          # UserProjectIntegrator class. Ruby allows implicit-receiver calls to
+          # private methods from prepended modules (no explicit `self.` prefix).
           def warn_single_target(aggregate_target)
             aggregate_target.user_targets.each do |user_target|
               user_target.build_configurations.each do |config|

metadata

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