podfileDep 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b307485990dd6f82f244290afb72f4cf37799311bee29b775760c1dc3d2bfb5
-  data.tar.gz: 5be9dcca047f6f9167c79fe24e146ba3ce17ffca75c0e2e1a6bbc010af85aa5e
+  metadata.gz: 836193a1245b8fa2e3d40f0385557c15f9fba4be89de0434dd5a5cf0ad0c248c
+  data.tar.gz: 1ba4d4138d17c6c9372264ee9bc817135d38604636adafba1b927a4c835cffaa
 SHA512:
-  metadata.gz: 1bb93659b414f9d33c19c7741c020e475b39e3c15b913f5e221ce7157e773c1f218d62518547a961ece3fc2ff20b0304c77751d60c3e1c39c911f00f08f9d979
-  data.tar.gz: 270ee21f3ecc998b145ae82693ee985fbce4f1cd4ee6cf00dc6f48f685ac2d91114c59fd2e3e9b1d36da4d65e2256444b3c93715a8a3be4050af87631ad4ebcf
+  metadata.gz: 2e95518e907348fed5af271d87cf006ed0ada275706f00bd4f98eae4fa6a4467c49bb949f5d2fd96c6424268667e035ecc65f6361a273a7cdc99d07c67caf4ee
+  data.tar.gz: 1239b1d3f7d880cf0167686700be40227f87ce83db74fecf7a9dfe63ad7e763418378bb2a9b059ad5e95797013a79e87fc0f7bf4a167d48081ffb7f633f59222

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## [Released]
 
-### [2.1.4] - 2023-6-19
+### [2.1.4] - 2023-6-20
+- 兼容同时支持subspec和configurations
+
+### [2.1.4] - 2023-6-20
 - 修复空异常
 
 ### [2.1.3] - 2023-6-19

data/lib/podfileDep/version.rb

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

data/lib/podfileDep/yaml/yaml_dep.rb

@@ -5,21 +5,9 @@ require_relative '../check/xcodeproj'
 module Pod
 
   class YamlRely
-    attr_reader :pod, :subspecs, :version, :git, :tag, :branch, :podspec, :configurations, :path, :inhibit_warnings, :source, :binary
-    def initialize(module_name, pod, subspecs, path, podspec, version, git, tag, branch, configurations, inhibit_warnings, source, binary)
-      @module_name = module_name
+    attr_accessor :module_name, :pod, :subspecs, :version, :git, :tag, :branch, :podspec, :configurations, :path, :inhibit_warnings, :source, :binary
+    def initialize(pod)
       @pod = pod
-      @subspecs = subspecs
-      @path = path
-      @podspec = podspec
-      @version = version
-      @git = git
-      @tag = tag
-      @branch = branch
-      @configurations = configurations
-      @inhibit_warnings = inhibit_warnings
-      @source = source
-      @binary = binary
     end
 
     def option
@@ -177,7 +165,7 @@ module Pod
         exit!
       end
 
-      return yaml_content
+      yaml_content
 
     end
 
@@ -298,21 +286,40 @@ module Pod
           self.local_yaml_deps << dependency['pod']
         end
 
-        # 生成依赖对象
-        dependency = YamlRely.new(module_name = dependency['module'],
-                                  pod = dependency['pod'],
-                                  subspecs = dependency['subspecs'],
-                                  path = dependency['path'],
-                                  podspec = dependency['podspec'],
-                                  version = version,
-                                  git = dependency['git'],
-                                  tag = dependency['tag'],
-                                  branch = dependency['branch'],
-                                  configurations = dependency['configurations'],
-                                  inhibit_warnings = inhibit_warnings,
-                                  source = source,
-                                  binary = binary)
-        yaml_dependencies[dependency.pod] = dependency
+        if Array(dependency['subspecs']).size > 0 and Array(dependency['configurations']).size > 0
+          dependency['subspecs'].each {|subspec|
+            dep = YamlRely.new(pod = "#{dependency['pod']}/#{subspec}")
+            dep.module_name = dependency['module']
+            dep.subspecs = nil
+            dep.path = dependency['path']
+            dep.podspec = dependency['podspec']
+            dep.version = version
+            dep.git = dependency['git']
+            dep.tag = dependency['tag']
+            dep.branch = dependency['branch']
+            dep.configurations = dependency['configurations']
+            dep.inhibit_warnings = inhibit_warnings
+            dep.source = source
+            dep.binary = binary
+            yaml_dependencies[dep.pod] = dep
+          }
+
+        else
+          dep = YamlRely.new(pod = dependency['pod'])
+          dep.module_name = dependency['module']
+          dep.subspecs = dependency['subspecs']
+          dep.path = dependency['path']
+          dep.podspec = dependency['podspec']
+          dep.version = version
+          dep.git = dependency['git']
+          dep.tag = dependency['tag']
+          dep.branch = dependency['branch']
+          dep.configurations = dependency['configurations']
+          dep.inhibit_warnings = inhibit_warnings
+          dep.source = source
+          dep.binary = binary
+          yaml_dependencies[dep.pod] = dep
+        end
       }
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - 王帅朋