cocoapods-core 0.27.1 → 0.28.0

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

@@ -29,7 +29,11 @@ module Pod
         #         robust handling of head versions (like a dedicated section).
         #
         def version
-           @version ||= root? ? Version.new(attributes_hash["version"]) : root.version
+          if root?
+            @version ||= Version.new(attributes_hash["version"])
+          else
+            @version ||= root.version
+          end
         end
 
         # @return [Hash] a hash containing the authors as the keys and their
@@ -63,6 +67,12 @@ module Pod
           end
         end
 
+        # @return [String] The social media URL.
+        #
+        def social_media_url
+          attributes_hash["social_media_url"]
+        end
+
         # @return [Hash] A hash containing the license information of the Pod.
         #
         # @note   The indentation is stripped from the license text.
@@ -108,8 +118,8 @@ module Pod
           description.strip_heredoc if description
         end
 
-        # @return [Array<String>] The list of the URL for the screenshots of the
-        #         Pod.
+        # @return [Array<String>] The list of the URL for the screenshots of
+        #         the Pod.
         #
         # @note   The value is coerced to an array.
         #
@@ -130,7 +140,7 @@ module Pod
           attributes_hash["prepare_command"]
         end
 
-        #-----------------------------------------------------------------------#
+        #---------------------------------------------------------------------#
 
         private
 
@@ -151,6 +161,8 @@ module Pod
           result
         end
 
+        #---------------------------------------------------------------------#
+
       end
     end
   end

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

@@ -1,9 +1,7 @@
 require 'active_support/core_ext/array/conversions'
-
 require 'cocoapods-core/specification/set/presenter'
 require 'cocoapods-core/specification/set/statistics'
 
-
 module Pod
   class Specification
 
@@ -38,7 +36,7 @@ module Pod
         @name    = name
         sources  = sources.is_a?(Array) ? sources : [sources]
         @sources = sources.sort_by(&:name)
-        @required_by  = []
+        @dependencies_by_requirer_name = {}
         @dependencies = []
       end
 
@@ -60,19 +58,26 @@ module Pod
       # @return [void]
       #
       def required_by(dependency, dependent_name)
-        unless @required_by.empty? || dependency.requirement.satisfied_by?(Version.new(required_version.to_s))
-          raise Informative, "#{dependent_name} tries to activate `#{dependency}', but already activated version `#{required_version}' by #{@required_by.to_sentence}."
+        dependencies_by_requirer_name[dependent_name] ||= []
+        dependencies_by_requirer_name[dependent_name] << dependency
+        dependencies << dependency
+
+        if acceptable_versions.empty?
+          message = "Unable to satisfy the following requirements:\n"
+          dependencies_by_requirer_name.each do |name, dependencies|
+            dependencies.each do |dep|
+              message << "- `#{dep.to_s}` required by `#{name}`"
+            end
+          end
+          raise Informative, message
         end
-        @specification = nil
-        @required_by  << dependent_name
-        @dependencies << dependency
       end
 
-      # @return [Dependency] a dependency that includes all the versions
+      # @return [Dependency] A dependency that includes all the versions
       #         requirements of the stored dependencies.
       #
       def dependency
-        @dependencies.inject(Dependency.new(name)) do |previous, dependency|
+        dependencies.reduce(Dependency.new(name)) do |previous, dependency|
           previous.merge(dependency.to_root_dependency)
         end
       end
@@ -85,9 +90,12 @@ module Pod
       #         used to disambiguate.
       #
       def specification
-        @specification ||= Specification.from_file(specification_path_for_version(required_version))
+        path = specification_path_for_version(required_version)
+        Specification.from_file(path)
       end
 
+      # TODO
+      #
       def specification_path_for_version(version)
         sources = []
         versions_by_source.each do |source, source_versions|
@@ -111,6 +119,13 @@ module Pod
         version
       end
 
+      # @return [Array<Version>] All the versions which are acceptable given
+      #         the requirements.
+      #
+      def acceptable_versions
+        versions.select { |v| dependency.match?(name, v) }
+      end
+
       # @return [Array<Version>] all the available versions for the Pod, sorted
       #         from highest to lowest.
       #
@@ -142,11 +157,14 @@ module Pod
       end
 
       def ==(other)
-        self.class === other && @name == other.name && @sources.map(&:name) == other.sources.map(&:name)
+        self.class == other.class &&
+          @name == other.name &&
+          @sources.map(&:name) == other.sources.map(&:name)
       end
 
       def to_s
-        "#<#{self.class.name} for `#{name}' with required version `#{required_version}' available at `#{sources.map(&:name) * ', '}'>"
+        "#<#{self.class.name} for `#{name}' with required version " \
+          "`#{required_version}' available at `#{sources.map(&:name) * ', '}'>"
       end
       alias_method :inspect, :to_s
 
@@ -162,8 +180,9 @@ module Pod
       # @return [Hash] The hash representation.
       #
       def to_hash
-        versions = versions_by_source.inject({}) do |memo, (source, version)|
-          memo[source.name] = version.map(&:to_s); memo
+        versions = versions_by_source.reduce({}) do |memo, (source, version)|
+          memo[source.name] = version.map(&:to_s)
+          memo
         end
         {
           'name' => name,
@@ -175,6 +194,11 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
+      attr_accessor :dependencies_by_requirer_name
+      attr_accessor :dependencies
+
+      #-----------------------------------------------------------------------#
+
       # The Set::External class handles Pods from external sources. Pods from
       # external sources don't use the {Source} and are initialized by a given
       # specification.
@@ -191,14 +215,7 @@ module Pod
         end
 
         def ==(other)
-          self.class === other && @specification == other.specification
-        end
-
-        def required_by(dependency, dependent_name)
-          before = @specification
-          super(dependency, dependent_name)
-        ensure
-          @specification = before
+          self.class == other.class && specification == other.specification
         end
 
         def specification_path
@@ -206,7 +223,7 @@ module Pod
         end
 
         def versions
-          [@specification.version]
+          [specification.version]
         end
       end
     end

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

@@ -82,7 +82,7 @@ module Pod
         #         highest available version.
         #
         def spec
-          @set.specification
+          @spec ||= @set.specification
         end
 
         # @return   [String] the list of the authors of the Pod in sentence
@@ -128,7 +128,7 @@ module Pod
         # @return [String] the URL of the source of the Pod.
         #
         def source_url
-          url_keys = [:git, :svn, :http, :hg, :path ]
+          url_keys = [:git, :svn, :http, :hg, :path]
           key = spec.source.keys.find { |k| url_keys.include?(k) }
           key ? spec.source[key] : 'No source url'
         end
@@ -141,7 +141,10 @@ module Pod
         #   "iOS - OS X"
         #
         def platform
-          spec.available_platforms.sort { |a,b| a.to_s.downcase <=> b.to_s.downcase }.join(' - ')
+          sorted_platforms = spec.available_platforms.sort do |a, b|
+            a.to_s.downcase <=> b.to_s.downcase
+          end
+          sorted_platforms.join(' - ')
         end
 
         # @return [String] the type of the license of the Pod.
@@ -212,7 +215,7 @@ module Pod
           return nil unless from_time
           from_time = Time.parse(from_time) unless from_time.is_a?(Time)
           to_time = Time.now
-          distance_in_days = (((to_time - from_time).abs)/60/60/24).round
+          distance_in_days = (((to_time - from_time).abs) / 60 / 60 / 24).round
 
           case distance_in_days
           when 0..7
@@ -234,4 +237,3 @@ module Pod
     end
   end
 end
-

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

@@ -13,7 +13,9 @@ module Pod
       #
       def to_hash
         hash = attributes_hash.dup
-        hash["subspecs"] = subspecs.map { |spec| spec.to_hash } unless subspecs.empty?
+        unless subspecs.empty?
+          hash["subspecs"] = subspecs.map { |spec| spec.to_hash }
+        end
         hash
       end
 
@@ -39,7 +41,9 @@ module Pod
       subspecs = attributes_hash.delete('subspecs')
       spec.attributes_hash = attributes_hash
       if subspecs
-        spec.subspecs = subspecs.map { |s_hash| Specification.from_hash(s_hash, spec) }
+        spec.subspecs = subspecs.map do |s_hash|
+          Specification.from_hash(s_hash, spec)
+        end
       end
       spec
     end

data/lib/cocoapods-core/standard_error.rb

@@ -67,11 +67,11 @@ module Pod
         lines      = File.readlines(dsl_path.to_s)
         indent     = " #  "
         indicator  = indent.dup.gsub("#", ">")
-        first_line = ( line_numer.zero? )
-        last_line  = ( line_numer == (lines.count - 1) )
+        first_line = (line_numer.zero?)
+        last_line  = (line_numer == (lines.count - 1))
 
         m << "\n"
-        m << "#{indent}from #{trace_line.gsub(/:in.*$/,'')}\n"
+        m << "#{indent}from #{trace_line.gsub(/:in.*$/, '')}\n"
         m << "#{indent}-------------------------------------------\n"
         m << "#{indent}#{    lines[line_numer - 1] }" unless first_line
         m << "#{indicator}#{ lines[line_numer] }"

data/lib/cocoapods-core/vendor.rb

@@ -52,4 +52,3 @@ module Pod
     end
   end
 end
-

data/lib/cocoapods-core/vendor/requirement.rb

@@ -38,7 +38,7 @@ module Pod::Vendor
     # If the input is "weird", the default version requirement is
     # returned.
 
-    def self.create input
+    def self.create(input)
       case input
       when Gem::Requirement then
         input
@@ -76,14 +76,14 @@ module Pod::Vendor
     #     parse("1.0")                   # => ["=", "1.0"]
     #     parse(Gem::Version.new("1.0")) # => ["=,  "1.0"]
 
-    def self.parse obj
+    def self.parse(obj)
       return ["=", obj] if Gem::Version === obj
 
       unless PATTERN =~ obj.to_s
         raise ArgumentError, "Illformed requirement [#{obj.inspect}]"
       end
 
-      [$1 || "=", Gem::Version.new($2)]
+      [Regexp.last_match[1] || "=", Gem::Version.new(Regexp.last_match[2])]
     end
 
     ##
@@ -98,7 +98,7 @@ module Pod::Vendor
     # requirements are ignored. An empty set of +requirements+ is the
     # same as <tt>">= 0"</tt>.
 
-    def initialize *requirements
+    def initialize(*requirements)
       requirements = requirements.flatten
       requirements.compact!
       requirements.uniq!
@@ -126,7 +126,7 @@ module Pod::Vendor
       [@requirements]
     end
 
-    def marshal_load array # :nodoc:
+    def marshal_load(array) # :nodoc:
       @requirements = array[0]
 
       fix_syck_default_key_in_requirements
@@ -140,7 +140,7 @@ module Pod::Vendor
     fix_syck_default_key_in_requirements
     end
 
-    def init_with coder # :nodoc:
+    def init_with(coder) # :nodoc:
       yaml_initialize coder.tag, coder.map
     end
 
@@ -148,7 +148,7 @@ module Pod::Vendor
       requirements.any? { |r| r.last.prerelease? }
     end
 
-    def pretty_print q # :nodoc:
+    def pretty_print(q) # :nodoc:
       q.group 1, 'Gem::Requirement.new(', ')' do
       q.pp as_list
     end
@@ -157,7 +157,7 @@ module Pod::Vendor
     ##
     # True if +version+ satisfies this Requirement.
 
-    def satisfied_by? version
+    def satisfied_by?(version)
       # #28965: syck has a bug with unquoted '=' YAML.loading as YAML::DefaultKey
       requirements.all? { |op, rv| (OPS[op] || OPS["="]).call version, rv }
     end
@@ -178,7 +178,7 @@ module Pod::Vendor
       as_list.join ", "
     end
 
-    def <=> other # :nodoc:
+    def <=>(other) # :nodoc:
       to_s <=> other.to_s
     end
 

data/lib/cocoapods-core/vendor/version.rb

@@ -142,192 +142,195 @@ module Pod::Vendor
   #   "~> 3.5"      3.5   ... 4.0
   #   "~> 3.5.0"    3.5.0 ... 3.6
 
-  class Gem::Version
-    autoload :Requirement, 'rubygems/requirement'
+  module Gem
+    class Version
+      autoload :Requirement, 'rubygems/requirement'
 
-    include Comparable
+      include Comparable
 
-    VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc:
-    ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
+      VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc:
+      ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
 
-    ##
-    # A string representation of this Version.
+      ##
+      # A string representation of this Version.
 
-    attr_reader :version
-    alias to_s version
+      attr_reader :version
+      alias to_s version
 
-    ##
-    # True if the +version+ string matches RubyGems' requirements.
+      ##
+      # True if the +version+ string matches RubyGems' requirements.
 
-    def self.correct? version
-      version.to_s =~ ANCHORED_VERSION_PATTERN
-    end
+      def self.correct?(version)
+        version.to_s =~ ANCHORED_VERSION_PATTERN
+      end
 
-    ##
-    # Factory method to create a Version object. Input may be a Version
-    # or a String. Intended to simplify client code.
-    #
-    #   ver1 = Version.create('1.3.17')   # -> (Version object)
-    #   ver2 = Version.create(ver1)       # -> (ver1)
-    #   ver3 = Version.create(nil)        # -> nil
-
-    def self.create input
-      if input.respond_to? :version then
-        input
-      elsif input.nil? then
-        nil
-      else
-        new input
+      ##
+      # Factory method to create a Version object. Input may be a Version
+      # or a String. Intended to simplify client code.
+      #
+      #   ver1 = Version.create('1.3.17')   # -> (Version object)
+      #   ver2 = Version.create(ver1)       # -> (ver1)
+      #   ver3 = Version.create(nil)        # -> nil
+
+      def self.create(input)
+        if input.respond_to? :version then
+          input
+        elsif input.nil? then
+          nil
+        else
+          new input
+        end
       end
-    end
 
-    ##
-    # Constructs a Version from the +version+ string.  A version string is a
-    # series of digits or ASCII letters separated by dots.
+      ##
+      # Constructs a Version from the +version+ string.  A version string is a
+      # series of digits or ASCII letters separated by dots.
 
-    def initialize version
-      raise ArgumentError, "Malformed version number string #{version}" unless
-      self.class.correct?(version)
+      def initialize(version)
+        unless self.class.correct?(version)
+          raise ArgumentError, "Malformed version number string #{version}"
+        end
 
-      @version = version.to_s
-      @version.strip!
-    end
+        @version = version.to_s
+        @version.strip!
+      end
 
-    ##
-    # Return a new version object where the next to the last revision
-    # number is one greater (e.g., 5.3.1 => 5.4).
-    #
-    # Pre-release (alpha) parts, e.g, 5.3.1.b.2 => 5.4, are ignored.
+      ##
+      # Return a new version object where the next to the last revision
+      # number is one greater (e.g., 5.3.1 => 5.4).
+      #
+      # Pre-release (alpha) parts, e.g, 5.3.1.b.2 => 5.4, are ignored.
 
-    def bump
-      segments = self.segments.dup
-      segments.pop while segments.any? { |s| String === s }
-      segments.pop if segments.size > 1
+      def bump
+        segments = self.segments.dup
+        segments.pop while segments.any? { |s| String === s }
+        segments.pop if segments.size > 1
 
-      segments[-1] = segments[-1].succ
-      self.class.new segments.join(".")
-    end
+        segments[-1] = segments[-1].succ
+        self.class.new segments.join(".")
+      end
 
-    ##
-    # A Version is only eql? to another version if it's specified to the
-    # same precision. Version "1.0" is not the same as version "1".
+      ##
+      # A Version is only eql? to another version if it's specified to the
+      # same precision. Version "1.0" is not the same as version "1".
 
-    def eql? other
-      self.class === other and @version == other.version
-    end
+      def eql?(other)
+        self.class === other and @version == other.version
+      end
 
-    def hash # :nodoc:
-      @hash ||= segments.hash
-    end
+      def hash # :nodoc:
+        @hash ||= segments.hash
+      end
 
-    def init_with coder # :nodoc:
-      yaml_initialize coder.tag, coder.map
-    end
+      def init_with(coder) # :nodoc:
+        yaml_initialize coder.tag, coder.map
+      end
 
-    def inspect # :nodoc:
-      "#<#{self.class} #{version.inspect}>"
-    end
+      def inspect # :nodoc:
+        "#<#{self.class} #{version.inspect}>"
+      end
 
-    ##
-    # Dump only the raw version string, not the complete object. It's a
-    # string for backwards (RubyGems 1.3.5 and earlier) compatibility.
+      ##
+      # Dump only the raw version string, not the complete object. It's a
+      # string for backwards (RubyGems 1.3.5 and earlier) compatibility.
 
-    def marshal_dump
-      [version]
-    end
+      def marshal_dump
+        [version]
+      end
 
-    ##
-    # Load custom marshal format. It's a string for backwards (RubyGems
-    # 1.3.5 and earlier) compatibility.
+      ##
+      # Load custom marshal format. It's a string for backwards (RubyGems
+      # 1.3.5 and earlier) compatibility.
 
-    def marshal_load array
-      initialize array[0]
-    end
+      def marshal_load(array)
+        initialize array[0]
+      end
 
-    def yaml_initialize(tag, map)
-      @version = map['version']
-      @segments = nil
-      @hash = nil
-    end
+      def yaml_initialize(tag, map)
+        @version = map['version']
+        @segments = nil
+        @hash = nil
+      end
 
-    ##
-    # A version is considered a prerelease if it contains a letter.
+      ##
+      # A version is considered a prerelease if it contains a letter.
 
-    def prerelease?
-      @prerelease ||= @version =~ /[a-zA-Z]/
-    end
+      def prerelease?
+        @prerelease ||= @version =~ /[a-zA-Z]/
+      end
 
-    def pretty_print q # :nodoc:
-      q.text "Gem::Version.new(#{version.inspect})"
-    end
+      def pretty_print(q) # :nodoc:
+        q.text "Gem::Version.new(#{version.inspect})"
+      end
 
-    ##
-    # The release for this version (e.g. 1.2.0.a -> 1.2.0).
-    # Non-prerelease versions return themselves.
+      ##
+      # The release for this version (e.g. 1.2.0.a -> 1.2.0).
+      # Non-prerelease versions return themselves.
 
-    def release
-      return self unless prerelease?
+      def release
+        return self unless prerelease?
 
-      segments = self.segments.dup
-      segments.pop while segments.any? { |s| String === s }
-      self.class.new segments.join('.')
-    end
+        segments = self.segments.dup
+        segments.pop while segments.any? { |s| String === s }
+        self.class.new segments.join('.')
+      end
 
-    def segments # :nodoc:
+      def segments # :nodoc:
 
-      # segments is lazy so it can pick up version values that come from
-      # old marshaled versions, which don't go through marshal_load.
+        # segments is lazy so it can pick up version values that come from
+        # old marshaled versions, which don't go through marshal_load.
 
-      @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
-      /^\d+$/ =~ s ? s.to_i : s
-    end
-    end
+        @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
+          /^\d+$/ =~ s ? s.to_i : s
+        end
+      end
 
-    ##
-    # A recommended version for use with a ~> Requirement.
+      ##
+      # A recommended version for use with a ~> Requirement.
 
-    def spermy_recommendation
-      segments = self.segments.dup
+      def spermy_recommendation
+        segments = self.segments.dup
 
-      segments.pop    while segments.any? { |s| String === s }
-      segments.pop    while segments.size > 2
-      segments.push 0 while segments.size < 2
+        segments.pop    while segments.any? { |s| String === s }
+        segments.pop    while segments.size > 2
+        segments.push 0 while segments.size < 2
 
-      "~> #{segments.join(".")}"
-    end
+        "~> #{segments.join(".")}"
+      end
 
-    ##
-    # Compares this version with +other+ returning -1, 0, or 1 if the
-    # other version is larger, the same, or smaller than this
-    # one. Attempts to compare to something that's not a
-    # <tt>Gem::Version</tt> return +nil+.
+      ##
+      # Compares this version with +other+ returning -1, 0, or 1 if the
+      # other version is larger, the same, or smaller than this
+      # one. Attempts to compare to something that's not a
+      # <tt>Gem::Version</tt> return +nil+.
 
-    def <=> other
-      return unless Gem::Version === other
-      return 0 if @version == other.version
+      def <=>(other)
+        return unless Gem::Version === other
+        return 0 if @version == other.version
 
-      lhsegments = segments
-      rhsegments = other.segments
+        lhsegments = segments
+        rhsegments = other.segments
 
-      lhsize = lhsegments.size
-      rhsize = rhsegments.size
-      limit  = (lhsize > rhsize ? lhsize : rhsize) - 1
+        lhsize = lhsegments.size
+        rhsize = rhsegments.size
+        limit  = (lhsize > rhsize ? lhsize : rhsize) - 1
 
-      i = 0
+        i = 0
 
-      while i <= limit
-        lhs, rhs = lhsegments[i] || 0, rhsegments[i] || 0
-        i += 1
+        while i <= limit
+          lhs, rhs = lhsegments[i] || 0, rhsegments[i] || 0
+          i += 1
 
-        next      if lhs == rhs
-        return -1 if String  === lhs && Numeric === rhs
-        return  1 if Numeric === lhs && String  === rhs
+          next      if lhs == rhs
+          return -1 if String  === lhs && Numeric === rhs
+          return  1 if Numeric === lhs && String  === rhs
 
-        return lhs <=> rhs
-      end
+          return lhs <=> rhs
+        end
 
-      return 0
+        0
+      end
     end
-  end
 
+  end
 end