cocoapods-core 0.30.0 → 1.15.2

data/lib/cocoapods-core/dependency.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # The Dependency allows to specify dependencies of a {Podfile} or a
   # {Specification} on a Pod. It stores the name of the dependency, version
   # requirements and external sources information.
@@ -10,7 +9,6 @@ module Pod
   # [MIT license](https://github.com/rubygems/rubygems/blob/master/MIT.txt).
   #
   class Dependency
-
     # @return [String] The name of the Pod described by this dependency.
     #
     attr_accessor :name
@@ -21,12 +19,10 @@ module Pod
     #
     attr_accessor :external_source
 
-    # @return [Bool] whether the dependency should use the podspec with the
-    #         highest know version but force the downloader to checkout the
-    #         `head` of the source repository.
-    #
-    attr_accessor :head
-    alias_method  :head?, :head
+    # @return [String] The source URL of the podspec repo to use to resolve
+    #         this dependency. If not set then the standard source list
+    #         should be used to resolve the dependency.
+    attr_accessor :podspec_repo
 
     # @overload   initialize(name, requirements)
     #
@@ -54,36 +50,48 @@ module Pod
     #   @example  Initialization with an external source.
     #
     #             Dependency.new('libPusher', {:git     => 'example.com/repo.git'})
-    #             Dependency.new('libPusher', {:path   => 'path/to/folder'})
+    #             Dependency.new('libPusher', {:path    => 'path/to/folder'})
     #             Dependency.new('libPusher', {:podspec => 'example.com/libPusher.podspec'})
     #
-    # @overload   initialize(name, is_head)
+    # @overload   initialize(name, requirements, podspec_repo)
     #
     #   @param    [String] name
     #             the name of the Pod.
     #
-    #   @param    [Symbol] is_head
-    #             a symbol that can be `:head` or nil.
+    #   @param    [Array, Version, String, Requirement] requirements
+    #             an array specifying the version requirements of the
+    #             dependency.
+    #
+    #   @param    [Hash] podspec_repo
+    #             The URL of the specific podspec repo to resolve this dependency from.
     #
-    #   @example  Initialization with the head option
+    #   @example  Initialization with a specific podspec repo
     #
-    #             Dependency.new('RestKit', :head)
+    #             Dependency.new('Artsy+UILabels', '~> 1.0', :source => 'https://github.com/Artsy/Specs.git')
     #
     def initialize(name = nil, *requirements)
       if requirements.last.is_a?(Hash)
-        @external_source = requirements.pop
-        unless requirements.empty?
-          raise Informative, "A dependency with an external source may not " \
-            "specify version requirements (#{name})."
+        additional_params = requirements.pop.select { |_, v| !v.nil? }
+        additional_params = nil if additional_params.empty?
+
+        if additional_params && @podspec_repo = additional_params[:source]
+          # This dependency specifies the exact source podspec repo to use.
+          additional_params.delete(:source)
+          unless additional_params.empty?
+            raise Informative, 'A dependency with a specified podspec repo may ' \
+              "not include other source parameters (#{name})."
+          end
+        elsif @external_source = additional_params
+          unless requirements.empty?
+            raise Informative, 'A dependency with an external source may not ' \
+              "specify version requirements (#{name})."
+          end
         end
 
       elsif requirements.last == :head
-        @head = true
-        requirements.pop
-        unless requirements.empty?
-          raise Informative, "A `:head` dependency may not specify version " \
-            "requirements (#{name})."
-        end
+        raise Informative, '`:head` dependencies have been removed. Please use ' \
+          "normal external source dependencies (`:git => 'GIT_REPO_URL'`) " \
+          "instead of `:head` for `#{name}`."
       end
 
       if requirements.length == 1 && requirements.first.is_a?(Requirement)
@@ -91,44 +99,47 @@ module Pod
       end
       @name = name
       @requirement = Requirement.create(requirements)
+      @specific_requirement ||= nil
+      @external_source ||= nil
     end
 
     # @return [Version] whether the dependency points to a specific version.
     #
-    attr_accessor :specific_version
+    attr_reader :specific_version
 
     # @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))
-      else
-        @requirement
-      end
+      @specific_requirement || @requirement
+    end
+
+    # @param [Version] version the specific version to point to
+    #
+    def specific_version=(version)
+      @specific_version = version
+      @specific_requirement = if version
+                                Requirement.new(Version.new(version.version))
+                              end
     end
 
-    # @return [Bool] whether the dependency points to a subspec.
+    # @return [Boolean] whether the dependency points to a subspec.
     #
     def subspec_dependency?
       @name.include?('/')
     end
 
-    # @return [Bool] whether the dependency points to an external source.
+    # @return [Boolean] whether the dependency points to an external source.
     #
     def external?
       !@external_source.nil?
     end
 
-    # @return [Bool] whether the dependency points to a local path.
+    # @return [Boolean] whether the dependency points to a local path.
     #
     def local?
       if external_source
-        !(external_source[:path] || external_source[:local]).nil?
+        external_source[:path]
       end
     end
 
@@ -174,28 +185,27 @@ module Pod
     # @note   This is used by the Lockfile to check if a stored dependency is
     #         still compatible with the Podfile.
     #
-    # @return [Bool] whether the dependency is compatible with the given one.
+    # @return [Boolean] whether the dependency is compatible with the given one.
     #
     def compatible?(other)
       return false unless name == other.name
-      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
 
-    # @return [Bool] whether the dependency is equal to another taking into
+    # @return [Boolean] whether the dependency is equal to another taking into
     #         account the loaded specification, the head options and the
     #         external source.
     #
     def ==(other)
       self.class == other.class &&
         name == other.name &&
-        requirement == other.requirement &&
-        head? == other.head? &&
-        external_source == other.external_source
+        external_source == other.external_source &&
+        podspec_repo == other.podspec_repo &&
+        requirement == other.requirement
     end
     alias_method :eql?, :==
 
@@ -218,35 +228,60 @@ module Pod
     # @param  [Dependency] other
     #         the other dependency to merge with.
     #
-    # @note   If one of the decencies specifies an external source or is head,
+    # @note   If one of the dependencies specifies an external source or is head,
     #         the resulting dependency preserves this attributes.
     #
-    # @return [Dependency] a dependency (not necessary a new instance) that
-    #         includes also the version requirements of the given one.
+    # @return [Dependency] a dependency (not necessarily a new instance) that
+    #         also includes the version requirements of the given one.
     #
     def merge(other)
       unless name == other.name
         raise ArgumentError, "#{self} and #{other} have different names"
       end
+
       default   = Requirement.default
       self_req  = requirement
       other_req = other.requirement
 
-      if other_req == default
-        dep = self.class.new(name, self_req)
-      elsif self_req == default
-        dep = self.class.new(name, other_req)
-      else
-        dep = self.class.new(name, self_req.as_list.concat(other_req.as_list))
-      end
+      req = if other_req == default
+              self_req
+            elsif self_req == default
+              other_req
+            else
+              self_req.as_list.concat(other_req.as_list)
+            end
+
+      opts = {}
 
-      dep.head = head? || other.head?
       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
+    #
+    # @return [Boolean] Whether the dependency has any pre-release requirements
+    #
+    def 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
@@ -258,7 +293,7 @@ module Pod
     # @param  [String, Version] version
     #         The proposed version.
     #
-    # @return [Bool] Whether the dependency is satisfied.
+    # @return [Boolean] Whether the dependency is satisfied.
     #
     def match?(name, version)
       return false unless self.name == name
@@ -282,7 +317,6 @@ module Pod
     #           "libPusher (= 1.0)"
     #           "libPusher (~> 1.0.1)"
     #           "libPusher (> 1.0, < 2.0)"
-    #           "libPusher (HEAD)"
     #           "libPusher (from `www.example.com')"
     #           "libPusher (defined in Podfile)"
     #           "RestKit/JSON"
@@ -293,8 +327,6 @@ module Pod
       version = ''
       if external?
         version << external_source_description(external_source)
-      elsif head?
-        version << 'HEAD'
       elsif requirement != Requirement.default
         version << requirement.to_s
       end
@@ -317,17 +349,15 @@ module Pod
     # @return   [Dependency] the dependency described by the string.
     #
     def self.from_string(string)
-      match_data = string.match(/(\S*)( (.*))?/)
+      match_data = string.match(/((?:\s?[^\s(])+)( (?:.*))?/)
       name = match_data[1]
       version = match_data[2]
       version = version.gsub(/[()]/, '') if version
       case version
-      when nil || /from `(.*)(`|')/
+      when nil, /from `(.*)(`|')/
         Dependency.new(name)
-      when /HEAD/
-        Dependency.new(name, :head)
       else
-        version_requirements =  version.split(',') if version
+        version_requirements = version.split(',') if version
         Dependency.new(name, version_requirements)
       end
     end
@@ -336,7 +366,7 @@ module Pod
     #
     def inspect
       "<#{self.class} name=#{name} requirements=#{requirement} " \
-        "external_source=#{external_source || 'nil'}>"
+        "source=#{podspec_repo || 'nil'} external_source=#{external_source || 'nil'}>"
     end
 
     #--------------------------------------#
@@ -369,13 +399,10 @@ module Pod
         desc = "`#{source[:podspec]}`"
       elsif source.key?(:path)
         desc = "`#{source[:path]}`"
-      elsif source.key?(:local)
-        desc = "`#{source[:local]}`"
       else
         desc = "`#{source}`"
       end
       "from #{desc}"
     end
   end
-
 end

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/github.rb

@@ -1,11 +1,9 @@
 module Pod
-
   # Allows to access information about the GitHub repos.
   #
   # This class is stored in Core because it might be used by web services.
   #
   module GitHub
-
     # Returns the information of a user.
     #
     # @param  [String] login
@@ -78,6 +76,36 @@ module Pod
       end
     end
 
+    # Returns whether the repository has been updated since a given commit.
+    # If the request fails, the response will be true as the API is still in
+    # beta and likely to change.
+    #
+    # @param [String] url @see #repo
+    #
+    # @param [String] commit
+    #        The current HEAD commit.
+    #
+    # @return [Boolean] Whether the repository has been updated since the commit.
+    #
+    def self.modified_since_commit(url, commit)
+      return true unless repo_id = normalized_repo_id(url)
+      require 'rest'
+      request_url = "https://api.github.com/repos/#{repo_id}/commits/master"
+      headers = {
+        'User-Agent' => 'CocoaPods',
+        'Accept' => 'application/vnd.github.v3.sha',
+        'If-None-Match' => %("#{commit}"),
+      }
+
+      begin
+        response = REST.get(request_url, headers)
+        code = response.status_code
+        code != 304
+      rescue
+        raise Informative, "Failed to connect to GitHub to update the #{repo_id} specs repo - Please check if you are offline, or that GitHub is down"
+      end
+    end
+
     private
 
     # @!group Private helpers
@@ -103,7 +131,7 @@ module Pod
     # @return [Nil] if the given url is not a valid github repo url.
     #
     def self.repo_id_from_url(url)
-      url[%r{github.com/([^/\.]*/[^/\.]*)\.*}, 1]
+      url[%r{github.com[/:]([^/]*/(?:(?!\.git)[^/])*)\.*}, 1]
     end
 
     # Performs a get request with the given URL.
@@ -116,7 +144,7 @@ module Pod
     def self.peform_request(url)
       require 'rest'
       require 'json'
-      headers = { "User-Agent" => "CocoaPods" }
+      headers = { 'User-Agent' => 'CocoaPods' }
       response = REST.get(url, headers)
       body = JSON.parse(response.body)
       if response.ok?
@@ -129,6 +157,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end

data/lib/cocoapods-core/http.rb

@@ -0,0 +1,86 @@
+require 'uri'
+
+module Pod
+  # Handles HTTP requests
+  #
+  module HTTP
+    # Resolve potential redirects and return the final URL.
+    #
+    # @return [string]
+    #
+    def self.get_actual_url(url, user_agent = nil)
+      redirects = 0
+
+      loop do
+        response = perform_head_request(url, user_agent)
+
+        if [301, 302, 303, 307, 308].include? response.status_code
+          location = response.headers['location'].first
+
+          if location =~ %r{://}
+            url = location
+          else
+            url = URI.join(url, location).to_s
+          end
+
+          redirects += 1
+        else
+          break
+        end
+
+        break unless redirects < MAX_HTTP_REDIRECTS
+      end
+
+      url
+    end
+
+    # Performs validation of a URL
+    #
+    # @return [REST::response]
+    #
+    def self.validate_url(url, user_agent = nil)
+      return nil unless url =~ /^#{URI.regexp}$/
+
+      begin
+        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
+
+      resp
+    end
+
+    #-------------------------------------------------------------------------#
+
+    private
+
+    # Does a HEAD request and in case of any errors a GET request
+    #
+    # @return [REST::response]
+    #
+    def self.perform_head_request(url, user_agent)
+      require 'rest'
+
+      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,
+                               'Range' => 'bytes=0-0')
+
+        if resp.status_code >= 400
+          resp = ::REST.get(url, 'User-Agent' => user_agent)
+        end
+      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
+end