cocoapods-jxedt 0.0.18 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c059b0853c0b86e555a853eea168d4a3c1c8652bb8db739d5e3e9a434abf22c
-  data.tar.gz: a77b1ca134e6f16ce3a12f6da6974b363c07992ee90939c63a0f7d6e9384d020
+  metadata.gz: abe43eae6c807ddde37ea7b81207987ba97882ffb07f19b6331d6e4ee3f0252a
+  data.tar.gz: 4de675f594a49c74c3c6542c4c39025cad621aefd62110f155b6da3634520137
 SHA512:
-  metadata.gz: e35493b31fe5ab1a60b447f8623360a6649a43cce78149bfb814fe55925c0e936ae111543901203f66634341de2c23b5c48d6ad997f6efe851b2d30a259ea31e
-  data.tar.gz: be8fdce02f67e56af427026fa8c99c593468354a6a77571b76394f9b32b5e31707db5d40b7424c209acc289b02b954c4f20eb1c61295e38c76df020e6a43549a
+  metadata.gz: 5fe8e4a1d9f7f49bc3171c97372a60f540180124468b81e34dfd055aff059d4fed9d865c4b0a0a7298ea638d77d9876e709246fef564b94e03fb707a3ba23ee7
+  data.tar.gz: 5a2aad13e0ac630865c88ef177048fbca2ef7b5cf88cc783c4cf8d502ca01faddf7e1f9fb6fa1c2b5db1c339124cf3bafeea3425074cfe1789eb29e714d8229e

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/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/prebuild_installer.rb

@@ -12,26 +12,40 @@ module Pod
             return unless Jxedt.config.create_index_project?
             
             Pod::UI.puts "-----------------------------------------"
-            Pod::UI.puts "🚖  生成Pods-Index.xcodeproj，可以直接把工程拖入workspace来查看源码或进行二进制调试"
+            Pod::UI.puts "🚖  正在生成Pods-Index.xcodeproj，可以直接把工程拖入workspace来查看源码或进行二进制调试"
             Pod::UI.puts "-----------------------------------------"
 
             # 生成index project开始标识
             sandbox.index_project_create_stage = true
       
-            # 只生成pods target工程
+            # 获取缓存
             cache_analysis_result = analyze_project_cache
-            # 获取缓存中需要生成的pod_targets
-            pod_targets_to_generate = cache_analysis_result.pod_targets_to_generate.clone
-            # 修改标识，这个标识用于修改Target的productName
-            pod_targets_to_generate.each { |target| target.binary_index_enabled = true }
-            
-            # 调用生成project的方法，aggregate_targets传空
+            # 获取缓存中需要生成的pod_targets，并拷贝一份新的，不修改原来的值
+            pod_targets_to_generate = cache_analysis_result.pod_targets_to_generate.map do |target|
+              target_to_copy = target.clone
+              target_to_copy.binary_index_enabled = true # 修改标识，用于修改Target的productName
+              target_to_copy
+            end
+
+            # 调用生成project的方法，aggregate_targets传空数组
             create_and_save_projects(pod_targets_to_generate, [],
                                      cache_analysis_result.build_configurations, cache_analysis_result.project_object_version)
             
             # 恢复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
 
@@ -55,12 +69,19 @@ module Pod
     class PodTarget < Target
       attr_accessor :binary_index_enabled
 
-      # 修改product module name
-      alias_method :old_product_module_name, :product_module_name
-      def product_module_name
-        name_ = old_product_module_name
-        return "#{name_}_Source" if binary_index_enabled
-        name_
+      # Target的PRODUCT_NAME写入逻辑可以查看`PodTargetInstaller`
+      # settings['PRODUCT_NAME'] = target.product_basename
+      # settings['PRODUCT_MODULE_NAME'] = target.product_module_name
+      # 
+      # 所以插件采用的方式是修改`product_basename`来改变Pods-Index.xcodeproj的名称
+      #
+      alias_method :old_product_basename, :product_basename
+      def product_basename
+        if binary_index_enabled
+          # 在后面添加'_Source'改变PRODUCT_NAME
+          return "#{old_product_basename}_Source"
+        end
+        old_product_basename
       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/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/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/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(true)   开启配置依赖的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.18"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.20
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-08-31 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