cocoapods-privacy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b2bf9e6e9cd3c863067c2e4e4bcf9db70d734b2d3786dfba8c881dcdc58a16
-  data.tar.gz: 4bf64cdce7e18acfef794f43a92371a2633bdcfae75d593a60c7c0e481975235
+  metadata.gz: aca165884812e22b5b99ff4220a5a87129f9b56f5940b95f32cea856418e8c32
+  data.tar.gz: fcfbee202add9d50cff29d74c5bf8b1558855daca7278905a25922d9674c40c0
 SHA512:
-  metadata.gz: 228886b2f261e7850e7531ceecdd282fe483589f8abf014c3e27fa933cb652c941c7e50276d7d13f50487cd5e5d97d9c04c47bbc62bb110502e0f573ac59f410
-  data.tar.gz: f2b7d99c39f6cd2e15f1943ac49fa6285595632fdef523504d973cb5e0f652daee9ace8bed17dc1652ae87a8b776c93b920272aae131796718004953aef2c6ee
+  metadata.gz: 3c61d2467300415d231fab11762e54c8a5e17ec7fb91f47af5f3aff9db72c85b30353d505354642e420513059bd7227bcb88a31f921d44929a9ba66150e626c7
+  data.tar.gz: 90718eb044f351c618a7a7c9490f156e010053083668aad75f31f6b5b7b95fca4142785193286b8b92008a3b7cc954b7724a7c1bc04a05786929ec290016aabb

data/lib/cocoapods-privacy/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPrivacy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

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

@@ -88,33 +88,29 @@ module Pod
       pod_folds = modules.map{ |spec|
         name = spec.name.split('/').first
         fold = File.join(@sandbox.root,name)
-        if Dir.exist?(fold)
-          fold
-        else
-          development_pods = @sandbox.development_pods
-          if name && development_pods
-            podspec_file_path = development_pods[name]
-            if podspec_file_path && !podspec_file_path.empty? 
-              podspec_fold_path = File.dirname(podspec_file_path)
-              source_files = spec.attributes_hash['source_files']
-              if source_files && !source_files.empty?
-                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
+        podspec_file_path_develop = validate_development_pods(name)
+        # 先验证是否是指向本地的组件（发现有的情况下 组件指向本地Pods 下依旧还是会有该组件，所以这里先判断本地的）
+        if podspec_file_path_develop
+          podspec_fold_path = File.dirname(podspec_file_path_develop)
+          source_files = spec.attributes_hash['source_files']
+          if source_files && !source_files.empty?
+            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
           nil
+        elsif Dir.exist?(fold)
+          formatter_search_fold(fold) 
         end
       }.compact
     
       
       pod_folds += development_folds # 拼接本地调试和远端的pod目录 
-      pod_folds += [PrivacyUtils.project_code_fold].compact # 拼接工程同名主目录
+      pod_folds += [formatter_search_fold(PrivacyUtils.project_code_fold)].compact # 拼接工程同名主目录
       pod_folds += custom_folds || [] # 拼接外部传入的自定义目录
       pod_folds = pod_folds.uniq # 去重
 
@@ -126,5 +122,22 @@ module Pod
       end
       puts "👆👆👆👆👆👆 End analysis project privacy 👆👆👆👆👆👆"
     end
+
+    private
+    def formatter_search_fold(fold)
+      File.join(fold,"**","*.{m,c,swift,mm,hap,hpp,cpp}") 
+    end
+
+    def validate_development_pods(name)
+      result = nil
+      development_pods = @sandbox.development_pods
+      if name && !name.empty? development_pods && !development_pods.empty?
+        podspec_file_path = development_pods[name]
+        if podspec_file_path && !podspec_file_path.empty? 
+          result = podspec_file_path
+        end
+      end
+      result
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-privacy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - youhui