cocoapods-core 1.7.5 → 1.8.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40f862cf3a86ca84b6fdfee612e78c9cecc02e97ae8bbc4a099d96088c3f612
-  data.tar.gz: 2a2e7881179f0f3088d0a9dcebcebfc64f0251923f4d7c6d79013481f4d0ae16
+  metadata.gz: b3b9cb102f03fac7ec166a52c1d0b47a4b0bcefec61664061dc1136b96db2d81
+  data.tar.gz: a568022e39121dae7ee044b60d58369e543698e6261f5bfc1dafb3469da18512
 SHA512:
-  metadata.gz: 3c41e9d914cfda9bf6cbb7d7ae3550d4a0250897180b5a397a1b4da929102aa795fcc28d98df2e765ca3631519c86b721354524f7b70e59c0b6fdfc59d75295f
-  data.tar.gz: 329736230be1caf67f4eaf0b4965ecfd07031a3dbd1ff3d2692c89311521dafdd4616e5c0369fb7559c9d152ec11896d5e572db3f3cee1fa756453f7cf1f42d9
+  metadata.gz: c4f4dad80c9d988f64f83235c53ebc0e532207cda1fb0a7704248d97a4ad733e26831c42f39e2a80fd2a46ceda271ce39fd2c7d76bbff1f0f42a2116ac364473
+  data.tar.gz: 73492f7437077ac6f9bfda2edae47a56868b3a3fefb3fc1f37cd6eb739593cd57accb2256a198950ffb3b912f9449807cceb354850c83e1f7c3c137a1db5d4ba

data/lib/cocoapods-core.rb

@@ -28,7 +28,7 @@ module Pod
   autoload :Podfile,        'cocoapods-core/podfile'
   autoload :Source,         'cocoapods-core/source'
   autoload :CDNSource,      'cocoapods-core/cdn_source'
-  autoload :MasterSource,   'cocoapods-core/master_source'
+  autoload :TrunkSource,    'cocoapods-core/trunk_source'
   autoload :Specification,  'cocoapods-core/specification'
   autoload :StandardError,  'cocoapods-core/standard_error'
   autoload :YAMLHelper,     'cocoapods-core/yaml_helper'

data/lib/cocoapods-core/cdn_source.rb

@@ -6,8 +6,8 @@ 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
+    MAX_CDN_NETWORK_THREADS = (ENV['MAX_CDN_NETWORK_THREADS'] || 50).to_i
+    MAX_NUMBER_OF_RETRIES = (ENV['COCOAPODS_CDN_MAX_NUMBER_OF_RETRIES'] || 5).to_i
 
     # @param [String] repo The name of the repository
     #
@@ -20,7 +20,7 @@ module Pod
 
       @executor = Concurrent::ThreadPoolExecutor.new(
         :min_threads => 5,
-        :max_threads => (ENV['MAX_CDN_NETWORK_THREADS'] || MAX_CDN_NETWORK_THREADS).to_i,
+        :max_threads => MAX_CDN_NETWORK_THREADS,
         :max_queue => 0 # unbounded work queue
       )
 
@@ -32,7 +32,7 @@ module Pod
     # @return [String] The URL of the source.
     #
     def url
-      @url ||= File.read(repo.join('.url'))
+      @url ||= File.read(repo.join('.url')).chomp.chomp('/') + '/'
     end
 
     # @return [String] The type of the source.
@@ -44,7 +44,8 @@ module Pod
     def refresh_metadata
       if metadata.nil?
         unless repo.exist?
-          raise Informative, "Unable to find a source named: `#{name}`"
+          debug "CDN: Repo #{name} does not exist!"
+          return
         end
 
         specs_dir.mkpath
@@ -55,8 +56,9 @@ module Pod
     end
 
     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|
+      files_to_update = files_definitely_to_update + deprecated_local_podspecs - ['deprecated_podspecs.txt']
+      debug "CDN: #{name} Going to update #{files_to_update.count} files"
+      loaders = files_to_update.map do |file|
         Concurrent::Promises.future_on(@executor) do
           download_file(file)
         end
@@ -67,6 +69,17 @@ module Pod
       end
     end
 
+    def files_definitely_to_update
+      Pathname.glob(repo.join('**/*.{txt,yml}')).map { |f| f.relative_path_from(repo).to_s }
+    end
+
+    def deprecated_local_podspecs
+      download_file('deprecated_podspecs.txt')
+      local_file('deprecated_podspecs.txt', &:to_a).
+        map { |f| Pathname.new(f.chomp) }.
+        select { |f| repo.join(f).exist? }
+    end
+
     # @return [Pathname] The directory where the specs are stored.
     #
     def specs_dir
@@ -143,6 +156,10 @@ module Pod
     def specification_path(name, version)
       raise ArgumentError, 'No name' unless name
       raise ArgumentError, 'No version' unless version
+      unless versions(name).include?(Version.new(version))
+        raise StandardError, "Unable to find the specification #{name} " \
+          "(#{version}) in the #{self.name} source."
+      end
 
       podspec_version_path_relative = Pathname.new(version.to_s).join("#{name}.podspec.json")
       relative_podspec = relative_pod_path(name).join(podspec_version_path_relative).to_s
@@ -202,14 +219,21 @@ module Pod
     #         the search term. Can be a regular expression.
     #
     # @param  [Bool] full_text_search
-    #         not supported due to performance reasons
+    #         performed using Algolia
     #
     # @note   full text search requires to load the specification for each pod,
     #         and therefore not supported.
     #
     def search_by_name(query, full_text_search = false)
       if full_text_search
-        raise Informative, "Can't perform full text search, it will take forever"
+        require 'algoliasearch'
+        begin
+          algolia_result = algolia_search_index.search(query, :attributesToRetrieve => 'name')
+          names = algolia_result['hits'].map { |r| r['name'] }
+          names.map { |n| set(n) }.reject { |s| s.versions.compact.empty? }
+        rescue Algolia::AlgoliaError => e
+          raise Informative, "CDN: #{name} - Cannot perform full-text search because Algolia returned an error: #{e}"
+        end
       else
         super(query)
       end
@@ -233,14 +257,18 @@ module Pod
       []
     end
 
-    def git?
-      # Long story here. This property is actually used solely by Source::Manager to determine
-      # which sources are updatable. Ideally, this would require a name change but @segiddins
-      # has pointed out that it is public and could break plugins.
-      # In any case, CDN-backed repos can be updated and therefore the value ought to be true.
+    def updateable?
       true
     end
 
+    def git?
+      false
+    end
+
+    def indexable?
+      false
+    end
+
     private
 
     def ensure_versions_file_loaded(fragment)
@@ -261,6 +289,18 @@ module Pod
       end
     end
 
+    def algolia_search_index
+      @index ||= begin
+        require 'algoliasearch'
+
+        raise Informative, "Cannot perform full-text search in repo #{name} because it's missing Algolia config" if download_file('AlgoliaSearch.yml').nil?
+        algolia_config = YAMLHelper.load_string(local_file('AlgoliaSearch.yml', &:read))
+
+        client = Algolia::Client.new(:application_id => algolia_config['application_id'], :api_key => algolia_config['api_key'])
+        Algolia::Index.new(algolia_config['index'], client)
+      end
+    end
+
     def index_file_name_for_fragment(fragment)
       fragment_joined = fragment.join('_')
       fragment_joined = '_' + fragment_joined unless fragment.empty?
@@ -305,18 +345,20 @@ 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)
+      download_retrying_retryable_errors(partial_url, file_remote_url, etag)
     end
 
-    def download_from_url(partial_url, file_remote_url, etag)
+    def download_retrying_retryable_errors(partial_url, file_remote_url, etag, retries = MAX_NUMBER_OF_RETRIES)
       path = repo + partial_url
       etag_path = path.sub_ext(path.extname + '.etag')
 
-      response = download_retrying_connection_errors(partial_url, file_remote_url, etag)
+      response = download_retrying_connection_errors(partial_url, file_remote_url, etag, retries)
 
       case response.status_code
       when 301
-        download_from_url(partial_url, response.headers['location'].first, etag)
+        redirect_location = response.headers['location'].first
+        debug "CDN: #{name} Redirecting from #{file_remote_url} to #{redirect_location}"
+        download_retrying_retryable_errors(partial_url, redirect_location, 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
@@ -333,16 +375,32 @@ module Pod
       when 404
         debug "CDN: #{name} Relative path couldn't be downloaded: #{partial_url} Response: #{response.status_code}"
         nil
+      when 502, 503, 504
+        if retries <= 1
+          raise Informative, "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.status_code}"
+        else
+          sleep_for(backoff_time(retries))
+          download_retrying_retryable_errors(partial_url, file_remote_url, etag, retries - 1)
+        end
       else
-        raise Informative, "CDN: #{name} Relative path couldn't be downloaded: #{partial_url} Response: #{response.status_code}"
+        raise Informative, "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.status_code}"
       end
     end
 
-    def download_retrying_connection_errors(partial_url, file_remote_url, etag, retries = MAX_NUMBER_OF_RETRIES)
+    def backoff_time(retries)
+      current_retry = MAX_NUMBER_OF_RETRIES - retries
+      4 * 2**current_retry
+    end
+
+    def sleep_for(seconds)
+      sleep(seconds)
+    end
+
+    def download_retrying_connection_errors(partial_url, file_remote_url, etag, 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}"
+      if retries <= 1
+        raise Informative, "CDN: #{name} URL couldn't be downloaded: #{file_remote_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)

data/lib/cocoapods-core/dependency.rb

@@ -69,20 +69,6 @@ module Pod
     #
     #             Dependency.new('Artsy+UILabels', '~> 1.0', :source => 'https://github.com/Artsy/Specs.git')
     #
-    # @overload   initialize(name, is_head)
-    #
-    #   @param    [String] name
-    #             the name of the Pod.
-    #
-    #   @param    [Symbol] is_head
-    #             a symbol that can be `:head` or nil.
-    #
-    #   @todo     Remove `:head` code once everyone has migrated past CocoaPods 1.0.
-    #
-    #   @example  Initialization with the head option
-    #
-    #             Dependency.new('RestKit', :head)
-    #
     def initialize(name = nil, *requirements)
       if requirements.last.is_a?(Hash)
         additional_params = requirements.pop.select { |_, v| !v.nil? }
@@ -122,10 +108,6 @@ module Pod
     # @return [Requirement] the requirement of this dependency (a set of
     #         one or more version restrictions).
     #
-    # @todo   The specific version is stripped from head information because
-    #         because its string representation would not parse. It would
-    #         be better to add something like Version#display_string.
-    #
     def requirement
       if specific_version
         Requirement.new(Version.new(specific_version.version))
@@ -291,8 +273,8 @@ module Pod
     # @return [Bool] Whether the dependency has any pre-release requirements
     #
     def prerelease?
-      @prerelease ||= requirement.requirements.
-        any? { |r| Version.new(r[1].version).prerelease? }
+      return @prerelease if defined?(@prerelease)
+      @prerelease = requirement.requirements.any? { |_op, version| version.prerelease? }
     end
 
     # Checks whether the dependency would be satisfied by the specification
@@ -357,8 +339,6 @@ module Pod
     #           part by clients that need to create a dependency equal to the
     #           original one.
     #
-    # @todo     Remove the `HEAD` code once everyone has migrated past 1.0.
-    #
     # @return   [Dependency] the dependency described by the string.
     #
     def self.from_string(string)
@@ -367,9 +347,6 @@ module Pod
       version = match_data[2]
       version = version.gsub(/[()]/, '') if version
       case version
-      when / HEAD( \(based on #{Pod::Version::VERSION_PATTERN}\))?/
-        CoreUI.warn "Ignoring obsolete `HEAD` specifier in `#{string}`"
-        Dependency.new(name)
       when nil, /from `(.*)(`|')/
         Dependency.new(name)
       else

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/http.rb

@@ -8,11 +8,11 @@ module Pod
     #
     # @return [string]
     #
-    def self.get_actual_url(url)
+    def self.get_actual_url(url, user_agent = nil)
       redirects = 0
 
       loop do
-        response = perform_head_request(url)
+        response = perform_head_request(url, user_agent)
 
         if [301, 302, 303, 307, 308].include? response.status_code
           location = response.headers['location'].first
@@ -38,12 +38,12 @@ module Pod
     #
     # @return [REST::response]
     #
-    def self.validate_url(url)
+    def self.validate_url(url, user_agent = nil)
       return nil unless url =~ /^#{URI.regexp}$/
 
       begin
-        url = get_actual_url(url)
-        resp = perform_head_request(url)
+        url = get_actual_url(url, user_agent)
+        resp = perform_head_request(url, user_agent)
       rescue SocketError, URI::InvalidURIError, REST::Error, REST::Error::Connection
         resp = nil
       end
@@ -59,17 +59,19 @@ module Pod
     #
     # @return [REST::response]
     #
-    def self.perform_head_request(url)
+    def self.perform_head_request(url, user_agent)
       require 'rest'
 
-      resp = ::REST.head(url, 'User-Agent' => USER_AGENT)
+      user_agent ||= USER_AGENT
+
+      resp = ::REST.head(url, 'User-Agent' => user_agent)
 
       if resp.status_code >= 400
-        resp = ::REST.get(url, 'User-Agent' => USER_AGENT,
+        resp = ::REST.get(url, 'User-Agent' => user_agent,
                                'Range' => 'bytes=0-0')
 
         if resp.status_code >= 400
-          resp = ::REST.get(url, 'User-Agent' => USER_AGENT)
+          resp = ::REST.get(url, 'User-Agent' => user_agent)
         end
       end
 

data/lib/cocoapods-core/lockfile.rb

@@ -489,7 +489,7 @@ module Pod
           next unless source
           next if specs.empty?
           key = source.url || source.name
-          key = key.downcase if source.name == Pod::MasterSource::MASTER_REPO_NAME
+          key = Pod::TrunkSource::TRUNK_REPO_NAME if source.name == Pod::TrunkSource::TRUNK_REPO_NAME
           value = specs.map { |s| s.root.name }.uniq
           [key, YAMLHelper.sorted_array(value)]
         end.compact]

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

@@ -687,6 +687,39 @@ module Pod
         current_target_definition.use_frameworks!(flag)
       end
 
+      # Specifies the Swift version requirements this target definition supports.
+      #
+      # **Note** These requirements are inherited from the parent, if specified and if none
+      # are specified at the root level then all versions are considered to be supported.
+      #
+      # @param   [String, Version, Array<String>, Array<Version>] requirements
+      #          The set of requirements this target supports.
+      #
+      # @example
+      #
+      #   target 'MyApp' do
+      #     supports_swift_versions '>= 3.0', '< 4.0'
+      #     pod 'AFNetworking', '~> 1.0'
+      #   end
+      #
+      # @example
+      #
+      #   supports_swift_versions '>= 3.0', '< 4.0'
+      #
+      #   target 'MyApp' do
+      #     pod 'AFNetworking', '~> 1.0'
+      #   end
+      #
+      #   target 'ZipApp' do
+      #     pod 'SSZipArchive'
+      #   end
+      #
+      # @return   [void]
+      #
+      def supports_swift_versions(*requirements)
+        current_target_definition.store_swift_version_requirements(*requirements)
+      end
+
       #-----------------------------------------------------------------------#
 
       # @!group Workspace
@@ -869,39 +902,6 @@ module Pod
         raise Informative, 'Specifying multiple `post_install` hooks is unsupported.' if @post_install_callback
         @post_install_callback = block
       end
-
-      # Specifies the Swift version requirements this target definition supports.
-      #
-      # **Note** These requirements are inherited from the parent, if specified and if none
-      # are specified at the root level then all versions are considered to be supported.
-      #
-      # @param   [String, Version, Array<String>, Array<Version>] requirements
-      #          The set of requirements this target supports.
-      #
-      # @example
-      #
-      #   target 'MyApp' do
-      #     supports_swift_versions '>= 3.0', '< 4.0'
-      #     pod 'AFNetworking', '~> 1.0'
-      #   end
-      #
-      # @example
-      #
-      #   supports_swift_versions '>= 3.0', '< 4.0'
-      #
-      #   target 'MyApp' do
-      #     pod 'AFNetworking', '~> 1.0'
-      #   end
-      #
-      #   target 'ZipApp' do
-      #     pod 'SSZipArchive'
-      #   end
-      #
-      # @return   [void]
-      #
-      def supports_swift_versions(*requirements)
-        current_target_definition.store_swift_version_requirements(*requirements)
-      end
     end
   end
 end

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

@@ -296,6 +296,20 @@ module Pod
 
       #--------------------------------------#
 
+      # @return [String] The project name to use for the given pod name or `nil` if none specified.
+      #
+      # @note   When querying for a subspec then use the root pod spec name instead as this is what's stored.
+      #
+      def project_name_for_pod(pod_name)
+        if root?
+          raw_project_names_hash[pod_name]
+        else
+          raw_project_names_hash[pod_name] || parent.project_name_for_pod(pod_name)
+        end
+      end
+
+      #--------------------------------------#
+      #
       # @return [Bool] whether the target definition should inhibit warnings
       #         for a single pod. If inhibit_all_warnings is true, it will
       #         return true for any asked pod.
@@ -666,6 +680,7 @@ module Pod
         parse_inhibit_warnings(name, requirements)
         parse_modular_headers(name, requirements)
         parse_configuration_whitelist(name, requirements)
+        parse_project_name(name, requirements)
 
         if requirements && !requirements.empty?
           pod = { name => requirements }
@@ -769,6 +784,7 @@ module Pod
         use_modular_headers
         user_project_path
         build_configurations
+        project_names
         dependencies
         script_phases
         children
@@ -1041,6 +1057,33 @@ module Pod
         requirements.pop if options.empty?
       end
 
+      # Removes :project_name from the requirements list, and adds
+      # the pods name into internal hash.
+      #
+      # @param [String] name The name of the pod
+      #
+      # @param [Array] requirements
+      #        If :project_name is the only key in the hash, the hash
+      #        should be destroyed because it confuses Gem::Dependency.
+      #
+      # @return [void]
+      #
+      def parse_project_name(name, requirements)
+        options = requirements.last
+        return requirements unless options.is_a?(Hash)
+
+        project_name = options.delete(:project_name)
+        pod_name = Specification.root_name(name)
+        raw_project_names_hash[pod_name] = project_name if project_name
+
+        requirements.pop if options.empty?
+      end
+
+      def raw_project_names_hash
+        get_hash_value('project_names', {})
+      end
+      private :raw_project_names_hash
+
       # Removes :configurations or :configuration from the requirements list,
       # and adds the pod's name into the internal hash for which pods should be
       # linked in which configuration only.

data/lib/cocoapods-core/source.rb

@@ -16,6 +16,9 @@ module Pod
   #     "#{SPEC_NAME}/#{VERSION}/#{SPEC_NAME}.podspec"
   #
   class Source
+    # The default branch in which the specs are stored
+    DEFAULT_SPECS_BRANCH = 'master'.freeze
+
     # @return [Pod::Source::Metadata] The metadata for this source.
     #
     attr_reader :metadata
@@ -55,7 +58,7 @@ module Pod
     # @return [String] The type of the source.
     #
     def type
-      'file system'
+      git? ? 'git' : 'file system'
     end
 
     alias_method :to_s, :name
@@ -353,8 +356,16 @@ module Pod
       diff_until_commit_hash(prev_commit_hash)
     end
 
+    def updateable?
+      git?
+    end
+
     def git?
-      !repo_git(%w(rev-parse HEAD)).empty?
+      repo.join('.git').exist? && !repo_git(%w(rev-parse HEAD)).empty?
+    end
+
+    def indexable?
+      true
     end
 
     def verify_compatibility!
@@ -435,7 +446,7 @@ module Pod
 
     def git_tracking_branch
       path = repo.join('.git', 'cocoapods_branch')
-      path.file? ? path.read.strip : Pod::MasterSource::MASTER_REPO_NAME
+      path.file? ? path.read.strip : DEFAULT_SPECS_BRANCH
     end
 
     def diff_until_commit_hash(commit_hash)

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

@@ -58,10 +58,17 @@ module Pod
         aggregate.sources
       end
 
+      # @return [Array<Source>] The list of all the non-indexable sources known to this
+      #         installation of CocoaPods.
+      #
+      def all_non_indexable
+        aggregate.sources.reject(&:indexable?)
+      end
+
       # @return [Array<Source>] The CocoaPods Master Repo source.
       #
       def master
-        sources([Pod::MasterSource::MASTER_REPO_NAME]).select { |s| s.repo.directory? }
+        sources([Pod::TrunkSource::TRUNK_REPO_NAME]).select { |s| s.repo.directory? }
       end
 
       # @!group Master repo
@@ -69,7 +76,7 @@ module Pod
       # @return [Pathname] The path of the master repo.
       #
       def master_repo_dir
-        source_dir(Pod::MasterSource::MASTER_REPO_NAME)
+        source_dir(Pod::TrunkSource::TRUNK_REPO_NAME)
       end
 
       # @return [Bool] Checks if the master repo is usable.
@@ -122,9 +129,15 @@ module Pod
           end
           found_set_names = query_word_results_hash.values.reduce(:&)
           found_set_names ||= []
+
+          sets_from_non_indexable = all_non_indexable.map { |s| s.search_by_name(query, true) }.flatten
+
+          found_set_names += sets_from_non_indexable.map(&:name).flatten.uniq
+
           sets = found_set_names.map do |name|
             aggregate.representative_set(name)
           end
+
           # Remove nil values because representative_set return nil if no pod is found in any of the sources.
           sets.compact!
         else
@@ -182,7 +195,7 @@ module Pod
       #
       def updated_search_index
         index = stored_search_index || {}
-        all.each do |source|
+        indexable_sources.each do |source|
           source_name = source.name
           unless index[source_name]
             CoreUI.print "Creating search index for spec repo '#{source_name}'.."
@@ -203,6 +216,7 @@ module Pod
         search_index = stored_search_index
         return unless search_index
         changed_spec_paths.each_pair do |source, spec_paths|
+          next unless source.indexable?
           index_for_source = search_index[source.name]
           next unless index_for_source && !spec_paths.empty?
           updated_pods = source.pods_for_specification_paths(spec_paths)
@@ -290,10 +304,10 @@ module Pod
       def source_from_path(path)
         @sources_by_path ||= Hash.new do |hash, key|
           hash[key] = case
+                      when key.basename.to_s == Pod::TrunkSource::TRUNK_REPO_NAME
+                        TrunkSource.new(key)
                       when (key + '.url').exist?
                         CDNSource.new(key)
-                      when key.basename.to_s == Pod::MasterSource::MASTER_REPO_NAME
-                        MasterSource.new(key)
                       else
                         Source.new(key)
                       end
@@ -312,27 +326,33 @@ module Pod
         @aggregates_by_repos[repos] ||= Source::Aggregate.new(sources)
       end
 
-      # @return [Source] The git source with the given name. If no git source
+      # @return [Source] The updateable source with the given name. If no updateable source
       #         with given name is found it raises.
       #
       # @param  [String] name
       #         The name of the source.
       #
-      def git_source_named(name)
+      def updateable_source_named(name)
         specified_source = sources([name]).first
         unless specified_source
           raise Informative, "Unable to find the `#{name}` repo."
         end
-        unless specified_source.git?
-          raise Informative, "The `#{name}` repo is not a git repo."
+        unless specified_source.updateable?
+          raise Informative, "The `#{name}` repo is not a updateable repo."
         end
         specified_source
       end
 
-      # @return [Source] The list of the git sources.
+      # @return [Source] The list of the updateable sources.
       #
-      def git_sources
-        all.select(&:git?)
+      def updateable_sources
+        all.select(&:updateable?)
+      end
+
+      # @return [Source] The list of the indexable sources.
+      #
+      def indexable_sources
+        all.select(&:indexable?)
       end
 
       # @return [Pathname] The path of the source with the given name.
@@ -350,13 +370,17 @@ module Pod
       #         The URL of the source.
       #
       def source_with_url(url)
-        url = url.downcase.gsub(/.git$/, '')
+        url = canonic_url(url)
         url = 'https://github.com/cocoapods/specs' if url =~ %r{github.com[:/]+cocoapods/specs}
         all.find do |source|
-          source.url && source.url.downcase.gsub(/.git$/, '') == url
+          source.url && canonic_url(source.url) == url
         end
       end
 
+      def canonic_url(url)
+        url.downcase.gsub(/\.git$/, '').gsub(%r{\/$}, '')
+      end
+
       # Returns a suitable repository name for `url`.
       #
       # @example A GitHub.com URL
@@ -394,8 +418,8 @@ module Pod
         end
 
         case url.to_s.downcase
-        when %r{github.com[:/]+cocoapods/specs}
-          base = Pod::MasterSource::MASTER_REPO_NAME
+        when %r{https://#{Regexp.quote(trunk_repo_hostname)}}i
+          base = Pod::TrunkSource::TRUNK_REPO_NAME
         when %r{github.com[:/]+(.+)/(.+)}
           base = Regexp.last_match[1]
         when %r{^\S+@(\S+)[:/]+(.+)$}
@@ -416,6 +440,12 @@ module Pod
         end
         name
       end
+
+      # Returns hostname for for `trunk` URL.
+      #
+      def trunk_repo_hostname
+        URI.parse(TrunkSource::TRUNK_REPO_URL).host.downcase.freeze
+      end
     end
   end
 end

data/lib/cocoapods-core/specification.rb

@@ -125,8 +125,9 @@ module Pod
     #         clients.
     #
     def to_s
-      if name && !version.version.empty?
-        "#{name} (#{version})"
+      specified_version = raw_version || ''
+      if name && !specified_version.empty?
+        "#{name} (#{specified_version})"
       elsif name
         name
       else
@@ -203,6 +204,13 @@ module Pod
         gsub(/[^a-zA-Z0-9_]/, '_').gsub(/_+/, '_')
     end
 
+    # @return [Object, Nil]
+    #         the raw value specified for the version attribute, or nil
+    #
+    def raw_version
+      root.attributes_hash['version']
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -435,6 +443,12 @@ module Pod
       Specification.convert_keys_to_symbol(value, :recursive => false)
     end
 
+    # @return [Hash] The Info.plist value.
+    #
+    def info_plist
+      attributes_hash['info_plist'] || {}
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -689,18 +703,18 @@ module Pod
     def self.from_string(spec_contents, path, subspec_name = nil)
       path = Pathname.new(path).expand_path
       spec = nil
-      Dir.chdir(path.parent.directory? ? path.parent : Dir.pwd) do
-        case path.extname
-        when '.podspec'
+      case path.extname
+      when '.podspec'
+        Dir.chdir(path.parent.directory? ? path.parent : Dir.pwd) do
           spec = ::Pod._eval_podspec(spec_contents, path)
           unless spec.is_a?(Specification)
             raise Informative, "Invalid podspec file at path `#{path}`."
           end
-        when '.json'
-          spec = Specification.from_json(spec_contents)
-        else
-          raise Informative, "Unsupported specification format `#{path.extname}` for spec at `#{path}`."
         end
+      when '.json'
+        spec = Specification.from_json(spec_contents)
+      else
+        raise Informative, "Unsupported specification format `#{path.extname}` for spec at `#{path}`."
       end
 
       spec.defined_in_file = path

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

@@ -110,6 +110,10 @@ module Pod
         merge_values(attr, value_for_attribute(:xcconfig), value_for_attribute(:user_target_xcconfig))
       end
 
+      # @return [Hash{String => String}] the Info.plist values for the current specification
+      #
+      spec_attr_accessor :info_plist
+
       # @return [String] The contents of the prefix header.
       #
       spec_attr_accessor :prefix_header_contents
@@ -144,6 +148,10 @@ module Pod
       spec_attr_accessor :requires_app_host
       alias_method :requires_app_host?, :requires_app_host
 
+      # @return [String] Name of the app host this spec requires
+      #
+      spec_attr_accessor :app_host_name
+
       # @return [Symbol] the test type supported by this specification.
       #
       spec_attr_accessor :test_type
@@ -309,12 +317,7 @@ module Pod
           r.compact
         elsif attr.container == Hash
           existing_value.merge(new_value) do |_, old, new|
-            if new.is_a?(Array) || old.is_a?(Array)
-              r = [*old] + [*new]
-              r.compact
-            else
-              old + ' ' + new
-            end
+            merge_hash_value(attr, old, new)
           end
         else
           new_value
@@ -349,6 +352,35 @@ module Pod
         end
       end
 
+      private
+
+      # Merges two values in a hash together based on the needs of the attribute
+      #
+      # @param  [Specification::DSL::Attribute] attr
+      #         the attribute for which that value is needed.
+      #
+      # @param  [Object] old the value from the original hash
+      #
+      # @param  [Object] new the value from the new hash
+      #
+      # @return [Object] the merged value
+      #
+      def merge_hash_value(attr, old, new)
+        case attr.name
+        when :info_plist
+          new
+        when ->(name) { spec.non_library_specification? && [:pod_target_xcconfig, :user_target_xcconfig, :xcconfig].include?(name) }
+          new
+        else
+          if new.is_a?(Array) || old.is_a?(Array)
+            r = Array(old) + Array(new)
+            r.compact
+          else
+            old + ' ' + new
+          end
+        end
+      end
+
       # @!group Preparing Values
       #-----------------------------------------------------------------------#
 

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

@@ -305,7 +305,7 @@ module Pod
         :git  => [:tag, :branch, :commit, :submodules].freeze,
         :svn  => [:folder, :tag, :revision].freeze,
         :hg   => [:revision].freeze,
-        :http => [:flatten, :type, :sha256, :sha1].freeze,
+        :http => [:flatten, :type, :sha256, :sha1, :headers].freeze,
       }.freeze
 
       # @!method source=(source)
@@ -704,6 +704,39 @@ module Pod
 
       #------------------#
 
+      # @!method info_plist=(info_plist)
+      #
+      #   Key-Value pairs to add to the generated `Info.plist`.
+      #
+      #   The values will be merged with the default values that
+      #   CocoaPods generates, overriding any duplicates.
+      #
+      #   For library specs, the values will be merged into the generated Info.plist
+      #   for libraries that are integrated using frameworks. It will have no effect
+      #   for static libraries.
+      #
+      #   Subspecs (other than app and test specs) are not supported.
+      #
+      #   For app specs, the values will be merged into the application host's `Info.plist`.
+      #
+      #   For test specs, the values will be merged into the test bundle's `Info.plist`.
+      #
+      #   @example
+      #
+      #     spec.info_plist = {
+      #       'CFBundleIdentifier' => 'com.myorg.MyLib',
+      #       'MY_VAR' => 'SOME_VALUE'
+      #     }
+      #
+      #   @param  [Hash] info_plist
+      #           The Info.plist values for the Pod.
+      #
+      attribute :info_plist,
+                :container => Hash,
+                :inherited => false
+
+      #------------------#
+
       # @!method requires_arc=(flag)
       #
       #   `requires_arc` allows you to specify which source_files use ARC.
@@ -1155,7 +1188,8 @@ module Pod
       #
       #   ---
       #
-      #   These are the headers that will be exposed to the user’s project and
+      #   These patterns are matched against the source files to include headers
+      #   that will be exposed to the user’s project and
       #   from which documentation will be generated. When the library is built,
       #   these headers will appear in the build directory. If no public headers
       #   are specified then **all** the headers in source_files are considered
@@ -1470,7 +1504,7 @@ module Pod
 
       # The list of the test types currently supported.
       #
-      SUPPORTED_TEST_TYPES = [:unit].freeze
+      SUPPORTED_TEST_TYPES = [:unit, :ui].freeze
 
       # The test type this specification supports. This only applies to test specifications.
       #
@@ -1508,6 +1542,39 @@ module Pod
                 :default_value => false,
                 :spec_types => [:test]
 
+      # @!method app_host_name=(name)
+      #
+      #   The app specification to use as an app host, if necessary.
+      #
+      # @note
+      #
+      #    You must depend on that app spec using `test_spec.dependency 'PodName'`.
+      #
+      # @example
+      #
+      #   Pod::Spec.new do |spec|
+      #     spec.name = 'NSAttributedString+CCLFormat'
+      #
+      #     spec.test_spec do |test_spec|
+      #       test_spec.source_files = 'NSAttributedString+CCLFormatTests.m'
+      #       test_spec.requires_app_host = true
+      #       test_spec.app_host_name = 'NSAttributedString+CCLFormat/App'
+      #       test_spec.dependency 'NSAttributedString+CCLFormat/App'
+      #     end
+      #
+      #     spec.app_spec 'App' do |app_spec|
+      #       app_spec.source_files = 'NSAttributedString+CCLFormat.m'
+      #       app_spec.dependency 'AFNetworking'
+      #     end
+      #   end
+      #
+      #   @param [String] name
+      #          The app specification to use as an app host, if necessary.
+      #
+      attribute :app_host_name,
+                :types => [String],
+                :spec_types => [:test]
+
       SCHEME_KEYS = [:launch_arguments, :environment_variables].freeze
 
       # @!method scheme=(flag)

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

@@ -121,15 +121,19 @@ module Pod
       def check_required_attributes
         attributes = DSL.attributes.values.select(&:required?)
         attributes.each do |attr|
-          value = spec.send(attr.name)
-          unless value && (!value.respond_to?(:empty?) || !value.empty?)
-            if attr.name == :license
-              results.add_warning('attributes', 'Missing required attribute ' \
-              "`#{attr.name}`.")
-            else
-              results.add_error('attributes', 'Missing required attribute ' \
-               "`#{attr.name}`.")
+          begin
+            value = spec.send(attr.name)
+            unless value && (!value.respond_to?(:empty?) || !value.empty?)
+              if attr.name == :license
+                results.add_warning('attributes', 'Missing required attribute ' \
+                "`#{attr.name}`.")
+              else
+                results.add_error('attributes', 'Missing required attribute ' \
+                 "`#{attr.name}`.")
+              end
             end
+          rescue => exception
+            results.add_error('attributes', "Unable to parse attribute `#{attr.name}` due to error: #{exception}")
           end
         end
       end
@@ -187,9 +191,13 @@ module Pod
         attributes.each do |attr|
           validation_hook = "_validate_#{attr.name}"
           next unless respond_to?(validation_hook, true)
-          value = target.send(attr.name)
-          next unless value
-          send(validation_hook, value)
+          begin
+            value = target.send(attr.name)
+            next unless value
+            send(validation_hook, value)
+          rescue => e
+            results.add_error(attr.name, "Unable to validate due to exception: #{e}")
+          end
         end
       end
 
@@ -350,6 +358,7 @@ module Pod
       # Performs validations related to the `source` attribute.
       #
       def _validate_source(s)
+        return unless s.is_a?(Hash)
         if git = s[:git]
           tag, commit = s.values_at(:tag, :commit)
           version = spec.version.to_s
@@ -394,6 +403,18 @@ module Pod
         end
       end
 
+      def _validate_app_host_name(n)
+        unless consumer.requires_app_host?
+          results.add_error('app_host_name', '`requires_app_host` must be set to ' \
+            '`true` when `app_host_name` is specified.')
+        end
+
+        unless consumer.dependencies.map(&:name).include?(n)
+          results.add_error('app_host_name', "The app host name (#{n}) specified by `#{consumer.spec.name}` could " \
+            'not be found. You must explicitly declare a dependency on that app spec.')
+        end
+      end
+
       # Performs validations related to the `script_phases` attribute.
       #
       def _validate_script_phases(s)
@@ -482,6 +503,15 @@ module Pod
         end
       end
 
+      # @param [Hash,Object] value
+      #
+      def _validate_info_plist(value)
+        return if value.empty?
+        if consumer.spec.subspec? && consumer.spec.library_specification?
+          results.add_error('info_plist', 'Info.plist configuration is not currently supported for subspecs.')
+        end
+      end
+
       #-----------------------------------------------------------------------#
 
       # @!group All specs validation helpers

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

@@ -181,6 +181,10 @@ module Pod
         end
 
         def validate_attribute_hash_keys(attribute, value)
+          unless value.is_a?(Hash)
+            results.add_error(attribute.name, "Unsupported type `#{value.class}`, expected `Hash`")
+            return
+          end
           major_keys = value.keys & attribute.keys.keys
           if major_keys.count.zero?
             results.add_warning('keys', "Missing primary key for `#{attribute.name}` " \

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

@@ -27,11 +27,6 @@ module Pod
 
         # @return [Version] The version of the Pod.
         #
-        # @todo   The version is memoized because the Resolvers sets the head
-        #         state on it. This information should be stored in the
-        #         specification instance and the lockfile should have a more
-        #         robust handling of head versions (like a dedicated section).
-        #
         def version
           if root?
             @version ||= Version.new(attributes_hash['version'])
@@ -131,7 +126,12 @@ module Pod
         #         should be retrieved.
         #
         def source
-          Specification.convert_keys_to_symbol(attributes_hash['source'])
+          value = attributes_hash['source']
+          if value && value.is_a?(Hash)
+            Specification.convert_keys_to_symbol(value)
+          else
+            value
+          end
         end
 
         # @return [String] A short description of the Pod.

data/lib/cocoapods-core/trunk_source.rb

@@ -0,0 +1,14 @@
+module Pod
+  class TrunkSource < CDNSource
+    # On-disk master repo name
+    TRUNK_REPO_NAME = 'trunk'.freeze
+
+    # Remote CDN repo URL
+    TRUNK_REPO_URL = 'https://cdn.cocoapods.org/'.freeze
+
+    def url
+      @url ||= TRUNK_REPO_URL
+      super
+    end
+  end
+end

data/lib/cocoapods-core/version.rb

@@ -68,7 +68,8 @@ module Pod
     #         For more info, see: http://semver.org
     #
     def prerelease?
-      @prerelease ||= @version =~ /[a-zA-Z\-]/
+      return @prerelease if defined?(@prerelease)
+      @prerelease = @version =~ /[a-zA-Z\-]/
     end
 
     # @return [Bool] Whether a string representation is correct.
@@ -205,7 +206,7 @@ module Pod
       compare = proc do |segments, other_segments, is_pre_release|
         limit = [segments.size, other_segments.size].max
 
-        (0..limit).each do |i|
+        0.upto(limit) do |i|
           lhs = segments[i]
           rhs = other_segments[i]
 
@@ -224,8 +225,6 @@ module Pod
           if comparison = lhs <=> rhs
             return comparison
           end
-          return 1 if lhs.is_a?(String) && rhs.is_a?(Numeric)
-          return -1 if lhs.is_a?(Numeric) && rhs.is_a?(String)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.8.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,6 +59,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.4
+- !ruby/object:Gem::Dependency
+  name: algoliasearch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +108,6 @@ files:
 - lib/cocoapods-core/github.rb
 - lib/cocoapods-core/http.rb
 - lib/cocoapods-core/lockfile.rb
-- lib/cocoapods-core/master_source.rb
 - lib/cocoapods-core/metrics.rb
 - lib/cocoapods-core/platform.rb
 - lib/cocoapods-core/podfile.rb
@@ -122,6 +135,7 @@ files:
 - lib/cocoapods-core/specification/set.rb
 - lib/cocoapods-core/specification/set/presenter.rb
 - lib/cocoapods-core/standard_error.rb
+- lib/cocoapods-core/trunk_source.rb
 - lib/cocoapods-core/vendor.rb
 - lib/cocoapods-core/vendor/requirement.rb
 - lib/cocoapods-core/vendor/version.rb

data/lib/cocoapods-core/master_source.rb

@@ -1,8 +0,0 @@
-module Pod
-  class MasterSource < Source
-    # For now, the MasterSource behaves exactly the same as any other Source.
-    # In the future we may apply separate logic to the MasterSource that doesn't
-    # depend on the file system.
-    MASTER_REPO_NAME = 'master'.freeze
-  end
-end