cocoapods-core 1.4.0 → 1.5.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 166a653c33e61517a2914e458b1b3f014ea91808c1f1bf291ce02f0cecdc46be
-  data.tar.gz: 4670a4a9deb6fee4332e4323378e1070129f42b916056f89105a8a4238f822a8
+  metadata.gz: f5951e63ba532abe3d6996c0e03644fe213db6d3cdba2202ceb9ceb375356167
+  data.tar.gz: 642e58e2d8f48431a0ba79a90488e526fa7075135934cfd0836653c6a9f1e273
 SHA512:
-  metadata.gz: ab43dfd433bdf0278aeb3c9433565354d26e34a9634e3cca9b123f781c6a1ea5ff59c83e8c1a2a1c20d10a9b8e5921a96b52eda6e79a8d1aa9292ea1c8b2f538
-  data.tar.gz: d6a4486d1c5429e84c3f3c6a22ac3c641634e33f41d3a9d70a2afc8331c8e049fddc97a5c8c83128b790186e64c734ce40e4a29f6e5c1f14d5aa0a3e034e9823
+  metadata.gz: cfbd4c782d9b20283bdd459bdb51ba302537d58773b2ac5ca70f48683667920882820be623056ae15aeffe526b2ffa7c23e84709d6acaa4aed4d4f8aa9338214
+  data.tar.gz: 1aa4a692e6147769145320bd71c491c148c08c182133d7e7eb0959fde3763877707c602e9bec4f08e38cb80b3aa557f94672ec18dff01683a70ff5eebaf17885

data/lib/cocoapods-core/dependency.rb

@@ -95,8 +95,7 @@ module Pod
             raise Informative, 'A dependency with a specified podspec repo may ' \
               "not include other source parameters (#{name})."
           end
-        else
-          @external_source = additional_params
+        elsif @external_source = additional_params
           unless requirements.empty?
             raise Informative, 'A dependency with an external source may not ' \
               "specify version requirements (#{name})."
@@ -216,7 +215,8 @@ module Pod
       self.class == other.class &&
         name == other.name &&
         requirement == other.requirement &&
-        external_source == other.external_source
+        external_source == other.external_source &&
+        podspec_repo == other.podspec_repo
     end
     alias_method :eql?, :==
 
@@ -249,24 +249,41 @@ module Pod
       unless name == other.name
         raise ArgumentError, "#{self} and #{other} have different names"
       end
+
       default   = Requirement.default
       self_req  = requirement
       other_req = other.requirement
 
-      dep = if other_req == default
-              self.class.new(name, self_req)
+      req = if other_req == default
+              self_req
             elsif self_req == default
-              self.class.new(name, other_req)
+              other_req
             else
-              self.class.new(name, self_req.as_list.concat(other_req.as_list))
+              self_req.as_list.concat(other_req.as_list)
             end
 
+      opts = {}
+
       if external_source || other.external_source
-        self_external_source  = external_source || {}
-        other_external_source = other.external_source || {}
-        dep.external_source = self_external_source.merge(other_external_source)
+        opts.
+          merge!(external_source || {}).
+          merge!(other.external_source || {})
+
+        req_to_set = req
+        req = []
+      end
+
+      if podspec_repo && other.podspec_repo && podspec_repo != other.podspec_repo
+        raise ArgumentError, "#{self} and #{other} have different podspec repos"
+      end
+
+      if repo = podspec_repo || other.podspec_repo
+        opts[:source] = repo
+      end
+
+      self.class.new(name, *req, opts).tap do |dep|
+        dep.instance_variable_set(:@requirement, Requirement.create(req_to_set)) if req_to_set
       end
-      dep
     end
 
     # Whether the dependency has any pre-release requirements

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/http.rb

@@ -44,7 +44,7 @@ module Pod
       begin
         url = get_actual_url(url)
         resp = perform_head_request(url)
-      rescue SocketError, URI::InvalidURIError, REST::Error, REST::DisconnectedError
+      rescue SocketError, URI::InvalidURIError, REST::Error, REST::Error::Connection
         resp = nil
       end
 
@@ -65,7 +65,12 @@ module Pod
       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)
+        end
       end
 
       resp

data/lib/cocoapods-core/lockfile.rb

@@ -77,7 +77,7 @@ module Pod
 
     # Returns the version of the given Pod.
     #
-    # @param [name] The name of the Pod (root name of the specification).
+    # @param [String] pod_name The name of the Pod (root name of the specification).
     #
     # @return [Version] The version of the pod.
     #
@@ -92,9 +92,21 @@ module Pod
       pod_versions[root_name]
     end
 
+    # Returns the source of the given Pod.
+    #
+    # @param [String] pod_name The name of the Pod (root name of the specification).
+    #
+    # @return [String] The source of the pod.
+    #
+    # @return [Nil] If there is no source stored for the given name.
+    #
+    def spec_repo(pod_name)
+      spec_repos_by_pod[pod_name]
+    end
+
     # Returns the checksum for the given Pod.
     #
-    # @param [name] The name of the Pod (root name of the specification).
+    # @param [String] name The name of the Pod (root name of the specification).
     #
     # @return [String] The checksum of the specification for the given Pod.
     #
@@ -121,6 +133,17 @@ module Pod
       @dependencies
     end
 
+    # Returns pod names grouped by the spec repo they were sourced from.
+    #
+    # @return [Hash<String, Array<String>>] A hash, where the keys are spec
+    #         repo source URLs (or names), and the values are arrays of pod names.
+    #
+    # @note   It does not include pods that come from "external sources".
+    #
+    def pods_by_spec_repo
+      @pods_by_spec_repo ||= internal_data['SPEC REPOS'] || {}
+    end
+
     # Generates a dependency that requires the exact version of the Pod with the
     # given name.
     #
@@ -225,6 +248,17 @@ module Pod
       internal_data['SPEC CHECKSUMS'] || {}
     end
 
+    # @return [Hash{String => String}] A hash containing the spec repo used for the specification
+    #         by the name of the root spec.
+    #
+    def spec_repos_by_pod
+      @spec_repos_by_pod ||= pods_by_spec_repo.each_with_object({}) do |(spec_repo, pods), spec_repos_by_pod|
+        pods.each do |pod|
+          spec_repos_by_pod[pod] = spec_repo
+        end
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     # !@group Comparison with a Podfile
@@ -335,6 +369,7 @@ module Pod
     HASH_KEY_ORDER = [
       'PODS',
       'DEPENDENCIES',
+      'SPEC REPOS',
       'EXTERNAL SOURCES',
       'CHECKOUT OPTIONS',
       'SPEC CHECKSUMS',
@@ -350,9 +385,7 @@ module Pod
     # @note   The YAML string is prettified.
     #
     def to_yaml
-      yaml_string = YAMLHelper.convert_hash(to_hash, HASH_KEY_ORDER, "\n\n")
-      yaml_string = yaml_string.tr("'", '')
-      yaml_string.tr('"', '')
+      YAMLHelper.convert_hash(to_hash, HASH_KEY_ORDER, "\n\n")
     end
 
     #-------------------------------------------------------------------------#
@@ -375,10 +408,11 @@ module Pod
       #
       # @return [Lockfile] a new lockfile.
       #
-      def generate(podfile, specs, checkout_options)
+      def generate(podfile, specs, checkout_options, spec_repos = {})
         hash = {
           'PODS'             => generate_pods_data(specs),
           'DEPENDENCIES'     => generate_dependencies_data(podfile),
+          'SPEC REPOS'       => generate_spec_repos(spec_repos),
           'EXTERNAL SOURCES' => generate_external_sources_data(podfile),
           'CHECKOUT OPTIONS' => checkout_options,
           'SPEC CHECKSUMS'   => generate_checksums(specs),
@@ -440,6 +474,21 @@ module Pod
         podfile.dependencies.map(&:to_s).sort
       end
 
+      # Generates the hash of spec repo sources used in the Podfile.
+      #
+      # @example  Output
+      #           { "https://github.com/CocoaPods/CocoaPods.git" => ["Alamofire", "Moya"] }
+      #
+      def generate_spec_repos(spec_repos)
+        Hash[spec_repos.map do |source, specs|
+          next unless source
+          next if specs.empty?
+          key = source.url || source.name
+          value = specs.map { |s| s.root.name }.uniq
+          [key, value]
+        end.compact]
+      end
+
       # Generates the information of the external sources.
       #
       # @example  Output

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

@@ -142,6 +142,19 @@ module Pod
       #
       # ------
       #
+      # ### Source
+      #
+      # By default the sources specified at the global level are searched in the order
+      # they are specified for a dependency match. This behaviour can be altered
+      # for a specific dependency by specifying the source with the dependency:
+      #
+      #     pod 'PonyDebugger', :source => 'https://github.com/CocoaPods/Specs.git'
+      #
+      # In this case only the specified source will be searched for the dependency
+      # and any global sources ignored.
+      #
+      # ------
+      #
       # ### Subspecs
       #
       # When installing a Pod via its name, it will install all of the
@@ -607,6 +620,26 @@ module Pod
         current_target_definition.inhibit_all_warnings = true
       end
 
+      # Use modular headers for all CocoaPods static libraries.
+      #
+      # ------
+      #
+      # This attribute is inherited by child target definitions.
+      #
+      # If you would like to use modular headers per Pod you can use the
+      # following syntax:
+      #
+      #     pod 'SSZipArchive', :modular_headers => true
+      #
+      # Additionally, when you use the `use_modular_headers!` attribute,
+      # you can exclude a particular Pod from modular headers using the following:
+      #
+      #     pod 'SSZipArchive', :modular_headers => false
+      #
+      def use_modular_headers!
+        current_target_definition.use_modular_headers_for_all_pods = true
+      end
+
       # Use frameworks instead of static libraries for Pods.
       #
       # ------

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

@@ -457,6 +457,96 @@ module Pod
 
       #--------------------------------------#
 
+      def raw_use_modular_headers_hash
+        get_hash_value('use_modular_headers', {})
+      end
+      private :raw_use_modular_headers_hash
+
+      # Returns the use_modular_headers hash pre-populated with default values.
+      #
+      # @return [Hash<String, Array>] Hash with :all key for building all
+      #         pods as modules, :for_pods key for building as module per Pod,
+      #         and :not_for_pods key for not biulding as module per Pod.
+      #
+      def use_modular_headers_hash
+        raw_hash = raw_use_modular_headers_hash
+        if exclusive?
+          raw_hash
+        else
+          parent_hash = parent.send(:use_modular_headers_hash).dup
+          if parent_hash['not_for_pods']
+            # Remove pods that are set to not use modular headers inside parent
+            # if they are set to use modular headers inside current target.
+            parent_hash['not_for_pods'] -= Array(raw_hash['for_pods'])
+          end
+          if parent_hash['for_pods']
+            # Remove pods that are set to use modular headers inside parent if they are set to not use modular headers inside current target.
+            parent_hash['for_pods'] -= Array(raw_hash['for_pods'])
+          end
+          if raw_hash['all']
+            # Clean pods that are set to not use modular headers inside parent if use_modular_headers! was set.
+            parent_hash['not_for_pods'] = nil
+          end
+          parent_hash.merge(raw_hash) do |_, l, r|
+            Array(l).concat(r).uniq
+          end
+        end
+      end
+
+      # @return [Bool] whether the target definition should use modular headers
+      #         for a single pod. If use_modular_headers! is true, it will
+      #         return true for any asked pod.
+      #
+      def build_pod_as_module?(pod_name)
+        if Array(use_modular_headers_hash['not_for_pods']).include?(pod_name)
+          false
+        elsif use_modular_headers_hash['all']
+          true
+        elsif !root? && parent.build_pod_as_module?(pod_name)
+          true
+        else
+          Array(use_modular_headers_hash['for_pods']).include? pod_name
+        end
+      end
+
+      # Sets whether the target definition should use modular headers for all pods.
+      #
+      # @param  [Bool] flag
+      #         Whether the warnings should be suppressed.
+      #
+      # @return [void]
+      #
+      def use_modular_headers_for_all_pods=(flag)
+        raw_use_modular_headers_hash['all'] = flag
+      end
+
+      # Use modular headers for a specific pod during compilation.
+      #
+      # @param  [String] pod_name
+      #         Name of the pod for which modular headers will be used.
+      #
+      # @param  [Bool] flag
+      #         Whether modular headers should be used.
+      #
+      # @return [void]
+      #
+      def set_use_modular_headers_for_pod(pod_name, flag)
+        hash_key = case flag
+                   when true
+                     'for_pods'
+                   when false
+                     'not_for_pods'
+                   when nil
+                     return
+                   else
+                     raise ArgumentError, "Got `#{flag.inspect}`, should be a boolean"
+                   end
+        raw_use_modular_headers_hash[hash_key] ||= []
+        raw_use_modular_headers_hash[hash_key] << pod_name
+      end
+
+      #--------------------------------------#
+
       PLATFORM_DEFAULTS = { :ios => '4.3', :osx => '10.6', :tvos => '9.0', :watchos => '2.0' }.freeze
 
       # @return [Platform] the platform of the target definition.
@@ -542,6 +632,7 @@ module Pod
       def store_pod(name, *requirements)
         return if parse_subspecs(name, requirements) # This parse method must be called first
         parse_inhibit_warnings(name, requirements)
+        parse_modular_headers(name, requirements)
         parse_configuration_whitelist(name, requirements)
 
         if requirements && !requirements.empty?
@@ -634,6 +725,7 @@ module Pod
         link_with
         link_with_first_target
         inhibit_warnings
+        use_modular_headers
         user_project_path
         build_configurations
         dependencies
@@ -873,6 +965,28 @@ module Pod
         requirements.pop if options.empty?
       end
 
+      # Removes :modular_headers from the requirements list, and adds
+      # the pods name into internal hash for modular headers.
+      #
+      # @param [String] pod name
+      #
+      # @param [Array] requirements
+      #        If :modular_headers is the only key in the hash, the hash
+      #        should be destroyed because it confuses Gem::Dependency.
+      #
+      # @return [void]
+      #
+      def parse_modular_headers(name, requirements)
+        options = requirements.last
+        return requirements unless options.is_a?(Hash)
+
+        defines_module = options.delete(:modular_headers)
+        pod_name = Specification.root_name(name)
+        set_use_modular_headers_for_pod(pod_name, defines_module)
+
+        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.

data/lib/cocoapods-core/source.rb

@@ -42,11 +42,13 @@ module Pod
     #       option. See https://github.com/CocoaPods/CocoaPods/issues/2724.
     #
     def url
-      remote = repo_git(%w(config --get remote.origin.url))
-      if !remote.empty?
-        remote
-      elsif (repo + '.git').exist?
-        "file://#{repo}/.git"
+      @url ||= begin
+        remote = repo_git(%w(config --get remote.origin.url))
+        if !remote.empty?
+          remote
+        elsif (repo + '.git').exist?
+          "file://#{repo}/.git"
+        end
       end
     end
 
@@ -260,7 +262,13 @@ module Pod
       if query.is_a?(Dependency)
         query = query.root_name
       end
-      found = Pathname.glob(pod_path(query)).map { |path| path.basename.to_s }
+
+      found = []
+      Pathname.glob(pod_path(query)) do |path|
+        next unless Dir.foreach(path).any? { |child| child != '.' && child != '..' }
+        found << path.basename.to_s
+      end
+
       if [query] == found
         set = set(query)
         set if set.specification_name == query
@@ -435,7 +443,7 @@ module Pod
     end
 
     def repo_git(args, include_error: false)
-      command = "git -C \"#{repo}\" " << args.join(' ')
+      command = "env -u GIT_CONFIG git -C \"#{repo}\" " << args.join(' ')
       command << ' 2>&1' if include_error
       (`#{command}` || '').strip
     end

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

@@ -42,14 +42,15 @@ module Pod
     # Or it can be quite detailed:
     #
     #     Pod::Spec.new do |spec|
-    #       spec.name         = 'Reachability'
-    #       spec.version      = '3.1.0'
-    #       spec.license      = { :type => 'BSD' }
-    #       spec.homepage     = 'https://github.com/tonymillion/Reachability'
-    #       spec.authors      = { 'Tony Million' => 'tonymillion@gmail.com' }
-    #       spec.summary      = 'ARC and GCD Compatible Reachability Class for iOS and OS X.'
-    #       spec.source       = { :git => 'https://github.com/tonymillion/Reachability.git', :tag => 'v3.1.0' }
-    #       spec.module_name  = 'Rich'
+    #       spec.name          = 'Reachability'
+    #       spec.version       = '3.1.0'
+    #       spec.license       = { :type => 'BSD' }
+    #       spec.homepage      = 'https://github.com/tonymillion/Reachability'
+    #       spec.authors       = { 'Tony Million' => 'tonymillion@gmail.com' }
+    #       spec.summary       = 'ARC and GCD Compatible Reachability Class for iOS and OS X.'
+    #       spec.source        = { :git => 'https://github.com/tonymillion/Reachability.git', :tag => 'v3.1.0' }
+    #       spec.module_name   = 'Rich'
+    #       spec.swift_version = '4.0'
     #
     #       spec.ios.deployment_target  = '9.0'
     #       spec.osx.deployment_target  = '10.10'

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

@@ -68,7 +68,7 @@ module Pod
       #         from highest to lowest.
       #
       def versions
-        versions_by_source.values.flatten.uniq.sort.reverse
+        @versions ||= versions_by_source.values.flatten.uniq.sort.reverse
       end
 
       # @return [Version] The highest version known of the specification.

data/lib/cocoapods-core/specification.rb

@@ -152,7 +152,7 @@ module Pod
     # @return [String] the root name
     #
     def self.root_name(full_name)
-      full_name.split('/').first
+      full_name.split('/', 2).first
     end
 
     # Returns the module name of a specification
@@ -607,7 +607,7 @@ module Pod
     # @return [Specification] the specification
     #
     def self.from_string(spec_contents, path, subspec_name = nil)
-      path = Pathname.new(path)
+      path = Pathname.new(path).expand_path
       spec = nil
       Dir.chdir(path.parent.directory? ? path.parent : Dir.pwd) do
         case path.extname

data/lib/cocoapods-core/yaml_helper.rb

@@ -109,6 +109,8 @@ module Pod
       # @return [String] the YAML representation of the given object.
       #
       def process_array(array)
+        return '[]' if array.empty?
+
         result = sorted_array(array).map do |array_value|
           processed = process_according_to_class(array_value)
           case array_value
@@ -143,6 +145,8 @@ module Pod
       # @return [String] the YAML representation of the given object.
       #
       def process_hash(hash, hash_keys_hint = nil, line_separator = "\n")
+        return '{}' if hash.empty?
+
         keys = sorted_array_with_hint(hash.keys, hash_keys_hint)
         key_lines = keys.map do |key|
           key_value = hash[key]
@@ -275,7 +279,7 @@ module Pod
         end
       end
 
-      RESOLVED_TAGS = [
+      RESOLVED_TAGS = Regexp.union(
         'null', 'Null', 'NULL', '~', '', # resolve to null
         'true', 'True', 'TRUE', 'false', 'False', 'FALSE', # bool
         /[-+]?[0-9]+/, # base 10 int
@@ -284,19 +288,29 @@ module Pod
         /[-+]?(\.[0-9]+|[0-9]+(\.[0-9]*)?)([eE][-+]?[0-9]+)?/, # float
         /[-+]?\.(inf|Inf|INF)/, # infinity
         /\.(nan|NaN|NAN)/, # NaN
-      ].freeze
+      )
       private_constant :RESOLVED_TAGS
 
+      INDICATOR_START_CHARS = %w(- ? : , [ ] { } # & * ! | > ' " % @ `).freeze
+      INDICATOR_START = /\A#{Regexp.union(INDICATOR_START_CHARS)}/
+      private_constant :INDICATOR_START_CHARS, :INDICATOR_START
+
       RESOLVED_TAGS_PATTERN = /\A#{Regexp.union(RESOLVED_TAGS)}\z/
       private_constant :RESOLVED_TAGS_PATTERN
 
+      VALID_PLAIN_SCALAR_STRING = %r{\A
+        [\w&&[^#{INDICATOR_START_CHARS}]] # valid first character
+        [\w/\ \(\)~<>=\.:`,-]* # all characters allowed after the first one
+      \z}ox
+      private_constant :VALID_PLAIN_SCALAR_STRING
+
       def process_string(string)
         case string
-        when /\A\s*\z/
-          string.inspect
         when RESOLVED_TAGS_PATTERN
           "'#{string}'"
-        when %r{\A\w[\w/ \(\)~<>=\.-]*\z}
+        when /\A\s*\z/, INDICATOR_START, /:\z/
+          string.inspect
+        when VALID_PLAIN_SCALAR_STRING
           string
         else
           string.inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods