cocoapods-binary-matchup 0.0.27 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78793c741a6a34286a3218fccb88e27c9a90353694c603ea38fecf548dc14ece
-  data.tar.gz: 3c23ec57b14ebc590c3804abcc299b06be47bb3101bc3395dffe85932cbe854c
+  metadata.gz: ab869750d66f2c06adb0360e3161f97100a4d52a4a3061e4823cfc4625a43081
+  data.tar.gz: 6713416c0a38d48fca05c72c5b9059725efe662963fc11482ebb74a2c582577b
 SHA512:
-  metadata.gz: f6318ba2e323ab8c7747c1a49edaff6816d22615a951ea202a402af2c42e09a8bd90bf09685c5061d67f90119712f01cc769b496fe462221156ec5281a75f137
-  data.tar.gz: 58d8c1ba281ac40cc2714948d0e0beca44e3a82d0ca4a93e02b5c659cd6170937a59d6c4009cb3322f62b61ee04628023d41a1ad417ae9af1ebac12da012bbce
+  metadata.gz: 88ccf73373ccbce3eb8026bf6ece983ff0f70633884713a022a1edb7f842d4a75a821edf2e02bba33b24f015e1f2030aa37d04b512ef99244d8941f68da4d6db
+  data.tar.gz: 56f3efa320ecff52e8f4be474d4312ffeaecccd4204a4de4f6842ca5829cdfb8cc0eddd91d2d8c0a4e999488aa559f5d986264505baadd42c12a6be11ca76674

data/cocoapods-binary-matchup.gemspec

@@ -13,14 +13,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/omiapp/cocoapod_binary_matchup'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/).reject{|f| f.start_with?("test/") || f.start_with?('demo/')}
+  # 不要用 git ls-files：子目录嵌套 .git / 路径前缀会导致打出空包（0.0.28 踩过坑）
+  spec.files         = Dir.chdir(__dir__) do
+    Dir.glob('{lib,spec}/**/*').reject { |f| File.directory?(f) } +
+      Dir.glob('{LICENSE*,README*,*.gemspec,Gemfile,Rakefile}')
+  end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_dependency "cocoapods", ">= 1.5.0", "< 2.0"
   spec.add_dependency "fourflusher", "~> 2.0"
-  spec.add_dependency "xcpretty", "~> 0.4.1"
+  # CI/Fastlane 可能仍锁 xcpretty 0.3.x，放宽避免插件激活失败导致 all_binary! 未定义
+  spec.add_dependency "xcpretty", ">= 0.3.0", "< 1.0"
 
   spec.add_development_dependency 'bundler', '~> 2.6.9'
   spec.add_development_dependency 'rake'

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

@@ -219,6 +219,8 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :post_install) do |instal
         
         # 收集预编译framework的资源
         framework_resources = collect_prebuilt_framework_resources(installer, aggregate_target)
+        # 仅扩展 .bin（嵌套路径），不改动原有资源注入逻辑
+        bin_resources = collect_prebuilt_framework_bin_resources(installer, aggregate_target)
         
         if framework_resources.any?
             # 修改资源脚本
@@ -227,6 +229,11 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :post_install) do |instal
         else
             Pod::UI.puts "  ℹ️  No framework resources found for #{aggregate_target.name}"
         end
+
+        if bin_resources.any?
+            append_bin_resources_script(script_path, bin_resources)
+            Pod::UI.puts "  ✅ Added #{bin_resources.count} bin resource(s) to #{script_path.basename}"
+        end
     end
     
     Pod::UI.puts "✅ Framework resources processing completed"
@@ -266,6 +273,32 @@ def collect_prebuilt_framework_resources(installer, aggregate_target)
     framework_resources.uniq
 end
 
+# 仅收集 framework 内 .bin（支持 m/m.bin 嵌套）
+def collect_prebuilt_framework_bin_resources(installer, aggregate_target)
+    bin_resources = []
+    prebuilt_pod_names = installer.refresh_prebuild_pod_names!
+
+    aggregate_target.pod_targets.each do |pod_target|
+        next unless prebuilt_pod_names.include?(pod_target.pod_name)
+
+        pod_dir = installer.sandbox.pod_dir(pod_target.pod_name)
+        next unless pod_dir.exist?
+
+        pod_dir.children.select { |c| c.directory? && c.extname == '.framework' }.each do |framework_dir|
+            framework_name = framework_dir.basename.to_s
+            Dir.glob(framework_dir.join('**/*.bin')).each do |bin_path|
+                rel = Pathname(bin_path).relative_path_from(framework_dir).to_s
+                bin_resources << {
+                    source: "${PODS_ROOT}/#{pod_target.pod_name}/#{framework_name}/#{rel}",
+                    relative: rel
+                }
+            end
+        end
+    end
+
+    bin_resources.uniq { |r| r[:source] }
+end
+
 # 扫描framework中的资源文件
 def scan_framework_resources(framework_dir, pod_name)
     resources = []
@@ -273,7 +306,7 @@ def scan_framework_resources(framework_dir, pod_name)
     
     Pod::UI.puts "      🎯 Framework path: #{framework_dir}"
     
-    # 资源文件类型
+    # 资源文件类型（.bin 由 append_bin_resources_script 单独处理，避免平铺路径错误）
     resource_patterns = [
         '*.png', '*.jpg', '*.jpeg', '*.gif', '*.webp',     # 图片
         '*.storyboard', '*.xib',                           # 界面文件
@@ -282,7 +315,6 @@ def scan_framework_resources(framework_dir, pod_name)
         '*.bundle',                                        # 资源包
         '*.ttf', '*.otf',                                  # 字体
         '*.mp3', '*.wav', '*.m4a', '*.mp4', '*.mov',        # 媒体
-        '*.bin',                                           # 二进制资源
         '*.metallib'                                            # metal or opengl文件
     ]
     
@@ -384,3 +416,33 @@ def build_framework_resources_block(framework_resources)
     
     return block
 end
+
+# 仅追加 .bin 安装（保留相对路径；不改动原有 Debug 资源块）
+def append_bin_resources_script(script_path, bin_resources)
+    return if bin_resources.empty?
+
+    content = script_path.read
+    content = content.gsub(
+        /\n?[ \t]*# Prebuilt Framework Bin Resources\n.*?echo "Prebuilt framework bin resources installation completed"\n/m,
+        "\n"
+    )
+
+    block = "# Prebuilt Framework Bin Resources\n"
+    block += "echo \"Installing prebuilt framework bin resources...\"\n"
+    bin_resources.each do |resource|
+        block += "PREBUILT_BIN_SRC=\"#{resource[:source]}\"\n"
+        block += "PREBUILT_BIN_DST=\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/#{resource[:relative]}\"\n"
+        block += "mkdir -p \"$(dirname \"$PREBUILT_BIN_DST\")\"\n"
+        block += "if [[ -e \"$PREBUILT_BIN_SRC\" ]]; then\n"
+        block += "  cp -f \"$PREBUILT_BIN_SRC\" \"$PREBUILT_BIN_DST\"\n"
+        block += "fi\n"
+    end
+    block += "echo \"Prebuilt framework bin resources installation completed\"\n"
+
+    if content.include?('exit 0')
+        content = content.sub(/exit 0/, "#{block}\nexit 0")
+    else
+        content = content + "\n#{block}"
+    end
+    script_path.write(content)
+end

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

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.0.27"
+    VERSION = "0.0.29"
 end

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

@@ -172,6 +172,18 @@ def scan_and_copy_resources_flat(source_dir, target_dir)
   find_and_copy_resources_recursively(source_dir, target_dir, source_dir, resource_extensions, special_directory_extensions)
 end
 
+# 仅 .bin：Apps/Cocome/Resources/m/m.bin -> m/m.bin
+def bin_relative_path_for_copy(child, source_root_dir)
+  rel_parts = child.relative_path_from(source_root_dir).each_filename.to_a
+  if (idx = rel_parts.index('Resources')) && idx < rel_parts.length - 1
+    return Pathname.new(rel_parts[(idx + 1)..-1].join('/'))
+  end
+  if rel_parts.length >= 2
+    return Pathname.new(rel_parts[-2..-1].join('/'))
+  end
+  Pathname.new(child.basename)
+end
+
 # 递归查找资源文件并拷贝
 def find_and_copy_resources_recursively(current_dir, target_dir, source_root_dir, resource_extensions, special_extensions)
   # 确保所有参数都是Pathname类型
@@ -199,19 +211,28 @@ def find_and_copy_resources_recursively(current_dir, target_dir, source_root_dir
     else
       # 检查是否是资源文件
       if resource_extensions.include?(child.extname.downcase)
-        Pod::UI.puts "  📄 Copying resource file: #{child.basename}"
-        target_path = target_dir + child.basename
-        
-        # 处理文件名冲突（如果有重名文件，添加路径前缀）
-        if target_path.exist?
-          # 计算相对于根目录的路径作为前缀
-          relative_dir = child.dirname.relative_path_from(source_root_dir)
-          safe_name = "#{relative_dir.to_s.gsub('/', '_')}_#{child.basename}"
-          target_path = target_dir + safe_name
-          Pod::UI.puts "    ⚠️  File name conflict, renamed to: #{safe_name}"
+        # .bin：仅扩展路径保留（m/m.bin），其它资源仍平铺，逻辑不变
+        if child.extname.downcase == '.bin'
+          relative_path = bin_relative_path_for_copy(child, source_root_dir)
+          target_path = target_dir + relative_path
+          Pod::UI.puts "  📄 Copying bin resource: #{relative_path}"
+          target_path.dirname.mkpath unless target_path.dirname.exist?
+          FileUtils.cp(child.to_s, target_path.to_s)
+        else
+          Pod::UI.puts "  📄 Copying resource file: #{child.basename}"
+          target_path = target_dir + child.basename
+          
+          # 处理文件名冲突（如果有重名文件，添加路径前缀）
+          if target_path.exist?
+            # 计算相对于根目录的路径作为前缀
+            relative_dir = child.dirname.relative_path_from(source_root_dir)
+            safe_name = "#{relative_dir.to_s.gsub('/', '_')}_#{child.basename}"
+            target_path = target_dir + safe_name
+            Pod::UI.puts "    ⚠️  File name conflict, renamed to: #{safe_name}"
+          end
+          
+          FileUtils.cp(child.to_s, target_path.to_s)
         end
-        
-        FileUtils.cp(child.to_s, target_path.to_s)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-matchup
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.29
 platform: ruby
 authors:
 - leavez
@@ -47,16 +47,22 @@ dependencies:
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,10 +99,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/.gitignore

@@ -1,32 +0,0 @@
-.DS_Store
-pkg
-.idea/
-
-test/Pods
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-### Xcode Patch ###
-*.xcodeproj/*
-!*.xcodeproj/project.pbxproj
-!*.xcodeproj/xcshareddata/
-!*.xcworkspace/contents.xcworkspacedata
-/*.gcno
-test/Binary.xcworkspace/contents.xcworkspacedata
-test/Binary.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
-test/Podfile
-test/Podfile.lock

data/.travis.yml

@@ -1,23 +0,0 @@
-osx_image: xcode9.3
-language: objective-c
-cache:
-- cocoapods
-- bundler
-before_install:
-- gem install cocoapods
-script:
-- rake install
-- cd test
-- sh test.sh
-- cd ..
-
-# auto deploy on tagging
-# automatically set by `travis setup rubygems`
-deploy:
-  provider: rubygems
-  api_key:
-    secure: rubygems_36250bc5acbeefaa1a7985a22146376d17725f0583417826
-  gem: cocoapods-binary-matchup
-  on:
-    tags: true
-    repo: omiapp/cocoapods-binary-matchup

data/Gemfile.lock

@@ -1,161 +0,0 @@
-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