podfileDep 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 836193a1245b8fa2e3d40f0385557c15f9fba4be89de0434dd5a5cf0ad0c248c
-  data.tar.gz: 1ba4d4138d17c6c9372264ee9bc817135d38604636adafba1b927a4c835cffaa
+  metadata.gz: ef9fc2973506646be111abc577b60c06b07129188ed93fe88c815a3e85e9e0a5
+  data.tar.gz: e52aa4bbfc892537eb91f11930b38a84fa60ac7028734174e45ea9b13bf64029
 SHA512:
-  metadata.gz: 2e95518e907348fed5af271d87cf006ed0ada275706f00bd4f98eae4fa6a4467c49bb949f5d2fd96c6424268667e035ecc65f6361a273a7cdc99d07c67caf4ee
-  data.tar.gz: 1239b1d3f7d880cf0167686700be40227f87ce83db74fecf7a9dfe63ad7e763418378bb2a9b059ad5e95797013a79e87fc0f7bf4a167d48081ffb7f633f59222
+  metadata.gz: 9a008c66635fe0980898dd5668f02ca4c42c461d5e213510ffe35487ed46de9e23887beb3a8e37917fd59115d2a761bfe4148d59a2d5f1442510f77e8f11487d
+  data.tar.gz: 2d5a0317b067349e14b4ee302a5218d2a3857b2ab5c16def58364b5e07ddc7addcef58ebbefc8040f2a004eaf8120c8a8a1b7d529579dda1907aca589eda8227

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## [Released]
 
-### [2.1.4] - 2023-6-20
+### [2.1.6] - 2023-6-21
+- 兼容同时支持最原始的podfile的方式pod依赖库
+- 
+### [2.1.5] - 2023-6-20
 - 兼容同时支持subspec和configurations
 
 ### [2.1.4] - 2023-6-20

data/lib/podfileDep/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PodfileDep
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

data/lib/podfileDep/yaml/yaml_dep.rb

@@ -86,8 +86,9 @@ module Pod
       end
 
       # 存储所有依赖
-      store_dependencies(targets_dependencies, podfile)
-
+      store_dependencies(targets_dependencies, podfile) do|name|
+        yield(name) if block_given?
+      end
     end
 
     def store_dependencies(targets, podfile)
@@ -102,6 +103,7 @@ module Pod
               podfile.pod dependency.pod, dependency.option
             end
           }
+          yield(name) if block_given?
         end
       }
       targets
@@ -267,11 +269,6 @@ module Pod
           puts "⚠️  组件#{dependency['pod']}使用podspec依赖方式应该写在#{podfile_local_yaml}"
         end
 
-        # 记录覆盖
-        if yaml_dependencies.key?(dependency['pod']) and can_cover
-          puts "✅ #{dependency['pod']}被#{yaml_name}覆盖"
-        end
-
         # 默认值
         source = dependency['source']
         unless source
@@ -286,7 +283,22 @@ module Pod
           self.local_yaml_deps << dependency['pod']
         end
 
-        if Array(dependency['subspecs']).size > 0 and Array(dependency['configurations']).size > 0
+        # subspecs的覆盖前 把之前展开的全部清空
+        if can_cover and Array(dependency['subspecs']).size > 0
+          pod_prefix = dependency['pod']
+          yaml_dependencies.delete_if{|key, value|
+            key.start_with?(pod_prefix)
+          }
+          puts "✅ #{dependency['pod']}被#{yaml_name}覆盖"
+        end
+
+        # 记录覆盖
+        if yaml_dependencies.key?(dependency['pod']) and can_cover
+          puts "✅ #{dependency['pod']}被#{yaml_name}覆盖"
+        end
+
+        need_expand = !!(Array(dependency['configurations']).size > 0 or can_cover)
+        if Array(dependency['subspecs']).size > 0 and need_expand
           dependency['subspecs'].each {|subspec|
             dep = YamlRely.new(pod = "#{dependency['pod']}/#{subspec}")
             dep.module_name = dependency['module']

data/lib/podfileDep.rb

@@ -9,7 +9,9 @@ module Pod
       plugin("podfileDep")
 
       # 解析依赖
-      Pod::YamlManager.share_manager.analysis_yaml(self, false)
+      Pod::YamlManager.share_manager.analysis_yaml(self, false) do |name|
+        yield(name) if block_given?
+      end
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - 王帅朋
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods