podfileDep 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf2bcb6146ac2d54e77b083a938e0d1c308d3eb955f76a750da2fbdb75c1ac8
-  data.tar.gz: d222e82e94885112c134f2dddfc2cd28ac63c0cf1c74574fc2036193e1ce8c60
+  metadata.gz: b792fae6391972a1f870f7e11bc548d441a823affdbc11d208a5771f1b18966f
+  data.tar.gz: 5b86253a370205f61e7da9d019766200c12a91dfe5d3a480acd2a8e691fa4d3f
 SHA512:
-  metadata.gz: 32206a00e4d2bf8328af4f42b27146ad7cadcb7fa0cda6d30a33d8c41477b75f3a4ffc092b01ca668cf685f6691ab22cff63f0ceae5aa910bd44d247ac840ddd
-  data.tar.gz: 2cb194f7a709307999896e7183a03b01216cd8c66159de4b64fcf01c9bb0b9902b35ed25762fa87b1ae17bcf508bb9493c16497bc3ed3936bea77681048e5421
+  metadata.gz: a7862489406381c529118ac75a2acadcf5e784298deedd13e5861692ed312501dd03f28f0ed73224a2bdc0dd1c8a78b231cfd7e216c13fe06f2d8992e9353bac
+  data.tar.gz: c2c6ac82937f28718fc5ccc15562e8ed8bf0d1db9c5f9429d2a97ba94239eac7a5e0688e2b279f05100b069163fbc29a090a5fbf055c1a027d5e25a0760f78e5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Released]
 
+### [2.4.3] - 2023-7-30
+- 修复数据类型错误
+
+### [2.4.3] - 2023-7-30
+- 修复指定非版本号的方式导致读不到podspec路径的问题
+
 ### [2.4.2] - 2023-7-30
 - nil导致异常问题修复
 

data/lib/podfileDep/check/project.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'colored2'
+require 'cocoapods/downloader/request'
 require_relative 'util'
 require_relative 'item'
 
@@ -173,25 +174,39 @@ module Xcodeproj
 
     # 读取某个模块的podspec路径
     def get_podspec_path(module_name)
+      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
+        if path
+          return Pathname(path).expand_path
+        end
       end
 
-      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
       version = @version_map[module_name]
-      podspec_json_name = "#{version}-#{md5_to5}.podspec.json"
-      path = "~/Library/Caches/CocoaPods/Pods/Specs/Release/#{module_name}/#{podspec_json_name}"
-      Pathname(path).expand_path
+      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
 
 
@@ -199,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
@@ -228,8 +249,8 @@ module Xcodeproj
 
       if vendor_frameworks
         if vendor_frameworks.class == Array
-          vendor_frameworks.each do |framework|
-            frameworks = deal_frameworks(vendor_frameworks)
+          vendor_frameworks.each do |vendor_framework|
+            frameworks = deal_frameworks(vendor_framework)
             if frameworks != "*"
               item_frameworks << frameworks
             end

data/lib/podfileDep/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.4
 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