podfileDep 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b91a2988e18202add645f9dfb02623d018854b09ed5b3e1c7cfe52ca463fba
-  data.tar.gz: 1a7f61c0e7d35282204b055e3580bf4d78894fc6525a3b1f5d59bfea7d4f95d4
+  metadata.gz: 878b46bd1a19d4bdefd0a6060fe42b6d927b9649ff430a220027f1e3cf532d97
+  data.tar.gz: 2253957d4fa07c0e293adb5e8b36d0432358360848ff2986a50823d8674a60ff
 SHA512:
-  metadata.gz: b6d370629f905be0397b4e76f2c2198b800a8e7868882d1436ed3a8a9aa19c57d3ed0a775ce1947e9e8f345cc6f2a018fc9d30c4264d966b87da80bca97f5bed
-  data.tar.gz: dccea04f95d9d9d06db5a22424ebf02f360a465b18f2e4a07aa05af32e3bbc2423dc34b429b360acdab81c5abdd1a878ba2578ee3b32f1c867f52dbdae9969d8
+  metadata.gz: d32c5d1b75841af22791bf840ddbd923d347bb18f35ce86dccd8d95d896e07256733b3f727371fdbb67c8db308b6d0516c44619bf344ad8fa1378738c8eb614c
+  data.tar.gz: 5b46900f0ce8b15dac042a149a6fe28160a0ada51a5ad8683a17682c53bafd71b99fe06481dfcf2aab449007651f00dfcb8637dc0e200d69da447433eb92444f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Released]
 
+### [2.4.3] - 2023-7-30
+- 修复指定非版本号的方式导致读不到podspec路径的问题
+
+### [2.4.2] - 2023-7-30
+- nil导致异常问题修复
+
 ### [2.4.1] - 2023-7-29
 - 依赖库关系检查特殊问题修复
 

data/lib/podfileDep/check/project.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'colored2'
+require 'cocoapods/downloader/request'
 require_relative 'util'
 require_relative 'item'
 
@@ -21,13 +22,18 @@ module Xcodeproj
     # @return [Hash]
     attr_accessor :lock_content
 
+    # @return [Hash]
+    attr_accessor :version_map
+
     def initialize
       @shell_project = nil
       @pod_project = nil
       @module_items = {}
+      @version_map = {}
       init_shell_project
       init_pod_project
       init_lockfile
+      init_version_map
       expand_module
       init_vendor_frameworks
     end
@@ -68,6 +74,21 @@ module Xcodeproj
 
       @lock_content = YAML.load_file(lockfile_path)
     end
+    def init_version_map
+      lock_content = @lock_content
+
+      remote_dependencies = lock_content["PODS"]
+      remote_dependencies.each do |dependency|
+        if dependency.class == Hash
+          dependency = dependency.keys.first
+        end
+        temp = dependency.split("(")
+        name = temp[0].split("/")[0] # UMCShare/Social/ReducedWeChat
+        name = name.gsub(" ", "").gsub(")", "")
+        version = temp[1].gsub("= ", "").gsub(")", "")
+        @version_map[name] = version
+      end
+    end
 
     # 展开模块
     def expand_module
@@ -153,34 +174,39 @@ module Xcodeproj
 
     # 读取某个模块的podspec路径
     def get_podspec_path(module_name)
-      lock_content = @lock_content
+      check_options = lock_content["CHECKOUT OPTIONS"]
+      if check_options and check_options[module_name]
+        check_option = check_options[module_name]
+        request = Pod::Downloader::Request.new(released:false, name:module_name, params:check_option)
+        slug_opts = {}
+        cache_path = request.slug(**slug_opts)
+        return "~/Library/Caches/CocoaPods/Pods/Specs/#{cache_path}.podspec.json"
+      end
+
+      # :path: localPods/XX
       local_spec = lock_content["EXTERNAL SOURCES"]
       if local_spec and local_spec[module_name]
         path = local_spec[module_name][:path]
-        return Pathname(path).expand_path
-      end
-
-      remote_dependencies = lock_content["DEPENDENCIES"]
-      version_map = {}
-      remote_dependencies.each do |dependency|
-        temp = dependency.split("(")
-        name = temp[0].split("/")[0] # UMCShare/Social/ReducedWeChat
-        name = name.gsub(" ", "").gsub(")", "")
-        version = temp[1].gsub("= ", "").gsub(")", "")
-        version_map[name] = version
+        if path
+          return Pathname(path).expand_path
+        end
       end
-      version = version_map[module_name]
 
-      remote_spec = lock_content["SPEC CHECKSUMS"]
+      # 4.0.1-24ee2.podspec.json
+      version_spec = @lock_content["SPEC CHECKSUMS"]
       md5_to5 = ""
-      if remote_spec and remote_spec[module_name]
-        md5 =  remote_spec[module_name]
+      if version_spec and version_spec[module_name]
+        md5 =  version_spec[module_name]
         md5_to5 = md5.slice(0,5)
       end
-      # 4.0.1-24ee2.podspec.json
-      podspec_json_name = "#{version}-#{md5_to5}.podspec.json"
-      path = "~/Library/Caches/CocoaPods/Pods/Specs/Release/#{module_name}/#{podspec_json_name}"
-      Pathname(path).expand_path
+      version = @version_map[module_name]
+      if version
+        podspec_json_name = "#{version}-#{md5_to5}.podspec.json"
+        path = "~/Library/Caches/CocoaPods/Pods/Specs/Release/#{module_name}/#{podspec_json_name}"
+        return Pathname(path).expand_path
+      end
+
+      nil
     end
 
 
@@ -188,6 +214,12 @@ module Xcodeproj
     def init_vendor_frameworks
       @module_items.each_value do |module_item|
         module_item.frameworks << module_item.module_name
+
+        unless module_item.podspec_path
+          puts "⚠️ 读取#{module_item.module_name}的podspec路径为空，请发送Podfile.lock文件联系开发者修复"
+          next
+        end
+
         podspec_content = Util.get_podspec_content(module_item.podspec_path)
 
         unless podspec_content

data/lib/podfileDep/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.3
 platform: ruby
 authors:
 - 王帅朋
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-29 00:00:00.000000000 Z
+date: 2023-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods