podfileDep 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 491f4a383b768a448297d15aa5fc6d1a20579e45ddf1deba7c1f692c72f6505a
-  data.tar.gz: a5c91fe5e5e5453905ea83ca0a8c51a510c81478f3386c93ee32c79c7a74a6f7
+  metadata.gz: 8d0616ba675d61a7cb9f12f36c98e0b313c8f87e3ba17ded2f7dbcfde9265af4
+  data.tar.gz: df8fe42f9b709d4c31405b97ce26b4b7f2ae82f794cf58ceb4e0095b83fda21b
 SHA512:
-  metadata.gz: bb54718fa3fd8b876793a5e9c2d0b8638aaf8c7a7b4481357f9bd9d030732da9cb52947ac6a1128f8f4ad41d2d7c73efffe94553f53dcdf896379941eaf32a2c
-  data.tar.gz: 864acce6a07eda525076f9397d6ad815b337b435a91681e7efcee9c206379b85dcf8cf85b6b419c31cf27c8c759f1881f971963d0c0b20181d951331c8f538d8
+  metadata.gz: 99ccba32f897f779b649f1c9c61377ecd882907f64cb05da41e10a80df074dae579904d49e1730e4ec18a1e81fa0fd79c88a2c380a6bf7c9fbda709d0ede0bdf
+  data.tar.gz: 5059a3d938a77b8bb479500c842ec903cabd6659a51b5b0d47cb0ea04e3e3be4dda89a46c88b21986245b1e275e4a2b42ee1804cc61a3e40f4f6af9ca4ad9ed8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Released]
 
+### [2.3.4] - 2023-7-24
+- pod依赖打印排序
+- pod依赖打印路径依赖时增加打印分支名
+
 ### [2.3.3] - 2023-7-24
 - import规范检查逻辑优化
 

data/lib/podfileDep/version.rb

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

data/lib/podfileDep/yaml/yaml_dep.rb

@@ -333,12 +333,26 @@ module Pod
       end
       puts "➡️  解析后依赖总数共计:#{all_deps.size}个\n"
 
+      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
+        else
+          dep1.pod.downcase <=> dep2.pod.downcase
+        end
+      end
+
       puts '⬇️  打印依赖'
-      all_deps.each_value { |dependency|
+      sort_deps.each { |sort_dep|
+        dependency = sort_dep[1]
         puts_result = "pod '#{dependency.pod}'"
 
         if dependency.path #路径引用
-          puts_result += ", :path => '#{dependency.path}'"
+          branch = repo_branch(dependency.path)
+          puts_result += ", :path => '#{dependency.path}'#{branch}"
         elsif dependency.podspec #podspec引用
           puts_result += ", :podspec => '#{dependency.podspec}'"
         elsif dependency.version #版本号引用
@@ -457,6 +471,35 @@ module Pod
       }
     end
 
+    # 获取某个目录下的当前分支
+    def repo_branch(path)
+      full_path = File.expand_path(path)
+      git_path = "#{full_path}/.git"
+      unless Dir.exist?(git_path)
+        return ""
+      end
+      head_path = "#{git_path}/HEAD"
+      unless File.exist?(head_path)
+        return ""
+      end
+
+      content = File.read(head_path)
+      content = content.gsub("\n", "")
+
+      branch_key_word = "ref: refs/heads/"
+      if content.include?(branch_key_word)
+        branch = content.gsub(branch_key_word, "")
+        return "(#{branch})"
+      end
+
+      if content.size >= 8
+        short_sha = content.slice(0, 7)
+        return "(#{short_sha})"
+      end
+
+      "(#{content})"
+    end
+
     # 读取主工程target列表
     def init_main_targets
       project_manager = XCProject::XcodeprojManager.share_manager

metadata

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