cocoapods-privacy 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad82b3ef0ee76d32a2323649deca0e0aade7ac3ce2b4833917b22e99bd4f2842
-  data.tar.gz: 5907b1321ca9eb9d496335743bff10cb49e666250eabc829e06c7728cb58b2b3
+  metadata.gz: 3a01926feebe0e4abec4ba740c40045150fa16eadbde2286bbe9bfeedaa6594d
+  data.tar.gz: 43e885178765e82aef94d3b2e0a115fc807c410b389b6c6752ac673dd45de73f
 SHA512:
-  metadata.gz: 499e6b195d45c6c87e8717cc0e84e670b8466ca8e8602170dee521af9bcf536a9fd8bc387a2f5097857de43eeb5fe73860030b45431578e629738fa1449af931
-  data.tar.gz: d6f72bc25b077147fa7e12489a45ca95401a9d9bef3f40efb7cf04feca3e488f94622fc531115a6b710dd31ef6154f947b37bdf85236024c5371dc7da666bd6d
+  metadata.gz: 625ebb584fe2db868894a19e7fe8bff1cbf817d3b1026418afaf48588d3ee5ae2bd81bb1c4d265bf03e8a28ffd61b73fceda1457c2c120315b2cb70be0c072d0
+  data.tar.gz: e9fc5727cafed29d6afbbd6a9c0f9dd964e1871125215e191103ad7e80342c0ddd2ca0068c213be272c70bedf7e99bf58442545c0b739263f4814607051a22e6

data/lib/cocoapods-privacy/gem_version.rb

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

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

@@ -8,6 +8,7 @@ require 'cocoapods-privacy/command'
 #  3、检索到的内容转换成隐私协议格式写入 隐私清单文件 PrivacyInfo.xcprivacy
 ##
 module PrivacyHunter
+
     KTypes = "NSPrivacyAccessedAPITypes"
     KType = "NSPrivacyAccessedAPIType"
     KReasons = "NSPrivacyAccessedAPITypeReasons"
@@ -103,12 +104,12 @@ module PrivacyHunter
     def self.fetch_template_plist_file
 
       unless File.exist?(PrivacyUtils.cache_config_file)
-        raise Informative, "无配置文件，run `pod privacy config config_file' 进行配置"
+        raise Pod::Informative, "无配置文件，run `pod privacy config config_file' 进行配置"
       end
   
       template_url = Privacy::Config.instance.api_template_url
       unless template_url && !template_url.empty?
-        raise Informative, "配置文件中无 `api.template.url` 配置，请补全后再更新配置 `pod privacy config config_file` "
+        raise Pod::Informative, "配置文件中无 `api.template.url` 配置，请补全后再更新配置 `pod privacy config config_file` "
       end
 
       # 目标文件路径

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

@@ -29,7 +29,7 @@ class BBRow
 end
 
 class BBSpec
-  attr_accessor :name, :alias_name, :full_name, :rows, :privacy_sources, :privacy_file
+  attr_accessor :name, :alias_name, :full_name, :parent, :rows, :privacy_sources, :privacy_file
 
   def initialize(name,alias_name,full_name)
     @rows = []
@@ -40,6 +40,23 @@ class BBSpec
     @privacy_file = "Pod/Privacy/#{full_name}/PrivacyInfo.xcprivacy"
   end
 
+
+  def uniq_full_name_in_parent(name)
+    names = []
+    @rows.each_with_index do |line, index|
+      if line && line.is_a?(BBSpec)  
+        names << line.name
+      end
+    end
+
+    #判断names 中是否包含 name，如果包含，那么给name 添加一个 “.diff” 后缀，一直到names 中没有包含name为止
+    while names.include?(name)
+      name = "#{name}.diff"
+    end
+
+    "#{@full_name}.#{name}"
+  end
+
   def privacy_handle(podspec_file_path)
     source_files_index = 1
     @rows.each_with_index do |line, index|
@@ -196,17 +213,23 @@ module PrivacyModule
   
   def self.parse_row(lines)
     rows = []  
-    if_stack = [] #排除if end 干扰
+    code_stack = [] #栈，用来排除if end 等对spec 的干扰
+
     lines.each do |line|
       content = line.strip
       is_comment = content.start_with?('#')
       is_spec_start = !is_comment && (content.include?('Pod::Spec.new') || content.include?('.subspec'))
       is_if = !is_comment && content.start_with?('if')  
       is_end = !is_comment && content.start_with?('end')
+
       # 排除if end 对spec_end 的干扰
-      if_stack.push(true) if is_if
-      is_spec_end = if_stack.empty? && is_end
-      if_stack.pop if is_end
+      code_stack.push('spec') if is_spec_start 
+      code_stack.push('if') if is_if 
+      stack_last = code_stack.last 
+      is_spec_end = is_end && stack_last && stack_last == 'spec'
+      is_if_end = is_end && stack_last && stack_last == 'if'
+      code_stack.pop if is_spec_end || is_if_end
+
       row = BBRow.new(line, is_comment, is_spec_start, is_spec_end)
       rows << row
     end
@@ -236,15 +259,20 @@ module PrivacyModule
 
     rows.each do |row|
       if row.is_spec_start 
+        # 获取父spec
+        parent_spec = spec_stack.last 
+
         # 创建 spec
         name = row.content.split("'")[1]&.strip || default_name
         alias_name = row.content.split("|")[1]&.strip
-        full_name = spec_stack.empty? ? name : "#{spec_stack.last.full_name}.#{name}" 
+        full_name = parent_spec ? parent_spec.uniq_full_name_in_parent(name) : name
+
         spec = BBSpec.new(name,alias_name,full_name)
         spec.rows << row
+        spec.parent = parent_spec
 
         # 当存在 spec 时，存储在 spec.rows 中；不存在时，直接存储在外层
-        (spec_stack.empty? ? result_rows : spec_stack.last.rows) << spec
+        (parent_spec ? parent_spec.rows : result_rows ) << spec
   
         # spec 入栈
         spec_stack.push(spec)

metadata

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