cocoapods-core 1.11.0.beta.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc77a2caddc23264c82d1b938d3861baa7db772d1aa64a2e8796d48fce457029
-  data.tar.gz: c456ecc4030277077b806f0e4cc73eb4ee292d48278cd2bde8ef45a64a180d32
+  metadata.gz: 1d1aeda22a44f71a0bb5c7964ed58df0632dffe07075ffe5ce77af08d83311d1
+  data.tar.gz: 8a3af2ba8040cf97cd7130a978e1d9e3c64f073c20476caf68212c0a2f4f9f3c
 SHA512:
-  metadata.gz: b3d173d8a43823bba5466e2385c8eaa728f6221a356a00ea557cd1488969154967b8175aed46b39fcb8f632ef18e28f73c8bc1bdbdaa3aa8aa08747733005a60
-  data.tar.gz: e9cfcadb169aff82575dac6e0e7a0e293a24cb4f69a603ff153397f168aedd426c0d8a23e1eb40822903d73afdb6f9f89b561df48e3be24dfc3330d9f885205e
+  metadata.gz: ff8f362b9ae42fd57696f3bb777b18306b8bc467e6cdf189a804601437efe17e848d851785476297d6bc7099c477b6a441350df8cab2a71845915315bab7767f
+  data.tar.gz: d9ebd7b5a5ef23bacced8fa9965d45867936b51cfe9624151a96dee8e2b877c77a561c2de9505ac84d87498b0498ed144b5c658a4188fe8f8b1fc7fa8808966c

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -461,7 +461,7 @@ module Pod
           # SCP-style URLs for private git repos
           url = valid_scp_url[url]
           base = base_from_host_and_path[url.host, url.path]
-        when %r{(?:git|ssh|https?|[a-z0-9_-]+@([-\w.]+)):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$}i
+        when %r{(?:git|ssh|https?|[a-z0-9_-]+@([-\w.]+)):(\/\/)?(.*?)(\.git)?(\/?|\#[-\d\w._]+?)$}i
           # Additional SCP-style URLs for private git repos
           host, _, path = Regexp.last_match.captures
           base = base_from_host_and_path[host, path]

data/lib/cocoapods-core/specification/consumer.rb

@@ -471,13 +471,21 @@ module Pod
       # @param  [String, Array, Hash] value.
       #         The value of the attribute as specified by the user.
       #
-      # @return [Hash] the on demand resources1.
+      # @return [Hash] the on demand resources.
       #
       def _prepare_on_demand_resources(value)
         result = {}
         if value
           value.each do |key, patterns|
-            result[key] = [*patterns].compact
+            case patterns
+            when String, Array
+              result[key] = { :paths => [*patterns].compact, :category => :download_on_demand }
+            when Hash
+              patterns = Specification.convert_keys_to_symbol(patterns, :recursive => false)
+              result[key] = { :paths => [*patterns[:paths]].compact, :category => patterns.fetch(:category, :download_on_demand).to_sym }
+            else
+              raise StandardError, "Unknown on demand resource value type `#{patterns}`."
+            end
           end
         end
         result

data/lib/cocoapods-core/specification/dsl.rb

@@ -1361,26 +1361,52 @@ module Pod
 
       #------------------#
 
+      # The keys accepted by the category attribute for each on demand resource entry.
+      #
+      ON_DEMAND_RESOURCES_CATEGORY_KEYS = [:download_on_demand, :prefetched, :initial_install].freeze
+
       # @!method on_demand_resources=(on_demand_resources)
       #
-      #   A hash of on_demand_resources that should be copied into the target bundle. Resources specified here
-      #   will automatically become part of the resources build phase of the target.
+      #   A hash of on demand resources that should be copied into the target bundle. Resources specified here
+      #   will automatically become part of the resources build phase of the target this pod is integrated into.
+      #
+      #   If no category is specified then `:download_on_demand` is used as the default.
+      #
+      #   @note
+      #
+      #   Tags specified by pods are _always_ managed by CocoaPods. If a tag is renamed, changed or deleted then
+      #   CocoaPods will update the tag within the targets the pod was integrated into. It is highly recommended not to
+      #   share the same tags for your project as the ones used by the pods your project consumes.
       #
       #   @example
       #
-      #   s.on_demand_resources = {
+      #     s.on_demand_resources = {
       #       'Tag1' => 'file1.png'
-      #   }
+      #     }
+      #
+      #   @example
       #
-      #   s.on_demand_resources = {
+      #     s.on_demand_resources = {
       #       'Tag1' => ['file1.png', 'file2.png']
-      #   }
+      #     }
       #
-      #   @param  [Hash{String=>String}, Hash{String=>Array<String>}] on_demand_resources
-      #           The on_demand_resources shipped with the Pod.
+      #   @example
+      #
+      #     s.on_demand_resources = {
+      #       'Tag1' => { :paths => ['file1.png', 'file2.png'], :category => :download_on_demand }
+      #     }
+      #
+      #   @example
+      #
+      #     s.on_demand_resources = {
+      #       'Tag1' => { :paths => ['file1.png', 'file2.png'], :category => :initial_install }
+      #     }
+      #
+      #   @param  [Hash{String=>String}, Hash{String=>Array<String>}, Hash{String=>Hash}] on_demand_resources
+      #           The on demand resources shipped with the Pod.
       #
       attribute :on_demand_resources,
-                :types => [String, Array],
+                :types => [String, Array, Hash],
                 :container => Hash,
                 :file_patterns => true,
                 :singularize => true

data/lib/cocoapods-core/specification/linter/analyzer.rb

@@ -90,6 +90,7 @@ module Pod
 
             if patterns.respond_to?(:each)
               patterns.each do |pattern|
+                pattern = pattern[:paths].join if attrb.name == :on_demand_resources
                 if pattern.respond_to?(:start_with?) && pattern.start_with?('/')
                   results.add_error('File Patterns', 'File patterns must be ' \
                     "relative and cannot start with a slash (#{attrb.name}).")

data/lib/cocoapods-core/specification/linter.rb

@@ -434,6 +434,17 @@ module Pod
         end
       end
 
+      # Performs validations related to the `on_demand_resources` attribute.
+      #
+      def _validate_on_demand_resources(h)
+        h.values.each do |value|
+          unless Specification::ON_DEMAND_RESOURCES_CATEGORY_KEYS.include?(value[:category])
+            results.add_error('on_demand_resources', "Invalid on demand resources category value `#{value[:category]}`. " \
+              "Available options are `#{Specification::ON_DEMAND_RESOURCES_CATEGORY_KEYS.join(', ')}`.")
+          end
+        end
+      end
+
       # Performs validation related to the `scheme` attribute.
       #
       def _validate_scheme(s)

data/lib/cocoapods-core/specification.rb

@@ -463,6 +463,12 @@ module Pod
       end
     end
 
+    # @return [Hash] The on demand resources value.
+    #
+    def on_demand_resources
+      attributes_hash['on_demand_resources'] || {}
+    end
+
     # @return [Hash] The scheme value.
     #
     def scheme

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.11.0.beta.1
+  version: 1.11.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -227,11 +227,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: The models of CocoaPods