cocoapods-core 0.33.1 → 0.34.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bcb2950b28f20e026b96f84fd961d4952fa62a8
-  data.tar.gz: c7ee976b781166cae7270542b3d94da6a00fd57b
+  metadata.gz: 0c766e4a992ce00a3c5e383dfb5ce948ac9f2415
+  data.tar.gz: d651129ce2d932f29abe25534aac47e3207388d5
 SHA512:
-  metadata.gz: 452e1a67f966f6d9b6288f0030d2d0da659e7e37fd6c58e1cd16bdb81a4a40164660076d876a0bbb40baab65bc1e403519a10f3ee4e02eb3601b2ae44a0f5ee3
-  data.tar.gz: eeb446c15c3bcde0280e2f8a03dc7a8308cf69241871640730e98247921c29c775bb0b128af0f68faf6835972cda0e754a2b4972d5ef9e0e5a806c583adc67a4
+  metadata.gz: 50cfb988efe23be79ddcf97e5bcd4dee9b54d8b4237e5745b7702d673a3462b8a971cfb07bb3af946f773b94a04401a1703d577680ab41d6977c7097a75164fd
+  data.tar.gz: 788e5574fdf5c4ea4557e353c4a4b9957e3212ce396baae8972ddec0945cb15de1d1a5380a1c264910b8791de569831350ef18d8b05661d086669ddc1ffdb7d8

data/lib/cocoapods-core/dependency.rb

@@ -179,7 +179,7 @@ module Pod
       return false unless head? == other.head?
       return false unless external_source == other.external_source
 
-      other.requirement.requirements.all? do | operator, version |
+      other.requirement.requirements.all? do | _operator, version |
         requirement.satisfied_by? Version.new(version)
       end
     end

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/http.rb

@@ -42,7 +42,7 @@ module Pod
       begin
         url = get_actual_url(url)
         resp = perform_head_request(url)
-      rescue SocketError
+      rescue SocketError, URI::InvalidURIError, REST::Error
         resp = nil
       end
 
@@ -60,16 +60,17 @@ module Pod
     def self.perform_head_request(url)
       require 'rest'
 
-      resp = ::REST.head(url)
+      resp = ::REST.head(url, 'User-Agent' => USER_AGENT)
 
       if resp.status_code >= 400
-        resp = ::REST.get(url)
+        resp = ::REST.get(url, 'User-Agent' => USER_AGENT)
       end
 
       resp
     end
 
     MAX_HTTP_REDIRECTS = 3
+    USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10) AppleWebKit/538.43.40 (KHTML, like Gecko) Version/8.0 Safari/538.43.40'
 
     #-------------------------------------------------------------------------#
   end

data/lib/cocoapods-core/lockfile.rb

@@ -38,7 +38,7 @@ module Pod
     def self.from_file(path)
       return nil unless path.exist?
       require 'yaml'
-      hash = File.open(path) { |f| YAMLHelper.load(f) }
+      hash = YAMLHelper.load_file(path)
       unless hash && hash.is_a?(Hash)
         raise Informative, "Invalid Lockfile in `#{path}`"
       end
@@ -133,20 +133,21 @@ module Pod
     #
     # @raise  If there is no version stored for the given name.
     #
-    # @return [Dependency] the generated dependency.
+    # @return [Array<Dependency>] the generated dependency.
     #
-    def dependency_to_lock_pod_named(name)
-      dep = dependencies.find { |d| d.name == name || d.root_name == name }
-      version = version(name)
-
-      unless dep && version
-        raise StandardError, "Attempt to lock the `#{name}` Pod without an " \
+    def dependencies_to_lock_pod_named(name)
+      deps = dependencies.select { |d| d.root_name == name }
+      if deps.empty?
+        raise StandardError, "Attempt to lock the `#{name}` Pod without a " \
           'known dependency.'
       end
 
-      locked_dependency = dep.dup
-      locked_dependency.specific_version = version
-      locked_dependency
+      deps.map do |dep|
+        version = version(dep.name)
+        locked_dependency = dep.dup
+        locked_dependency.specific_version = version
+        locked_dependency
+      end
     end
 
     # @return [Version] The version of CocoaPods which generated this lockfile.
@@ -233,8 +234,8 @@ module Pod
       [:added, :changed, :removed, :unchanged].each { |k| result[k] = [] }
 
       installed_deps = dependencies.map do |dep|
-        dependency_to_lock_pod_named(dep.name)
-      end
+        dependencies_to_lock_pod_named(dep.root_name)
+      end.flatten
       all_dep_names  = (dependencies + podfile.dependencies).map(&:name).uniq
       all_dep_names.each do |name|
         installed_dep = installed_deps.find { |d| d.name == name }
@@ -393,7 +394,7 @@ module Pod
       # @return   [Array] the generated data.
       #
       def generate_dependencies_data(podfile)
-        podfile.dependencies.map { |d| d.to_s }.sort
+        podfile.dependencies.map(&:to_s).sort
       end
 
       # Generates the information of the external sources.
@@ -431,7 +432,7 @@ module Pod
       #
       def generate_checksums(specs)
         checksums = {}
-        specs.select { |spec| spec.defined_in_file }.each do |spec|
+        specs.select(&:defined_in_file).each do |spec|
           checksums[spec.root.name] = spec.checksum
         end
         checksums

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

@@ -89,6 +89,26 @@ module Pod
       #
       # ------
       #
+      # ### Build configurations
+      #
+      # *IMPORTANT*: the following syntax is tentative and might change without
+      # notice in future. This feature is released in this state due to
+      # the strong demand for it. You can use it but you might need to change
+      # your Podfile to use future versions of CocoaPods. Anyway a clear and
+      # simple upgrade path will be provided.
+      #
+      # By default dependencies are installed on all the build configurations
+      # of the target. For debug purposes or for other reasons, they can be
+      # enabled only on a given list of build configuration names.
+      #
+      #     pod 'PonyDebugger', :configurations => ['Release', 'App Store']
+      #
+      # Alternatively you can white-list only a single build configuration.
+      #
+      #     pod 'PonyDebugger', :configuration => ['Release']
+      #
+      # ------
+      #
       # Dependencies can be obtained also from external sources.
       #
       #
@@ -145,7 +165,7 @@ module Pod
       # @note       This method allow a nil name and the raises to be more
       #             informative.
       #
-        # @note       Support for inline podspecs has been deprecated.
+      # @note       Support for inline podspecs has been deprecated.
       #
       # @return     [void]
       #
@@ -448,6 +468,44 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
+      # @!group Sources
+      #
+      #   The Podfile retrieves specs from a given list of sources (repos).
+      #
+      #   Sources are __global__ and they are not stored per target definition.
+
+      #-----------------------------------------------------------------------#
+
+      # Specifies the location of specs
+      #
+      # -----
+      #
+      # By default, the github Cocoapods/specs repository is used. Use this
+      # method to specify (an) other(s) source(s). The order of the sources is
+      # relevant. CocoaPods will use the highest version of a Pod of the first
+      # source which includes the Pod (regardless whether other sources have a
+      # higher version).
+      #
+      # @param    [String] source
+      #           The name of a specs repo. Previously specified by user
+      #           via pod repo add command
+      #
+      # @example  Specifying to use first `my_private_repo` and then the
+      #           CocoaPods Master Repo
+      #
+      #           source 'my_private_repo'
+      #           source 'master'
+      #
+      # @return   [void]
+      #
+      def source(source)
+        hash_sources = get_hash_value('sources') || []
+        hash_sources << source
+        set_hash_value('sources', hash_sources.uniq)
+      end
+
+      #-----------------------------------------------------------------------#
+
       # @!group Hooks
       #   The Podfile provides hooks that will be called during the
       #   installation process.
@@ -460,7 +518,7 @@ module Pod
       # been downloaded but before they are installed.
       #
       # It receives the
-      # [`Pod::Hooks::InstallerRepresentation`](http://docs.cocoapods.org/cocoapods/pod/hooks/installerrepresentation/)
+      # [`Pod::Hooks::InstallerRepresentation`](http://rubydoc.info/gems/cocoapods/Pod/Hooks/InstallerRepresentation/)
       # as its only argument.
       #
       # @example  Defining a pre install hook in a Podfile.
@@ -479,7 +537,7 @@ module Pod
       # to perform.
       #
       # It receives the
-      # [`Pod::Hooks::InstallerRepresentation`](http://docs.cocoapods.org/cocoapods/pod/hooks/installerrepresentation/)
+      # [`Pod::Hooks::InstallerRepresentation`](http://rubydoc.info/gems/cocoapods/Pod/Hooks/InstallerRepresentation/)
       # as its only argument.
       #
       # @example  Customizing the `OTHER_LDFLAGS` of all targets

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

@@ -316,6 +316,67 @@ module Pod
 
       #--------------------------------------#
 
+      # Whether a specific pod should be linked to the target when building for
+      # a specific configuration. If a pod has not been explicitly whitelisted
+      # for any configuration, it is implicitly whitelisted.
+      #
+      # @param  [String] pod_name
+      #         The pod that we're querying about inclusion for in the given
+      #         configuration.
+      #
+      # @param  [String] configuration_name
+      #         The configuration that we're querying about inclusion of the
+      #         pod in.
+      #
+      # @note   Build configurations are case compared case-insensitively in
+      #         CocoaPods.
+      #
+      # @return [Bool] flag
+      #         Whether the pod should be linked with the target
+      #
+      def pod_whitelisted_for_configuration?(pod_name, configuration_name)
+        found = false
+        configuration_pod_whitelist.each do |configuration, pods|
+          if pods.include?(pod_name)
+            found = true
+            if configuration.downcase == configuration_name.to_s.downcase
+              return true
+            end
+          end
+        end
+        !found
+      end
+
+      # Whitelists a pod for a specific configuration. If a pod is whitelisted
+      # for any configuration, it will only be linked with the target in the
+      # configuration(s) specified. If it is not whitelisted for any
+      # configuration, it is implicitly included in all configurations.
+      #
+      # @param  [String] pod_name
+      #         The pod that should be included in the given configuration.
+      #
+      # @param  [String, Symbol] configuration_name
+      #         The configuration that the pod should be included in
+      #
+      # @note   Build configurations are stored as a String.
+      #
+      # @return [void]
+      #
+      def whitelist_pod_for_configuration(pod_name, configuration_name)
+        configuration_name = configuration_name.to_s
+        configuration_pod_whitelist[configuration_name] ||= []
+        configuration_pod_whitelist[configuration_name] << pod_name
+      end
+
+      # @return [Array<String>] unique list of all configurations for which
+      #         pods have been whitelisted.
+      #
+      def all_whitelisted_configurations
+        configuration_pod_whitelist.keys.uniq
+      end
+
+      #--------------------------------------#
+
       # @return [Platform] the platform of the target definition.
       #
       # @note   If no deployment target has been specified a default value is
@@ -384,6 +445,7 @@ module Pod
       #
       def store_pod(name, *requirements)
         parse_inhibit_warnings(name, requirements)
+        parse_configuration_whitelist(name, requirements)
 
         if requirements && !requirements.empty?
           pod = { name => requirements }
@@ -444,6 +506,7 @@ module Pod
         build_configurations
         dependencies
         children
+        configuration_pod_whitelist
       ).freeze
 
       # @return [Hash] The hash representation of the target definition.
@@ -537,6 +600,16 @@ module Pod
         get_hash_value('inhibit_warnings', {})
       end
 
+      # Returns the configuration_pod_whitelist hash
+      #
+      # @return [Hash<String, Array>] Hash with configuration name as key,
+      #         array of pod names to be linked in builds with that configuration
+      #         as value.
+      #
+      def configuration_pod_whitelist
+        get_hash_value('configuration_pod_whitelist', {})
+      end
+
       # @return [Array<Dependency>] The dependencies specified by the user for
       #         this target definition.
       #
@@ -558,7 +631,7 @@ module Pod
       # @note   The podspec directive is intended include the dependencies of a
       #         spec in the project where it is developed. For this reason the
       #         spec, or any of it subspecs, cannot be included in the
-      #         dependencies. Otherwise it would generate an chicken-and-egg
+      #         dependencies. Otherwise it would generate a chicken-and-egg
       #         problem.
       #
       def podspec_dependencies
@@ -619,6 +692,32 @@ module Pod
         requirements.pop if options.empty?
       end
 
+      # 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.
+      #
+      # @param [String] pod name
+      #
+      # @param [Array] requirements
+      #        If :configurations is the only key in the hash, the hash
+      #        should be destroyed because it confuses Gem::Dependency.
+      #
+      # @return [void]
+      #
+      def parse_configuration_whitelist(name, requirements)
+        options = requirements.last
+        return requirements unless options.is_a?(Hash)
+
+        configurations = options.delete(:configurations)
+        configurations ||= options.delete(:configuration)
+        if configurations
+          Array(configurations).each do |configuration|
+            whitelist_pod_for_configuration(name, configuration)
+          end
+        end
+        requirements.pop if options.empty?
+      end
+
       #-----------------------------------------------------------------------#
     end
   end

data/lib/cocoapods-core/podfile.rb

@@ -95,6 +95,12 @@ module Pod
 
     # @!group Attributes
 
+    # @return [Array<String>] The name of the sources.
+    #
+    def sources
+      get_hash_value('sources') || []
+    end
+
     # @return [String] the path of the workspace if specified by the user.
     #
     def workspace_path
@@ -173,6 +179,7 @@ module Pod
     HASH_KEYS = %w(
       target_definitions
       workspace
+      sources
       generate_bridge_support
       set_arc_compatibility_flag
     ).freeze
@@ -239,7 +246,7 @@ module Pod
           # rubocop:disable Eval
           eval(string, nil, path.to_s)
           # rubocop:enable Eval
-        rescue Exception => e
+        rescue => e
           message = "Invalid `#{path.basename}` file: #{e.message}"
           raise DSLError.new(message, path, e.backtrace)
         end
@@ -264,7 +271,7 @@ module Pod
       if string.respond_to?(:encoding) && string.encoding.name != 'UTF-8'
         string.encode!('UTF-8')
       end
-      hash = YAMLHelper.load(string)
+      hash = YAMLHelper.load_string(string)
       from_hash(hash, path)
     end
 

data/lib/cocoapods-core/requirement.rb

@@ -45,7 +45,7 @@ module Pod
       new('>= 0')
     end
 
-    # Parses the given object returning an tuple where the first entry is an
+    # Parses the given object returning a tuple where the first entry is an
     # operator and the second a version. If not operator is provided it
     # defaults to `=`.
     #

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

@@ -33,7 +33,7 @@ module Pod
       # @param  [String] name
       #         The name of the Pod.
       #
-      def versions(name)
+      def versions(_name)
         raise StandardError, 'Abstract method.'
       end
 
@@ -45,7 +45,7 @@ module Pod
       # @param  [String] version
       #         The version of the Pod.
       #
-      def specification(name, version)
+      def specification(_name, _version)
         raise StandardError, 'Abstract method.'
       end
 
@@ -58,7 +58,7 @@ module Pod
       # @param  [String] version
       #         the version of the Pod.
       #
-      def specification_contents(name, version)
+      def specification_contents(_name, _version)
         raise StandardError, 'Abstract method.'
       end
 

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

@@ -3,38 +3,38 @@ module Pod
     # The Aggregate manages a directory of sources repositories.
     #
     class Aggregate
-      # @return [Pathname] the directory were the repositories are stored.
+      # @return [Array<Pathname>] The ordered list of source directories.
       #
-      attr_reader :repos_dir
+      attr_reader :directories
 
-      # @param [Pathname] repos_dir @see repos_dir.
+      # @param  [Array<Pathname>] repos_dirs @see directories
       #
-      def initialize(repos_dir)
-        @repos_dir = repos_dir
+      def initialize(repos_dirs)
+        @directories = Array(repos_dirs)
       end
 
-      # @return [Array<Source>] all the sources.
+      # @return [Array<Source>] The ordered list of the sources.
       #
-      def all
-        @sources ||= dirs.map { |repo| Source.new(repo) }.sort_by(&:name)
+      def sources
+        @sources ||= directories.map { |repo| Source.new(repo) }
       end
 
       # @return [Array<String>] the names of all the pods available.
       #
       def all_pods
-        all.map(&:pods).flatten.uniq
+        sources.map(&:pods).flatten.uniq
       end
 
-      # @return [Array<Set>] the sets for all the pods available.
+      # @return [Array<Set>] The sets for all the pods available.
       #
       # @note   Implementation detail: The sources don't cache their values
       #         because they might change in response to an update. Therefore
-      #         this method to prevent slowness caches the values before
+      #         this method to preserve performance caches the values before
       #         processing them.
       #
       def all_sets
         pods_by_source = {}
-        all.each do |source|
+        sources.each do |source|
           pods_by_source[source] = source.pods
         end
         sources = pods_by_source.keys
@@ -47,20 +47,6 @@ module Pod
         end
       end
 
-      # @return [Array<Pathname>] the directories where the sources are stored.
-      #
-      # @note   If the repos dir doesn't exits this will return an empty array.
-      #
-      # @raise  If the repos dir doesn't exits.
-      #
-      def dirs
-        if repos_dir.exist?
-          repos_dir.children.select(&:directory?)
-        else
-          []
-        end
-      end
-
       # Returns a set configured with the source which contains the highest
       # version in the aggregate.
       #
@@ -73,7 +59,7 @@ module Pod
       def representative_set(name)
         representative_source = nil
         highest_version = nil
-        all.each do |source|
+        sources.each do |source|
           source_versions = source.versions(name)
           if source_versions
             source_version = source_versions.first
@@ -100,9 +86,9 @@ module Pod
       # @see    Source#search
       #
       def search(dependency)
-        sources = all.select { |s| s.search(dependency) }
-        unless sources.empty?
-          Specification::Set.new(dependency.root_name, sources)
+        found_sources = sources.select { |s| s.search(dependency) }
+        unless found_sources.empty?
+          Specification::Set.new(dependency.root_name, found_sources)
         end
       end
 
@@ -117,7 +103,7 @@ module Pod
       def search_by_name(query, full_text_search = false)
         pods_by_source = {}
         result = []
-        all.each do |s|
+        sources.each do |s|
           source_pods = s.search_by_name(query, full_text_search)
           pods_by_source[s] = source_pods.map(&:name)
         end

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

@@ -180,8 +180,8 @@ module Pod
       def value_for_attribute(attr_name)
         attr = Specification::DSL.attributes[attr_name]
         value = value_with_inheritance(spec, attr)
-        value ||= attr.default(platform_name)
-        value ||= attr.container.new if attr.container
+        value = attr.default(platform_name) if value.nil?
+        value = attr.container.new if value.nil? && attr.container
         value
       end
 

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

@@ -3,8 +3,8 @@ module Pod
     module DSL
       # @return [Array<Attribute>] The attributes of the class.
       #
-      def self.attributes
-        @attributes
+      class << self
+        attr_reader :attributes
       end
 
       # This module provides support for storing the runtime information of the
@@ -14,7 +14,7 @@ module Pod
         # Defines a root attribute for the extended class.
         #
         # Root attributes make sense only in root specification, they never are
-        # multiplatform, they don't have inheritance, and they never have a
+        # multi-platform, they don't have inheritance, and they never have a
         # default value.
         #
         # @param  [String] name
@@ -33,7 +33,7 @@ module Pod
 
         # Defines an attribute for the extended class.
         #
-        # Regular attributes in general support inheritance and multi platform
+        # Regular attributes in general support inheritance and multi-platform
         # values, so resolving them for a given specification is not trivial.
         #
         # @param  [String] name

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

@@ -9,43 +9,6 @@ module Pod
           CoreUI.warn "[#{self}] `preferred_dependency` has been renamed "\
             'to `default_subspecs`.'
         end
-
-        def singleton_method_added(method)
-          if method == :header_mappings
-            raise Informative, "[#{self}] The use of the `header_mappings` " \
-              "hook has been deprecated.\n Use the `header_dir` and the " \
-                '`header_mappings_dir` attributes.'
-
-          elsif method == :copy_header_mapping
-            raise Informative, "[#{self}] The use of the " \
-              "`copy_header_mapping` hook has been deprecated.\nUse" \
-                'the `header_dir` and the `header_mappings_dir` attributes.'
-          end
-        end
-
-        def documentation=(value)
-          CoreUI.warn "[#{self}] The `documentation` DSL directive of the " \
-            'podspec format has been deprecated.'
-        end
-
-        def clean_paths=(value)
-          raise Informative, "[#{self}] Clean paths are deprecated. " \
-            'CocoaPods now cleans unused files by default. Use the ' \
-              '`preserve_paths` attribute if needed.'
-        end
-
-        DEPRECATED_METHODS = [
-          :part_of_dependency=,
-          :part_of=,
-          :exclude_header_search_paths=,
-        ]
-
-        DEPRECATED_METHODS.each do |method|
-          define_method method do |value|
-            raise Informative, "[#{self}] Attribute "\
-              "`#{method.to_s[0..-2]}` has been deprecated."
-          end
-        end
       end
     end
   end