cocoapods-modularization 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a957978551a03bbb2981d82db79af963b278e30bb7b6aabf9f548d8f2b0d19f
-  data.tar.gz: 3d85b136021d97324b0d4a35ded4e6a6bcd80c3ec307cb5e837ec7678fd88d3e
+  metadata.gz: 63944ae82b5b66ce3c213dd2cbc15fd378832bef84f6a33c74711967abad347b
+  data.tar.gz: a474c043be6b3031543d996cac56f1ce5558679cbce979d943a70008c86c5ea4
 SHA512:
-  metadata.gz: 47a8dfee525a1e511964224caeecde0cad4d5219535f98fd8b187652eb5633ba67bc4612ab257c084a9bf5c759177dabba8d4d4a1b239c9176d020a2678cf213
-  data.tar.gz: 02b2e788c363579782ce2a51989e1e98aebef66bc0890327025e7850bb323b0d00ee955a8f8a56dabe056867254cdaf87d87d9675da20d39e39272071ea35e50
+  metadata.gz: f2a46b8ca4aa610346e769684710129f772b31e59d1b352651e3e2e6ef1ff68aebfc56403331f6ded433751509e10bd6efdb454b5303e0867c65397c0007ccb4
+  data.tar.gz: 6f1ecf9615e0cf901d0ab78bb56e282ccbd1ac2322efb7a1221e821ceb7e58310f730c8e68b285ec3f861ba6158d7e2cda3fcd000c5e4e27142c6fdf78dee7c6

data/lib/cocoapods-modularization/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsModularization
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 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,14 @@ module Pod
         end
 
         private
+        def repo_url(name, regex)
+          puts "#{Config.instance.sources_manager.all.select { |e| e.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'
+          puts url
+          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.1
 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