cocoapods-core 1.8.4 → 1.9.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306a8c96eeccd74ea026697148fe4b1cb29336e906a448f24ab7c1d254f0d9f8
-  data.tar.gz: f5d4447b0d9016de3c8d122ad6f2472d41c3df2fad6a96a0d58d82d3f06b2c4e
+  metadata.gz: 767b9681ebb1b555c9750c0fb6ceafa498dd5193a5a509e7560e3c395ef7093e
+  data.tar.gz: ad41c838f0582b8ae978b180f35f2cfc32c321dcb47f8f8591abd3843f61598c
 SHA512:
-  metadata.gz: d9c8236b2c02a23d7d70495bff802a2fe46c061a8ecc4a51fd012c7f717cdde113a227b60e1b4b857cd6f74b954b48d3fc11ec4a1cdfae62b8d80be0249711f0
-  data.tar.gz: d8472bbcbcd8b00a673e7e42f61827d35b887f796b66b16e7ee922dfed4ab7b254e3176e09b27234bd8bf3ea4693c9d8823d752e6eff581941758abdf75b035f
+  metadata.gz: a6e61b8cd239ea526a301f6a340b043ecc4fa02be1e6985e728bbff0376aea1389f45e689b6bcef170300e80fdde978c48d20392fafa30d9902443e157b42ec9
+  data.tar.gz: 4eb1ba7d93173e723207bfdfb9488d5fda243cdf2c7cba14b76e96a7a46929747f80ed6d7fd5efd6d707faee99433b9846d5d567b290fa52899755e0d4196c93

data/lib/cocoapods-core.rb

@@ -32,6 +32,7 @@ module Pod
   autoload :Specification,  'cocoapods-core/specification'
   autoload :StandardError,  'cocoapods-core/standard_error'
   autoload :YAMLHelper,     'cocoapods-core/yaml_helper'
+  autoload :BuildType,      'cocoapods-core/build_type'
 
   # TODO: Fix
   #

data/lib/cocoapods-core/build_type.rb

@@ -0,0 +1,121 @@
+module Pod
+  class BuildType
+    # @return [Array<Symbol>] known packaging options.
+    #
+    KNOWN_PACKAGING_OPTIONS = %i(library framework).freeze
+
+    # @return [Array<Symbol>] known linking options.
+    #
+    KNOWN_LINKAGE_OPTIONS = %i(static dynamic).freeze
+
+    # @return [Symbol] the packaging for this build type, one of #KNOWN_PACKAGING_OPTIONS
+    #
+    attr_reader :packaging
+
+    # @return [Symbol] the linkage for this build type, one of #KNOWN_LINKAGE_OPTIONS
+    #
+    attr_reader :linkage
+
+    attr_reader :hash
+
+    def initialize(linkage: :static, packaging: :library)
+      unless KNOWN_LINKAGE_OPTIONS.include?(linkage)
+        raise ArgumentError, "Invalid linkage option #{linkage.inspect}, valid options are #{KNOWN_LINKAGE_OPTIONS.inspect}"
+      end
+      unless KNOWN_PACKAGING_OPTIONS.include?(packaging)
+        raise ArgumentError, "Invalid packaging option #{packaging.inspect}, valid options are #{KNOWN_PACKAGING_OPTIONS.inspect}"
+      end
+      @packaging = packaging
+      @linkage = linkage
+      @hash = packaging.hash ^ linkage.hash
+    end
+
+    # @return [BuildType] the build type for a dynamic library
+    def self.dynamic_library
+      new(:linkage => :dynamic, :packaging => :library)
+    end
+
+    # @return [BuildType] the build type for a static library
+    #
+    def self.static_library
+      new(:linkage => :static, :packaging => :library)
+    end
+
+    # @return [BuildType] the build type for a dynamic framework
+    #
+    def self.dynamic_framework
+      new(:linkage => :dynamic, :packaging => :framework)
+    end
+
+    # @return [BuildType] the build type for a static framework
+    #
+    def self.static_framework
+      new(:linkage => :static, :packaging => :framework)
+    end
+
+    # @return [Boolean] whether the target is built dynamically
+    #
+    def dynamic?
+      linkage == :dynamic
+    end
+
+    # @return [Boolean] whether the target is built statically
+    #
+    def static?
+      linkage == :static
+    end
+
+    # @return [Boolean] whether the target is built as a framework
+    #
+    def framework?
+      packaging == :framework
+    end
+
+    # @return [Boolean] whether the target is built as a library
+    #
+    def library?
+      packaging == :library
+    end
+
+    # @return [Boolean] whether the target is built as a dynamic framework
+    #
+    def dynamic_framework?
+      dynamic? && framework?
+    end
+
+    # @return [Boolean] whether the target is built as a dynamic library
+    #
+    def dynamic_library?
+      dynamic? && library?
+    end
+
+    # @return [Boolean] whether the target is built as a static framework
+    #
+    def static_framework?
+      static? && framework?
+    end
+
+    # @return [Boolean] whether the target is built as a static library
+    #
+    def static_library?
+      static? && library?
+    end
+
+    def to_s
+      "#{linkage} #{packaging}"
+    end
+
+    def to_hash
+      { :linkage => linkage, :packaging => packaging }
+    end
+
+    def inspect
+      "#<#{self.class} linkage=#{linkage} packaging=#{packaging}>"
+    end
+
+    def ==(other)
+      linkage == other.linkage &&
+        packaging == other.packaging
+    end
+  end
+end

data/lib/cocoapods-core/cdn_source.rb

@@ -1,13 +1,20 @@
 require 'cocoapods-core/source'
 require 'rest'
 require 'concurrent'
+require 'typhoeus'
+require 'netrc'
 
 module Pod
   # Subclass of Pod::Source to provide support for CDN-based Specs repositories
   #
   class CDNSource < Source
-    MAX_CDN_NETWORK_THREADS = (ENV['MAX_CDN_NETWORK_THREADS'] || 50).to_i
+    include Concurrent
+
     MAX_NUMBER_OF_RETRIES = (ENV['COCOAPODS_CDN_MAX_NUMBER_OF_RETRIES'] || 5).to_i
+    # Single thread executor for all network activity.
+    HYDRA_EXECUTOR = Concurrent::SingleThreadExecutor.new
+
+    private_constant :HYDRA_EXECUTOR
 
     # @param [String] repo The name of the repository
     #
@@ -18,12 +25,6 @@ module Pod
       # after the source was initialized, is considered fresh enough.
       @startup_time = Time.new
 
-      @executor = Concurrent::ThreadPoolExecutor.new(
-        :min_threads => 5,
-        :max_threads => MAX_CDN_NETWORK_THREADS,
-        :max_queue => 0 # unbounded work queue
-      )
-
       @version_arrays_by_fragment_by_name = {}
 
       super(repo)
@@ -58,14 +59,14 @@ module Pod
     def preheat_existing_files
       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
-      end
 
-      catching_concurrent_errors do
-        Concurrent::Promises.zip(*loaders).wait!
+      concurrent_requests_catching_errors do
+        # Queue all tasks first
+        loaders = files_to_update.map do |file|
+          download_file_async(file)
+        end
+        # Block and wait for all to complete running on Hydra
+        Promises.zip_futures_on(HYDRA_EXECUTOR, *loaders).wait!
       end
     end
 
@@ -117,27 +118,30 @@ module Pod
 
       return nil if @version_arrays_by_fragment_by_name[fragment][name].nil?
 
-      loaders = []
-      @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::Promises.future_on(@executor) do
-            download_file(pod_path_relative.join(podspec_version_path_relative).to_s)
+      concurrent_requests_catching_errors do
+        loaders = []
+
+        @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?
+            # Queue all podspec download tasks first
+            loaders << download_file_async(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_path_actual}` Pod in the `#{name}` repository."
-        end
-      end.compact.sort.reverse
 
-      catching_concurrent_errors do
-        Concurrent::Promises.zip(*loaders).wait!
+          begin
+            Version.new(version) if version[0, 1] != '.'
+          rescue ArgumentError
+            raise Informative, 'An unexpected version directory ' \
+            "`#{version}` was encountered for the " \
+            "`#{pod_path_actual}` Pod in the `#{name}` repository."
+          end
+        end.compact.sort.reverse
+
+        # Block and wait for all to complete running on Hydra
+        Promises.zip_futures_on(HYDRA_EXECUTOR, *loaders).wait!
       end
 
       @versions_by_name[name]
@@ -323,18 +327,25 @@ module Pod
     end
 
     def download_file(partial_url)
+      # Block the main thread waiting for Hydra to finish
+      #
+      # Used for single-file downloads
+      download_file_async(partial_url).wait!
+    end
+
+    def download_file_async(partial_url)
       file_remote_url = URI.encode(url + partial_url.to_s)
       path = repo + partial_url
 
       if File.exist?(path)
         if @startup_time < File.mtime(path)
           debug "CDN: #{name} Relative path: #{partial_url} modified during this run! Returning local"
-          return partial_url
+          return Promises.fulfilled_future(partial_url, HYDRA_EXECUTOR)
         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"
-          return partial_url
+          return Promises.fulfilled_future(partial_url, HYDRA_EXECUTOR)
         end
       end
 
@@ -345,46 +356,68 @@ 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_retrying_retryable_errors(partial_url, file_remote_url, etag)
+      download_and_save_with_retries_async(partial_url, file_remote_url, etag)
     end
 
-    def download_retrying_retryable_errors(partial_url, file_remote_url, etag, retries = MAX_NUMBER_OF_RETRIES)
+    def download_and_save_with_retries_async(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, retries)
-
-      case response.status_code
-      when 301
-        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
-        # optimization. See #initialize for more information.
-        FileUtils.touch path
-        partial_url
-      when 200
-        File.open(path, 'w') { |f| f.write(response.body) }
-
-        etag_new = response.headers['etag'].first if response.headers.include?('etag')
-        debug "CDN: #{name} Relative path downloaded: #{partial_url}, save ETag: #{etag_new}"
-        File.open(etag_path, 'w') { |f| f.write(etag_new) } unless etag_new.nil?
-        partial_url
-      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}"
+      download_task = download_typhoeus_impl_async(file_remote_url, etag).then do |response|
+        case response.response_code
+        when 301
+          redirect_location = response.headers['location']
+          debug "CDN: #{name} Redirecting from #{file_remote_url} to #{redirect_location}"
+          download_and_save_with_retries_async(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
+          # optimization. See #initialize for more information.
+          FileUtils.touch path
+          partial_url
+        when 200
+          File.open(path, 'w') { |f| f.write(response.response_body) }
+
+          etag_new = response.headers['etag']
+          debug "CDN: #{name} Relative path downloaded: #{partial_url}, save ETag: #{etag_new}"
+          File.open(etag_path, 'w') { |f| f.write(etag_new) } unless etag_new.nil?
+          partial_url
+        when 404
+          debug "CDN: #{name} Relative path couldn't be downloaded: #{partial_url} Response: #{response.response_code}"
+          nil
+        when 502, 503, 504
+          # Retryable HTTP errors, usually related to server overloading
+          if retries <= 1
+            raise Informative, "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.response_code} #{response.response_body}"
+          else
+            debug "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.response_code} #{response.response_body}, retries: #{retries - 1}"
+            exponential_backoff_async(retries).then do
+              download_and_save_with_retries_async(partial_url, file_remote_url, etag, retries - 1)
+            end
+          end
+        when 0
+          # Non-HTTP errors, usually network layer
+          if retries <= 1
+            raise Informative, "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.return_message}"
+          else
+            debug "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.return_message}, retries: #{retries - 1}"
+            exponential_backoff_async(retries).then do
+              download_and_save_with_retries_async(partial_url, file_remote_url, etag, retries - 1)
+            end
+          end
         else
-          sleep_for(backoff_time(retries))
-          download_retrying_retryable_errors(partial_url, file_remote_url, etag, retries - 1)
+          raise Informative, "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.response_code} #{response.response_body}"
         end
-      else
-        raise Informative, "CDN: #{name} URL couldn't be downloaded: #{file_remote_url} Response: #{response.status_code}"
       end
+
+      # Calling `Future#run` flattens the chained futures created by retries or redirects
+      #
+      # Does not, in fact, run the task - that is already happening in Hydra at this point
+      download_task.run
+    end
+
+    def exponential_backoff_async(retries)
+      sleep_async(backoff_time(retries))
     end
 
     def backoff_time(retries)
@@ -392,19 +425,38 @@ module Pod
       4 * 2**current_retry
     end
 
-    def sleep_for(seconds)
-      sleep(seconds)
-    end
+    def sleep_async(seconds)
+      # Async sleep to avoid blocking either the main or the Hydra thread
+      Promises.schedule_on(HYDRA_EXECUTOR, seconds)
+    end
+
+    def download_typhoeus_impl_async(file_remote_url, etag)
+      # Create a prefereably HTTP/2 request - the protocol is ultimately responsible for picking
+      # the maximum supported protocol
+      # When debugging with proxy, use the following extra options:
+      # :proxy => 'http://localhost:8888',
+      # :ssl_verifypeer => false,
+      # :ssl_verifyhost => 0,
+      request = Typhoeus::Request.new(
+        file_remote_url,
+        :method => :get,
+        :http_version => :httpv2_0,
+        :timeout => 10,
+        :connecttimeout => 10,
+        :accept_encoding => 'gzip',
+        :netrc => :optional,
+        :netrc_file => Netrc.default_path,
+        :headers => etag.nil? ? {} : { 'If-None-Match' => etag },
+      )
 
-    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 <= 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)
+      future = Promises.resolvable_future_on(HYDRA_EXECUTOR)
+      queue_request(request)
+      request.on_complete do |response|
+        future.fulfill(response)
       end
+
+      # This `Future` should never reject, network errors are exposed on `Typhoeus::Response`
+      future
     end
 
     def debug(message)
@@ -415,11 +467,27 @@ module Pod
       end
     end
 
-    def catching_concurrent_errors
+    def concurrent_requests_catching_errors
       yield
-    rescue Concurrent::MultipleErrors => e
+    rescue MultipleErrors => e
+      # aggregated error message from `Concurrent`
       errors = e.errors
       raise Informative, "CDN: #{name} Repo update failed - #{e.errors.size} error(s):\n#{errors.join("\n")}"
     end
+
+    def queue_request(request)
+      @hydra ||= Typhoeus::Hydra.new
+
+      # Queue the request into the Hydra (libcurl reactor).
+      @hydra.queue(request)
+
+      # Cycle the reactor on a separate thread
+      #
+      # The way it works is that if more requests are queued while Hydra is in the `#run`
+      # method, it will keep executing them
+      #
+      # The upcoming calls to `#run` will simply run empty.
+      HYDRA_EXECUTOR.post(@hydra, &:run)
+    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.8.4'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.9.0.beta.1'.freeze unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/platform.rb

@@ -45,6 +45,10 @@ module Pod
         @symbolic_name = input.name
         @deployment_target = input.deployment_target
       else
+        # Allow `Platform.new('macos')` to be equivalent to `Platform.macos`
+        if input == 'macos'
+          input = 'osx'
+        end
         @symbolic_name = input.to_sym
         target = target[:deployment_target] if target.is_a?(Hash)
         @deployment_target = Version.create(target)

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

@@ -422,6 +422,9 @@ module Pod
       #           specifies the position of which this script phase should be executed. The currently supported values are:
       #           `:before_compile`, `:after_compile` and `:any` which is the default.
       #
+      # @option   options [String] :dependency_file
+      #           specifies the dependency file to use for this script phase.
+      #
       # @return   [void]
       #
       def script_phase(options)
@@ -677,14 +680,39 @@ module Pod
         current_target_definition.use_modular_headers_for_all_pods = true
       end
 
-      # Use frameworks instead of static libraries for Pods.
+      # Use frameworks instead of static libraries for Pods. When using frameworks, you may also specify the `:linkage`
+      # style to use, either `:static` or `:dynamic`.
       #
       # ------
       #
       # This attribute is inherited by child target definitions.
       #
-      def use_frameworks!(flag = true)
-        current_target_definition.use_frameworks!(flag)
+      # @param [Boolean, Hash] option
+      #        The option to use for configuring packaging and linkage style.
+      #
+      # @example
+      #
+      #   target 'MyApp' do
+      #     use_frameworks!
+      #     pod 'AFNetworking', '~> 1.0'
+      #   end
+      #
+      # @example
+      #
+      #   target 'MyApp' do
+      #     use_frameworks! :linkage => :dynamic
+      #     pod 'AFNetworking', '~> 1.0'
+      #   end
+      #
+      #   target 'ZipApp' do
+      #     use_frameworks! :linkage => :static
+      #     pod 'SSZipArchive'
+      #   end
+      #
+      # @return   [void]
+      #
+      def use_frameworks!(option = true)
+        current_target_definition.use_frameworks!(option)
       end
 
       # Specifies the Swift version requirements this target definition supports.

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

@@ -365,25 +365,54 @@ module Pod
 
       #--------------------------------------#
 
-      # Sets whether the target definition should build a framework.
+      # The (desired) build type for the pods integrated in this target definition. Defaults to static libraries and can
+      # only be overridden through Pod::Podfile::DSL#use_frameworks!.
+      #
+      # @return [BuildType]
+      #
+      def build_type
+        value = get_hash_value('uses_frameworks', root? ? BuildType.static_library : parent.build_type)
+        case value
+        when true, false
+          value ? BuildType.dynamic_framework : BuildType.static_library
+        when Hash
+          BuildType.new(:linkage => value.fetch(:linkage), :packaging => value.fetch(:packaging))
+        when BuildType
+          value
+        else
+          raise ArgumentError, "Got `#{value.inspect}`, should be a boolean, hash or BuildType."
+        end
+      end
+
+      # Sets whether the target definition's pods should be built as frameworks.
       #
-      # @param  [Bool] flag
-      #         Whether a framework should be built.
+      # @param [Boolean, Hash] option
+      #        Whether pods that are integrated in this target should be built as frameworks. If the option is a
+      #        boolean then the value affects both packaging and linkage styles. If set to true, then dynamic frameworks
+      #        are used and if it's set to false, then static libraries are used. If the option is a hash then
+      #        `:framework` packaging is implied and the user configures the `:linkage` style to use.
       #
       # @return [void]
       #
-      def use_frameworks!(flag = true)
-        set_hash_value('uses_frameworks', flag)
+      def use_frameworks!(option = true)
+        value = case option
+                when true, false
+                  option ? BuildType.dynamic_framework : BuildType.static_library
+                when Hash
+                  BuildType.new(:linkage => option.fetch(:linkage), :packaging => :framework)
+                else
+                  raise ArgumentError, "Got `#{option.inspect}`, should be a boolean or hash."
+                end
+        set_hash_value('uses_frameworks', value.to_hash)
       end
 
-      # @return [Bool] whether the target definition should build
-      #         a framework.
+      # @return [Bool] whether the target definition pods should be built as frameworks.
       #
       def uses_frameworks?
         if internal_hash['uses_frameworks'].nil?
           root? ? false : parent.uses_frameworks?
         else
-          get_hash_value('uses_frameworks')
+          build_type.framework?
         end
       end
 
@@ -737,7 +766,8 @@ module Pod
       # @param  [Hash] options
       #         The options to use for this script phase. The required keys
       #         are: `:name`, `:script`, while the optional keys are:
-      #         `:shell_path`, `:input_files`, `:output_files`, `:show_env_vars_in_log` and `:execution_position`.
+      #         `:shell_path`, `:input_files`, `:output_files`, `:show_env_vars_in_log`, `:execution_position` and
+      #         `:dependency_file`.
       #
       # @return [void]
       #

data/lib/cocoapods-core/specification.rb

@@ -346,11 +346,17 @@ module Pod
       end
     end
 
-    # @return [Array<String>] the name of the default subspecs if provided.
+    # @return [Array<String>, Symbol] the name(s) of the default subspecs if provided or :none for no default subspecs.
     #
     def default_subspecs
       # TODO: remove singular form and update the JSON specs.
-      Array(attributes_hash['default_subspecs'] || attributes_hash['default_subspec'])
+      value = Array(attributes_hash['default_subspecs'] || attributes_hash['default_subspec'])
+      first = value.first
+      if first == :none || first == 'none'
+        first.to_sym
+      else
+        value
+      end
     end
 
     # Returns the dependencies on subspecs.
@@ -367,6 +373,8 @@ module Pod
     def subspec_dependencies(platform = nil)
       specs = if default_subspecs.empty?
                 subspecs.compact.reject(&:non_library_specification?)
+              elsif default_subspecs == :none
+                []
               else
                 default_subspecs.map do |subspec_name|
                   root.subspec_by_name("#{name}/#{subspec_name}")
@@ -403,10 +411,29 @@ module Pod
       dependencies(platform) + subspec_dependencies(platform)
     end
 
+    # Returns whether a dependency is whitelisted for the given configuration.
+    #
+    # @param  [Pod::Dependency] dependency
+    #         the dependency verify.
+    #
+    # @param  [Symbol, String] configuration
+    #         the configuration to check against.
+    #
+    # @return [Bool] whether the dependency is whitelisted or not.
+    #
+    def dependency_whitelisted_for_configuration?(dependency, configuration)
+      inherited = -> { root? ? true : parent.dependency_whitelisted_for_configuration?(dependency, configuration) }
+
+      return inherited[] unless configuration_whitelist = attributes_hash['configuration_pod_whitelist']
+      return inherited[] unless whitelist_for_pod = configuration_whitelist[dependency.name]
+
+      whitelist_for_pod.include?(configuration.to_s.downcase)
+    end
+
     # Returns a consumer to access the multi-platform attributes.
     #
     # @param  [String, Symbol, Platform] platform
-    #         he platform of the consumer
+    #         the platform of the consumer
     #
     # @return [Specification::Consumer] the consumer for the given platform
     #

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

@@ -653,6 +653,12 @@ module Pod
       #   spec.dependency 'AFNetworking', '~> 1.0'
       #
       # @example
+      #   spec.dependency 'AFNetworking', '~> 1.0', :configurations => ['Debug']
+      #
+      # @example
+      #   spec.dependency 'AFNetworking', '~> 1.0', :configurations => :debug
+      #
+      # @example
       #   spec.dependency 'RestKit/CoreData', '~> 0.20.0'
       #
       # @example
@@ -676,16 +682,22 @@ module Pod
             end
           end
         end
-        unless version_requirements.all? { |req| req.is_a?(String) }
-          version_requirements.each do |requirement|
-            if requirement.is_a?(Hash)
-              if !requirement[:path].nil?
-                raise Informative, 'Podspecs cannot specify the source of dependencies. The `:path` option is not supported.'\
-                                   ' `:path` can be used in the Podfile instead to override global dependencies.'
-              elsif !requirement[:git].nil?
-                raise Informative, 'Podspecs cannot specify the source of dependencies. The `:git` option is not supported.'\
-                                   ' `:git` can be used in the Podfile instead to override global dependencies.'
-              end
+
+        configurations_option = version_requirements.find { |option| option.is_a?(Hash) && option.key?(:configurations) }
+        whitelisted_configurations = if configurations_option
+                                       version_requirements.delete(configurations_option)
+                                       Array(configurations_option.delete(:configurations)).map { |c| c.to_s.downcase }
+                                     end
+
+        dependency_options = version_requirements.reject { |req| req.is_a?(String) }
+        dependency_options.each do |dependency_option|
+          if dependency_option.is_a?(Hash)
+            if !dependency_option[:path].nil?
+              raise Informative, 'Podspecs cannot specify the source of dependencies. The `:path` option is not supported.'\
+                                 ' `:path` can be used in the Podfile instead to override global dependencies.'
+            elsif !dependency_option[:git].nil?
+              raise Informative, 'Podspecs cannot specify the source of dependencies. The `:git` option is not supported.'\
+                                 ' `:git` can be used in the Podfile instead to override global dependencies.'
             end
           end
 
@@ -694,6 +706,15 @@ module Pod
 
         attributes_hash['dependencies'] ||= {}
         attributes_hash['dependencies'][name] = version_requirements
+
+        unless whitelisted_configurations.nil?
+          if (extras = whitelisted_configurations - %w(debug release)) && !extras.empty?
+            raise Informative, "Only `Debug` & `Release` are allowed under configurations for dependency on `#{name}`. " \
+              "Found #{extras.map { |configuration| "`#{configuration}`" }.to_sentence}."
+          end
+          attributes_hash['configuration_pod_whitelist'] ||= {}
+          attributes_hash['configuration_pod_whitelist'][name] = whitelisted_configurations
+        end
       end
 
       def dependency=(args)
@@ -1024,7 +1045,7 @@ module Pod
       SCRIPT_PHASE_REQUIRED_KEYS = [:name, :script].freeze
 
       SCRIPT_PHASE_OPTIONAL_KEYS = [:shell_path, :input_files, :output_files, :input_file_lists, :output_file_lists,
-                                    :show_env_vars_in_log, :execution_position].freeze
+                                    :show_env_vars_in_log, :execution_position, :dependency_file].freeze
 
       EXECUTION_POSITION_KEYS = [:before_compile, :after_compile, :any].freeze
 
@@ -1575,7 +1596,7 @@ module Pod
                 :types => [String],
                 :spec_types => [:test]
 
-      SCHEME_KEYS = [:launch_arguments, :environment_variables].freeze
+      SCHEME_KEYS = [:launch_arguments, :environment_variables, :code_coverage].freeze
 
       # @!method scheme=(flag)
       #
@@ -1648,9 +1669,12 @@ module Pod
       # @!method default_subspecs=(subspec_array)
       #
       #   An array of subspecs names that should be used as preferred dependency.
-      #   If not specified a specifications requires all its subspecs as
+      #   If not specified, a specification requires all of its subspecs as
       #   dependencies.
       #
+      #   You may use the value `:none` to specify that none of the subspecs are
+      #   required to compile this pod and that all subspecs are optional.
+      #
       #   ---
       #
       #   A Pod should make available the full library by default. Users can
@@ -1666,17 +1690,21 @@ module Pod
       #     spec.default_subspec = 'Core'
       #
       #   @example
+      #
       #     spec.default_subspecs = 'Core', 'UI'
       #
-      #   @param  [Array<String>] subspec_names
+      #   @example
+      #
+      #     spec.default_subspecs = :none
+      #
+      #   @param  [Array<String>, String, Symbol] subspec_names
       #           An array of subspec names that should be inherited as
       #           dependency.
       #
-      attribute :default_subspecs,
-                :container => Array,
-                :singularize => true,
-                :multi_platform => false,
-                :root_only => true
+      root_attribute :default_subspecs,
+                     :container => Array,
+                     :types => [Array, String, Symbol],
+                     :singularize => true
 
       #-----------------------------------------------------------------------#
 

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

@@ -17,7 +17,7 @@ module Pod
         # multi-platform, they don't have inheritance, and they never have a
         # default value.
         #
-        # @param  [String] name
+        # @param  [Symbol, String] name
         #         The name of the attribute.
         #
         # @param  [Hash] options
@@ -36,7 +36,7 @@ module Pod
         # Regular attributes in general support inheritance and multi-platform
         # values, so resolving them for a given specification is not trivial.
         #
-        # @param  [String] name
+        # @param  [Symbol, String] name
         #         The name of the attribute.
         #
         # @param  [Hash] options

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

@@ -450,6 +450,9 @@ module Pod
           if s.key?(:environment_variables) && !s[:environment_variables].is_a?(Hash)
             results.add_error('scheme', 'Expected a hash for key `environment_variables`.')
           end
+          if s.key?(:code_coverage) && ![true, false].include?(s[:code_coverage])
+            results.add_error('scheme', 'Expected a boolean for key `code_coverage`.')
+          end
         end
       end
 

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

@@ -28,6 +28,14 @@ module Pod
 
         attr_reader :results
 
+        # @return [Array<String>] Keys that are valid but have been deprecated.
+        #
+        DEPRECATED_KEYS = ['swift_version'].freeze
+
+        # @return [Array<String>] Keys that are only used for internal purposes.
+        #
+        INTERNAL_KEYS = ['configuration_pod_whitelist'].freeze
+
         # Checks the attributes hash for any unknown key which might be the
         # result of a misspelling in a JSON file.
         #
@@ -42,8 +50,7 @@ module Pod
         def check_attributes
           attributes_keys = Pod::Specification::DSL.attributes.keys.map(&:to_s)
           platform_keys = Specification::DSL::PLATFORMS.map(&:to_s)
-          deprecated_keys = ['swift_version']
-          valid_keys = attributes_keys + platform_keys + deprecated_keys
+          valid_keys = attributes_keys + platform_keys + DEPRECATED_KEYS + INTERNAL_KEYS
           attributes_hash = consumer.spec.attributes_hash
           keys = attributes_hash.keys
           Specification::DSL::PLATFORMS.each do |platform|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,6 +87,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  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: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +143,7 @@ files:
 - LICENSE
 - README.md
 - lib/cocoapods-core.rb
+- lib/cocoapods-core/build_type.rb
 - lib/cocoapods-core/cdn_source.rb
 - lib/cocoapods-core/core_ui.rb
 - lib/cocoapods-core/dependency.rb