cocoapods-modularization 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f059a9e0d46db0b16b2406a014d1c67c38b6e0ccfdc78a8709e7e47dcdc161
-  data.tar.gz: 1ed9ca0070efe02e4458b92cd5e7b65ef7e24e3da1d88ddaa7c47f0967c38f60
+  metadata.gz: d075ef12765876d72726f62eb5c16276f74015f694543aa91b6c41b5e1648c70
+  data.tar.gz: f7042cc2fb5e875312bdf7fb845d558143e481c63a17ab29e982971a66d61703
 SHA512:
-  metadata.gz: 64ea0a12e3d679578e443418b1b9cfbaae78e2a824f4bb2cac1f98e260fcc429484ae0edeb7ef0efaf4610bff19a4978c2b6b2747614da3ee86a4b594e07375e
-  data.tar.gz: cb639f43d8fd2cae1e5304f4a74cb9d02f569fad684b4db63cadf858aa951143c2ef19f667ce05eb3517ca9ce74c6b8a7a982236cd7aa30d927917e2c8e19c9e
+  metadata.gz: 55af9a46121004d21724544e50f8ac2111a8c400d565e9507447d360214e1b444fbb6ce2a603c49a0c28adc698da2d739547b5325ffebc0ba0479e90d8d23461
+  data.tar.gz: 78b306721f37c53529643dab3f249ff5764d204c8ca5d790060367375f78f2d3dc58be46b4b23c075740c866751e4aff299466e665134b418780b6732390f2ec

data/lib/cocoapods-modularization/command/mod/info.rb

@@ -37,9 +37,9 @@ module Pod
         def run
           repo_url = String.new
           if @use_binary
-            repo_url = Private::PrivateCache.binary_repo_url
+            repo_url = Private::PrivateCache.binary_repo_url(@name)
           else
-            repo_url = Private::PrivateCache.source_repo_url
+            repo_url = Private::PrivateCache.source_repo_url(@name)
           end
 
           # 如果工作区有存在的Repo，先删除后clone

data/lib/cocoapods-modularization/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsModularization
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/cocoapods-modularization/meta/meta_accessor.rb

@@ -18,7 +18,7 @@ module Pod
             dep_map = Hash[
               MetaConstants.version_key => version,
               MetaConstants.binary_key => binary || true,
-              MetaConstants.source_key => binary ? Private::PrivateCache.binary_repo_url : Private::PrivateCache.source_repo_url,
+              MetaConstants.source_key => binary ? Private::PrivateCache.binary_repo_url(key) : Private::PrivateCache.source_repo_url(key),
             ]
           end
 

data/lib/cocoapods-modularization/meta/meta_reference.rb

@@ -154,7 +154,7 @@ module Pod
               podspec = File.directory?(dependency.local?) ? Pod::Specification.from_file("#{dependency.local?}/#{dependency.name.to_s}.podspec") : Pod::Specification.from_file(dependency.local?)
               next podspec.name.to_s == dependency.name.to_s
             end
-            if [Private::PrivateCache.source_repo_url, Private::PrivateCache.binary_repo_url].include?(dependency.podspec_repo)
+            if [Private::PrivateCache.source_repo_url(dependency.name.to_s), Private::PrivateCache.binary_repo_url(dependency.name.to_s)].include?(dependency.podspec_repo)
               next true
             end
             next false
@@ -169,7 +169,7 @@ module Pod
               data_element[MetaConstants.local_path_key] = Private::PrivateCache.read_local_path(dependency.name)
             end
 
-            data_element[MetaConstants.binary_key] = dependency.podspec_repo == Private::PrivateCache.binary_repo_url
+            data_element[MetaConstants.binary_key] = dependency.podspec_repo == Private::PrivateCache.binary_repo_url(dependency.name.to_s)
 
             data[dependency.name.to_s] = data_element
           end
@@ -186,8 +186,8 @@ module Pod
             data_element[MetaConstants.version_key] = generate_version(dependency)
 
             if dependency.podspec_repo.kind_of?(String)
-              if [Private::PrivateCache.source_repo_url, Private::PrivateCache.binary_repo_url].include?(dependency.podspec_repo)
-                data_element[MetaConstants.binary_key] = dependency.podspec_repo == Private::PrivateCache.binary_repo_url
+              if [Private::PrivateCache.source_repo_url(dependency.name.to_s), Private::PrivateCache.binary_repo_url(dependency.name.to_s)].include?(dependency.podspec_repo)
+                data_element[MetaConstants.binary_key] = dependency.podspec_repo == Private::PrivateCache.binary_repo_url(dependency.name.to_s)
               else
                 data_element[MetaConstants.source_key] = dependency.podspec_repo
               end

data/lib/cocoapods-modularization/private/private_cache.rb

@@ -153,7 +153,12 @@ module Pod
           map[repo_name] = path
 
           # path的上一级作为search_path
-          map['search_path'] = Pathname.new(path).parent
+          search_path = json['search_path']
+          if search_path.kind_of?(String) && search_path.length > 0
+            map['search_path'] = search_path
+          else
+            map['search_path'] = Pathname.new(path).parent
+          end
 
           File.open(@@path_map_path, "w") { |io| io.puts map.to_json }
         end
@@ -175,7 +180,8 @@ module Pod
 
         private
         def repo_url(name, regex)
-          url = Config.instance.sources_manager.all.select { |e| e.name =~ /#{regex}/ }.find { |e| Dir.exists?("#{Pathname.new(File.expand_path('~'))}/.cocoapods/repos/#{e}/#{name}") }.url
+          source = Config.instance.sources_manager.all.select { |e| e.name =~ /#{regex}/ }.find { |e| Dir.exists?("#{Pathname.new(File.expand_path('~'))}/.cocoapods/repos/#{e}/#{name}") }
+          url = source.url if source.kind_of?(Source::Manager)
           url ||= 'https://github.com/CocoaPods/Specs.git'
           url
         end
@@ -212,7 +218,10 @@ module Pod
         end
 
         def locate_spec_in_search_path(repo_name)
-          return Dir.glob("#{search_path}/#{repo_name}").first
+          puts search_path
+          matched = Dir.glob("#{search_path}/**/{*, */*, */*/*}/#{repo_name}", File::FNM_CASEFOLD).min_by { |folder| folder.split('/').count }
+          puts matched
+          return matched
         end
 
         ## 检查yrepos下是否包含repo_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-modularization
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - lazy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler