cocoapods-nexus-plugin 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df026cfc9c2eefaa4beceaaf93abb41a19f3a76e806bab4e6c563ee2d0aabc7
-  data.tar.gz: 98e8fd621d013dcafd3133671150040fc90694d2a2ab34c4f6070a45a183ac34
+  metadata.gz: 3b2c66db3b2ff1af98373df383cb1cd778c1b962e18af22ebed6b57af0f2a01a
+  data.tar.gz: fa71bd34cc332de94473428e1e500d391c1789b09d6850233983c44a4d968534
 SHA512:
-  metadata.gz: b265154b6dde29a3252ac14a583cdf318b2772273a2fe01ea21278efcdfc4408153c731b1e5d392a4c5da73dcaeda86a5bc34ee7e16a83f28ab4d4d8a7fff339
-  data.tar.gz: 45263dbf4c7677cf0f9eee71dd9504eafc385fd76f38c87e46805019c22d44d25fdc9b83d4b27252def17be072139263d26f03315db80cd75faa1ec55cb31d1e
+  metadata.gz: a048e0b18e356bd184b23331cd7de9cb2b14c7d051944ceefffe5017ce1317752c3001ada990cdeb1bc22f01fd31dfcf598ff6ef4647ad1f2d730452bc75e010
+  data.tar.gz: f938720c9a1a30cba71ebcd97c027a1434d7e33e1d6df3b806ce2223faf32e5d72e2391bc93f676ac9fdc8e7cc2994b1faa1b5fbe8e6fb97259ff5e079a31d7b

data/lib/cocoapods-nexus-plugin/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsNexusPlugin
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/cocoapods_plugin.rb

@@ -1,8 +1,6 @@
 require 'cocoapods-nexus-plugin/command'
 require 'fileutils'
 
-CDN_URL = "https://cdn.cocoapods.org"
-
 POD_BLACKLIST = [
   "libwebp",
   "Braintree",
@@ -31,20 +29,33 @@ module Pod
 
           sources = podfile.sources
 
-          # create folder for our source
-          repo_path = "#{Pod::Config.instance.home_dir}/repos/cocoapods-cache"
-          FileUtils.mkdir_p(repo_path) unless Dir.exist?(repo_path)
-
-          # create .url file in this folder which is used by CocoaPods to determine the source URL
-          File.write("#{repo_path}/.url", NEXUS_COCOAPODS_REPO_URL)
-
-          if sources.include?(CDN_URL)
-            sources[sources.index(CDN_URL)] = Pod::CDNSource.new(repo_path)
+          if sources.include?(Pod::TrunkSource::TRUNK_REPO_URL)
+            sources[sources.index(Pod::TrunkSource::TRUNK_REPO_URL)] = NEXUS_COCOAPODS_REPO_URL
           else
-            sources = [Pod::CDNSource.new(repo_path)].concat(sources)
+            sources = [NEXUS_COCOAPODS_REPO_URL].concat(sources)
           end
 
-          @sources = sources
+          # Fragment below comes from the original sources method located https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/installer/analyzer.rb
+
+          #################################################################
+          plugin_sources = @plugin_sources || []
+
+          # Add any sources specified using the :source flag on individual dependencies.
+          dependency_sources = podfile_dependencies.map(&:podspec_repo).compact
+
+          sources += dependency_sources
+
+          result = sources.uniq.map do |source_url|
+            sources_manager.find_or_create_source_with_url(source_url)
+          end
+          unless plugin_sources.empty?
+            result.insert(0, *plugin_sources)
+            plugin_sources.each do |source|
+              sources_manager.add_source(source)
+            end
+          end
+          result
+          #################################################################
         else
           orig_sources
         end
@@ -75,7 +86,7 @@ module Pod
             puts "detected #{detected_unsupported_pod}, using CocoaPods CDN to fetch its podspec..."
             @@_detected_unsupported_pods.push(detected_unsupported_pod)
           end
-          _original_download_and_save_with_retries_async.bind(self).(partial_url, "#{CDN_URL}/#{partial_url}", etag, retries)
+          _original_download_and_save_with_retries_async.bind(self).(partial_url, "#{Pod::TrunkSource::TRUNK_REPO_URL}/#{partial_url}", etag, retries)
         else
           _original_download_and_save_with_retries_async.bind(self).(partial_url, file_remote_url, etag, retries)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-nexus-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Expo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler