cocoapods-binary-matchup 0.0.7 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e74656ba959137bc467283d6f0187e12fdd347d4e32a8febe29378e30edd1f
-  data.tar.gz: 2f7a94d654c0bfac6d802ae6146f546883b2c21beb2c39ff25a8fdc079d5bb79
+  metadata.gz: fece0a9ebc431cab6345ee1f7e5ed505ac49b5326248b3240d98e5620bd2ff1a
+  data.tar.gz: 01aba47a154241f25fc9fb9160b9dfc671b4629976abc1f8062c9f3b962026c6
 SHA512:
-  metadata.gz: 119f67d579be29c580760217af5bd18fe59a020b50b513acc9151e9ba7b83878db2eefb0e1636709ecf58abc2149e959065c05400fa97e5555a2d51448d8c086
-  data.tar.gz: c79dc28fee921124ab5100c8c8e9764191ddfa2af941f7a05500f4e34f5ec1dd10403478ed6500b0fcccde5119acf2588fc02ca40b4b049a96cbe139c6805def
+  metadata.gz: e735c25acc5e4eea62085c276e1fa9d47cb37ee1316ccf0a9333c420134e39c03c88315839278d8e859fbdec7dac481201c93138df5accfe415de4aab08436cd
+  data.tar.gz: 9f69eb604b8bd504ae381888754e7e78d4b9bb5e1beda1780cd9136c57ac11ee78d3d654d19c20a69049f110d02e67d9edefdc9845c748db0bd920a01862d1ad

data/Gemfile.lock

@@ -0,0 +1,161 @@
+PATH
+  remote: .
+  specs:
+    cocoapods-binary-matchup (0.0.14)
+      cocoapods (>= 1.5.0, < 2.0)
+      fourflusher (~> 2.0)
+      xcpretty (~> 0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    bacon (1.2.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    claide (1.1.0)
+    cocoapods (1.16.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.16.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    drb (2.2.3)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    ffi (1.17.2)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86-linux-gnu)
+    ffi (1.17.2-x86-linux-musl)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.9.0)
+      mutex_m
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    json (2.12.2)
+    logger (1.7.0)
+    minitest (5.25.5)
+    mocha (2.7.1)
+      ruby2_keywords (>= 0.0.5)
+    mocha-on-bacon (0.2.3)
+      mocha (>= 0.13.0)
+    molinillo (0.8.0)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    nkf (0.2.0)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
+    public_suffix (4.0.7)
+    rake (13.3.0)
+    rexml (3.4.1)
+    rouge (2.0.7)
+    ruby-macho (2.5.1)
+    ruby2_keywords (0.0.5)
+    securerandom (0.4.1)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.27.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+
+PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
+
+DEPENDENCIES
+  bacon
+  bundler (~> 2.6.9)
+  cocoapods
+  cocoapods-binary-matchup!
+  mocha
+  mocha-on-bacon
+  prettybacon
+  rake
+
+BUNDLED WITH
+   2.6.9

data/README.md

@@ -30,12 +30,12 @@ Then in the flowing normal install process, we hook the integration functions to
 
 ## Installation
 
-    $ gem install cocoapods-binary
+    $ gem install cocoapods-binary-matchup
 
 ## Usage
 
 ``` ruby
-plugin 'cocoapods-binary'
+plugin 'cocoapods-binary-matchup'
 
 use_frameworks!
 # all_binary!
@@ -45,7 +45,7 @@ target "HP" do
 end
 ```
 
-- Add `plugin 'cocoapods-binary'` in the head of Podfile 
+- Add `plugin 'cocoapods-binary-matchup'` in the head of Podfile 
 - Add `:binary => true` as a option of one specific pod, or add `all_binary!` before all targets, which makes all pods binaries.
 - pod install, and that's all
 
@@ -59,11 +59,22 @@ If your `Pods` folder is excluded from git, you may add `keep_source_code_for_pr
 
 If bitcode is needed, add a `enable_bitcode_for_prebuilt_frameworks!` before all targets in Podfile
 
+if forbidden simulator, add a `simulator_build_disable!` before all targets in Podfile 
+
+if custom main deployment target, add a `min_deployment_target(version)` before all targets in Podfile; e.g: `min_deployment_target(14.0)` 
+
+if custom build configuration is needed, add a `set_custom_xcodebuild_options_for_prebuilt_frameworks` before all targets in Podfile; e.g: 
+set_custom_xcodebuild_options_for_prebuilt_frameworks({
+  :device => "ARCHS=arm64",
+  :simulator => "ARCHS=x86_64",
+  :DEBUG_INFORMATION_FORMAT => "dwarf"
+})
+
 
 #### Known Issues
 
 - doesn't support watchos now
-- dSYM files is missing for dynamic frameworks using this plugin. Walkaround: Don't use this plugin for a release build. Add a if condition with ENV around `plugin 'cocoapods-binary'`
+- dSYM files is missing for dynamic frameworks using this plugin. Walkaround: Don't use this plugin for a release build. Add a if condition with ENV around `plugin 'cocoapods-binary-matchup'`
 
 ## License
 

data/cocoapods-binary-matchup.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fourflusher", "~> 2.0"
   spec.add_dependency "xcpretty", "~> 0.3.0"
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 2.6.9'
   spec.add_development_dependency 'rake'
 end

data/lib/cocoapods-binary-matchup/Integration.rb

@@ -27,18 +27,12 @@ module Pod
                 UI.puts "install_for_prebuild! start: #{self.name}"
                 
                 # 获取pod版本信息
-                pod_version = Pod::PrebuildCache::Cache.get_pod_version(standard_sanbox, self.name)
+                prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sanbox)
+
+                pod_version = Pod::PrebuildCache::Cache.get_pod_version(prebuild_sandbox, self.name)
                 target_folder = standard_sanbox.pod_dir(self.name)
                 target_folder.rmtree if target_folder.exist?
                 
-                # 1. 首先尝试从缓存恢复
-                if Pod::PrebuildCache::Cache.copy_from_cache_if_exists(self.name, pod_version, target_folder.to_s)
-                    UI.puts "📦 Successfully restored #{self.name} (#{pod_version}) from cache"
-                    return
-                end
-                
-                # 2. 如果缓存不存在，从预构建目录拷贝
-                prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sanbox)
                 real_file_folder = prebuild_sandbox.framework_folder_path_for_pod_name(self.name)
                 
                 if real_file_folder.exist?
@@ -88,7 +82,7 @@ module Pod
                 # 只有当不是预构建的pod时才删除，避免删除刚拷贝的预构建文件
                 next if self.prebuild_pod_names.include?(root_name)
 
-                # delete the cached files
+                # delete the cached files，include all cached files in the target
                 target_path = self.sandbox.pod_dir(root_name)
                 target_path.rmtree if target_path.exist?
 
@@ -122,6 +116,7 @@ module Pod
 
             #
             specs = self.analysis_result.specifications
+            # 只保留podspec中prebuild的pod，这里本质过滤了所有非prebuild的pod
             prebuilt_specs = (specs.select do |spec|
                 self.prebuild_pod_names.include? spec.root.name
             end)
@@ -137,6 +132,7 @@ module Pod
                 root_name = spec.root.name
                 
                 target = name_to_target_hash[root_name]
+                # 如果是非源码编译成的pod（如本身是动态库和静态库依赖），则跳过集成，使用pod本身的配置
                 next if Prebuild::Passer.target_names_to_skip_integration_framework.include? target.pod_name
 
                 # use the prebuilt framework
@@ -227,7 +223,7 @@ module Pod
         old_method = instance_method(:install_source_of_pod)
         define_method(:install_source_of_pod) do |pod_name|
 
-            # copy from original
+            # copy from original，创建一个单pod的安装器
             pod_installer = create_pod_installer(pod_name)
             # \copy from original
             

data/lib/cocoapods-binary-matchup/Integration_cache.rb

@@ -19,160 +19,54 @@ module Pod
             
             # 获取pod的版本信息，优先使用commit hash
             def self.get_pod_version(sandbox, pod_name)
-                begin
-                    Pod::UI.puts "🔍 Looking for version of: #{pod_name}"
-                    # 优先级：commit > tag > version > timestamp
-                    
-                    # 1. 首先尝试从Manifest.lock获取commit信息
-                    manifest_lock = sandbox.root + 'Manifest.lock'
-                    if manifest_lock.exist?
-                        manifest_content = YAML.load_file(manifest_lock)
-                        
-                        # 优先检查 CHECKOUT OPTIONS 中的commit信息
-                        checkout_options = manifest_content['CHECKOUT OPTIONS'] || {}
-                        if checkout_options[pod_name].is_a?(Hash)
-                            checkout_info = checkout_options[pod_name]
-                            # 优先使用commit，然后是tag
-                            if checkout_info[:commit] || checkout_info['commit']
-                                commit = checkout_info[:commit] || checkout_info['commit']
-                                Pod::UI.puts "📋 Using commit for #{pod_name}: #{commit[0..7]}..."
-                                return commit
-                            elsif checkout_info[:tag] || checkout_info['tag']
-                                tag = checkout_info[:tag] || checkout_info['tag']
-                                Pod::UI.puts "📋 Using tag for #{pod_name}: #{tag}"
-                                return tag
-                            end
-                        end
-                        
-                        # 如果没有commit信息，查找版本信息
-                        pods = manifest_content['PODS'] || []
-                        Pod::UI.puts "🔍 Searching in #{pods.length} pod entries from Manifest.lock"
-                        
-                        pods.each do |pod_entry|
-                            if pod_entry.is_a?(Hash)
-                                # Hash 格式：{"PodName (1.0.0)" => [...]}
-                                pod_entry.each do |key, _|
-                                    key_str = key.to_s
-                                    
-                                    # 使用更灵活的匹配逻辑，支持subspec
-                                    match = key_str.match(/^#{Regexp.escape(pod_name)}\s*\(([^)]+)\)/)
-                                    if match
-                                        Pod::UI.puts "📋 Found exact match! Using version for #{pod_name}: #{match[1]}"
-                                        return match[1]
-                                    end
-                                    
-                                    # 如果精确匹配失败，尝试检查是否是subspec的情况
-                                    # 例如：pod_name是"GoogleUtilities/AppDelegateSwizzler"，但key是"GoogleUtilities/AppDelegateSwizzler (8.1.0)"
-                                    if key_str.include?(pod_name) && key_str.include?('(')
-                                        version_match = key_str.match(/\(([^)]+)\)/)
-                                        if version_match
-                                            Pod::UI.puts "📋 Found partial match! Using version for #{pod_name}: #{version_match[1]}"
-                                            return version_match[1]
-                                        end
-                                    end
-                                end
-                            elsif pod_entry.is_a?(String)
-                                # String 格式："PodName (1.0.0)"
-                                
-                                match = pod_entry.match(/^#{Regexp.escape(pod_name)}\s*\(([^)]+)\)/)
-                                if match
-                                    Pod::UI.puts "📋 Found exact match! Using version for #{pod_name}: #{match[1]}"
-                                    return match[1]
-                                end
-                                
-                                # 如果精确匹配失败，尝试部分匹配
-                                if pod_entry.include?(pod_name) && pod_entry.include?('(')
-                                    version_match = pod_entry.match(/\(([^)]+)\)/)
-                                    if version_match
-                                        Pod::UI.puts "📋 Found partial match! Using version for #{pod_name}: #{version_match[1]}"
-                                        return version_match[1]
-                                    end
-                                end
-                            end
-                        end
-                        
-                        Pod::UI.puts "⚠️  No version found for #{pod_name} in Manifest.lock"
+                UI.puts "🔍 starting get pod version: #{pod_name}"
+                checkout_options = sandbox.manifest.checkout_options_for_pod_named(pod_name)
+                # 优先使用checkout_options中的检出来源
+                if checkout_options
+                    UI.puts "🔍 get pod checkout version: #{pod_name}"
+                    if checkout_options[:tag]
+                        UI.puts "🔍 get pod checkout version tag: #{pod_name}# - #{checkout_options[:tag]}"
+                        return checkout_options[:tag]
+                    end
+                    if checkout_options[:branch]
+                        UI.puts "🔍 get pod checkout version branch: #{pod_name}# - #{checkout_options[:branch]}"
+                        return checkout_options[:branch]
                     end
+                    if checkout_options[:commit]
+                        UI.puts "🔍 get pod checkout version commit: #{pod_name}# - #{checkout_options[:commit]}"
+                        return checkout_options[:commit]
+                    end
+                end
 
-                    
-                    
-                    # 2. 如果Manifest.lock不存在或没找到，尝试从Podfile.lock获取
-                    podfile_lock = sandbox.root.parent + 'Podfile.lock'
-                    if podfile_lock.exist?
-                        podfile_content = YAML.load_file(podfile_lock)
-                        
-                        # 同样优先检查checkout信息
-                        checkout_options = podfile_content['CHECKOUT OPTIONS'] || {}
-                        if checkout_options[pod_name].is_a?(Hash)
-                            checkout_info = checkout_options[pod_name]
-                            if checkout_info[:commit] || checkout_info['commit']
-                                commit = checkout_info[:commit] || checkout_info['commit']
-                                Pod::UI.puts "📋 Using commit for #{pod_name}: #{commit[0..7]}..."
-                                return commit
-                            elsif checkout_info[:tag] || checkout_info['tag']
-                                tag = checkout_info[:tag] || checkout_info['tag']
-                                Pod::UI.puts "📋 Using tag for #{pod_name}: #{tag}"
-                                return tag
-                            end
+                # 如果checkout_options中没有版本信息，则使用dependency中的版本信息
+                dependency = sandbox.manifest.dependencies.find { |d| d.name == pod_name }
+                if dependency
+                    UI.puts "🔍 get pod dependency version: #{pod_name}"
+                    external_source = dependency.external_source
+                    if external_source
+                        UI.puts "🔍 get pod dependency version podspec: #{external_source}"
+                        if external_source[:commit]
+                            UI.puts "🔍 get pod dependency version commit: #{pod_name}# - #{external_source[:commit]}"
+                            return external_source[:commit]
                         end
-                        
-                        # 查找版本信息
-                        pods = podfile_content['PODS'] || []
-                        Pod::UI.puts "🔍 Searching in #{pods.length} pod entries from Podfile.lock"
-                        
-                        pods.each do |pod_entry|
-                            if pod_entry.is_a?(Hash)
-                                pod_entry.each do |key, _|
-                                    key_str = key.to_s
-                                    
-                                    # 使用更灵活的匹配逻辑，支持subspec
-                                    match = key_str.match(/^#{Regexp.escape(pod_name)}\s*\(([^)]+)\)/)
-                                    if match
-                                        Pod::UI.puts "📋 Found exact match! Using version for #{pod_name}: #{match[1]}"
-                                        return match[1]
-                                    end
-                                    
-                                    # 如果精确匹配失败，尝试部分匹配
-                                    if key_str.include?(pod_name) && key_str.include?('(')
-                                        version_match = key_str.match(/\(([^)]+)\)/)
-                                        if version_match
-                                            Pod::UI.puts "📋 Found partial match! Using version for #{pod_name}: #{version_match[1]}"
-                                            return version_match[1]
-                                        end
-                                    end
-                                end
-                            elsif pod_entry.is_a?(String)
-                                # String 格式："PodName (1.0.0)"
-                                
-                                match = pod_entry.match(/^#{Regexp.escape(pod_name)}\s*\(([^)]+)\)/)
-                                if match
-                                    Pod::UI.puts "📋 Found exact match! Using version for #{pod_name}: #{match[1]}"
-                                    return match[1]
-                                end
-                                
-                                # 如果精确匹配失败，尝试部分匹配
-                                if pod_entry.include?(pod_name) && pod_entry.include?('(')
-                                    version_match = pod_entry.match(/\(([^)]+)\)/)
-                                    if version_match
-                                        Pod::UI.puts "📋 Found partial match! Using version for #{pod_name}: #{version_match[1]}"
-                                        return version_match[1]
-                                    end
-                                end
-                            end
+                        if external_source[:branch]
+                            UI.puts "🔍 get pod dependency version branch: #{pod_name}# - #{external_source[:branch]}"
+                            return external_source[:branch]
                         end
-                        
-                        Pod::UI.puts "⚠️  No version found for #{pod_name} in Podfile.lock"
                     end
-                    
-                    # 3. 如果无法从任何lockfile获取，使用时间戳作为版本
-                    timestamp = Time.now.strftime("%Y%m%d_%H%M%S")
-                    Pod::UI.puts "⚠️  Warning: Cannot find version/commit for #{pod_name} in lock files, using timestamp: #{timestamp}"
-                    return timestamp
-                rescue => e
-                    timestamp = Time.now.strftime("%Y%m%d_%H%M%S")
-                    Pod::UI.puts "⚠️  Warning: Error getting version for #{pod_name}: #{e.message}, using timestamp: #{timestamp}"
-                    return timestamp
                 end
+
+                # 如果checkout_options和dependency中没有版本信息，则使用podspec中的version
+                UI.puts "🔍 get pod spec version: #{pod_name}"
+                version = sandbox.manifest.version(pod_name).version
+                if version
+                    UI.puts "🔍 get pod spec version: #{pod_name}# - #{version}"
+                    return version
+                end
+
+                # 如果以上都失败，则返回unknown，理论上只要是正常的podfile.lock或者manifest.lock，都不会走到这里
+                UI.puts "🔍 get pod version failed: #{pod_name}"
+                return "unknown"
             end
             
             # 计算目录内容的哈希值（用于验证缓存完整性）

data/lib/cocoapods-binary-matchup/Main.rb

@@ -66,20 +66,20 @@ module Pod
             end
 
             class_attr_accessor :simulator_build_enabled
-            simulator_build_enabled = true
+            self.simulator_build_enabled = true
 
             class_attr_accessor :min_deployment_target
-            min_deployment_target = '14.0'
+            self.min_deployment_target = '14.0'
 
             private
             class_attr_accessor :prebuild_all
-            prebuild_all = false
+            self.prebuild_all = false
 
             class_attr_accessor :bitcode_enabled
-            bitcode_enabled = false
+            self.bitcode_enabled = false
 
             class_attr_accessor :dont_remove_source_code
-            dont_remove_source_code = false
+            self.dont_remove_source_code = false
 
             class_attr_accessor :custom_build_options
             class_attr_accessor :custom_build_options_simulator
@@ -123,6 +123,10 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :pre_install) do |install
     update = nil
     repo_update = nil
     
+    # pod install → update=false, repo_update=false
+    # pod update → update=true, repo_update=false
+    # pod install --repo-update → update=false, repo_update=true
+    # pod update --repo-update → update=true, repo_update=true
     include ObjectSpace
     ObjectSpace.each_object(Pod::Installer) { |installer|
         update = installer.update
@@ -173,6 +177,7 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :pre_install) do |install
     # install
     Pod::UI.puts "\n"
     Pod::UI.puts "🤖  Pod Install"
+    # 只有进入正常阶段才会执行Integration中的相关hook行为
     require_relative 'Integration'
     # go on the normal install step ...
 end

data/lib/cocoapods-binary-matchup/Prebuild.rb

@@ -26,6 +26,7 @@ module Pod
             UI.puts "prebuild_pods_changes"
             UI.puts "--------------------------------"
             if @prebuild_pods_changes.nil?
+                # detect the changes with podfile by manifest.lock
                 changes = local_manifest.detect_changes_with_podfile(podfile)
                 @prebuild_pods_changes = Analyzer::SpecsState.new(changes)
                 # save the chagnes info for later stage
@@ -126,6 +127,8 @@ module Pod
             Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
             Pod::Prebuild.remove_build_dir(sandbox_path)
             targets.each do |target|
+                # If target shouldn't build, we copy all the original files
+                # This is for target with only .a and .h files
                 if !target.should_build?
                     UI.puts "Prebuilding #{target.label}"
                     next
@@ -186,6 +189,7 @@ module Pod
                     next
                 end
 
+                # copy the vendored frameworks and libraries in _Prebuild to Pods/
                 target.spec_consumers.each do |consumer|
                     file_accessor = Sandbox::FileAccessor.new(root_path, consumer)
                     lib_paths = file_accessor.vendored_frameworks || []

data/lib/cocoapods-binary-matchup/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.0.7"
+    VERSION = "0.0.15"
 end

data/lib/cocoapods-binary-matchup/helper/feature_switches.rb

@@ -19,9 +19,12 @@ module Pod
             end
 
             # --- patch ---
+            # filter the pods that should be prebuild(all_binary! or binary => true)，remember the pod is must remote pod
+            # this will be effective when enable_prebuild_patch is true(the binary prebuild step)
+            # when in system step, the enable_prebuild_patch is false, so the original method will be called
             old_method = instance_method(:pod)
-
             define_method(:pod) do |name, *args|
+                # if not enable, just call the original method
                 if !@@enable_prebuild_patch
                     old_method.bind(self).(name, *args)
                     return
@@ -56,6 +59,8 @@ module Pod
             @@force_disable_integration = value
         end
         
+        # prebuild step's purpose is to build source target code or copy the prebuild framework to the target, 
+        # so we need to disable the original method
         old_method = instance_method(:integrate_user_project)
         define_method(:integrate_user_project) do 
             if @@force_disable_integration

data/lib/cocoapods-binary-matchup/helper/podfile_options.rb

@@ -14,8 +14,11 @@ module Pod
             should_prebuild = Pod::Podfile::DSL.prebuild_all
 
             options = requirements.last
+            # 如果options是hash，并且包含Pod::Prebuild.keyword，则设置should_prebuild为true
             if options.is_a?(Hash) && options[Pod::Prebuild.keyword] != nil 
+                # [DINetwork', { :binary => true, :configurations => ['Debug'] }]
                 should_prebuild = options.delete(Pod::Prebuild.keyword)
+                # [DINetwork', { :configurations => ['Debug'] }]，避免干扰其他配置，不删除可能让后续cocoapods本身解析报错
                 requirements.pop if options.empty?
             end
     
@@ -55,6 +58,7 @@ module Pod
         # ---- patch method ----
         # We want modify `store_pod` method, but it's hard to insert a line in the 
         # implementation. So we patch a method called in `store_pod`.
+        # use this method to parse prebuild framework(:binary => true)
         old_method = instance_method(:parse_inhibit_warnings)
 
         define_method(:parse_inhibit_warnings) do |name, requirements|
@@ -80,7 +84,6 @@ module Pod
                 
                 UI.puts "🔍 Processing #{aggregate_target.name}:"
                 UI.puts "🔍   pod_targets count: #{targets.count}"
-                UI.puts "🔍   pod_targets: #{targets.map(&:pod_name).join(', ')}" if targets.count < 10
 
                 # filter prebuild
                 prebuild_names = target_definition.prebuild_framework_names
@@ -98,7 +101,6 @@ module Pod
             end
 
             all = all.reject {|pod_target| sandbox.local?(pod_target.pod_name) }
-            UI.puts "🔍 prebuild_pod_targets: #{all.map(&:pod_name).join(', ')}"
             all.uniq
         end
 

data/lib/cocoapods-binary-matchup/rome/build_framework.rb

@@ -30,12 +30,12 @@ def build_for_iosish_platform(sandbox,
   other_options = []
   # bitcode enabled
   other_options += ['BITCODE_GENERATION_MODE=bitcode'] if bitcode_enabled
-  # make less arch to iphone simulator for faster build
-  custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
 
   is_succeed, _ = xcodebuild(sandbox, target_label, device, deployment_target, other_options + custom_build_options)
   exit 1 unless is_succeed
   if Pod::Podfile::DSL.simulator_build_enabled
+    # make less arch to iphone simulator for faster build
+    custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
     is_succeed, _ = xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + custom_build_options_simulator)
     exit 1 unless is_succeed
   end

data/spec/plugin_spec.rb

@@ -0,0 +1,54 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe "CocoaPods Binary Matchup Plugin" do
+  it "should load the plugin" do
+    Pod::Prebuild.keyword.should == :binary
+  end
+
+  it "should load successfully" do
+    # 简单验证插件加载成功
+    defined?(Pod::Prebuild).should.not.be.nil
+  end
+
+  it "should have basic constants defined" do
+    # 验证基本常量存在
+    Pod.constants.should.include?(:Prebuild)
+  end
+
+  it "should define DSL instance methods" do
+    # 验证实例方法存在（这些是在Podfile中使用的方法）
+    # instance_methods是反射方法，用于获取所有的实例方法，注意false代表不获取父类
+    dsl_methods = Pod::Podfile::DSL.instance_methods(false)
+    dsl_methods.should.include?(:all_binary!)
+    dsl_methods.should.include?(:enable_bitcode_for_prebuilt_frameworks!)
+    dsl_methods.should.include?(:keep_source_code_for_prebuilt_frameworks!)
+    dsl_methods.should.include?(:min_deployment_target)
+    dsl_methods.should.include?(:simulator_build_disable!)
+    dsl_methods.should.include?(:set_custom_xcodebuild_options_for_prebuilt_frameworks)
+  end
+
+  it "should have correct default values for public attributes" do
+    # 验证公开的默认配置值
+    Pod::Podfile::DSL.simulator_build_enabled.should == true
+    # should是bacon中的测试断言，这里的意思是min_deployment_target应该等于'14.0'
+    Pod::Podfile::DSL.min_deployment_target.should == '14.0'
+  end
+
+  it "should allow setting min_deployment_target" do
+    # 验证可以设置最小部署目标
+    original_target = Pod::Podfile::DSL.min_deployment_target
+    Pod::Podfile::DSL.min_deployment_target = '15.0'
+    Pod::Podfile::DSL.min_deployment_target.should == '15.0'
+    # 恢复原值
+    Pod::Podfile::DSL.min_deployment_target = original_target
+  end
+
+  it "should allow toggling simulator build" do
+    # 验证可以切换模拟器构建设置
+    original_value = Pod::Podfile::DSL.simulator_build_enabled
+    Pod::Podfile::DSL.simulator_build_enabled = false
+    Pod::Podfile::DSL.simulator_build_enabled.should == false
+    # 恢复原值
+    Pod::Podfile::DSL.simulator_build_enabled = original_value
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'pretty_bacon'
 require 'pathname'
 require 'cocoapods'
 
-Mocha::Configuration.prevent(:stubbing_non_existent_method)
+# Mocha::Configuration.prevent(:stubbing_non_existent_method)  # 兼容性问题，暂时注释
 
 require 'cocoapods_plugin'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-matchup
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.15
 platform: ruby
 authors:
 - leavez
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.6.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.6.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,10 +96,10 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- cocoapods-binary-matchup-0.0.6.gem
 - cocoapods-binary-matchup.gemspec
 - lib/cocoapods-binary-matchup/Integration.rb
 - lib/cocoapods-binary-matchup/Integration_cache.rb
@@ -115,6 +115,7 @@ files:
 - lib/cocoapods-binary-matchup/tool/tool.rb
 - lib/cocoapods-binary.rb
 - lib/cocoapods_plugin.rb
+- spec/plugin_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/omiapp/cocoapod_binary_matchup
 licenses:
@@ -139,4 +140,5 @@ specification_version: 4
 summary: A CocoaPods plugin to integrate pods in form of prebuilt frameworks, not
   source code, by adding just one flag in podfile. Speed up compiling dramatically.
 test_files:
+- spec/plugin_spec.rb
 - spec/spec_helper.rb