podfileDep 2.4.9 → 2.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c081de3be2c3b0512df6ce9dd56529a9a439c029d42b40fb0828d0c2597caf
-  data.tar.gz: 533aeacfd5ba972e6c33a44dd4b73527fe10d35aff84a60656916413f25ad30d
+  metadata.gz: c1bb4022b21a25559de7d0713947b41268b939ab6365201c5c7893c6ad4cb671
+  data.tar.gz: a750ec5aa01e7213d7b648e256bd09a2e9d96ef98f658e788d6408ece49d4e1b
 SHA512:
-  metadata.gz: b4a4246b66260a06ebbe4dd47747bfad51670f243de72f662916be3e847b1ea55000984cc7208d605b88e5f50d86fe5024aabc98d175af2a603b1a5c7a06a960
-  data.tar.gz: e816ae19981c30b3ea276ae7689ca9d1360651175d62e8b91123b7146e99b7afc1adf0939838a272a0eef12820bff458843c7822610f077f245f74f91aa333cf
+  metadata.gz: 7224cccee0f8e5c44530a716bf2dd4f502f23d645e794bbc7618e3e6cc3f2fbc3a62d5e2e38cb155fca4ac5b0ca967e5728334156e14a9c561e134ae4afcd074
+  data.tar.gz: 5346eeea597e84fbdcdb67d31d3c847443064d02d65986e19493b1b4d0889a0204ef299dfb8aa566c2c037170489a275e800f5a61e44ad3b23fd82dd6abb8ec1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Released]
 
+### [2.4.11] - 2023-08-04
+- 打印pod依赖库按类型输出
+
+### [2.4.10] - 2023-08-02
+- 修复开发模块读取podspec路径错误的问题
+
 ### [2.4.9] - 2023-08-02
 - 修复读取podspec路径错误的问题
 

data/lib/podfileDep/check/project.rb

@@ -122,6 +122,9 @@ module Xcodeproj
         if group_hierarchy_path_array.size == 3
           source_file_item.module_path = group.real_path
         end
+        if group_hierarchy_path_array.include?("Development Pods")
+          source_file_item.is_development_module = true
+        end
       end
 
       # 文件引用
@@ -155,9 +158,8 @@ module Xcodeproj
         if source_file_item
           extend_name = child.real_path.basename.extname
           basename = child.real_path.basename
-          if basename == "#{module_name}.podspec" or basename == "#{module_name}.podspec.json"
+          if basename.to_s == "#{module_name}.podspec" or basename.to_s == "#{module_name}.podspec.json"
             source_file_item.podspec_path = child.real_path
-            source_file_item.is_development_module = true
           elsif source_file_extension.include?(extend_name)
             source_file_item.source_files[child.real_path.basename.to_s] = child.real_path
             if header_file_extension.include?(extend_name)
@@ -189,8 +191,14 @@ module Xcodeproj
       local_spec = lock_content["EXTERNAL SOURCES"]
       if local_spec and local_spec[module_name]
         path = local_spec[module_name][:path]
-        if path
-          return Pathname(path).expand_path
+        podspec_path = "#{path}/#{module_name}.podspec"
+        podspec_json_path = "#{path}/#{module_name}.podspec.json"
+        if File.exist?(podspec_path)
+          return Pathname(podspec_path).expand_path
+        elsif File.exist?(podspec_json_path)
+          return Pathname(podspec_json_path).expand_path
+        else
+          return nil
         end
       end
 

data/lib/podfileDep/version.rb

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

data/lib/podfileDep/yaml/yaml_dep.rb

@@ -336,10 +336,8 @@ module Pod
       sort_deps = all_deps.sort do |arr1, arr2|
         dep1 = arr1[1]
         dep2 = arr2[1]
-        if dep1.path and not dep2.path
-          1
-        elsif not dep1.path and dep2.path
-          -1
+        if dep1.type != dep2.type
+          dep1.type < dep2.type ? 1 : -1
         else
           dep1.pod.downcase <=> dep2.pod.downcase
         end
@@ -383,6 +381,9 @@ module Pod
           branch = repo_branch(dependency.path)
           modify = repo_modify(dependency.path)
           puts puts_result.cyan + branch.magenta + modify.magenta
+
+        elsif dependency.branch
+          puts "[!] #{puts_result}"
         else
           puts puts_result
         end

data/lib/podfileDep/yaml/yaml_pod.rb

@@ -18,6 +18,7 @@ module Pod
     attr_accessor :inhibit_warnings
     attr_accessor :source
     attr_accessor :binary
+    attr_reader :type
 
     def option
       result = {:configurations => self.configurations,
@@ -40,5 +41,21 @@ module Pod
       end
       result
     end
+
+    def type
+      if self.path and self.path.size > 0
+        0
+      elsif self.branch and self.branch.size > 0
+        return 1
+      elsif self.podspec and self.podspec.size > 0
+        return 2
+      elsif self.version and self.version.size > 0
+        return 3
+      elsif self.tag and self.tag.size > 0
+        return 4
+      else
+        0
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 2.4.11
 platform: ruby
 authors:
 - 王帅朋
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods