cocoapods-privacy 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84dea61fc2bc984ef88adabe1aa4de41f27b05dbea00a570ae1dc2e2a43966e3
-  data.tar.gz: 61ba57f0692ca5c5034379f0c1abc02c7dd6b69048c3fe033981115b2f729c63
+  metadata.gz: 9b4a00e9abc854afbf658a6361ed8934fd35fa2c08acf7cc17e8a05ffa9f515d
+  data.tar.gz: 70c3102a4c9b371f4c1eb38317dcc4e1f568c19a95349b146902126029742a08
 SHA512:
-  metadata.gz: f5c68b15d9089e1cd43732c1f33e302748e4d8bbb6abf6c74394d5ce3bdd4bf57e5fe1a26dfba9ce6530b9f12e9b1deda38fc73e3089f8f0778b746a94d75867
-  data.tar.gz: 76a55bb3e4486e640ff20a909863f49cdf3e19b120c06e28346e6898a9cc9d745a8568b197d230abc925b240660cf3c11de18fd8b7756fdf8346c23805f4dc27
+  metadata.gz: 0d8074f3e754caa905a5452b9e232599654e626f0a119ec1dedf7c5c960c85826ed084a6d52f1f5d32afa81024a68782e4391bda61ca9114857f563722d58d6c
+  data.tar.gz: 13248a72deadcf1117be0c135e1b2724a5106d99654f499081cbbfb53c50bf6c443bf9fe8e81d1ab0894a5e31168c98ea5a722c554ae9b41ad9d26c2ee54c3c5

data/README.md

@@ -4,8 +4,9 @@ Apple 2024 will review the App's privacy list in the spring, and any apps that d
 [Click to view details on Apple](https://developer.apple.com/documentation/bundleresources/privacy_manifest_files)
 
 ## Installation
-
-    $ gem install cocoapods-privacy
+```
+$ gem install cocoapods-privacy
+```
 
 ## Usage
 #### init
@@ -26,7 +27,7 @@ There has 3 keys in defalut config, you should custom it!
 
 #### To Component
 ```
-    $ pod privacy spec [podspec_file_path]
+$ pod privacy spec [podspec_file_path]
 ```
 This command will auto create privacy file, and search the path of podspec' source_files' define relate to NSPrivacyAccessedAPITypes, finaly, write to PrivacyInfo.xcprivacy file.
 if your component has much subspec,  all subspec that define ‘source_files’ will create PrivacyInfo.xcprivacy, and auto modify .podspec link .xcprivacy to 'resource_bundle' key.
@@ -68,9 +69,9 @@ end
     
 #### To Project
 ```
-    $ pod install --privacy
-    or
-    $ pod privacy install
+$ pod install --privacy
+or
+$ pod privacy install
 ```
 <img width="298" alt="截屏2024-02-02 10 59 59" src="https://github.com/ymoyao/cocoapods-privacy/assets/13619221/c6f10e36-0f62-497a-93d4-f8b336dc8df4">
 

data/lib/cocoapods-privacy/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPrivacy
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

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

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

@@ -98,8 +98,12 @@ module Pod
               podspec_fold_path = File.dirname(podspec_file_path)
               source_files = spec.attributes_hash['source_files']
               if source_files && !source_files.empty?
-                source_files.each do |file|
-                  development_folds << File.join(podspec_fold_path,file)
+                if source_files.is_a?(String) && !source_files.empty?
+                  development_folds << File.join(podspec_fold_path,source_files)
+                elsif source_files.is_a?(Array)
+                  source_files.each do |file|
+                    development_folds << File.join(podspec_fold_path,file)
+                  end
                 end
               end
             end

metadata

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