cocoapods-nexus-plugin 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df026cfc9c2eefaa4beceaaf93abb41a19f3a76e806bab4e6c563ee2d0aabc7
-  data.tar.gz: 98e8fd621d013dcafd3133671150040fc90694d2a2ab34c4f6070a45a183ac34
+  metadata.gz: 52db53c770864447cf5430160357a53118cd58e05afe34dcdde7ae8e7a9fa331
+  data.tar.gz: ab29c36c452a3a8b36f5580d00ff1bacf1079a126ed950ad42cb59d561dccc69
 SHA512:
-  metadata.gz: b265154b6dde29a3252ac14a583cdf318b2772273a2fe01ea21278efcdfc4408153c731b1e5d392a4c5da73dcaeda86a5bc34ee7e16a83f28ab4d4d8a7fff339
-  data.tar.gz: 45263dbf4c7677cf0f9eee71dd9504eafc385fd76f38c87e46805019c22d44d25fdc9b83d4b27252def17be072139263d26f03315db80cd75faa1ec55cb31d1e
+  metadata.gz: 1c6accb8ac001e5d2fbaf6a2c88d46a63e7aa06684a7ff4be0c741cce347f57fb663e77cd1745b1b8b32b37306b072d9a0ff3d7f7046f905cf6cd8932cd20e3a
+  data.tar.gz: e68a6aca44a9ee4150d0e57f4e21a9edbc2b49d24783086d0e9b97f65433c7703a35d949900c15dd1771fd0b2fb32eed31c23af76002adcb221e661200193a04

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

@@ -1,3 +1,3 @@
 module CocoapodsNexusPlugin
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 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",
@@ -11,7 +9,8 @@ POD_BLACKLIST = [
   "MapboxCommon",
   "MapboxCoreMaps",
   "CFSDK",
-  "MapboxMobileEvents"
+  "MapboxMobileEvents",
+  "Mapbox-iOS-SDK"
 ]
 
 NEXUS_COCOAPODS_REPO_URL = ENV['NEXUS_COCOAPODS_REPO_URL']
@@ -31,20 +30,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 +87,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.11
 platform: ruby
 authors:
 - Expo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler