cocoapods-core 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1def4418127d244ff521d4f76a14445fb4a559c2
-  data.tar.gz: 50da728c79fd04ece560821d954b689b7e3f5053
+  metadata.gz: ef59fe8297bc413cb1482805ca6b260f3a340fb4
+  data.tar.gz: 92ca3d425f5058c370a8bf7573d8e7c371299a7c
 SHA512:
-  metadata.gz: 4d2b45626d5775c887f71646a6b565fb21691b7a1f9e0882774aa02fa683c5ffe7c298bd621c1f371494a61d5a57e3745872f8b8a47062ebcd15b782c01f4736
-  data.tar.gz: 475271274e02a01b7130b3168d52c19d6a9ff4b3e855c62faff403dd079d83d90134d3e2f81328e7dedddcc8c448a251651e1e59f200fe6a6c8bff41aa15a87c
+  metadata.gz: 0772a35c2331bfa3c776b69d0eadd804730360eb181f3ca87525d217b1ee1805c63205ca546969310641318047e7ec4c372edddfc9dae5e84c25209923886341
+  data.tar.gz: cfc998b133ab66bfd8247722734c0290406a9d2b878cbbae4880ebb8cf4e785489d2e07449ed9aec2d066e174c0aca0a8f5b4242fbcf046e84fb07f16cc3e7ba

data/lib/cocoapods-core/core_ui.rb

@@ -1,9 +1,7 @@
 module Pod
-
   # Manages the UI output so dependent gems can customize it.
   #
   module CoreUI
-
     def self.puts(message)
       STDOUT.puts message
     end
@@ -13,6 +11,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end

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
@@ -26,7 +24,7 @@ module Pod
     #         `head` of the source repository.
     #
     attr_accessor :head
-    alias_method  :head?, :head
+    alias_method :head?, :head
 
     # @overload   initialize(name, requirements)
     #
@@ -128,7 +126,7 @@ module Pod
     #
     def local?
       if external_source
-        !(external_source[:path] || external_source[:local]).nil?
+        external_source[:path] || external_source[:local]
       end
     end
 
@@ -377,5 +375,4 @@ module Pod
       "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.31.1' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '0.32.0' 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
@@ -103,7 +101,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/([^/]*/[^/]*)\.*}, 1]
     end
 
     # Performs a get request with the given URL.
@@ -116,7 +114,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 +127,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end

data/lib/cocoapods-core/lockfile.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # The Lockfile stores information about the pods that were installed by
   # CocoaPods.
   #
@@ -11,7 +10,6 @@ module Pod
   # need to be installed or removed.
   #
   class Lockfile
-
     # @todo   The symbols should be converted to a String and back to symbol
     #         when reading (EXTERNAL SOURCES Download options)
 
@@ -40,7 +38,7 @@ module Pod
     def self.from_file(path)
       return nil unless path.exist?
       require 'yaml'
-      hash = File.open(path) { |f| YAML.load(f) }
+      hash = File.open(path) { |f| YAMLHelper.load(f) }
       unless hash && hash.is_a?(Hash)
         raise Informative, "Invalid Lockfile in `#{path}`"
       end
@@ -184,7 +182,7 @@ module Pod
     #         that required the pod.
     #
     def external_sources_data
-      @external_sources_data ||= internal_data["EXTERNAL SOURCES"] || {}
+      @external_sources_data ||= internal_data['EXTERNAL SOURCES'] || {}
     end
 
     # @return [Hash{String => Version}] a Hash containing the name of the root
@@ -306,19 +304,18 @@ module Pod
     #
     def to_yaml
       keys_hint = [
-        "PODS",
-        "DEPENDENCIES",
-        "EXTERNAL SOURCES",
-        "SPEC CHECKSUMS",
-        "COCOAPODS",
+        'PODS',
+        'DEPENDENCIES',
+        'EXTERNAL SOURCES',
+        'SPEC CHECKSUMS',
+        'COCOAPODS',
       ]
-      YAMLConverter.convert_hash(to_hash, keys_hint, "\n\n")
+      YAMLHelper.convert_hash(to_hash, keys_hint, "\n\n")
     end
 
     #-------------------------------------------------------------------------#
 
     class << self
-
       # !@group Generation
 
       public
@@ -434,7 +431,7 @@ module Pod
       #
       def generate_checksums(specs)
         checksums = {}
-        specs.select { |spec| !spec.defined_in_file.nil? }.each do |spec|
+        specs.select { |spec| spec.defined_in_file }.each do |spec|
           checksums[spec.root.name] = spec.checksum
         end
         checksums

data/lib/cocoapods-core/platform.rb

@@ -1,14 +1,11 @@
 module Pod
-
   # A Platform describes an SDK name and deployment target.
   #
   class Platform
-
     # @return [Symbol, String] the name of the SDK represented by the platform.
     #
-    def name
-      @symbolic_name
-    end
+    attr_reader :symbolic_name
+    alias_method :name, :symbolic_name
 
     # @return [Version] the deployment target of the platform.
     #
@@ -89,6 +86,18 @@ module Pod
       end
     end
 
+    # (see #==)
+    alias_method :eql?, :==
+
+    # Hashes the instance by the platform name and deployment target.
+    #
+    # This adds support to make instances usable as Hash keys.
+    #
+    # @!visibility private
+    def hash
+      name.hash ^ deployment_target.hash
+    end
+
     # Checks whether a platform supports another one.
     #
     # In the context of operating system SDKs, a platform supports another
@@ -151,7 +160,7 @@ module Pod
     #
     def requires_legacy_ios_archs?
       if name == :ios
-        deployment_target && (deployment_target < Version.new("4.3"))
+        deployment_target && (deployment_target < Version.new('4.3'))
       else
         false
       end

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

@@ -1,6 +1,5 @@
 module Pod
   class Podfile
-
     # The of the methods defined in this file and the order of the methods is
     # relevant for the documentation generated on
     # CocoaPods/cocoapods.github.com.
@@ -34,7 +33,6 @@ module Pod
     #     end
     #
     module DSL
-
       # @!group Dependencies
       #   The Podfile specifies the dependencies of each user target.
       #
@@ -141,13 +139,13 @@ module Pod
       # If a podspec is available from another source outside of the library’s
       # repo. Consider, for instance, a podspec available via HTTP:
       #
-      #     pod 'JSONKit', :podspec => 'https://raw.github.com/gist/1346394/1d26570f68ca27377a27430c65841a0880395d72/JSONKit.podspec'
+      #     pod 'JSONKit', :podspec => 'https://example.com/JSONKit.podspec'
       #
       #
       # @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]
       #
@@ -158,7 +156,7 @@ module Pod
         end
 
         unless name
-          raise StandardError, "A dependency requires a name."
+          raise StandardError, 'A dependency requires a name.'
         end
 
         current_target_definition.store_pod(name, *requirements)

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

@@ -1,6 +1,5 @@
 module Pod
   class Podfile
-
     # The TargetDefinition stores the information of a CocoaPods static
     # library. The target definition can be linked with one or more targets of
     # the user project.
@@ -9,7 +8,6 @@ module Pod
     # of the parent.
     #
     class TargetDefinition
-
       # @return [TargetDefinition, Podfile] the parent target definition or the
       #         Podfile if the receiver is root.
       #
@@ -100,8 +98,8 @@ module Pod
       #         name.
       #
       def label
-        if root? && name == "Pods"
-          "Pods"
+        if root? && name == 'Pods'
+          'Pods'
         elsif exclusive? || parent.nil?
           "Pods-#{name}"
         else
@@ -622,7 +620,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods-core/podfile.rb

@@ -2,7 +2,6 @@ require 'cocoapods-core/podfile/dsl'
 require 'cocoapods-core/podfile/target_definition'
 
 module Pod
-
   # The Podfile is a specification that describes the dependencies of the
   # targets of an Xcode project.
   #
@@ -13,7 +12,6 @@ module Pod
   # information of necessary to generate the CocoaPods libraries.
   #
   class Podfile
-
     # @!group DSL support
 
     include Pod::Podfile::DSL
@@ -46,7 +44,7 @@ module Pod
       self.defined_in_file = defined_in_file
       @internal_hash = internal_hash
       if block
-        default_target_def = TargetDefinition.new("Pods", self)
+        default_target_def = TargetDefinition.new('Pods', self)
         default_target_def.link_with_first_target = true
         @root_target_definitions = [default_target_def]
         @current_target_definition = default_target_def
@@ -60,7 +58,7 @@ module Pod
     #         presented to the user.
     #
     def to_s
-      "Podfile"
+      'Podfile'
     end
 
     #-------------------------------------------------------------------------#
@@ -194,11 +192,8 @@ module Pod
       to_hash.to_yaml
     end
 
-    #-------------------------------------------------------------------------#
-
-    public
-
     # @!group Class methods
+    #-------------------------------------------------------------------------#
 
     # Initializes a podfile from the file with the given path.
     #
@@ -236,7 +231,7 @@ module Pod
     def self.from_ruby(path)
       string = File.open(path, 'r:utf-8') { |f| f.read }
       # Work around for Rubinius incomplete encoding in 1.9 mode
-      if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+      if string.respond_to?(:encoding) && string.encoding.name != 'UTF-8'
         string.encode!('UTF-8')
       end
       podfile = Podfile.new(path) do
@@ -266,10 +261,10 @@ module Pod
     def self.from_yaml(path)
       string = File.open(path, 'r:utf-8') { |f| f.read }
       # Work around for Rubinius incomplete encoding in 1.9 mode
-      if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+      if string.respond_to?(:encoding) && string.encoding.name != 'UTF-8'
         string.encode!('UTF-8')
       end
-      hash = YAML.load(string)
+      hash = YAMLHelper.load(string)
       from_hash(hash, path)
     end
 
@@ -358,6 +353,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end

data/lib/cocoapods-core/requirement.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # A Requirement is a set of one or more version restrictions of a
   # {Dependency}.
   #
@@ -10,8 +9,7 @@ module Pod
   #       the Dependency class.
   #
   class Requirement < Pod::Vendor::Gem::Requirement
-
-    quoted_operators = OPS.keys.map { |k| Regexp.quote k }.join "|"
+    quoted_operators = OPS.keys.map { |k| Regexp.quote k }.join '|'
 
     # @return [Regexp] The regular expression used to validate input strings.
     #
@@ -57,19 +55,17 @@ module Pod
     # @return [Array] A tuple representing the requirement.
     #
     def self.parse(input)
-      return ["=", input] if input.is_a?(Version)
+      return ['=', input] if input.is_a?(Version)
 
       unless PATTERN =~ input.to_s
         raise ArgumentError, "Illformed requirement `#{input.inspect}`"
       end
 
-      operator = Regexp.last_match[1] || "="
+      operator = Regexp.last_match[1] || '='
       version = Version.new(Regexp.last_match[2])
       [operator, version]
     end
 
     #-------------------------------------------------------------------------#
-
   end
-
 end

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

@@ -1,10 +1,8 @@
 module Pod
   class Source
-
     # Defines the required and the optional methods of a data provider.
     #
     class AbstractDataProvider
-
       public
 
       # @group Required methods
@@ -13,20 +11,20 @@ module Pod
       # @return [String] The name of the source.
       #
       def name
-        raise StandardError, "Abstract method."
+        raise StandardError, 'Abstract method.'
       end
 
       # @return [String] The user friendly type of the source.
       #
       def type
-        raise StandardError, "Abstract method."
+        raise StandardError, 'Abstract method.'
       end
 
       # @return [Array<String>] The list of the name of all the Pods known to
       #         the Source.
       #
       def pods
-        raise StandardError, "Abstract method."
+        raise StandardError, 'Abstract method.'
       end
 
       # @return [Array<String>] All the available versions of a given Pod,
@@ -36,7 +34,7 @@ module Pod
       #         The name of the Pod.
       #
       def versions(name)
-        raise StandardError, "Abstract method."
+        raise StandardError, 'Abstract method.'
       end
 
       # @return [Specification] The specification for a given version of a Pod.
@@ -48,7 +46,7 @@ module Pod
       #         The version of the Pod.
       #
       def specification(name, version)
-        raise StandardError, "Abstract method."
+        raise StandardError, 'Abstract method.'
       end
 
       # @return [Specification] The contents of the specification for a given
@@ -61,11 +59,10 @@ module Pod
       #         the version of the Pod.
       #
       def specification_contents(name, version)
-        raise StandardError, "Abstract method."
+        raise StandardError, 'Abstract method.'
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

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

@@ -1,12 +1,10 @@
 module Pod
   class Source
-
     # Checks whether a podspec can be accepted by a source. The check takes
     # into account the introduction of 0.0.1 version if there are already
     # tagged ones or whether there is change in the source.
     #
     class Acceptor
-
       # @return [Source] the source where the podspec should be added.
       #
       attr_reader :source
@@ -45,7 +43,7 @@ module Pod
         spec = Specification.from_file(spec_path)
         analyze(spec)
       rescue
-        ["Unable to load the specification."]
+        ['Unable to load the specification.']
       end
 
       private
@@ -53,6 +51,31 @@ module Pod
       # @!group Private helpers
       #-----------------------------------------------------------------------#
 
+      MAX_HTTP_REDIRECTS = 3
+
+      # Resolve potential redirects and return the final URL.
+      #
+      # @return [string]
+      #
+      def get_actual_url(url)
+        redirects = 0
+        loop do
+          require 'rest'
+          response = REST.head(url)
+
+          if [301, 302, 303, 307, 308].include? response.status_code
+            url = response.headers['location'].first
+            redirects += 1
+          else
+            break
+          end
+
+          break unless redirects < MAX_HTTP_REDIRECTS
+        end
+
+        url
+      end
+
       # Checks whether the source of the proposed specification is different
       # from the one of the reference specification.
       #
@@ -68,11 +91,15 @@ module Pod
         source = spec.source.values_at(*keys).compact.first
         old_source = reference_spec(spec).source.values_at(*keys).compact.first
         unless source == old_source
-          message = "The source of the spec doesn't match with the recorded "
-          message << "ones. Source: `#{source}`. Previous: `#{old_source}`.\n "
-          message << "Please contact the specs repo maintainers if the"
-          message << "library changed location."
-          errors << message
+          source = get_actual_url(source)
+          old_source = get_actual_url(old_source)
+          unless source == old_source
+            message = "The source of the spec doesn't match with the recorded "
+            message << "ones. Source: `#{source}`. Previous: `#{old_source}`.\n "
+            message << 'Please contact the specs repo maintainers if the'
+            message << 'library changed location.'
+            errors << message
+          end
         end
       end
 
@@ -104,7 +131,7 @@ module Pod
         return unless previous_spec
         return unless spec.version == Version.new('0.0.1')
         unless spec.source[:commit] == previous_spec.source[:commit]
-          errors << "Attempt to rewrite the commit of a 0.0.1 version."
+          errors << 'Attempt to rewrite the commit of a 0.0.1 version.'
         end
       end
 
@@ -161,7 +188,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

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

@@ -1,10 +1,8 @@
 module Pod
   class Source
-
     # The Aggregate manages a directory of sources repositories.
     #
     class Aggregate
-
       # @return [Pathname] the directory were the repositories are stored.
       #
       attr_reader :repos_dir
@@ -102,7 +100,7 @@ module Pod
       # @see    Source#search
       #
       def search(dependency)
-        sources = all.select { |s| !s.search(dependency).nil? }
+        sources = all.select { |s| s.search(dependency) }
         unless sources.empty?
           Specification::Set.new(dependency.root_name, sources)
         end
@@ -132,7 +130,7 @@ module Pod
           result << Specification::Set.new(pod, sources)
         end
         if result.empty?
-          extra = ", author, summary, or description" if full_text_search
+          extra = ', author, summary, or description' if full_text_search
           raise Informative, "Unable to find a pod with name" \
             "#{extra} matching `#{query}'"
         end
@@ -236,7 +234,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

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

@@ -1,11 +1,9 @@
 module Pod
   class Source
-
     # Data provider for a `Pod::Source` backed by a repository hosted in the
     # file system.
     #
     class FileSystemDataProvider < AbstractDataProvider
-
       # @return [Pathname] The path where the source is stored.
       #
       attr_reader :repo
@@ -30,7 +28,7 @@ module Pod
       # @return [String] The user friendly type of the source.
       #
       def type
-        "file system"
+        'file system'
       end
 
       # @return [Array<String>] The list of the name of all the Pods known to
@@ -42,7 +40,7 @@ module Pod
         return nil unless specs_dir
         specs_dir_as_string = specs_dir.to_s
         Dir.entries(specs_dir).select do |entry|
-          valid_name = !(entry == '.' || entry == '..' || entry == '.git')
+          valid_name = entry[0, 1] != '.'
           valid_name && File.directory?(File.join(specs_dir_as_string, entry))
         end.sort
       end
@@ -55,13 +53,13 @@ module Pod
       #
       def versions(name)
         return nil unless specs_dir
-        raise ArgumentError, "No name" unless name
+        raise ArgumentError, 'No name' unless name
         pod_dir = specs_dir + name
         return unless pod_dir.exist?
         pod_dir.children.map do |v|
           basename = v.basename.to_s
-          basename if v.directory? && basename[0, 1] != '.'
-        end.compact.sort.reverse
+          Version.new(basename) if v.directory? && basename[0, 1] != '.'
+        end.compact.sort.reverse.map(&:to_s)
       end
 
       # @return [Specification] The specification for a given version of a Pod.
@@ -107,8 +105,8 @@ module Pod
       # @return [Pathname] The path of the specification.
       #
       def specification_path(name, version)
-        raise ArgumentError, "No name" unless name
-        raise ArgumentError, "No version" unless version
+        raise ArgumentError, 'No name' unless name
+        raise ArgumentError, 'No version' unless version
         return nil unless specs_dir
         path = specs_dir + name + version.to_s
         specification_path = path + "#{name}.podspec.json"
@@ -144,7 +142,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end