cocoapods-jxedt 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472fb07816c0d1c0e832786027600851e8676949716ce3d4b9d953023c497120
-  data.tar.gz: a98a8e436579197870178ff57bf820af36bfb029b758f5b646aa62bc275fe61c
+  metadata.gz: a6302e970ed73bc5b9e9d1c360b07866274dfef9c17cb525fbf421c18731a0af
+  data.tar.gz: bc7af03bb9f4754d6ad79011b9350f05008a311701236f69f5d8f265a85e1bd7
 SHA512:
-  metadata.gz: 812df6af0ccbfafcd314c944683da40d8d6aa235fc91e373374eda1089f536c8f0e47e7351facc26d297bbec23fe37304ace96db3b893634244617cabc22250b
-  data.tar.gz: 28461e27c2869c1688bdcd38dec279ce333732fe14a85ce46b8ccf98339801026e412be60c9b5867d5d66d50dd3361b3d656e0c91a572761e98635d302574d4c
+  metadata.gz: 4792210d5b87ea5ed46be38635a2c6851a355c97cc964b59cfb8c35031bb5da0b18f36ac496ce59f031e9108cd469821ea3eb887bb22ecb6cf0b0744ecaaff4f
+  data.tar.gz: ae695a6d13a154a1b5d3f9fb060c1e8aabf346c719a8d5e3c2f76f07d4eb81260550796ef7721730b616090be5d0aaecd6ee726b85e6fbdd13ea51c7fd1aa4ec

data/lib/cocoapods-jxedt/binary/Intergation.rb

@@ -18,8 +18,8 @@ module Pod
         class PodSourceInstaller
 
             def install_for_prebuild!(standard_sanbox)
-                check_sandbox = Jxedt::Sandbox.from_sandbox(standard_sanbox)
-                target_names = check_sandbox.existed_target_names(self.name)
+                binary_sandbox = Jxedt::BinarySandbox.from_sandbox(standard_sanbox)
+                target_names = binary_sandbox.existed_target_names(self.name)
                 
                 def walk(path, &action)
                     return unless path.exist?
@@ -53,7 +53,7 @@ module Pod
                 target_names.each do |name|
 
                     # symbol link copy all substructure
-                    real_file_folder = check_sandbox.framework_folder_path_for_target_name(name)
+                    real_file_folder = binary_sandbox.framework_folder_path_for_target_name(name)
                     
                     # If have only one platform, just place int the root folder of this pod.
                     # If have multiple paths, we use a sperated folder to store different
@@ -132,8 +132,11 @@ module Pod
                     end
                 end
             end
+            
+            # 设置使用二进制的targets标识
+            prebuilt_pod_targets.each { |target| target.use_binary = true }
 
-            check_sandbox = Jxedt::Sandbox.from_sandbox(self.sandbox)
+            binary_sandbox = Jxedt::BinarySandbox.from_sandbox(self.sandbox)
 
             specs = self.analysis_result.specifications
             prebuilt_specs = (specs.select do |spec|
@@ -175,7 +178,7 @@ module Pod
                     resources = [resources] if resources.kind_of?(String)
                     spec.attributes_hash["resources"] = resources
                     # spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
-                    prebuild_bundles = check_sandbox.prebuild_bundles(spec.root.name).each.map { |bundle_path| "_Prebuild/" + bundle_path }
+                    prebuild_bundles = binary_sandbox.prebuild_bundles(spec.root.name).each.map { |bundle_path| "_Prebuild/" + bundle_path }
                     prebuild_bundles = [] if checked_specs[spec.root.name].size > 1 # spec.root.name相同的只添加一次bundle文件
                     spec.attributes_hash["resources"] += prebuild_bundles
                 end
@@ -186,7 +189,7 @@ module Pod
                 targets.each do |target|
                     # the framework_file_path rule is decided when `install_for_prebuild`,
                     # as to compitable with older version and be less wordy.
-                    check_sandbox.prebuild_vendored_frameworks(spec.root.name).each do |frame_file_path|
+                    binary_sandbox.prebuild_vendored_frameworks(spec.root.name).each do |frame_file_path|
                         framework_file_path = "_Prebuild/" + frame_file_path
                         framework_file_path = nil if checked_specs[spec.root.name].size > 1 # spec.root.name相同的只添加一次framework文件
                         add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)

data/lib/cocoapods-jxedt/binary/config.rb

@@ -18,6 +18,7 @@ module Jxedt
             :xcconfig_configuration_alias => "xcconfig文件中配置多configuration的别名（一定要唯一），用于搜索替换，我们用来支持多configuration的二进制。一般不需要设置，默认值为'cocoapods-jxedt-binary'",
             :framework_header_search_enabled => "开启binary的组件是否配置HEADER_SEARCH_PATH头文件搜索，兼容头文件引用的问题。默认为false",
             :silent_build => "静默编译，即不输出编译命令。默认true",
+            :fix_swiftinterface_pods => "修复swiftinterface的bug，即：组件中包含和module name同名的class，使用不同swift编译器编译时报错；需要填写需要修复的组件名称",
             :configurations => "支持的configuration配置，可以写字符串'Debug'或'Release'，也可以写多个'['Debug', 'Release']'。默认为'Release'",
             :xcframework => "编译结果是否为xcframework。默认false",
             :clean_build => "编译的时候是否clean build。默认true",
@@ -119,6 +120,11 @@ module Jxedt
             @dsl_config[:silent_build] || @dsl_config[:silent_build].nil?
         end
 
+        def should_fix_swiftinterface_bug?(target_name)
+            @fix_swiftinterface_pods = @dsl_config[:fix_swiftinterface_pods] || []
+            @fix_swiftinterface_pods.include?(target_name)
+        end
+
         def xcframework?
             @dsl_config[:xcframework] || false
         end
@@ -201,7 +207,12 @@ module Jxedt
         end
 
         def git_remote_repo
-            @remote ||= cache_repo[:remote]
+            @remote ||= begin
+                remote = cache_repo[:remote]
+                remote.chomp!('/') if remote.is_a?(String) # 去除最后的'/'
+                remote.strip! if remote.is_a?(String) # 去除左右空格、转义字符
+                remote
+            end
         end
 
         def cache_repo_enabled?

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

@@ -52,8 +52,8 @@ module Pod
           }.uniq
           
           available_pod_names = []
-          check_sandbox = Jxedt::Sandbox.from_sandbox(self.sandbox)
-          available_pod_names = check_sandbox.target_paths.map {|path| path.basename.to_s }
+          binary_sandbox = Jxedt::BinarySandbox.from_sandbox(self.sandbox)
+          available_pod_names = binary_sandbox.target_paths.map {|path| path.basename.to_s }
           if Jxedt.config.all_binary_enabled?
             explicit_prebuild_pod_names = available_pod_names
           else

data/lib/cocoapods-jxedt/binary/helper/podfile_post_install_hook.rb

@@ -20,6 +20,7 @@ module Pod
             def handle_pods_project_configurations!(installer)
                 installer.pods_project.targets.each do |target|
                     target.build_configurations.each do |config|
+                        config.build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
                         config.build_settings["CODE_SIGN_IDENTITY"] = "" if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
                     end
                 end

data/lib/cocoapods-jxedt/binary/helper/prebuild_installer.rb

@@ -34,6 +34,18 @@ module Pod
             # 恢复sandbox标识
             sandbox.index_project_create_stage = false
         end
+
+        def resolve_dependencies
+          analyzer = super
+          self.analysis_result.specifications.each do |spec|
+            # keep all file in pods
+            preserve_paths = spec.attributes_hash["preserve_paths"] || []
+            preserve_paths = [preserve_paths] if preserve_paths.kind_of?(String)
+            preserve_paths += ['_Prebuild']
+            spec.attributes_hash["preserve_paths"] = preserve_paths
+          end
+          analyzer
+        end
     end
 end
 

data/lib/cocoapods-jxedt/binary/helper/target_definition.rb

@@ -10,21 +10,16 @@ module Pod
           if options.is_a?(Hash) && options.include?(:binary)
             @explicit_prebuild_pod_names << Specification.root_name(name) if options[:binary]
             @reject_prebuild_pod_names << Specification.root_name(name) unless options[:binary]
-          else
-            settings = Jxedt.config.binary_settings
-            symbol_name = Specification.root_name(name).to_sym
-            if settings.include?(symbol_name) && [true, false].include?(settings[symbol_name])
-              @explicit_prebuild_pod_names << Specification.root_name(name) if settings[symbol_name]
-              @reject_prebuild_pod_names << Specification.root_name(name) unless settings[symbol_name]
-            end
           end
           
           
           # header search path
           @explicit_header_search_pod_names ||= []
           @reject_header_search_pod_names ||= []
-          @explicit_header_search_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options[:framework_header_search]
-          @reject_header_search_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options.include?(:framework_header_search) && !options[:framework_header_search]
+          if options.is_a?(Hash) && options.include?(:framework_header_search)
+            @explicit_header_search_pod_names << Specification.root_name(name) if options[:framework_header_search]
+            @reject_header_search_pod_names << Specification.root_name(name) unless options[:framework_header_search]
+          end
 
           options.delete(:binary) if options.is_a?(Hash)
           options.delete(:framework_header_search) if options.is_a?(Hash)
@@ -37,6 +32,17 @@ module Pod
         original_parse_inhibit_warnings = instance_method(:parse_inhibit_warnings)
         define_method(:parse_inhibit_warnings) do |name, requirements|
           detect_prebuilt_pod(name, requirements)
+
+          # merge binary settings
+          Jxedt.config.binary_settings.each { |name, val| 
+            next if @explicit_prebuild_pod_names.include?(name) # 配置:binary的组件优先级高
+            next if @reject_prebuild_pod_names.include?(name)
+            next unless [true, false].include?(val)
+            
+            @explicit_prebuild_pod_names << name.to_s if val
+            @reject_prebuild_pod_names << name.to_s unless val
+          }
+
           original_parse_inhibit_warnings.bind(self).call(name, requirements)
         end
       end

data/lib/cocoapods-jxedt/binary/pod-room/xcodebuild_command.rb

@@ -35,6 +35,16 @@ module Jxedt
         else
           collect_output(target, Dir[target_products_dir_of(target, sdks[0]) + "/*"])
         end
+
+        # fix swiftinterface bug
+        if target.defines_module? && Jxedt.config.should_fix_swiftinterface_bug?(target.label)
+          # https://developer.apple.com/forums/thread/123253
+          cmd = "find #{output_path(target)} -name '*.swiftinterface' -exec sed -i -e 's/#{target.product_module_name}\\.//g' {} \\;"
+          `#{cmd}`
+
+          Pod::UI.puts "- Fix Swiftinterface Bug: #{target}".magenta unless Jxedt.config.silent_build?
+          Pod::UI.puts_indented "$ #{cmd}" unless Jxedt.config.silent_build?
+        end
       end
     end
 

data/lib/cocoapods-jxedt/binary/prebuild.rb

@@ -1,6 +1,6 @@
 module Jxedt
-    class Sandbox
-        attr_accessor :sandbox
+    class BinarySandbox
+        attr_accessor :standard_sandbox
 
         def initialize(path=nil)
             @sandbox_path = path
@@ -9,9 +9,9 @@ module Jxedt
         def self.from_sandbox(sandbox)
             search_path = Jxedt.config.binary_dir
             binary_dir = search_path.empty? ? nil : sandbox.standard_sandbox_root + search_path
-            check_sandbox = Sandbox.new(binary_dir)
-            check_sandbox.sandbox = sandbox
-            check_sandbox
+            binary_sandbox = BinarySandbox.new(binary_dir)
+            binary_sandbox.standard_sandbox = sandbox
+            binary_sandbox
         end
 
         def binary_dir
@@ -21,11 +21,11 @@ module Jxedt
         def target_paths
             return [] if @sandbox_path.nil?
             return [] unless binary_dir.exist?
-            return [] if @sandbox.source_lockfile.nil?
+            return [] if @standard_sandbox.source_lockfile.nil?
             @targets ||= begin
                 prebuild_targets = binary_dir.children().map do |target_path|
                     if target_path.directory? && (not target_path.children.empty?)
-                        hash_key = @sandbox.source_lockfile.spec_checksums_hash_key(target_path.basename.to_s)
+                        hash_key = @standard_sandbox.source_lockfile.spec_checksums_hash_key(target_path.basename.to_s)
                         next if hash_key.nil?
                         
                         checksum_files = target_path.children().select { |path| path.extname == '.checksum' }
@@ -126,8 +126,8 @@ module Jxedt
         end
 
         def build
-            check_sandbox = Jxedt::Sandbox.from_sandbox(@source_installer.sandbox)
-            existed_target_names = check_sandbox.target_paths.map { |pair| pair.basename.to_s }
+            binary_sandbox = Jxedt::BinarySandbox.from_sandbox(@source_installer.sandbox)
+            existed_target_names = binary_sandbox.target_paths.map { |pair| pair.basename.to_s }
             targets = targets_to_prebuild.reject { |target| existed_target_names.include?(target.name.to_s) }
 
             Pod::UI.puts "Prebuild total count: #{targets.size}"

data/lib/cocoapods-jxedt/binary/targets/pod_target.rb

@@ -54,8 +54,6 @@ module Pod
       class BuildSettings
         # missing framework header search paths
         def missing_framework_header_search_path(pt)
-            return [] unless pt.frame_header_search_paths_enable?
-
             paths = []
             pt.file_accessors.each do |file_accessor|
                 # xcframeworks
@@ -123,7 +121,11 @@ module Pod
             alias_method :old_raw_header_search_paths, :_raw_header_search_paths
             def _raw_header_search_paths
                 header_search_paths = old_raw_header_search_paths
-                header_search_paths.concat pod_targets.flat_map { |pt| missing_framework_header_search_path(pt) }
+                header_search_paths.concat pod_targets.flat_map { |pt| 
+                    search_paths = []
+                    search_paths.concat missing_framework_header_search_path(pt) if pt.frame_header_search_paths_enable?
+                    search_paths
+                }
                 header_search_paths.uniq
             end
          end
@@ -134,7 +136,8 @@ module Pod
             alias_method :old_raw_header_search_paths, :_raw_header_search_paths
             def _raw_header_search_paths
                 header_search_paths = old_raw_header_search_paths
-                header_search_paths.concat dependent_targets.flat_map { |pt| missing_framework_header_search_path(pt) } if target.should_build?
+                # 两个条件都满足时添加header_search_paths
+                header_search_paths.concat dependent_targets.flat_map { |pt| missing_framework_header_search_path(pt) } if target.should_build? && target.frame_header_search_paths_enable?
                 header_search_paths.uniq
             end
 

data/lib/cocoapods-jxedt/command/binary/command/push.rb

@@ -12,11 +12,13 @@ module Pod
                     ]
                     def self.options
                         [
-                            ['--force-push', '强制推送组件二进制到远程，远程有相同的校验和会被本地覆盖']
+                            ['--force-push', '强制推送组件二进制到远程，远程有相同的校验和会被本地覆盖'],
+                            ['--name', '需要推送到远程的组件名称，不填则推送全部的二进制组件到远程']
                         ]
                     end
                     def initialize(argv)
                         @force_push = argv.flag?('force-push', false)
+                        @name = argv.option('name')
                         super
                     end
         
@@ -32,7 +34,10 @@ module Pod
                         require 'cocoapods-jxedt/git_helper/cache_pucher'
 
                         output_dir = Pod::Config.instance.sandbox.root + Jxedt.config.binary_dir
-                        Jxedt::CachePucher.push(output_dir, nil, @force_push)
+
+                        targets = []
+                        targets += @name.split(',') if @name && @name.length > 0
+                        Jxedt::CachePucher.push(output_dir, targets, @force_push)
                     end
                 end
             end

data/lib/cocoapods-jxedt/command/binary/command/source_project.rb

@@ -44,6 +44,8 @@ module Pod
                         source_installer = Pod::JxedtPrebuildInstaller.new(prebuild_sandbox, podfile, lockfile)
                         # 执行install
                         source_installer.install!
+                        # 生成index工程
+                        source_installer.generate_pods_index_project!
                     end
                 end
             end

data/lib/cocoapods-jxedt/command/header/header.rb

@@ -75,7 +75,8 @@ module Pod
                         lines = File.readlines(file_path)
                         # 获取命中的行
                         File.foreach(file_path).with_index {|line, num|
-                            matched = line =~ /^\s*#import\s*"#{header_name_regulation}"\s*\n$/ || line =~ /^\s*#import\s*<#{header_name_regulation}>\s*\n$/
+                            matched_regex = "(^\s*#import\s*\"#{header_name_regulation}\")|(^\s*#import\s*<#{header_name_regulation}>)"
+                            matched = line =~ /#{matched_regex}/
                             next unless matched
                             
                             header_name = line.match(/(?<=")#{header_name_regulation}(?=")/) || line.match(/(?<=<)#{header_name_regulation}(?=>)/)
@@ -83,7 +84,7 @@ module Pod
 
                             changed = true # 文件需要修改
                             project_module_name = public_header_mapping["#{header_name}"]
-                            replace_line = "#import " << "<#{project_module_name}/#{header_name}>\n"
+                            replace_line = line.gsub(/#{matched_regex}/, "#import <#{project_module_name}/#{header_name}>") 
                             lines[num] = replace_line
                             record << "#{file_path} 第#{num}行，#{line} => #{replace_line}"
                         }
@@ -107,7 +108,8 @@ module Pod
                             文件修改详情：
                             #{JSON.pretty_generate(record)}
                         LOGS
-                        logs.gsub!('\\"', '"').gsub!('\\n', '') # 去除转义字符
+                        logs.gsub!('\\"', '"')# 去除转义字符
+                        logs.gsub!('\\n', '') # 去除转义字符
                         puts logs if @verbose_flag
                         File.open(log_file_path, 'w') { |file| file.write("#{logs}") } unless log_file_path.nil?
                     end

data/lib/cocoapods-jxedt/command/jxedt.rb

@@ -2,6 +2,7 @@ require_relative 'options/options'
 require_relative 'header/header'
 require_relative 'binary/binary'
 require_relative 'user/user'
+require_relative 'modify/modify'
 
 module Pod
   class Command

data/lib/cocoapods-jxedt/command/modify/modify.rb

@@ -0,0 +1,63 @@
+module Pod
+    class Command
+        class JxedtCommand < Command
+            class ModifyDir < JxedtCommand
+                self.summary = '修改文件目录的真实路径，并在原位置创建一个目录的软链接，为二进制调试提供便利。'
+                self.description = <<-DESC
+                可以把很多台机器上的工程目录统一放置到一个相同目录，这样可以确保所有的机器的工程目录都是相同的。\n
+                编译打包的文件路径也是相同的，然后就可以使用二进制调试的功能了。\n
+                这个统一的目录是`/Users/cocoapods-jxedt/`
+                DESC
+                self.command = 'modifydir'
+                self.arguments = [
+                    CLAide::Argument.new('DIRECTORY_PATH', true)
+                ]
+                def self.options
+                    [
+                        ['--name', '统一路径下的工程目录名称']
+                    ]
+                end
+                def initialize(argv)
+                    @dir_path = argv.shift_argument
+                    @name = argv.option('name')
+                    super
+                end
+      
+                def validate!
+                    super
+                    help! '没有传入操作目录！！！' if @dir_path.nil?
+                    # 获取完整路径
+                    @dir_path = File.expand_path(@dir_path)
+                    help! '操作目录不存在！！！' unless File.exist?(@dir_path)
+                    help! '传入的地址不是一个目录！！！' unless File.directory?(@dir_path)
+                    help! '操作目录已经是一个软链接！！！' if File.ftype(@dir_path) == 'link'
+                    help! '操作目录已经在指定目录下！！！' if @dir_path =~ /^#{user_path}/
+                    help! '当前目录不允许操作，操作路径最少要3层目录！！！' unless @dir_path.split('/').reject { |path| path.empty? }.count > 2
+                end
+      
+                def run
+                    op_dir_path = Pathname.new(@dir_path)
+                    # 获取target name
+                    @name = op_dir_path.basename if @name.nil? || @name.empty?
+
+                    # create user directory
+                    `sudo mkdir #{user_path} && sudo chmod -R 777 #{user_path}` unless user_path.exist?
+
+                    # 路径是否存在
+                    target_path = user_path + @name
+                    # target_path.rmtree if target_path.exist?
+                    help! '目录已存在！！！' if target_path.exist?
+
+                    # 移动目录
+                    FileUtils.mv(@dir_path, target_path)
+                    # 创建软链接
+                    FileUtils.ln_s(target_path, op_dir_path)
+                end
+
+                def user_path
+                    @user_path ||= Pathname.new('/Users/cocoapods-jxedt/')
+                end
+            end
+        end
+    end
+end

data/lib/cocoapods-jxedt/command/options/options.rb

@@ -40,6 +40,30 @@ module Pod
                     log_section "🌹 GIT_CACHE_CONFIG"
                     git_config = Jxedt::Config::GIT_CACHE_CONFIG
                     Pod::UI.puts JSON.pretty_generate(git_config)
+
+                    log_section "🌹 DSL支持的方法"
+                    Pod::UI.puts dsl_support_method
+
+                    log_section "🌹 组件支持的DSL配置"
+                    Pod::UI.puts arguments_support
+                end
+
+                def dsl_support_method
+                    dsl_method = <<DSL_METHOD
+all_binary!                             组件全部使用二进制
+binary_dir('../_Prebuild')              配置二进制的放置路径
+binary_switch(true)                     二进制开关
+framework_header_search_enabled!        开启配置依赖的framework头文件配置
+use_binary_settings(Hash)               使用二进制的组件配置
+cocoapods_jxedt_config(Hash)            配置插件
+DSL_METHOD
+                end
+
+                def arguments_support
+                    config = <<CONFIG
+:binary => true                         组件是否使用二进制
+:framework_header_search => true        组件是否需要配置依赖的framework的头文件
+CONFIG
                 end
 
                 def print_base_options_config

data/lib/cocoapods-jxedt/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJxedt
-  VERSION = "0.0.19"
+  VERSION = "0.0.21"
 end

data/lib/cocoapods-jxedt/git_helper/cache_pucher.rb

@@ -16,7 +16,7 @@ module Jxedt
             output_dir.children.each do |child|
                 next unless child.directory?
                 pod_name = child.basename.to_s
-                next if targets && targets.is_a?(Array) && !(targets.include?(pod_name))
+                next if targets && targets.is_a?(Array) && targets.size > 0 && !(targets.include?(pod_name))
 
                 pod_checksum = child.children.select { |ch| ch.extname == '.checksum' }.first
                 pod_checksum = pod_checksum.basename.sub_ext('').to_s unless pod_checksum.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -100,6 +100,7 @@ files:
 - lib/cocoapods-jxedt/command/binary/command/statistics.rb
 - lib/cocoapods-jxedt/command/header/header.rb
 - lib/cocoapods-jxedt/command/jxedt.rb
+- lib/cocoapods-jxedt/command/modify/modify.rb
 - lib/cocoapods-jxedt/command/options/options.rb
 - lib/cocoapods-jxedt/command/user/user.rb
 - lib/cocoapods-jxedt/gem_version.rb