cocoapods-privacy 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1138888b85b8d2e4eb857fc7bb3d86f305f8a414b79702a9e898da0c351b7f8
-  data.tar.gz: e47d7800f08af2b3464f5dcf7cfb77c8e46961d2198acb4e12390df3eeff6df0
+  metadata.gz: 06cfd0105293d04c3f940b48b2a591daa1c361ddceeca67e4c19263984b5e5dd
+  data.tar.gz: bdbba9767ad2127bee8fbbbac60bd2b06adcd3471d29899f6f2a829582f68f06
 SHA512:
-  metadata.gz: e3d5745b2c7c7eaa6cdffe1e9f11a6d6720a8b2fd56d6a7195b6176a99467f2462e5f3e4233d695148ebe38ef07f74ab92525f318bf930bf9dc806f0ba4dfedb
-  data.tar.gz: 0caa4e0cfe57beadfdbf979bfe9712997e5b9d5193216204ee5eef51292d8d1638522d5f2bb892e978007fda675918cc0aff28688bc26a72fe0bfa55640904ee
+  metadata.gz: bc73b9f26811740f419e0519e34f765ee596e9bb52c17c8767866867d078d697c509a17cf0ee111a4ec8db755550d32b4fda4920cb67bcea3a747c48c218e0fa
+  data.tar.gz: 2142d38a2e33517f88c44b2108c5db12adc40467b95b4135a30692c28cad5c71a81c37b0f5ff34b8b1cfb74823785c4f64b5a8d86960fab385788f77f5ecde93

data/lib/cocoapods-privacy/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPrivacy
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 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|
@@ -137,7 +154,9 @@ module PrivacyModule
 
     # 如果不存在引用，创建新的引入xcode引用
     if resources_group.find_file_by_path(PrivacyUtils.privacy_name).nil?
-      resources_group.new_reference(PrivacyUtils.privacy_name)
+      privacy_file_ref = resources_group.new_reference(PrivacyUtils.privacy_name)
+      target = project.targets.first
+      target.add_file_references([privacy_file_ref]) # 将文件引用添加到 target 中
       # resources_group.new_file(privacy_file_path)
     end
     
@@ -196,17 +215,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 +261,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-privacy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - youhui