cocoapods-core 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec7ec4e495a2cbc2a01cbe258d3d2323da27af6ad5717e77aceee1f1d5463339
-  data.tar.gz: 34a8fe7414bd94664f7258cc5c710e954b85a835cfb549c6902d50f2291ee6ae
+  metadata.gz: '02973d64419e7900d55429665eca2284ad9983f9ef5ad9c282b7705039ae961f'
+  data.tar.gz: da5f66b809e679357de6bbe1d3f1beceac415d9d27b05a258df5ac7f06b3bffe
 SHA512:
-  metadata.gz: d8c1766e9efc229ef4381d832d0e6633a0cc348fa061ad326c5b8dc86babcb50965c9be560af1c72efce81bb7a4defe02cc2d6eb566029f0ce9144ab0d6f652d
-  data.tar.gz: 5da4ee295ddacd8008a77c6431aabf71e759117f07630aa2a85bd2cec82674c7b7598ed1937c724cb2c145ef9d59d27d43b57968a0d2259c669f42d6608eba0d
+  metadata.gz: 9186ce5f1af5ae40103f3bb5606f9adf9f8aa66e2004b1ae68ccdfd88a05c6fd3474a1809f948831254662ed78d5fd9108a084730152bd3ed2209ffd081afae4
+  data.tar.gz: 75ac1c751ed37d42e2b6900a48f2a19f6f102f0c3954cd100359ab754ef3d7868f96f50c79402b30f9b9dad3f85963a5912f825dac49326686162919fac6164c

data/lib/cocoapods-core/cdn_source.rb

@@ -6,6 +6,9 @@ module Pod
   # Subclass of Pod::Source to provide support for CDN-based Specs repositories
   #
   class CDNSource < Source
+    MAX_CDN_NETWORK_THREADS = 50
+    MAX_NUMBER_OF_RETRIES = 5
+
     # @param [String] repo The name of the repository
     #
     def initialize(repo)
@@ -16,8 +19,8 @@ module Pod
       @startup_time = Time.new
 
       @executor = Concurrent::ThreadPoolExecutor.new(
-        :min_threads => 1,
-        :max_threads => 200,
+        :min_threads => 5,
+        :max_threads => (ENV['MAX_CDN_NETWORK_THREADS'] || MAX_CDN_NETWORK_THREADS).to_i,
         :max_queue => 0 # unbounded work queue
       )
 
@@ -54,11 +57,14 @@ module Pod
     def preheat_existing_files
       all_existing_files = [repo.join('**/*.yml'), repo.join('**/*.txt'), repo.join('**/*.json')].map(&Pathname.method(:glob)).flatten
       loaders = all_existing_files.map { |f| f.relative_path_from(repo).to_s }.map do |file|
-        Concurrent::Promise.execute(:executor => @executor) do
+        Concurrent::Promises.future_on(@executor) do
           download_file(file)
         end
       end
-      Concurrent::Promise.zip(*loaders).wait!
+
+      catching_concurrent_errors do
+        Concurrent::Promises.zip(*loaders).wait!
+      end
     end
 
     # @return [Pathname] The directory where the specs are stored.
@@ -104,7 +110,7 @@ module Pod
         # in #specification_path regardless.
         podspec_version_path_relative = Pathname.new(version).join("#{name}.podspec.json")
         unless pod_path_actual.join(podspec_version_path_relative).exist?
-          loaders << Concurrent::Promise.execute(:executor => @executor) do
+          loaders << Concurrent::Promises.future_on(@executor) do
             download_file(pod_path_relative.join(podspec_version_path_relative).to_s)
           end
         end
@@ -113,10 +119,14 @@ module Pod
         rescue ArgumentError
           raise Informative, 'An unexpected version directory ' \
           "`#{version}` was encountered for the " \
-          "`#{pod_dir}` Pod in the `#{name}` repository."
+          "`#{pod_path_actual}` Pod in the `#{name}` repository."
         end
       end.compact.sort.reverse
-      Concurrent::Promise.zip(*loaders).wait!
+
+      catching_concurrent_errors do
+        Concurrent::Promises.zip(*loaders).wait!
+      end
+
       @versions_by_name[name]
     end
 
@@ -302,7 +312,7 @@ module Pod
       path = repo + partial_url
       etag_path = path.sub_ext(path.extname + '.etag')
 
-      response = etag.nil? ? REST.get(file_remote_url) : REST.get(file_remote_url, 'If-None-Match' => etag)
+      response = download_retrying_connection_errors(partial_url, file_remote_url, etag)
 
       case response.status_code
       when 301
@@ -328,6 +338,17 @@ module Pod
       end
     end
 
+    def download_retrying_connection_errors(partial_url, file_remote_url, etag, retries = MAX_NUMBER_OF_RETRIES)
+      etag.nil? ? REST.get(file_remote_url) : REST.get(file_remote_url, 'If-None-Match' => etag)
+    rescue REST::Error => e
+      if retries <= 0
+        raise Informative, "CDN: #{name} Relative path couldn't be downloaded: #{partial_url}, error: #{e}"
+      else
+        debug "CDN: #{name} Relative path: #{partial_url} error: #{e} - retrying"
+        download_retrying_connection_errors(partial_url, file_remote_url, etag, retries - 1)
+      end
+    end
+
     def debug(message)
       if defined?(Pod::UI)
         Pod::UI.message(message)
@@ -335,5 +356,12 @@ module Pod
         CoreUI.puts(message)
       end
     end
+
+    def catching_concurrent_errors
+      yield
+    rescue Concurrent::MultipleErrors => e
+      errors = e.errors
+      raise Informative, "CDN: #{name} Repo update failed - #{e.errors.size} error(s):\n#{errors.join("\n")}"
+    end
   end
 end

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '1.7.2'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.7.3'.freeze unless defined? Pod::CORE_VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport