cocoapods-modularization 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a957978551a03bbb2981d82db79af963b278e30bb7b6aabf9f548d8f2b0d19f
-  data.tar.gz: 3d85b136021d97324b0d4a35ded4e6a6bcd80c3ec307cb5e837ec7678fd88d3e
+  metadata.gz: 67f059a9e0d46db0b16b2406a014d1c67c38b6e0ccfdc78a8709e7e47dcdc161
+  data.tar.gz: 1ed9ca0070efe02e4458b92cd5e7b65ef7e24e3da1d88ddaa7c47f0967c38f60
 SHA512:
-  metadata.gz: 47a8dfee525a1e511964224caeecde0cad4d5219535f98fd8b187652eb5633ba67bc4612ab257c084a9bf5c759177dabba8d4d4a1b239c9176d020a2678cf213
-  data.tar.gz: 02b2e788c363579782ce2a51989e1e98aebef66bc0890327025e7850bb323b0d00ee955a8f8a56dabe056867254cdaf87d87d9675da20d39e39272071ea35e50
+  metadata.gz: 64ea0a12e3d679578e443418b1b9cfbaae78e2a824f4bb2cac1f98e260fcc429484ae0edeb7ef0efaf4610bff19a4978c2b6b2747614da3ee86a4b594e07375e
+  data.tar.gz: cb639f43d8fd2cae1e5304f4a74cb9d02f569fad684b4db63cadf858aa951143c2ef19f667ce05eb3517ca9ce74c6b8a7a982236cd7aa30d927917e2c8e19c9e

data/lib/cocoapods-modularization/gem_version.rb

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

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

@@ -121,11 +121,12 @@ module Pod
         def try_source(e, dependency_data)
           binary = dependency_data[MetaConstants.binary_key]
           source_url = dependency_data[MetaConstants.source_key]
+          _source_url = Private::PrivateCache.source_repo_url(e)
 
-          if binary && (source_url == Private::PrivateCache.source_repo_url || source_url == nil)
-            source_url = Private::PrivateCache.binary_repo_url
+          if binary && (source_url == _source_url || source_url == nil)
+            source_url = Private::PrivateCache.binary_repo_url(e)
           else
-            source_url ||= Private::PrivateCache.source_repo_url
+            source_url ||= Private::PrivateCache.source_repo_url(e)
           end
 
           Hash[e => [dependency_data[MetaConstants.version_key], Hash[:source => source_url]]]

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

@@ -49,32 +49,16 @@ module Pod
           File.open(@@repo_map_path, 'w') { |io| io << repo_map.to_json }
         end
 
-        def binary_repo_name
-          repo_map = cached_repo_map
-          binary_map = repo_map[@@binary_repo_key]
-          return nil unless binary_map.kind_of?(Hash)
-          binary_map.keys.first
-        end
-
-        def source_repo_name
-          repo_map = cached_repo_map
-          source_map = repo_map[@@source_repo_key]
-          return nil unless source_map.kind_of?(Hash)
-          source_map.keys.first
-        end
-
-        def binary_repo_url
-          repo_map = cached_repo_map
-          binary_map = repo_map[@@binary_repo_key]
-          return nil unless binary_map.kind_of?(Hash)
-          binary_map.values.first
+        def binary_repo_url(name)
+          repo_url = repo_url(name, ".*?specs[-_]?binary")
+          return nil unless repo_url.kind_of?(String) && repo_url.length > 0
+          repo_url
         end
 
-        def source_repo_url
-          repo_map = cached_repo_map
-          source_map = repo_map[@@source_repo_key]
-          return nil unless source_map.kind_of?(Hash)
-          source_map.values.first
+        def source_repo_url(name)
+          repo_url = repo_url(name, ".*?specs[-_]?source")
+          return nil unless repo_url.kind_of?(String) && repo_url.length > 0
+          repo_url
         end
 
         def root_path
@@ -190,6 +174,12 @@ module Pod
         end
 
         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
+          url ||= 'https://github.com/CocoaPods/Specs.git'
+          url
+        end
+
         def cached_repo_map
           repo_map = Hash.new
           if File.exists?(@@repo_map_path)

metadata

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