cocoapods-core 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 620d24f4ab350ba81f7e7e853b32b197f453698e626cc855181fc8df65d3c802
-  data.tar.gz: cd9abf729b77f76489158efa29c02b7b0050d127203ab245dbd6967a9cdc6ef9
+  metadata.gz: ec7ec4e495a2cbc2a01cbe258d3d2323da27af6ad5717e77aceee1f1d5463339
+  data.tar.gz: 34a8fe7414bd94664f7258cc5c710e954b85a835cfb549c6902d50f2291ee6ae
 SHA512:
-  metadata.gz: 4fc9e428f78cfa72f573d16217eddcfe3dc604c76c954af577f4321bbfd8450218b443de66d0adaac95bd383e14027bb9e359cb00453410cceac116aa18b30df
-  data.tar.gz: 3b3d0d45cd08f9de662b89ad96fd639a320587280ef2019c74b9e26aa193d3c6ec8cb1d71f59d37f3b024b854f4e34e2f544378109d44817ec37b6072d57863e
+  metadata.gz: d8c1766e9efc229ef4381d832d0e6633a0cc348fa061ad326c5b8dc86babcb50965c9be560af1c72efce81bb7a4defe02cc2d6eb566029f0ce9144ab0d6f652d
+  data.tar.gz: 5da4ee295ddacd8008a77c6431aabf71e759117f07630aa2a85bd2cec82674c7b7598ed1937c724cb2c145ef9d59d27d43b57968a0d2259c669f42d6608eba0d

data/lib/cocoapods-core/cdn_source.rb

@@ -20,6 +20,9 @@ module Pod
         :max_threads => 200,
         :max_queue => 0 # unbounded work queue
       )
+
+      @version_arrays_by_fragment_by_name = {}
+
       super(repo)
     end
 
@@ -84,36 +87,34 @@ module Pod
       return nil unless specs_dir
       raise ArgumentError, 'No name' unless name
 
+      fragment = pod_shard_fragment(name)
+
+      ensure_versions_file_loaded(fragment)
+
       return @versions_by_name[name] unless @versions_by_name[name].nil?
 
       pod_path_actual = pod_path(name)
       pod_path_relative = relative_pod_path(name)
-      versions_file_path_relative = pod_path_relative.join(INDEX_FILE_NAME).to_s
-      download_file(versions_file_path_relative)
 
-      return nil unless pod_path_actual.join(INDEX_FILE_NAME).exist?
+      return nil if @version_arrays_by_fragment_by_name[fragment][name].nil?
 
       loaders = []
-      @versions_by_name[name] ||= local_file(versions_file_path_relative) do |file|
-        file.map do |v|
-          version = v.chomp
-
-          # Optimization: ensure all the podspec files at least exist. The correct one will get refreshed
-          # 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
-              download_file(pod_path_relative.join(podspec_version_path_relative).to_s)
-            end
-          end
-          begin
-            Version.new(version) if version[0, 1] != '.'
-          rescue ArgumentError
-            raise Informative, 'An unexpected version directory ' \
-            "`#{version}` was encountered for the " \
-            "`#{pod_dir}` Pod in the `#{name}` repository."
+      @versions_by_name[name] ||= @version_arrays_by_fragment_by_name[fragment][name].map do |version|
+        # Optimization: ensure all the podspec files at least exist. The correct one will get refreshed
+        # 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
+            download_file(pod_path_relative.join(podspec_version_path_relative).to_s)
           end
         end
+        begin
+          Version.new(version) if version[0, 1] != '.'
+        rescue ArgumentError
+          raise Informative, 'An unexpected version directory ' \
+          "`#{version}` was encountered for the " \
+          "`#{pod_dir}` Pod in the `#{name}` repository."
+        end
       end.compact.sort.reverse
       Concurrent::Promise.zip(*loaders).wait!
       @versions_by_name[name]
@@ -146,6 +147,12 @@ module Pod
       raise Informative, "Can't retrieve all the specs for a CDN-backed source, it will take forever"
     end
 
+    # @return [Array<Sets>] the sets of all the Pods.
+    #
+    def pod_sets
+      raise Informative, "Can't retrieve all the pod sets for a CDN-backed source, it will take forever"
+    end
+
     # @!group Searching the source
     #-------------------------------------------------------------------------#
 
@@ -165,7 +172,13 @@ module Pod
         query = query.root_name
       end
 
-      found = download_file(relative_pod_path(query).join(INDEX_FILE_NAME).to_s)
+      fragment = pod_shard_fragment(query)
+
+      ensure_versions_file_loaded(fragment)
+
+      version_arrays_by_name = @version_arrays_by_fragment_by_name[fragment] || {}
+
+      found = version_arrays_by_name[query].nil? ? nil : query
 
       if found
         set = set(query)
@@ -220,12 +233,37 @@ module Pod
 
     private
 
-    # Index files contain all the sub directories in the directory, separated by
-    # a newline. We use those because you can't get a directory listing from a CDN.
-    INDEX_FILE_NAME = 'index.txt'.freeze
+    def ensure_versions_file_loaded(fragment)
+      return if !@version_arrays_by_fragment_by_name[fragment].nil? && !@check_existing_files_for_update
+
+      # Index file that contains all the versions for all the pods in the shard.
+      # We use those because you can't get a directory listing from a CDN.
+      index_file_name = index_file_name_for_fragment(fragment)
+      download_file(index_file_name)
+      versions_raw = local_file(index_file_name, &:to_a).map(&:chomp)
+      @version_arrays_by_fragment_by_name[fragment] = versions_raw.reduce({}) do |hash, row|
+        row = row.split('/')
+        pod = row.shift
+        versions = row
+
+        hash[pod] = versions
+        hash
+      end
+    end
+
+    def index_file_name_for_fragment(fragment)
+      fragment_joined = fragment.join('_')
+      fragment_joined = '_' + fragment_joined unless fragment.empty?
+      "all_pods_versions#{fragment_joined}.txt"
+    end
+
+    def pod_shard_fragment(pod_name)
+      metadata.path_fragment(pod_name)[0..-2]
+    end
 
     def local_file(partial_url)
-      File.open(repo.join(partial_url)) do |file|
+      file_path = repo.join(partial_url)
+      File.open(file_path) do |file|
         yield file if block_given?
       end
     end
@@ -257,9 +295,18 @@ module Pod
       etag = File.read(etag_path) if File.exist?(etag_path)
       debug "CDN: #{name} Relative path: #{partial_url}, has ETag? #{etag}" unless etag.nil?
 
+      download_from_url(partial_url, file_remote_url, etag)
+    end
+
+    def download_from_url(partial_url, file_remote_url, etag)
+      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)
 
       case response.status_code
+      when 301
+        download_from_url(partial_url, response.headers['location'].first, etag)
       when 304
         debug "CDN: #{name} Relative path not modified: #{partial_url}"
         # We need to update the file modification date, as it is later used for freshness

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/source/metadata.rb

@@ -47,7 +47,7 @@ module Pod
                        hashed.slice!(0, length)
                      end
                    end
-        prefixes.concat([pod_name, version]).compact.join(File::SEPARATOR)
+        prefixes.concat([pod_name, version]).compact
       end
 
       def last_compatible_version(target_version)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods