cocoapods-core 1.10.2 → 1.11.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06fcd643645ff4a84183bfc20579b2e7bd03571c9dd411bf347ce5c2b63fb3d2
-  data.tar.gz: 92ab0561ef8b87dc703f1246d3a62d04c2534a69028602c60c753a76d2e5830d
+  metadata.gz: fc77a2caddc23264c82d1b938d3861baa7db772d1aa64a2e8796d48fce457029
+  data.tar.gz: c456ecc4030277077b806f0e4cc73eb4ee292d48278cd2bde8ef45a64a180d32
 SHA512:
-  metadata.gz: 408e8ca1e678852e862af47f120626c8fea4d6d7e28f271cd2841a579eb45957024bd0e6c9ef6e48a67c5ea8080b7c2d65989d271708539ca99802fe1dbec113
-  data.tar.gz: c3eeb7d11671f57e559af1d00cbbec7baf3a9a3bc6e523b0ecd803affb4dbd32a3ac080164347dfe05dc9c0969122ae4741bfc911a7f1b36192af69fa517d823
+  metadata.gz: b3d173d8a43823bba5466e2385c8eaa728f6221a356a00ea557cd1488969154967b8175aed46b39fcb8f632ef18e28f73c8bc1bdbdaa3aa8aa08747733005a60
+  data.tar.gz: e9cfcadb169aff82575dac6e0e7a0e293a24cb4f69a603ff153397f168aedd426c0d8a23e1eb40822903d73afdb6f9f89b561df48e3be24dfc3330d9f885205e

data/lib/cocoapods-core/cdn_source.rb

@@ -350,7 +350,7 @@ module Pod
         end
 
         unless @check_existing_files_for_update
-          debug "CDN: #{name} Relative path: #{partial_url} exists! Returning local because checking is only perfomed in repo update"
+          debug "CDN: #{name} Relative path: #{partial_url} exists! Returning local because checking is only performed in repo update"
           return Promises.fulfilled_future(partial_url, HYDRA_EXECUTOR)
         end
       end

data/lib/cocoapods-core/dependency.rb

@@ -109,11 +109,16 @@ module Pod
     #         one or more version restrictions).
     #
     def requirement
-      if specific_version
-        Requirement.new(Version.new(specific_version.version))
-      else
-        @requirement
-      end
+      @specific_requirement || @requirement
+    end
+
+    # @param [Version] version the specific version to point to
+    #
+    def specific_version=(version)
+      @specific_version = version
+      @specific_requirement = if version
+                                Requirement.new(Version.new(version.version))
+                              end
     end
 
     # @return [Bool] whether the dependency points to a subspec.
@@ -196,9 +201,9 @@ module Pod
     def ==(other)
       self.class == other.class &&
         name == other.name &&
-        requirement == other.requirement &&
         external_source == other.external_source &&
-        podspec_repo == other.podspec_repo
+        podspec_repo == other.podspec_repo &&
+        requirement == other.requirement
     end
     alias_method :eql?, :==
 

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/podfile.rb

@@ -166,6 +166,23 @@ module Pod
       end
     end
 
+    # Calls the pre integrate callback if defined.
+    #
+    # @param  [Pod::Installer] installer
+    #         the installer that is performing the installation.
+    #
+    # @return [Bool] whether a pre integrate callback was specified and it was
+    #         called.
+    #
+    def pre_integrate!(installer)
+      if @pre_integrate_callback
+        @pre_integrate_callback.call(installer)
+        true
+      else
+        false
+      end
+    end
+
     # Calls the post install callback if defined.
     #
     # @param  [Pod::Installer] installer
@@ -310,9 +327,9 @@ module Pod
       podfile = Podfile.new(path) do
         # rubocop:disable Lint/RescueException
         begin
-          # rubocop:disable Eval
+          # rubocop:disable Security/Eval
           eval(contents, nil, path.to_s)
-          # rubocop:enable Eval
+          # rubocop:enable Security/Eval
         rescue Exception => e
           message = "Invalid `#{path.basename}` file: #{e.message}"
           raise DSLError.new(message, path, e, contents)

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

@@ -921,9 +921,7 @@ module Pod
       # This hook allows you to make any changes to the Pods after they have
       # been downloaded but before they are installed.
       #
-      # It receives the
-      # [`Pod::Installer`](http://rubydoc.info/gems/cocoapods/Pod/Installer/)
-      # as its only argument.
+      # It receives the [Pod::Installer] as its only argument.
       #
       # @example  Defining a pre-install hook in a Podfile.
       #
@@ -936,15 +934,31 @@ module Pod
         @pre_install_callback = block
       end
 
+      # This hook allows you to make changes before the project is written
+      # to disk.
+      #
+      # It receives the [Pod::Installer] as its only argument.
+      #
+      # @example  Customizing the dependencies before integration
+      #
+      #   pre_integrate do |installer|
+      #     # perform some changes on dependencies
+      #   end
+      #
+      # @return   [void]
+      #
+      def pre_integrate(&block)
+        raise Informative, 'Specifying multiple `pre_integrate` hooks is unsupported.' if @pre_integrate_callback
+        @pre_integrate_callback = block
+      end
+
       # This hook allows you to make any last changes to the generated Xcode
       # project before it is written to disk, or any other tasks you might want
       # to perform.
       #
-      # It receives the
-      # [`Pod::Installer`](http://rubydoc.info/gems/cocoapods/Pod/Installer/)
-      # as its only argument.
+      # It receives the [Pod::Installer] as its only argument.
       #
-      # @example  Customising the build settings of all targets
+      # @example  Customizing the build settings of all targets
       #
       #   post_install do |installer|
       #     installer.pods_project.targets.each do |target|
@@ -964,11 +978,9 @@ module Pod
       # This hook allows you to make changes after the project is written
       # to disk.
       #
-      # It receives the
-      # [`Pod::Installer`](http://rubydoc.info/gems/cocoapods/Pod/Installer/)
-      # as its only argument.
+      # It receives the [Pod::Installer] as its only argument.
       #
-      # @example  Customising the build settings of all targets
+      # @example  Customizing the build settings of all targets
       #
       #   post_integrate do |installer|
       #     # some change after project write to disk

data/lib/cocoapods-core/podfile/target_definition.rb

@@ -963,7 +963,7 @@ module Pod
         if exclusive?
           whitelist_hash
         else
-          parent.send(:configuration_pod_whitelist).merge(whitelist_hash) { |l, r| (l + r).uniq }
+          parent.send(:configuration_pod_whitelist).merge(whitelist_hash) { |_, l, r| Array(l).concat(r).uniq }
         end
       end
 

data/lib/cocoapods-core/requirement.rb

@@ -15,7 +15,7 @@ module Pod
     #
     PATTERN = /\A\s*(#{quoted_operators})?\s*(#{Version::VERSION_PATTERN})\s*\z/
 
-    DefaultRequirement = ['>=', Version.new(0)] # rubocop:disable Style/ConstantName
+    DefaultRequirement = ['>=', Version.new(0)] # rubocop:disable Naming/ConstantName
 
     #-------------------------------------------------------------------------#
 

data/lib/cocoapods-core/source.rb

@@ -167,9 +167,11 @@ module Pod
       pod_dir = pod_path(name)
       return unless pod_dir.exist?
       @versions_by_name[name] ||= pod_dir.children.map do |v|
+        next nil unless v.directory?
         basename = v.basename.to_s
+        next unless basename[0, 1] != '.'
         begin
-          Version.new(basename) if v.directory? && basename[0, 1] != '.'
+          Version.new(basename)
         rescue ArgumentError
           raise Informative, 'An unexpected version directory ' \
            "`#{basename}` was encountered for the " \
@@ -266,6 +268,11 @@ module Pod
         query = query.root_name
       end
 
+      if (versions = @versions_by_name[query]) && !versions.empty?
+        set = set(query)
+        return set if set.specification_name == query
+      end
+
       found = []
       Pathname.glob(pod_path(query)) do |path|
         next unless Dir.foreach(path).any? { |child| child != '.' && child != '..' }

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

@@ -1,3 +1,5 @@
+require 'public_suffix'
+
 module Pod
   class Source
     class Manager
@@ -265,6 +267,11 @@ module Pod
             require 'json'
             begin
               index = JSON.parse(search_index_path.read)
+              unless index # JSON.parse("null") => nil
+                search_index_path.delete
+                return nil
+              end
+
               index if index.is_a?(Hash) # TODO: should we also check if hash has correct hierarchy?
             rescue JSON::ParserError
               search_index_path.delete
@@ -404,12 +411,12 @@ module Pod
       # @example A non-Github.com URL
       #
       #          name_for_url('https://sourceforge.org/Artsy/Specs.git')
-      #            # sourceforge-artsy-specs
+      #            # sourceforge-artsy
       #
       # @example A file URL
       #
       #           name_for_url('file:///Artsy/Specs.git')
-      #             # artsy-specs
+      #             # artsy
       #
       # @param  [#to_s] url
       #         The URL of the source.
@@ -419,33 +426,52 @@ module Pod
       def name_for_url(url)
         base_from_host_and_path = lambda do |host, path|
           if host && !host.empty?
-            base = host.split('.')[-2] || host
-            base += '-'
+            domain = PublicSuffix.parse(host) rescue nil
+            base = [domain&.sld || host]
+            base = [] if base == %w(github)
           else
-            base = ''
+            base = []
           end
 
-          base + path.gsub(/.git$/, '').gsub(%r{^/}, '').split('/').join('-')
+          path = path.gsub(/.git$/, '').gsub(%r{^/}, '').split('/')
+          path.pop if path.last == 'specs'
+
+          (base + path).join('-')
+        end
+
+        valid_url = lambda do |url|
+          url =~ URI.regexp && (URI(url) rescue false)
         end
 
-        case url.to_s.downcase
+        valid_scp_url = lambda do |url|
+          valid_url['scp://' + url]
+        end
+
+        url = url.to_s.downcase
+
+        case url
         when %r{https://#{Regexp.quote(trunk_repo_hostname)}}i
+          # Main CDN repo
           base = Pod::TrunkSource::TRUNK_REPO_NAME
-        when %r{github.com[:/]+(.+)/(.+)}
-          base = Regexp.last_match[1]
-        when %r{^\S+@(\S+)[:/]+(.+)$}
-          host, path = Regexp.last_match.captures
-          base = base_from_host_and_path[host, path]
-        when URI.regexp
-          url = URI(url.downcase)
+        when valid_url
+          # HTTPS URL or something similar
+          url = valid_url[url]
+          base = base_from_host_and_path[url.host, url.path]
+        when valid_scp_url
+          # 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
+          # Additional SCP-style URLs for private git repos
+          host, _, path = Regexp.last_match.captures
+          base = base_from_host_and_path[host, path]
         else
-          base = url.to_s.downcase
+          # This is nearly impossible, with all the previous cases
+          raise Informative, "Couldn't determine repo name for URL: #{url}"
         end
 
         name = base
-        infinity = 1.0 / 0
-        (1..infinity).each do |i|
+        (1..).each do |i|
           break unless source_dir(name).exist?
           name = "#{base}-#{i}"
         end

data/lib/cocoapods-core/specification.rb

@@ -824,9 +824,9 @@ module Pod
   #
   #
   def self._eval_podspec(string, path)
-    # rubocop:disable Eval
+    # rubocop:disable Security/Eval
     eval(string, nil, path.to_s)
-    # rubocop:enable Eval
+    # rubocop:enable Security/Eval
 
     # rubocop:disable Lint/RescueException
   rescue Exception => e

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

@@ -168,6 +168,10 @@ module Pod
       #
       spec_attr_accessor :public_header_files
 
+      # @return [Array<String>] the project headers of the Pod.
+      #
+      spec_attr_accessor :project_header_files
+
       # @return [Array<String>] the private headers of the Pod.
       #
       spec_attr_accessor :private_header_files
@@ -182,7 +186,13 @@ module Pod
       #
       spec_attr_accessor :vendored_libraries
 
-      # @return [Hash{String=>String}]]  hash where the keys are the names of
+      # @return [Hash{String => Array<String>}] hash where the keys are the tags of
+      #         the on demand resources and the values are their relative file
+      #         patterns.
+      #
+      spec_attr_accessor :on_demand_resources
+
+      # @return [Hash{String=>String}]] hash where the keys are the names of
       #         the resource bundles and the values are their relative file
       #         patterns.
       #
@@ -455,6 +465,24 @@ module Pod
         Specification.convert_keys_to_symbol(value, :recursive => false) if value && value.is_a?(Hash)
       end
 
+      # Ensures that the file patterns of the on demand resources are contained in
+      # an array.
+      #
+      # @param  [String, Array, Hash] value.
+      #         The value of the attribute as specified by the user.
+      #
+      # @return [Hash] the on demand resources1.
+      #
+      def _prepare_on_demand_resources(value)
+        result = {}
+        if value
+          value.each do |key, patterns|
+            result[key] = [*patterns].compact
+          end
+        end
+        result
+      end
+
       # Ensures that the file patterns of the resource bundles are contained in
       # an array.
       #

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

@@ -1077,7 +1077,7 @@ module Pod
       SCRIPT_PHASE_OPTIONAL_KEYS = [:shell_path, :input_files, :output_files, :input_file_lists, :output_file_lists,
                                     :show_env_vars_in_log, :execution_position, :dependency_file].freeze
 
-      EXECUTION_POSITION_KEYS = [:before_compile, :after_compile, :any].freeze
+      EXECUTION_POSITION_KEYS = [:before_compile, :after_compile, :before_headers, :after_headers, :any].freeze
 
       ALL_SCRIPT_PHASE_KEYS = (SCRIPT_PHASE_REQUIRED_KEYS + SCRIPT_PHASE_OPTIONAL_KEYS).freeze
 
@@ -1259,6 +1259,32 @@ module Pod
 
       #------------------#
 
+      # @!method project_header_files=(project_header_files)
+      #
+      #   A list of file patterns that should be used to mark project headers.
+      #
+      #   ---
+      #
+      #   These patterns are matched against the public headers (or all the
+      #   headers if no public headers have been specified) to exclude those
+      #   headers which should not be exposed to the user project and which
+      #   should not be used to generate the documentation. When the library
+      #   is built, these headers will _not_ appear in the build directory.
+      #
+      #
+      #   @example
+      #
+      #     spec.project_header_files = 'Headers/Project/*.h'
+      #
+      #   @param  [String, Array<String>] project_header_files
+      #           the project headers of the Pod.
+      #
+      attribute :project_header_files,
+                :container => Array,
+                :file_patterns => true
+
+      #------------------#
+
       # @!method private_header_files=(private_header_files)
       #
       #   A list of file patterns that should be used to mark private headers.
@@ -1271,7 +1297,7 @@ module Pod
       #   should not be used to generate the documentation. When the library
       #   is built, these headers will appear in the build directory.
       #
-      #   Header files that are not listed as neither public nor private will
+      #   Header files that are not listed as neither public nor project or private will
       #   be treated as private, but in addition will not appear in the build
       #   directory at all.
       #
@@ -1335,6 +1361,32 @@ module Pod
 
       #------------------#
 
+      # @!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.
+      #
+      #   @example
+      #
+      #   s.on_demand_resources = {
+      #       'Tag1' => 'file1.png'
+      #   }
+      #
+      #   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.
+      #
+      attribute :on_demand_resources,
+                :types => [String, Array],
+                :container => Hash,
+                :file_patterns => true,
+                :singularize => true
+
+      #------------------#
+
       # @!method resource_bundles=(*resource_bundles)
       #
       #   This attribute allows to define the name and the file of the resource
@@ -1458,6 +1510,12 @@ module Pod
       #   The module map file that should be used when this pod is integrated as
       #   a framework.
       #
+      #   `false` indicates that the default CocoaPods `modulemap` file should not
+      #   be generated.
+      #
+      #   `true` is the default and indicates that the default CocoaPods
+      #   `modulemap` file should be generated.
+      #
       #   ---
       #
       #   By default, CocoaPods creates a module map file based upon the public
@@ -1467,11 +1525,17 @@ module Pod
       #
       #     spec.module_map = 'source/module.modulemap'
       #
-      #   @param  [String] module_map
-      #           the path to the module map file that should be used.
+      #   @example
+      #
+      #     spec.module_map = false
+      #
+      #   @param  [String, Bool] module_map
+      #           the path to the module map file that should be used
+      #           or whether to disable module_map generation.
       #
       attribute :module_map,
-                :root_only     => true
+                :types => [TrueClass, FalseClass, String],
+                :root_only => true
 
       #-----------------------------------------------------------------------#
 

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

@@ -242,9 +242,6 @@ module Pod
       def _validate_version(v)
         if v.to_s.empty?
           results.add_error('version', 'A version is required.')
-        elsif v <= Version::ZERO
-          results.add_error('version', 'The version of the spec should be' \
-          ' higher than 0.')
         end
       end
 
@@ -337,19 +334,6 @@ module Pod
         end
       end
 
-      # Performs validations related to the `vendored_libraries` attribute.
-      #
-      # @param [Array<String>] vendored_libraries the values specified in the `vendored_libraries` attribute
-      #
-      def _validate_vendored_libraries(vendored_libraries)
-        vendored_libraries.each do |lib|
-          lib_name = lib.downcase
-          unless lib_name.end_with?('.a') && lib_name.start_with?('lib')
-            results.add_warning('vendored_libraries', "`#{File.basename(lib)}` does not match the expected static library name format `lib[name].a`")
-          end
-        end
-      end
-
       # Performs validations related to the `license` attribute.
       #
       def _validate_license(l)

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

@@ -102,7 +102,7 @@ module Pod
         # Check empty subspec attributes
         #
         def check_if_spec_is_empty
-          methods = %w( source_files resources resource_bundles preserve_paths
+          methods = %w( source_files on_demand_resources resources resource_bundles preserve_paths
                         dependencies vendored_libraries vendored_frameworks )
           empty_patterns = methods.all? { |m| consumer.send(m).empty? }
           empty = empty_patterns && consumer.spec.subspecs.empty?

data/lib/cocoapods-core/yaml_helper.rb

@@ -212,8 +212,6 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
-      private
-
       # @!group Array Sorting
 
       # Sorts an array using another one as a sort hint. All the values of the
@@ -291,21 +289,21 @@ module Pod
         /0x[0-9a-fA-F]+/, # base 16 int
         /[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?/, # float
         /[-+]?\.(inf|Inf|INF)/, # infinity
-        /\.(nan|NaN|NAN)/, # NaN
+        /\.(nan|NaN|NAN)/ # NaN
       )
       private_constant :RESOLVED_TAGS
 
       INDICATOR_START_CHARS = %w(- ? : , [ ] { } # & * ! | > ' " % @ `).freeze
-      INDICATOR_START = /\A#{Regexp.union(INDICATOR_START_CHARS)}/
+      INDICATOR_START = /\A#{Regexp.union(INDICATOR_START_CHARS)}/.freeze
       private_constant :INDICATOR_START_CHARS, :INDICATOR_START
 
-      RESOLVED_TAGS_PATTERN = /\A#{Regexp.union(RESOLVED_TAGS)}\z/
+      RESOLVED_TAGS_PATTERN = /\A#{Regexp.union(RESOLVED_TAGS)}\z/.freeze
       private_constant :RESOLVED_TAGS_PATTERN
 
       VALID_PLAIN_SCALAR_STRING = %r{\A
         [\w&&[^#{INDICATOR_START_CHARS}]] # valid first character
         [\w/\ \(\)~<>=\.:`,-]* # all characters allowed after the first one
-      \z}ox
+      \z}ox.freeze
       private_constant :VALID_PLAIN_SCALAR_STRING
 
       def process_string(string)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,28 +9,28 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
@@ -121,28 +121,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -224,15 +224,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: The models of CocoaPods
 test_files: []