cocoapods-jxedt 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f69690fe092a3b3f3ac75812d982e144d4f5e8434e70d999ab81a6d0aeef89
-  data.tar.gz: 55319b9dd689f80433855208a24a81b4b85a6b1a898b88b9921b961ef6bae4a0
+  metadata.gz: 7c059b0853c0b86e555a853eea168d4a3c1c8652bb8db739d5e3e9a434abf22c
+  data.tar.gz: a77b1ca134e6f16ce3a12f6da6974b363c07992ee90939c63a0f7d6e9384d020
 SHA512:
-  metadata.gz: ecbb12c9bb4c7adac71673b5a47d02a80695112d0acfc157585448c761a91e8ee679d091500cbbcecabea583cfa92a76b1ac74738fc07bf3f8a70494f853c2be
-  data.tar.gz: 03cb1d511a955cbbe0b6925e1c03a1bc840f09095b91000c5ee581c692d4415adad79fd1b67213c6e712942afcd4d296285ecb9cc8667fdaa51f5a865dadf6d6
+  metadata.gz: e35493b31fe5ab1a60b447f8623360a6649a43cce78149bfb814fe55925c0e936ae111543901203f66634341de2c23b5c48d6ad997f6efe851b2d30a259ea31e
+  data.tar.gz: be8fdce02f67e56af427026fa8c99c593468354a6a77571b76394f9b32b5e31707db5d40b7424c209acc289b02b954c4f20eb1c61295e38c76df020e6a43549a

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

@@ -140,6 +140,12 @@ module Pod
                 # rmtree
                 target_prebuild_files = self.sandbox.pod_dir(spec.name) + "_Prebuild"
                 target_prebuild_files.rmtree if target_prebuild_files.exist?
+                
+                # 切换到local pod时，清除一下pod所在目录下的_Prebuild文件夹
+                if self.sandbox.local?(spec.root.name)
+                    source_target_prebuild_files = self.sandbox.sources_root + spec.root.name + "_Prebuild"
+                    source_target_prebuild_files.rmtree if source_target_prebuild_files.exist?
+                end
 
                 self.prebuild_pod_names.include? spec.root.name
             end)

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

@@ -12,6 +12,7 @@ module Jxedt
             :binary_switch => "插件开关，设置为false则关闭插件二进制功能。默认为true",
             :prebuild_job => "开启编译任务，设置为false则不触发编译功能。默认为true",
             :keep_source_project => "保留源码的pods工程，方便查看源码，文件目录为Podfile文件同级目录下'Pods-Source'。默认为false",
+            :create_index_project => "在源码工程目录下创建一个index project工程，可以直接拖入workspace中，可点击查看源码，可断点调试。默认取`keep_source_project`的配置",
             :dev_pods_enabled => "Development Pods是否支持二进制。默认为false",
             :excluded_pods => "排除binary的pods，是一个数组。默认是[]",
             :xcconfig_configuration_alias => "xcconfig文件中配置多configuration的别名（一定要唯一），用于搜索替换，我们用来支持多configuration的二进制。一般不需要设置，默认值为'cocoapods-jxedt-binary'",
@@ -63,6 +64,13 @@ module Jxedt
             @dsl_config[:all_binary] || false
         end
 
+        def binary_settings
+            @options ||= begin
+                @dsl_config[:use_binary_settings] || {}
+            end
+            @options
+        end
+
         def binary_switch?
             @dsl_config[:binary_switch] || @dsl_config[:binary_switch].nil?
         end
@@ -75,6 +83,14 @@ module Jxedt
             @dsl_config[:keep_source_project] || false
         end
 
+        def create_index_project?
+            @create_index ||= begin
+                create_index = @dsl_config[:create_index_project]
+                create_index = keep_source_project? if create_index.nil?
+                create_index && keep_source_project?
+            end
+        end
+
         def dev_pods_enabled?
             @dsl_config[:dev_pods_enabled] || false
         end

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

@@ -7,5 +7,62 @@ module Pod
                 super.to_h.merge(:integrate_targets => false)
             )
         end
+
+        def generate_pods_index_project!
+            return unless Jxedt.config.create_index_project?
+            
+            Pod::UI.puts "-----------------------------------------"
+            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传空
+            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
+    end
+end
+
+module Pod
+    class Installer
+      # Cleans up the sandbox directory by removing stale target support files and headers.
+      #
+      class SandboxDirCleaner
+        alias_method :old_sandbox_project_dir_names, :sandbox_project_dir_names
+        def sandbox_project_dir_names
+          project_dir_names = old_sandbox_project_dir_names
+          if sandbox.is_a?(Pod::JxedtPrebuildSandbox)
+            # 如果允许生成Pods-Index.xcodeproj，排除这个文件
+            project_dir_names.reject! { |d| d.basename.to_s =~ /#{sandbox.index_project_name}$/ } if Jxedt.config.create_index_project?
+          end
+          project_dir_names
+        end
+      end
+    end
+  
+    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_
+      end
     end
-end
+end
+  
+  

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

@@ -51,6 +51,8 @@ module Pod
   #
   #
   class JxedtPrebuildSandbox < Sandbox
+    attr_accessor :index_project_create_stage
+
     # [Pod::Sandbox] standard_sandbox
     def self.from_standard_sandbox(sandbox, sandbox_path: nil, real_path_compiler: false)
       prebuild_sandbox_path = Pathname.new(sandbox.root).realpath + '../Pods-Source'
@@ -105,9 +107,16 @@ module Pod
     end
 
     def project_path
+      if index_project_create_stage
+        return root + index_project_name
+      end
       root + 'Pods-Source.xcodeproj'
     end
 
+    def index_project_name
+      return 'Pods-Index.xcodeproj'
+    end
+
     def clean_source_project!
       return if Jxedt.config.keep_source_project?
 

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

@@ -7,8 +7,18 @@ module Pod
           # prebuild
           @explicit_prebuild_pod_names ||= []
           @reject_prebuild_pod_names ||= []
-          @explicit_prebuild_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options[:binary]
-          @reject_prebuild_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options.include?(:binary) && !options[:binary]
+          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 ||= []

data/lib/cocoapods-jxedt/binary/hooks/pre_install.rb

@@ -70,6 +70,7 @@ module Jxedt
                     Jxedt::CachePucher.push(output_dir, build_targets, false)
                 end
             end
+            source_installer.generate_pods_index_project!
             prebuild_sandbox.clean_source_project!
 
             log_section "🤖  Resume pod installation"

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

@@ -17,6 +17,13 @@ module Pod
                 Jxedt.config.dsl_config.merge!({'framework_header_search_enabled': true})
             end
 
+            # 统一设置是否使用binary
+            def use_binary_settings(options=nil)
+                return if options.nil?
+                return unless options.is_a?(Hash)
+                Jxedt.config.dsl_config.merge!({'use_binary_settings': options})
+            end
+
             def cocoapods_jxedt_config(options)
                 Jxedt.config.dsl_config.merge!(options)
                 Jxedt.config.validate_dsl_config

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

@@ -37,7 +37,11 @@ module Pod
 
                         used_binary = []
                         Dir.glob("#{pods_root}/*/_Prebuild") do |file_path|
+                            # 不是目录，不处理
                             next unless File.directory?(file_path)
+                            # 目录下文件为空不处理
+                            next if Dir["#{file_path}/*"].empty?
+
                             dir_name = File.dirname(file_path)
                             name = File.basename(dir_name).to_s
                             target_path = binary_dir + name
@@ -64,6 +68,9 @@ module Pod
                         index, failed = 0, []
                         used_binary.sort_by {|hash| hash[:name].capitalize }.each do |hash|
                             name = hash[:name]
+                            
+                            # lockfile中没有则跳过
+                            next unless lockfile.internal_data["SPEC CHECKSUMS"].include?(name)
 
                             checksum = lockfile.spec_checksums_hash_key(name)
                             validation_passed = checksum && checksum == hash[:checksum] && hash[:checksum_count] == 1

data/lib/cocoapods-jxedt/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJxedt
-  VERSION = "0.0.16"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods