cocoapods-privacy 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e2c2edb2a21e1dc73f639fab1bd7b78eda9e0caeecd8597378c8f8b4c4f35c2
-  data.tar.gz: 8f98ddf47a36beebbc8c80b3da3fad5f0cfccfd0a0b491e81af13bf1f156e16f
+  metadata.gz: ad82b3ef0ee76d32a2323649deca0e0aade7ac3ce2b4833917b22e99bd4f2842
+  data.tar.gz: 5907b1321ca9eb9d496335743bff10cb49e666250eabc829e06c7728cb58b2b3
 SHA512:
-  metadata.gz: 407e0cf2c260455f3bfed2232b656317b140759018dae8ce9eb6aa605c3df316d07ef772c23b2aa823a03790088257c5763e5bf73f2e70d0342783df5c953fc6
-  data.tar.gz: 5c2859958cdfafb1ef978d1ede514595caaaf73a9bd864a84eb7a1522f0d40768a3310b67d7206b68c95f16514a9b22cb014e6b23215cbd70e19d2f861ccd1c2
+  metadata.gz: 499e6b195d45c6c87e8717cc0e84e670b8466ca8e8602170dee521af9bcf536a9fd8bc387a2f5097857de43eeb5fe73860030b45431578e629738fa1449af931
+  data.tar.gz: d6f72bc25b077147fa7e12489a45ca95401a9d9bef3f40efb7cf04feca3e488f94622fc531115a6b710dd31ef6154f947b37bdf85236024c5371dc7da666bd6d

data/lib/cocoapods-privacy/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPrivacy
-  VERSION = "0.0.5"
+  VERSION = "0.1.1"
 end

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

@@ -33,7 +33,7 @@ class BBSpec
 
   def initialize(name,alias_name,full_name)
     @rows = []
-    @privacy_sources = []
+    @privacy_sources = nil
     @name = name
     @alias_name = alias_name
     @full_name = full_name
@@ -41,6 +41,7 @@ class BBSpec
   end
 
   def privacy_handle(podspec_file_path)
+    source_files_index = 1
     @rows.each_with_index do |line, index|
       if !line || line.is_a?(BBSpec) || !line.key || line.key.empty? 
         next
@@ -52,7 +53,7 @@ class BBSpec
         spec = eval("Pod::Spec.new do |s|; s.source_files = #{line.value}; end;")
         if spec && !spec.attributes_hash['source_files'].nil?
           source_files_value = spec.attributes_hash['source_files']
-          if source_files_value.is_a?(String)
+          if source_files_value.is_a?(String) && !source_files_value.empty?
             source_files_array = [source_files_value]
           elsif source_files_value.is_a?(Array)
             # 如果已经是数组，直接使用
@@ -62,6 +63,7 @@ class BBSpec
             source_files_array = []
           end
         
+          source_files_index = index
           @privacy_sources = source_files_array.map do |file_path|
             File.join(File.dirname(podspec_file_path), file_path.strip)
           end
@@ -69,19 +71,19 @@ class BBSpec
       end
     end
     create_privacy_file_if_need(podspec_file_path)
-    modify_privacy_resource_bundle_if_need()
+    modify_privacy_resource_bundle_if_need(source_files_index)
   end
 
   # 对应Spec新增隐私文件
   def create_privacy_file_if_need(podspec_file_path)
-    if !@privacy_sources.empty?
+    if @privacy_sources
       PrivacyUtils.create_privacy_if_empty(File.join(File.dirname(podspec_file_path), @privacy_file))
     end
   end
 
   # 把新增的隐私文件 映射给 podspec
-  def modify_privacy_resource_bundle_if_need
-    if !@privacy_sources.empty?
+  def modify_privacy_resource_bundle_if_need(source_files_index)
+    if @privacy_sources
       privacy_resource_bundle = { "#{full_name}.privacy" => @privacy_file }
       if @has_resource_bundle
         @rows.each_with_index do |line, index|
@@ -99,11 +101,11 @@ class BBSpec
           end
         end
       else
-        space = PrivacyUtils.count_spaces_before_first_character(rows.first.content)
+        space = PrivacyUtils.count_spaces_before_first_character(rows[source_files_index].content)
         line = "#{alias_name}.resource_bundle = #{privacy_resource_bundle}"
-        line = PrivacyUtils.add_spaces_to_string(line,space + 2)
+        line = PrivacyUtils.add_spaces_to_string(line,space)
         row = BBRow.new(line)
-        @rows.insert(1, row)
+        @rows.insert(source_files_index+1, row)
       end
     end
   end
@@ -182,7 +184,7 @@ module PrivacyModule
 
      
       # Step 6: 获取privacy 相关信息，传递给后续处理
-      privacy_hash = fetch_privacy_hash(combin_sepcs_and_rows,podspec_file_path)
+      privacy_hash = fetch_privacy_hash(combin_sepcs_and_rows,podspec_file_path).compact
       filtered_privacy_hash = privacy_hash.reject { |_, value| value.empty? }
       filtered_privacy_hash
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-privacy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - youhui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler