cocoapods-binary-matchup 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77687afa8ff87355acd7b995f536a35aa4d1334d53d6ea7db4b6f86a02076ed9
-  data.tar.gz: 0ceec41e504339e42451f6d4c917bffe08c3c586946a4b8fc6bdaf04b0e15d45
+  metadata.gz: f502abdc9c88f5bf6a8456317679006084ed07a542322c5dcd3a0c3d9626b672
+  data.tar.gz: 2c6885e69c0c152643fa3b6a219c449b4dc650de4f3d70acf584f1892c861df5
 SHA512:
-  metadata.gz: c20a732d70ae30b3d58af05f1307153f0eba8aac9969d62b9480b6fafa797f988bec2d579789b138aaf4be086822000e9005c816803b21ce96d0ab931c897f21
-  data.tar.gz: a2b128171275f2c3753940adc1bd2bd055be8ffadf2f7ee222c14b841e8e2407c1247a892c9e52970787306a5be7258a92be7d56b567526833d24a1fe38f461c
+  metadata.gz: e3998fdb496a4c3b63ff2ec2d122623c61b7054d720ad2a5beb17ec623019ee0cd009ee4654c560611d033845701fc89595dbe7a580aff100eb689f549d5eba2
+  data.tar.gz: 755c022f45768edddcce95be38afd9b816b4a1a83ff6bb101866159d419d0889d60bcea8712612efa949e767909288e582a9f175f63e692f27236619152a3414

data/Rakefile

@@ -9,5 +9,18 @@ task :specs do
   sh "bundle exec bacon #{specs('**')}"
 end
 
+desc 'Build gem and assert it is not empty (has lib/cocoapods_plugin.rb)'
+task :build_and_verify do
+  require_relative 'lib/cocoapods-binary-matchup/gem_version'
+  gem_name = "cocoapods-binary-matchup-#{CocoapodsBinary::VERSION}.gem"
+  sh 'gem', 'build', 'cocoapods-binary-matchup.gemspec'
+  require 'rubygems/package'
+  files = Gem::Package.new(gem_name).spec.files
+  unless files.include?('lib/cocoapods_plugin.rb')
+    abort "[build_and_verify] #{gem_name} is empty/broken (files=#{files.size}). Abort push."
+  end
+  puts "[build_and_verify] OK: #{gem_name} contains #{files.size} files"
+end
+
 task :default => :specs
 

data/cocoapods-binary-matchup.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/omiapp/cocoapod_binary_matchup'
   spec.license       = 'MIT'
 
-  # 禁止用 git ls-files：本目录有嵌套 .git，ls-files 为空会打出空包（0.0.28/0.0.30 已踩坑）
+  # 禁止用 git ls-files：若本目录再出现空的嵌套 .git，ls-files 会为空从而打出空包（0.0.28/0.0.30）
   spec.files         = Dir.chdir(__dir__) do
     Dir.glob('{lib,spec}/**/*').reject { |f| File.directory?(f) } +
       Dir.glob('{LICENSE*,README*,*.gemspec,Gemfile,Rakefile}')
@@ -22,6 +22,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  unless spec.files.include?('lib/cocoapods_plugin.rb')
+    raise <<~MSG
+      [cocoapods-binary-matchup] refuse to build an empty/broken gem:
+        spec.files is missing lib/cocoapods_plugin.rb (count=#{spec.files.size}).
+        Check gemspec file list; do not use `git ls-files` if a nested .git exists.
+    MSG
+  end
+
   spec.add_dependency "cocoapods", ">= 1.5.0", "< 2.0"
   spec.add_dependency "fourflusher", "~> 2.0"
   # CI 可能锁 xcpretty 0.3.x，过严会导致插件激活失败

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

@@ -137,8 +137,14 @@ module Pod
                 standard_sandbox_path = sandbox.standard_sanbox_path
                 Pod::UI.puts "📦 [#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}] Prebuild Start pod: #{target.pod_name}"
                 if Pod::PrebuildCache::Cache.restore_from_pod_cache(target.pod_name, sandbox)
-                    Pod::UI.puts "📦 [#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}] Using exact cache from ~/.PodCache"
-                    next
+                    output_path = sandbox.framework_folder_path_for_pod_name(target.name)
+                    if prebuild_resource_bundles_missing?(target, output_path)
+                        Pod::UI.puts "⚠️  Cached #{target.pod_name} missing resource_bundles; rebuilding..."
+                        output_path.rmtree if output_path.exist?
+                    else
+                        Pod::UI.puts "📦 [#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}] Using exact cache from ~/.PodCache"
+                        next
+                    end
                 end
                 Pod::UI.puts "📦 [#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}] Prebuild End pod: #{target.pod_name}"
 

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

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.0.31"
+    VERSION = "0.0.32"
 end

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

@@ -131,6 +131,74 @@ def build_for_iosish_platform(sandbox,
 
   FileUtils.mv device_framework_path, output_path, :force => true
 
+  # resource_bundles（如 MatchUpSecurityWB.bundle）由 xcodebuild 生成在 products 目录，
+  # 原先只 mv 了 .framework，bundle 会随 build_dir 被删掉 → App 里找不到 m/m.bin。
+  # Integration 会把 resource_bundles 改成 resources: ["Xxx.bundle"]，必须放在预编译产物根目录。
+  copy_resource_bundles_to_output(sandbox, target, output_path, build_dir, device)
+
+end
+
+# 把 podspec resource_bundles 产物拷到预编译输出目录（与 .framework 同级）
+def copy_resource_bundles_to_output(sandbox, target, output_path, build_dir, device)
+  output_path = Pathname(output_path)
+  output_path.mkpath unless output_path.exist?
+
+  products_dir = Pathname("#{build_dir}/#{CONFIGURATION}-#{device}/#{target.name}")
+  copied = []
+
+  if products_dir.exist?
+    products_dir.children.select { |p| p.directory? && p.extname == '.bundle' }.each do |bundle|
+      dest = output_path + bundle.basename
+      FileUtils.rm_rf(dest) if dest.exist?
+      FileUtils.cp_r(bundle.to_s, dest.to_s)
+      copied << bundle.basename.to_s
+      Pod::UI.puts "  📦 Copied resource bundle from build products: #{bundle.basename}"
+    end
+  end
+
+  # 兜底：xcodebuild 未产出 bundle 时，按 file_accessor.resource_bundles 从源码组装
+  # （保留 Resources/ 之后的相对路径，如 m/m.bin）
+  expected_bundles = {}
+  Array(target.file_accessors).each do |fa|
+    next unless fa.respond_to?(:resource_bundles)
+    fa.resource_bundles.each do |name, paths|
+      expected_bundles[name] ||= []
+      expected_bundles[name].concat(Array(paths))
+    end
+  end
+
+  expected_bundles.each do |bundle_name, paths|
+    dest_bundle = output_path + "#{bundle_name}.bundle"
+    next if dest_bundle.exist? && copied.include?("#{bundle_name}.bundle")
+
+    Pod::UI.puts "  📦 Assembling resource bundle from sources: #{bundle_name}.bundle"
+    FileUtils.rm_rf(dest_bundle) if dest_bundle.exist?
+    dest_bundle.mkpath
+
+    pod_root = Pathname(sandbox.pod_dir(target.pod_name))
+    Array(paths).each do |path|
+      src = Pathname(path)
+      next unless src.file?
+
+      relative = resource_bundle_relative_path(src, pod_root)
+      dest = dest_bundle + relative
+      dest.dirname.mkpath unless dest.dirname.exist?
+      FileUtils.cp(src.to_s, dest.to_s)
+      Pod::UI.puts "    📄 #{relative}"
+    end
+    copied << "#{bundle_name}.bundle"
+  end
+
+  Pod::UI.puts "  ✅ Resource bundles ready: #{copied.uniq.join(', ')}" unless copied.empty?
+end
+
+# Apps/Cocome/Resources/m/m.bin -> m/m.bin（与 CocoaPods resource_bundle 常见布局一致）
+def resource_bundle_relative_path(file_path, pod_root)
+  rel_parts = Pathname(file_path).relative_path_from(Pathname(pod_root)).each_filename.to_a rescue [file_path.basename.to_s]
+  if (idx = rel_parts.index('Resources')) && idx < rel_parts.length - 1
+    return Pathname.new(rel_parts[(idx + 1)..-1].join('/'))
+  end
+  Pathname.new(file_path.basename)
 end
 
 # 新增函数：拷贝资源文件到 framework

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-matchup
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - leavez