cocoapods-jxedt 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87df49d02d7bd4e47d3a4279b4c075e9a55d260d25adc98223aced2c342bc804
-  data.tar.gz: 93fe5bda70d2c56b17b5c0e0b692bd96b6b5dc9aef8f7fc4ee014a860ea9f6d4
+  metadata.gz: 87b8390f2490128b3ae787cd3a5d1ae8677eda84a3d8b2817f9d89fef6b47e1d
+  data.tar.gz: b43bef366375925d915be7bf0a4e4b745a1f2eaf506ea0991f6cd7292bce849c
 SHA512:
-  metadata.gz: '09a2a403367a4d7b10b7d8b03741325faeb1a32b4d8af1dedce1712e62ad1f1e3b23b5aacc02a60b069f75c7c3ecca8140ea9962e111b2a89bcd394b5236ab74'
-  data.tar.gz: 7581173b0772a0a6abb08d71a76a9bf7b72faba95ca61aa7c4ebb09c03adf2af37f7db470f43d04bae33c635fc15430148867f3bafb30997cd8368611828acc3
+  metadata.gz: 7a771222219d027b4f5b5de8077c63d6d9e04450b39c8383e940a1c3b1bf2bdccdd0c974d024ba4a9e8b30da82a530c4370d79c4f14067f1384a9d0fea8d6c4c
+  data.tar.gz: 2a7f8424df70d69f239aa28996152857504e6e07253521fefab8b9370c15a03c98b0effa5637a08ac82a004e75622708a7b3c1d99a2b1af4baa0cd22d0792772

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

@@ -63,6 +63,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

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

@@ -109,7 +109,23 @@ module Pod
     end
 
     def clean_source_project!
-      return if Jxedt.config.keep_source_project?
+      if Jxedt.config.keep_source_project?
+        # 修改productName后，可以把源码工程拖入workspace中源码调试，而源码不链接和编译
+        require 'xcodeproj'
+        project = Xcodeproj::Project.open(project_path)
+        project.targets.each do |target|
+          target.build_configurations.each do |config|
+            # 修改工程的product name
+            product_name = config.build_settings['PRODUCT_NAME'] || target.name
+            config.build_settings['PRODUCT_NAME'] = "#{product_name}_Source"
+          end
+          # target.name = "#{target.name}_Source"
+        end
+        project.save
+
+        # 保存源码工程，退出
+        return
+      end
 
       sources_root.rmtree if real_path_compiler? && sources_root.exist?
       root.rmtree if root.exist?

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

@@ -45,10 +45,11 @@ module Jxedt
             # fetch cache and sync
             if Jxedt.config.cache_repo_enabled? && Jxedt.config.auto_fetch?
                 log_section "🚗  Fetch git cache"
-                pods = prebuild_sandbox.source_lockfile.internal_data["SPEC CHECKSUMS"].keys
-                binary_hash = pods.reduce({}) do |hash, name|
+                # 统计需要prebuild的targets
+                prebuild_pods =  Jxedt::Prebuild.new(source_installer).targets_to_prebuild.map(&:pod_name)
+                binary_hash = prebuild_pods.reduce({}) do |hash, name|
                     checksum = prebuild_sandbox.source_lockfile.spec_checksums_hash_key(name)
-                    hash.update(name => checksum) unless checksum.nil?
+                    hash.update(name => checksum)
                 end
 
                 require 'cocoapods-jxedt/git_helper/cache_fetcher'

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.15"
+  VERSION = "0.0.17"
 end

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

@@ -19,6 +19,8 @@ module Jxedt
             cache_dir = Pathname.new(Jxedt.config.git_cache_path) + "GeneratedFrameworks"
             to_dir = Pathname.new(to_dir)
             binary_hash.each do |name, checksum|
+                next if checksum.nil?
+
                 zip_file = cache_dir + name + "#{checksum}.zip"
                 next unless zip_file.exist?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods