cocoapods-privacy 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160e1e50e0b10ceb9008703a37b624861e89e48aa7626ba69db17d5958f57d11
-  data.tar.gz: 4d2f9bc6b15442f8759f22d3609716349281a2c33460bbfd55433d04362ae2a2
+  metadata.gz: 3002f15cfb7bff2a3872ddceff7124881501695300162e37d9b0b4da6d197c55
+  data.tar.gz: 0cec2084e455bef224bb7d08174c5e3b0df86d08285dc6564239594c0a01d93e
 SHA512:
-  metadata.gz: 040723e52f2c23ee4fbfe2f33469194faf9d48c6d6af0cc8aa901966ad15e89830e97f9e227a05565c2e988776bef53ab3ae8d789aacc860bb2bed6a365c441a
-  data.tar.gz: 3d239ca8ed9639bf88647ab5fb6802e55bfe011fa61417a26325806ca91b4f1dd5e9dc0ee4dffdd37f08c7803326f7401018d939067ed746a2745fb5c79686e4
+  metadata.gz: d514b38b91b5bd46947cba044beaea0269b56a6e0154e913ade8b91a6fb625e456f5f077dd9de005b2d00d6ecdcac48caf4c767d3b3a03bb8d931cced5af5973
+  data.tar.gz: 69295dbcee5061ba3cc413b54da60d22870f1849d1dc5f2b8daaf9c4149ad830f1b25fdd63b23b99746c1b612c38071a08753a46daa4b2fabfbabe35ecd13021

data/lib/cocoapods-privacy/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPrivacy
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/lib/cocoapods-privacy/privacy/PrivacyHunter.rb

@@ -182,9 +182,15 @@ module PrivacyHunter
       # 获取文件夹下所有文件（包括子文件夹）
       all_files = []
       folder_paths.each do |folder|
-        allowed_extensions = ['m', 'c', 'swift', 'mm', 'hap', 'cpp']
-        pattern = File.join(folder, '**', '*.{'+allowed_extensions.join(',')+'}')
-        all_files += Dir.glob(pattern, File::FNM_DOTMATCH).reject { |file| File.directory?(file) }
+        # allowed_extensions = ['m', 'c', 'swift', 'mm', 'hap', 'cpp']
+        # pattern = File.join(folder, '**', '*.{'+allowed_extensions.join(',')+'}')
+        # all_files += Dir.glob(pattern, File::FNM_DOTMATCH).reject { |file| File.directory?(file) }
+
+        # 使用 Dir.glob 方法直接获取符合条件的文件路径
+        files_in_folder = Dir.glob(folder, File::FNM_DOTMATCH)
+        
+        # 过滤掉目录路径，只保留文件路径，并将其添加到 all_files 数组中
+        all_files += files_in_folder.reject { |file| File.directory?(file) }
       end
       # 遍历文件进行检索
       all_files.uniq.each_with_index do |file_path, index|

data/lib/cocoapods-privacy/privacy/PrivacyModule.rb

@@ -103,18 +103,42 @@ class BBSpec
     if @privacy_sources
       privacy_resource_bundle = { "#{full_name}.privacy" => @privacy_file }
       if @has_resource_bundle
+        line_incomplete = nil
         @rows.each_with_index do |line, index|
-          if !line || line.is_a?(BBSpec) || !line.key || line.key.empty? 
+          if !line || line.is_a?(BBSpec)
             next
           end
 
-          if !line.is_comment && line.key.include?(".resource_bundle")
-            origin_resource_bundle = eval(line.value)
-            merged_resource_bundle = origin_resource_bundle.merge(privacy_resource_bundle)
+          is_resource_bundle_line = line.key && line.key.include?(".resource_bundle")
+          if !line.is_comment && (is_resource_bundle_line || line_incomplete)
+            begin
+              if line_incomplete
+                code = "#{line_incomplete.value}#{line.content}"
+              else
+                code = "#{line.value}"
+              end
+
+              # 清除 content 和 value, 后面会把所有的resource_bundle 组装起来，多余的内容要清除，避免重复
+              line.content = ''
+              line.value = nil
+
+              RubyVM::InstructionSequence.compile(code)
+              origin_resource_bundle = eval(code)
+            rescue SyntaxError, StandardError => e
+              unless line_incomplete
+                line_incomplete = line
+              end
+              line_incomplete.value = code if line_incomplete #存储当前残缺的value,和后面完整的进行拼接
+              next
+            end
+
+            final_line = (line_incomplete ? line_incomplete : line)
 
+            merged_resource_bundle = origin_resource_bundle.merge(privacy_resource_bundle)
             @resource_bundle = merged_resource_bundle
-            line.value = merged_resource_bundle
-            line.content = "#{line.key}= #{line.value}"
+            final_line.value = merged_resource_bundle
+            final_line.content = "#{final_line.key}= #{final_line.value}"
+            break
           end
         end
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-privacy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - youhui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler