cocoapods-binary-matchup 0.0.30 → 0.0.31

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

@@ -0,0 +1,337 @@
+require 'fourflusher'
+require 'xcpretty'
+
+CONFIGURATION = "Debug"
+PLATFORMS = { 'iphonesimulator' => 'iOS',
+              'appletvsimulator' => 'tvOS',
+              'watchsimulator' => 'watchOS' }
+
+#  Build specific target to framework file
+#  @param [PodTarget] target
+#         a specific pod target
+#
+def build_for_iosish_platform(sandbox, 
+                              build_dir, 
+                              output_path,
+                              target, 
+                              device, 
+                              simulator,
+                              bitcode_enabled,
+                              custom_build_options = [], # Array<String>
+                              custom_build_options_simulator = [] # Array<String>
+                              )
+  
+  target_label = target.label # name with platform if it's used in multiple platforms
+  Pod::UI.puts "Prebuilding #{target_label}..."
+  
+  other_options = []
+  # bitcode enabled
+  other_options += ['BITCODE_GENERATION_MODE=bitcode'] if bitcode_enabled
+
+  is_succeed, _ = xcodebuild(sandbox, target_label, device, 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, target, other_options + custom_build_options_simulator)
+    exit 1 unless is_succeed
+  end
+
+  # paths
+  target_name = target.name # equals target.label, like "AFNeworking-iOS" when AFNetworking is used in multiple platforms.
+  module_name = target.product_module_name
+  device_framework_path = "#{build_dir}/#{CONFIGURATION}-#{device}/#{target_name}/#{module_name}.framework"
+  device_binary = device_framework_path + "/#{module_name}"
+
+  tmp_lipoed_binary_path = "#{build_dir}/#{target_name}"
+  lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary}`
+
+  if Pod::Podfile::DSL.simulator_build_enabled
+    simulator_framework_path = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{target_name}/#{module_name}.framework"
+    simulator_binary = simulator_framework_path + "/#{module_name}"
+    return unless File.file?(device_binary) && File.file?(simulator_binary)
+  else
+    return unless File.file?(device_binary)
+  end
+
+  puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
+  FileUtils.mv tmp_lipoed_binary_path, device_binary, :force => true
+  
+  # collect the swiftmodule file for various archs.
+  device_swiftmodule_path = device_framework_path + "/Modules/#{module_name}.swiftmodule"
+  if File.exist?(device_swiftmodule_path) && Pod::Podfile::DSL.simulator_build_enabled
+    simulator_framework_path = "#{build_dir}/#{CONFIGURATION}-#{simulator}/#{target_name}/#{module_name}.framework"
+    simulator_swiftmodule_path = simulator_framework_path + "/Modules/#{module_name}.swiftmodule"
+    FileUtils.cp_r simulator_swiftmodule_path + "/.", device_swiftmodule_path
+  end
+
+  # combine the generated swift headers
+  # (In xcode 10.2, the generated swift headers vary for each archs)
+  # https://github.com/leavez/cocoapods-binary/issues/58
+  if Pod::Podfile::DSL.simulator_build_enabled
+    device_generated_swift_header_path = device_framework_path + "/Headers/#{module_name}-Swift.h"
+    device_header = File.read(device_generated_swift_header_path)
+    simulator_generated_swift_header_path = simulator_framework_path + "/Headers/#{module_name}-Swift.h"
+    if File.exist? simulator_generated_swift_header_path
+      
+      simulator_header = File.read(simulator_generated_swift_header_path)
+      # https://github.com/Carthage/Carthage/issues/2718#issuecomment-473870461
+      combined_header_content = %Q{
+  #if TARGET_OS_SIMULATOR // merged by cocoapods-binary
+
+  #{simulator_header}
+
+  #else // merged by cocoapods-binary
+
+  #{device_header}
+
+  #endif // merged by cocoapods-binary
+  }
+      File.write(device_generated_swift_header_path, combined_header_content.strip)
+    end
+  else
+    device_generated_swift_header_path = device_framework_path + "/Headers/#{module_name}-Swift.h"
+    if File.exist?(device_generated_swift_header_path)
+      device_header = File.read(device_generated_swift_header_path)
+      combined_header_content = %Q{
+        #if TARGET_OS_SIMULATOR // merged by cocoapods-binary
+
+        #else // merged by cocoapods-binary
+      
+        #{device_header}
+      
+        #endif // merged by cocoapods-binary
+        }
+      File.write(device_generated_swift_header_path, combined_header_content.strip)
+    end
+  end
+
+  # handle the dSYM files
+  # device_dsym = "#{device_framework_path}.dSYM"
+  # if File.exist? device_dsym
+  #   # lipo the simulator dsym
+  #   simulator_dsym = "#{simulator_framework_path}.dSYM"
+  #   if File.exist? simulator_dsym
+  #     tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
+  #     lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_dsym}/Contents/Resources/DWARF/#{module_name}`
+  #     puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
+  #     FileUtils.mv tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
+  #   end
+  #   # move
+  #   FileUtils.mv device_dsym, output_path, :force => true
+  # end
+
+  # output
+  output_path.mkpath unless output_path.exist?
+
+  if target.static_framework?
+    # 🔑 添加资源处理 - 修复静态库资源丢失问题
+    copy_resources_to_framework(sandbox, target, device_framework_path)
+  end
+
+  FileUtils.mv device_framework_path, output_path, :force => true
+
+end
+
+# 新增函数：拷贝资源文件到 framework
+def copy_resources_to_framework(sandbox, target, framework_path)
+  Pod::UI.puts "📋 Processing resources for #{target.name}..."
+  
+  pod_dir = Pathname.new(sandbox.pod_dir(target.pod_name))
+  framework_dir = Pathname.new(framework_path)
+  
+  # 直接递归扫描 pod 目录下的所有资源文件，拷贝到 framework 根目录
+  scan_and_copy_resources_flat(pod_dir, framework_dir)
+  
+  Pod::UI.puts "✅ Resource processing completed for #{target.name}"
+end
+
+# 递归扫描资源文件并平铺拷贝到目标目录
+def scan_and_copy_resources_flat(source_dir, target_dir)
+  # 确保参数是Pathname类型
+  source_dir = Pathname.new(source_dir) unless source_dir.is_a?(Pathname)
+  target_dir = Pathname.new(target_dir) unless target_dir.is_a?(Pathname)
+  
+  Pod::UI.puts "📁 Recursively scanning directory: #{source_dir}"
+  
+  # 资源文件扩展名
+  resource_extensions = [
+    '.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg',     # 图片
+    '.storyboard', '.xib', '.storyboardc', '.nib',        # 界面文件
+    '.ttf', '.otf', '.woff', '.woff2',                    # 字体
+    '.mp3', '.wav', '.m4a', '.mp4', '.mov', '.avi',       # 媒体
+    '.json', '.plist', '.strings', '.xcassets',           # 配置文件
+    '.bin',                                               # 二进制资源
+    'metallib'                                            # metal or opengl文件
+  ]
+  
+  # 特殊处理的目录类型（这些需要完整保留）
+  special_directory_extensions = ['.bundle', '.xcassets', '.lproj']
+  
+  # 递归查找并拷贝资源文件，传递原始根目录用于路径计算
+  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类型
+  current_dir = Pathname.new(current_dir) unless current_dir.is_a?(Pathname)
+  target_dir = Pathname.new(target_dir) unless target_dir.is_a?(Pathname) 
+  source_root_dir = Pathname.new(source_root_dir) unless source_root_dir.is_a?(Pathname)
+  
+  return unless current_dir.exist? && current_dir.directory?
+  
+  current_dir.children.each do |child|
+    # 跳过隐藏文件和系统目录
+    next if child.basename.to_s.start_with?('.')
+    next if ['.git', '.svn', 'node_modules', '.DS_Store'].include?(child.basename.to_s)
+    
+    if child.directory?
+      # 检查是否是特殊资源目录（需要完整保留的）
+      if special_extensions.include?(child.extname)
+        Pod::UI.puts "  📦 Copying special directory: #{child.basename}"
+        target_path = target_dir + child.basename
+        FileUtils.cp_r(child.to_s, target_path.to_s, :remove_destination => true)
+      else
+        # 递归处理普通目录
+        find_and_copy_resources_recursively(child, target_dir, source_root_dir, resource_extensions, special_extensions)
+      end
+    else
+      # 检查是否是资源文件
+      if resource_extensions.include?(child.extname.downcase)
+        # .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
+      end
+    end
+  end
+end
+
+def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_options=[])
+  args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{CONFIGURATION} -sdk #{sdk} )
+  platform = PLATFORMS[sdk]
+  args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
+  args += other_options
+  Pod::UI.puts "📦 start compile project #{target} (#{args}) "
+  log = `xcodebuild #{args.join(" ")} 2>&1`
+  exit_code = $?.exitstatus  # Process::Status
+  is_succeed = (exit_code == 0)
+
+  if !is_succeed
+    Pod::UI.puts "❌ Build failed for target #{target} (exit code: #{exit_code})".red
+    begin
+        if log.include?('** BUILD FAILED **')
+            # use xcpretty to print build log
+            # 64 represent command invalid. http://www.manpagez.com/man/3/sysexits/
+            printer = XCPretty::Printer.new({:formatter => XCPretty::Simple, :colorize => 'auto'})
+            log.each_line do |line|
+              printer.pretty_print(line)
+            end
+        else
+            raise "shouldn't be handle by xcpretty"
+        end
+    rescue
+        puts log.red
+    end
+    Pod::UI.puts "💥 Compilation terminated due to build failure. Please check the error messages above.".red
+    exit 1
+  end
+  [is_succeed, log]
+end
+
+module Pod
+  class Prebuild
+
+    # Build the frameworks with sandbox and targets
+    #
+    # @param  [String] sandbox_root_path
+    #         The sandbox root path where the targets project place
+    #         
+    #         [PodTarget] target
+    #         The pod targets to build
+    #
+    #         [Pathname] output_path
+    #         output path for generated frameworks
+    #
+    def self.build(sandbox_root_path, target, output_path, bitcode_enabled = false, custom_build_options=[], custom_build_options_simulator=[])
+    
+      return if target.nil?
+    
+      sandbox_root = Pathname(sandbox_root_path)
+      sandbox = Pod::Sandbox.new(sandbox_root)
+      build_dir = self.build_dir(sandbox_root)
+
+      # -- build the framework
+      case target.platform.name
+      when :ios then build_for_iosish_platform(sandbox, build_dir, output_path, target, 'iphoneos', 'iphonesimulator', bitcode_enabled, custom_build_options, custom_build_options_simulator)
+      when :osx then xcodebuild(sandbox, target.label, 'macosx', nil, custom_build_options)
+      # when :tvos then build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator')
+      when :watchos then build_for_iosish_platform(sandbox, build_dir, output_path, target, 'watchos', 'watchsimulator', true, custom_build_options, custom_build_options_simulator)
+      else raise "Unsupported platform for '#{target.name}': '#{target.platform.name}'" end
+    
+      raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
+
+      # # --- copy the vendored libraries and framework
+      # frameworks = build_dir.children.select{ |path| File.extname(path) == ".framework" }
+      # Pod::UI.puts "Built #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)}"
+    
+      # pod_target = target
+      # consumer = pod_target.root_spec.consumer(pod_target.platform.name)
+      # file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(pod_target.pod_name), consumer)
+      # frameworks += file_accessor.vendored_libraries
+      # frameworks += file_accessor.vendored_frameworks
+
+      # frameworks.uniq!
+    
+      # frameworks.each do |framework|
+      #   FileUtils.mkdir_p destination
+      #   FileUtils.cp_r framework, destination, :remove_destination => true
+      # end
+      # build_dir.rmtree if build_dir.directory?
+    end
+    
+    def self.remove_build_dir(sandbox_root)
+      path = build_dir(sandbox_root)
+      path.rmtree if path.exist?
+    end
+
+    private 
+    
+    def self.build_dir(sandbox_root)
+      # don't know why xcode chose this folder
+      sandbox_root.parent + 'build' 
+    end
+
+  end
+end

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

@@ -0,0 +1,12 @@
+# attr_accessor for class variable.
+# usage:
+#
+#   ```
+#   class Pod
+#       class_attr_accessor :is_prebuild_stage
+#   end
+#   ```
+#
+def class_attr_accessor(symbol)
+    self.class.send(:attr_accessor, symbol)
+end

data/lib/cocoapods-binary.rb

@@ -0,0 +1 @@
+require 'cocoapods-binary-matchup/gem_version'

data/lib/cocoapods_plugin.rb

@@ -0,0 +1,2 @@
+require 'cocoapods-binary-matchup/Main'
+

data/spec/plugin_spec.rb

@@ -0,0 +1,43 @@
+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?(: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
+  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

@@ -0,0 +1,50 @@
+require 'pathname'
+ROOT = Pathname.new(File.expand_path('../../', __FILE__))
+$:.unshift((ROOT + 'lib').to_s)
+$:.unshift((ROOT + 'spec').to_s)
+
+require 'bundler/setup'
+require 'bacon'
+require 'mocha-on-bacon'
+require 'pretty_bacon'
+require 'pathname'
+require 'cocoapods'
+
+# Mocha::Configuration.prevent(:stubbing_non_existent_method)  # 兼容性问题，暂时注释
+
+require 'cocoapods_plugin'
+
+#-----------------------------------------------------------------------------#
+
+module Pod
+
+  # Disable the wrapping so the output is deterministic in the tests.
+  #
+  UI.disable_wrap = true
+
+  # Redirects the messages to an internal store.
+  #
+  module UI
+    @output = ''
+    @warnings = ''
+
+    class << self
+      attr_accessor :output
+      attr_accessor :warnings
+
+      def puts(message = '')
+        @output << "#{message}\n"
+      end
+
+      def warn(message = '', actions = [])
+        @warnings << "#{message}\n"
+      end
+
+      def print(message)
+        @output << message
+      end
+    end
+  end
+end
+
+#-----------------------------------------------------------------------------#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-matchup
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 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
@@ -92,7 +98,28 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files: []
-files: []
+files:
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- cocoapods-binary-matchup.gemspec
+- lib/cocoapods-binary-matchup/Integration.rb
+- lib/cocoapods-binary-matchup/Integration_cache.rb
+- lib/cocoapods-binary-matchup/Main.rb
+- lib/cocoapods-binary-matchup/Prebuild.rb
+- lib/cocoapods-binary-matchup/gem_version.rb
+- lib/cocoapods-binary-matchup/helper/feature_switches.rb
+- lib/cocoapods-binary-matchup/helper/passer.rb
+- lib/cocoapods-binary-matchup/helper/podfile_options.rb
+- lib/cocoapods-binary-matchup/helper/prebuild_sandbox.rb
+- lib/cocoapods-binary-matchup/helper/target_checker.rb
+- lib/cocoapods-binary-matchup/rome/build_framework.rb
+- 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:
 - MIT
@@ -115,4 +142,6 @@ rubygems_version: 3.6.9
 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: []
+test_files:
+- spec/plugin_spec.rb
+- spec/spec_helper.rb