cocoapods-core 0.36.1 → 0.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5ece60001c7c220a0916f21ae5ee62a5d3b8e8
-  data.tar.gz: aefe70127e25fbeba2855023b26af57e6a38c445
+  metadata.gz: 24a08556f451a7342ca4cb8e548c95132f67c681
+  data.tar.gz: 2a29f49d2609e75130d3416c781a6afdecd4f572
 SHA512:
-  metadata.gz: 7a02153f283bcefa836ac55ba6d97dcec1ed693e81f15ff8259c30406d47f056af1b16155711a2a27534cb148bdad1256fd4f3e13c11aaddccbbd1848f72e2c3
-  data.tar.gz: 8a282537d5b49728850ea58b564f2602dc0548f29ba836627f28a3b88af600845521f33a0245015f8c751467cfb2307188facdfca2399a6f4eb9368ad8f661c1
+  metadata.gz: c87a763366caa4d3beb4631c605c6918819ec752a1091e3e08d880dd8464cf7af9dddf361f24c452c307ed0d7caa523c499971c911d4705115aad3f1dea3d7aa
+  data.tar.gz: e883638172fe09c0fd2b964d33d26678c2f239e03cdc435d5e58893737de799bba049f27223d8743452054f4ed27b477e266ce0c893b12d0ad04c38f876b8cf5

data/lib/cocoapods-core/dependency.rb

@@ -69,7 +69,8 @@ module Pod
     #
     def initialize(name = nil, *requirements)
       if requirements.last.is_a?(Hash)
-        @external_source = requirements.pop
+        external_source = requirements.pop.select { |_, v| !v.nil? }
+        @external_source = external_source unless external_source.empty?
         unless requirements.empty?
           raise Informative, 'A dependency with an external source may not ' \
             "specify version requirements (#{name})."

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/podfile.rb

@@ -255,7 +255,7 @@ module Pod
           # rubocop:enable Eval
         rescue => e
           message = "Invalid `#{path.basename}` file: #{e.message}"
-          raise DSLError.new(message, path, e.backtrace)
+          raise DSLError.new(message, path, e.backtrace, string)
         end
       end
       podfile

data/lib/cocoapods-core/specification.rb

@@ -608,6 +608,6 @@ module Pod
     # rubocop:enable Eval
   rescue => e
     message = "Invalid `#{path.basename}` file: #{e.message}"
-    raise DSLError.new(message, path, e.backtrace)
+    raise DSLError.new(message, path, e.backtrace, string)
   end
 end

data/lib/cocoapods-core/standard_error.rb

@@ -25,10 +25,20 @@ module Pod
     # @param [Exception] backtrace @see backtrace
     # @param [String]    dsl_path  @see dsl_path
     #
-    def initialize(description, dsl_path, backtrace)
+    def initialize(description, dsl_path, backtrace, contents = nil)
       @description = description
       @dsl_path    = dsl_path
       @backtrace   = backtrace
+      @contents    = contents
+    end
+
+    # @return [String] the contents of the DSL that cause the exception to
+    #         be raised.
+    #
+    def contents
+      @contents ||= begin
+        dsl_path && File.exist?(dsl_path) && File.read(dsl_path)
+      end
     end
 
     # The message of the exception reports the content of podspec for the
@@ -50,21 +60,24 @@ module Pod
     # @return [String] the message of the exception.
     #
     def message
-      unless @message
+      @message ||= begin
+        trace_line, description = parse_line_number_from_description
+
         m = "\n[!] "
         m << description
         m << ". Updating CocoaPods might fix the issue.\n"
         m = m.red if m.respond_to?(:red)
 
-        return m unless backtrace && dsl_path && File.exist?(dsl_path)
+        return m unless backtrace && dsl_path && contents
 
-        trace_line = backtrace.find { |l| l.include?(dsl_path.to_s) }
+        trace_line = backtrace.find { |l| l.include?(dsl_path.to_s) } || trace_line
         return m unless trace_line
         line_numer = trace_line.split(':')[1].to_i - 1
         return m unless line_numer
-        lines      = File.readlines(dsl_path.to_s)
+
+        lines      = contents.lines
         indent     = ' #  '
-        indicator  = indent.dup.gsub('#', '>')
+        indicator  = indent.gsub('#', '>')
         first_line = (line_numer.zero?)
         last_line  = (line_numer == (lines.count - 1))
 
@@ -76,10 +89,18 @@ module Pod
         m << "#{indent}#{    lines[line_numer + 1] }" unless last_line
         m << "\n" unless m.end_with?("\n")
         m << "#{indent}-------------------------------------------\n"
-        m << ''
-        @message = m
       end
-      @message
+    end
+
+    private
+
+    def parse_line_number_from_description
+      description = self.description
+      if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path.to_s}):\d+)/
+        trace_line = Regexp.last_match[1]
+        description = description.sub(/#{Regexp.quote trace_line}:\s*/, '')
+      end
+      [trace_line, description]
     end
   end
 end

data/lib/cocoapods-core/vendor.rb

@@ -9,7 +9,7 @@ module Pod
     #
     # E.g. https://github.com/CocoaPods/CocoaPods/issues/398
     #
-    # The following classes are copied from RubyGems `v1.8.24`. The changes
+    # The following classes are copied from RubyGems `v2.4.6`. The changes
     # performed to the source files are the following:
     #
     # - Namespaced in `Pod::Vendor`

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

@@ -1,35 +1,49 @@
 module Pod::Vendor
 
   # require "rubygems/version"
+  # require "rubygems/deprecate"
+
+  # If we're being loaded after yaml was already required, then
+  # load our yaml + workarounds now.
+  # Gem.load_yaml if defined? ::YAML
 
   ##
   # A Requirement is a set of one or more version restrictions. It supports a
   # few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
-
-  # REFACTOR: The fact that a requirement is singular or plural is kind of
-  # awkward. Is Requirement the right name for this? Or should it be one
-  # [op, number] pair, and we call the list of requirements something else?
-  # Since a Requirement is held by a Dependency, maybe this should be made
-  # singular and the list aspect should be pulled up into Dependency?
-
-  # require "rubygems/version"
-  # require "rubygems/deprecate"
+  #
+  # See Gem::Version for a description on how versions and requirements work
+  # together in RubyGems.
 
   class Gem::Requirement
-    include Comparable
-
     OPS = { #:nodoc:
       "="  =>  lambda { |v, r| v == r },
       "!=" =>  lambda { |v, r| v != r },
-      ">"  =>  lambda { |v, r| v > r  },
-      "<"  =>  lambda { |v, r| v < r  },
+      ">"  =>  lambda { |v, r| v >  r },
+      "<"  =>  lambda { |v, r| v <  r },
       ">=" =>  lambda { |v, r| v >= r },
       "<=" =>  lambda { |v, r| v <= r },
       "~>" =>  lambda { |v, r| v >= r && v.release < r.bump }
     }
 
+    SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
+
     quoted  = OPS.keys.map { |k| Regexp.quote k }.join "|"
-    PATTERN = /\A\s*(#{quoted})?\s*(#{Gem::Version::VERSION_PATTERN})\s*\z/
+    PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*" # :nodoc:
+
+    ##
+    # A regular expression that matches a requirement
+
+    PATTERN = /\A#{PATTERN_RAW}\z/
+
+    ##
+    # The default requirement matches any version
+
+    DefaultRequirement = [">=", Gem::Version.new(0)]
+
+    ##
+    # Raised when a bad requirement is encountered
+
+    class BadRequirementError < ArgumentError; end
 
     ##
     # Factory method to create a Gem::Requirement object.  Input may be
@@ -38,12 +52,14 @@ 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
       when Gem::Version, Array then
         new input
+      when '!' then
+        source_set
       else
         if input.respond_to? :to_str then
           new [input.to_str]
@@ -55,15 +71,18 @@ module Pod::Vendor
 
     ##
     # A default "version requirement" can surely _only_ be '>= 0'.
-    #--
-    # This comment once said:
-    #
-    # "A default "version requirement" can surely _only_ be '> 0'."
 
     def self.default
       new '>= 0'
     end
 
+    ###
+    # A source set requirement, used for Gemfiles and lockfiles
+
+    def self.source_set # :nodoc:
+      SOURCE_SET_REQUIREMENT
+    end
+
     ##
     # Parse +obj+, returning an <tt>[op, version]</tt> pair. +obj+ can
     # be a String or a Gem::Version.
@@ -76,14 +95,18 @@ 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}]"
+        raise BadRequirementError, "Illformed requirement [#{obj.inspect}]"
       end
 
-      [Regexp.last_match[1] || "=", Gem::Version.new(Regexp.last_match[2])]
+      if $1 == ">=" && $2 == "0"
+        DefaultRequirement
+      else
+        [$1 || "=", Gem::Version.new($2)]
+      end
     end
 
     ##
@@ -98,18 +121,62 @@ 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!
 
-      requirements << ">= 0" if requirements.empty?
-      @none = (requirements == ">= 0")
-      @requirements = requirements.map! { |r| self.class.parse r }
+      if requirements.empty?
+        @requirements = [DefaultRequirement]
+      else
+        @requirements = requirements.map! { |r| self.class.parse r }
+      end
     end
 
+    ##
+    # Concatenates the +new+ requirements onto this requirement.
+
+    def concat new
+      new = new.flatten
+      new.compact!
+      new.uniq!
+      new = new.map { |r| self.class.parse r }
+
+      @requirements.concat new
+    end
+
+    ##
+    # Formats this requirement for use in a Gem::RequestSet::Lockfile.
+
+    def for_lockfile # :nodoc:
+      return if [DefaultRequirement] == @requirements
+
+      list = requirements.sort_by { |_, version|
+        version
+      }.map { |op, version|
+        "#{op} #{version}"
+      }.uniq
+
+      " (#{list.join ', '})"
+    end
+
+    ##
+    # true if this gem has no requirements.
+
     def none?
-      @none ||= (to_s == ">= 0")
+      if @requirements.size == 1
+        @requirements[0] == DefaultRequirement
+      else
+        false
+      end
+    end
+
+    ##
+    # true if the requirement is for only an exact version
+
+    def exact?
+      return false unless @requirements.size == 1
+      @requirements[0][0] == "="
     end
 
     def as_list # :nodoc:
@@ -117,7 +184,7 @@ module Pod::Vendor
     end
 
     def hash # :nodoc:
-      requirements.hash
+      requirements.sort.hash
     end
 
     def marshal_dump # :nodoc:
@@ -126,7 +193,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
@@ -134,36 +201,51 @@ module Pod::Vendor
 
     def yaml_initialize(tag, vals) # :nodoc:
       vals.each do |ivar, val|
-      instance_variable_set "@#{ivar}", val
-    end
+        instance_variable_set "@#{ivar}", val
+      end
 
+      Gem.load_yaml
       fix_syck_default_key_in_requirements
     end
 
-    def init_with(coder) # :nodoc:
+    def init_with coder # :nodoc:
       yaml_initialize coder.tag, coder.map
     end
 
+    def to_yaml_properties # :nodoc:
+      ["@requirements"]
+    end
+
+    def encode_with coder # :nodoc:
+      coder.add 'requirements', @requirements
+    end
+
+    ##
+    # A requirement is a prerelease if any of the versions inside of it
+    # are prereleases
+
     def prerelease?
       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
+        q.pp as_list
+      end
     end
 
     ##
     # True if +version+ satisfies this Requirement.
 
-    def satisfied_by?(version)
+    def satisfied_by? version
+      raise ArgumentError, "Need a Gem::Version: #{version.inspect}" unless
+        Gem::Version === version
       # #28965: syck has a bug with unquoted '=' YAML.loading as YAML::DefaultKey
       requirements.all? { |op, rv| (OPS[op] || OPS["="]).call version, rv }
     end
 
-    alias_method :===, :satisfied_by?
-    alias_method :=~, :satisfied_by?
+    alias :=== :satisfied_by?
+    alias :=~ :satisfied_by?
 
     ##
     # True if the requirement will not always match the latest version.
@@ -171,20 +253,20 @@ module Pod::Vendor
     def specific?
       return true if @requirements.length > 1 # GIGO, > 1, > 2 is silly
 
-      not %w(> >=).include? @requirements.first.first # grab the operator
+      not %w[> >=].include? @requirements.first.first # grab the operator
     end
 
     def to_s # :nodoc:
       as_list.join ", "
     end
 
-    def <=>(other) # :nodoc:
-      to_s <=> other.to_s
+    def == other # :nodoc:
+      Gem::Requirement === other and to_s == other.to_s
     end
 
     private
 
-    def fix_syck_default_key_in_requirements
+    def fix_syck_default_key_in_requirements # :nodoc:
       Gem.load_yaml
 
       # Fixup the Syck DefaultKey bug
@@ -196,13 +278,10 @@ module Pod::Vendor
     end
   end
 
-  # :stopdoc:
-  # Gem::Version::Requirement is used in a lot of old YAML specs. It's aliased
-  # here for backwards compatibility. I'd like to remove this, maybe in RubyGems
-  # 2.0.
-
-  # ::Gem::Version::Requirement = ::Gem::Requirement
-  Gem::Version::Requirement = Gem::Requirement
-  # :startdoc:
+  class Gem::Version
+    # This is needed for compatibility with older yaml
+    # gemspecs.
 
+    Requirement = Gem::Requirement # :nodoc:
+  end
 end

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

@@ -24,6 +24,11 @@ module Pod::Vendor
   # 3. 1.0.a.2
   # 4. 0.9
   #
+  # If you want to specify a version restriction that includes both prereleases
+  # and regular releases of the 1.x series this is the best way:
+  #
+  #   s.add_dependency 'example', '>= 1.0.0.a', '< 2.0.0'
+  #
   # == How Software Changes
   #
   # Users expect to be able to specify a version constraint that gives them
@@ -83,8 +88,8 @@ module Pod::Vendor
   #
   # * Any "public" release of a gem should have a different version.  Normally
   #   that means incrementing the build number.  This means a developer can
-  #   generate builds all day long for himself, but as soon as he/she makes a
-  #   public release, the version must be updated.
+  #   generate builds all day long, but as soon as they make a public release,
+  #   the version must be updated.
   #
   # === Examples
   #
@@ -101,26 +106,25 @@ module Pod::Vendor
   # Version 1.1.1:: Fixed a bug in the linked list implementation.
   # Version 1.1.2:: Fixed a bug introduced in the last fix.
   #
-  # Client A needs a stack with basic push/pop capability.  He writes to the
-  # original interface (no <tt>top</tt>), so his version constraint looks
-  # like:
+  # Client A needs a stack with basic push/pop capability.  They write to the
+  # original interface (no <tt>top</tt>), so their version constraint looks like:
   #
   #   gem 'stack', '~> 0.0'
   #
   # Essentially, any version is OK with Client A.  An incompatible change to
-  # the library will cause him grief, but he is willing to take the chance (we
-  # call Client A optimistic).
+  # the library will cause them grief, but they are willing to take the chance
+  # (we call Client A optimistic).
   #
-  # Client B is just like Client A except for two things: (1) He uses the
-  # <tt>depth</tt> method and (2) he is worried about future
-  # incompatibilities, so he writes his version constraint like this:
+  # Client B is just like Client A except for two things: (1) They use the
+  # <tt>depth</tt> method and (2) they are worried about future
+  # incompatibilities, so they write their version constraint like this:
   #
   #   gem 'stack', '~> 0.1'
   #
   # The <tt>depth</tt> method was introduced in version 0.1.0, so that version
   # or anything later is fine, as long as the version stays below version 1.0
   # where incompatibilities are introduced.  We call Client B pessimistic
-  # because he is worried about incompatible future changes (it is OK to be
+  # because they are worried about incompatible future changes (it is OK to be
   # pessimistic!).
   #
   # == Preventing Version Catastrophe:
@@ -131,8 +135,8 @@ module Pod::Vendor
   # specify your dependency as ">= 2.0.0" then, you're good, right? What
   # happens if fnord 3.0 comes out and it isn't backwards compatible
   # with 2.y.z? Your stuff will break as a result of using ">=". The
-  # better route is to specify your dependency with an "optimistic" version
-  # specifier. They're a tad confusing, so here is how the dependency
+  # better route is to specify your dependency with an "approximate" version
+  # specifier ("~>"). They're a tad confusing, so here is how the dependency
   # specifiers work:
   #
   #   Specification From  ... To (exclusive)
@@ -141,196 +145,216 @@ module Pod::Vendor
   #   "~> 3.0.0"    3.0.0 ... 3.1
   #   "~> 3.5"      3.5   ... 4.0
   #   "~> 3.5.0"    3.5.0 ... 3.6
+  #   "~> 3"        3.0   ... 4.0
+  #
+  # For the last example, single-digit versions are automatically extended with
+  # a zero to give a sensible result.
 
-  module Gem
-    class Version
-      autoload :Requirement, 'rubygems/requirement'
+  class Gem::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]+)*(-[0-9A-Za-z-]+(\.[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_method :to_s, :version
+    def version
+      @version.dup
+    end
 
-      ##
-      # True if the +version+ string matches RubyGems' requirements.
+    alias to_s version
 
-      def self.correct?(version)
-        version.to_s =~ ANCHORED_VERSION_PATTERN
-      end
+    ##
+    # True if the +version+ string matches RubyGems' requirements.
+
+    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
-        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 self === input then # check yourself before you wreck yourself
+        input
+      elsif input.nil? then
+        nil
+      else
+        new input
       end
+    end
 
-      ##
-      # Constructs a Version from the +version+ string.  A version string is a
-      # series of digits or ASCII letters separated by dots.
+    @@all = {}
 
-      def initialize(version)
-        unless self.class.correct?(version)
-          raise ArgumentError, "Malformed version number string #{version}"
-        end
+    def self.new version # :nodoc:
+      return super unless Gem::Version == self
 
-        @version = version.to_s
-        @version.strip!
-      end
+      @@all[version] ||= super
+    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.
+    ##
+    # Constructs a Version from the +version+ string.  A version string is a
+    # series of digits or ASCII letters separated by dots.
 
-      def bump
-        segments = self.segments.dup
-        segments.pop while segments.any? { |s| String === s }
-        segments.pop if segments.size > 1
+    def initialize version
+      raise ArgumentError, "Malformed version number string #{version}" unless
+        self.class.correct?(version)
 
-        segments[-1] = segments[-1].succ
-        self.class.new segments.join(".")
-      end
+      @version = version.to_s.strip.gsub("-",".pre.")
+      @segments = nil
+    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".
+    ##
+    # 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 eql?(other)
-        self.class === other and @version == other.version
-      end
+    def bump
+      segments = self.segments.dup
+      segments.pop while segments.any? { |s| String === s }
+      segments.pop if segments.size > 1
 
-      def hash # :nodoc:
-        @hash ||= segments.hash
-      end
+      segments[-1] = segments[-1].succ
+      self.class.new segments.join(".")
+    end
 
-      def init_with(coder) # :nodoc:
-        yaml_initialize coder.tag, coder.map
-      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".
 
-      def inspect # :nodoc:
-        "#<#{self.class} #{version.inspect}>"
-      end
+    def eql? other
+      self.class === other and @version == other.version
+    end
 
-      ##
-      # Dump only the raw version string, not the complete object. It's a
-      # string for backwards (RubyGems 1.3.5 and earlier) compatibility.
+    def hash # :nodoc:
+      @hash ||= segments.hash
+    end
 
-      def marshal_dump
-        [version]
-      end
+    def init_with coder # :nodoc:
+      yaml_initialize coder.tag, coder.map
+    end
 
-      ##
-      # Load custom marshal format. It's a string for backwards (RubyGems
-      # 1.3.5 and earlier) compatibility.
+    def inspect # :nodoc:
+      "#<#{self.class} #{version.inspect}>"
+    end
 
-      def marshal_load(array)
-        initialize array[0]
-      end
+    ##
+    # Dump only the raw version string, not the complete object. It's a
+    # string for backwards (RubyGems 1.3.5 and earlier) compatibility.
 
-      def yaml_initialize(tag, map)
-        @version = map['version']
-        @segments = nil
-        @hash = nil
-      end
+    def marshal_dump
+      [version]
+    end
 
-      ##
-      # A version is considered a prerelease if it contains a letter.
+    ##
+    # Load custom marshal format. It's a string for backwards (RubyGems
+    # 1.3.5 and earlier) compatibility.
 
-      def prerelease?
-        @prerelease ||= @version =~ /[a-zA-Z]/
-      end
+    def marshal_load array
+      initialize array[0]
+    end
 
-      def pretty_print(q) # :nodoc:
-        q.text "Gem::Version.new(#{version.inspect})"
-      end
+    def yaml_initialize(tag, map) # :nodoc:
+      @version = map['version']
+      @segments = nil
+      @hash = nil
+    end
 
-      ##
-      # The release for this version (e.g. 1.2.0.a -> 1.2.0).
-      # Non-prerelease versions return themselves.
+    def to_yaml_properties # :nodoc:
+      ["@version"]
+    end
 
-      def release
-        return self unless prerelease?
+    def encode_with coder # :nodoc:
+      coder.add 'version', @version
+    end
 
-        segments = self.segments.dup
-        segments.pop while segments.any? { |s| String === s }
-        self.class.new segments.join('.')
-      end
+    ##
+    # A version is considered a prerelease if it contains a letter.
+
+    def prerelease?
+      @prerelease ||= !!(@version =~ /[a-zA-Z]/)
+    end
 
-      def segments # :nodoc:
+    def pretty_print q # :nodoc:
+      q.text "Gem::Version.new(#{version.inspect})"
+    end
 
-        # segments is lazy so it can pick up version values that come from
-        # old marshaled versions, which don't go through marshal_load.
+    ##
+    # The release for this version (e.g. 1.2.0.a -> 1.2.0).
+    # Non-prerelease versions return themselves.
 
-        @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
-          /^\d+$/ =~ s ? s.to_i : s
-        end
-      end
+    def release
+      return self unless prerelease?
 
-      ##
-      # A recommended version for use with a ~> Requirement.
+      segments = self.segments.dup
+      segments.pop while segments.any? { |s| String === s }
+      self.class.new segments.join('.')
+    end
 
-      def optimistic_recommendation
-        segments = self.segments.dup
+    def segments # :nodoc:
 
-        segments.pop    while segments.any? { |s| String === s }
-        segments.pop    while segments.size > 2
-        segments.push 0 while segments.size < 2
+      # segments is lazy so it can pick up version values that come from
+      # old marshaled versions, which don't go through marshal_load.
 
-        "~> #{segments.join(".")}"
+      @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.
 
-      ##
-      # 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 approximate_recommendation
+      segments = self.segments.dup
 
-      def <=>(other)
-        return unless Gem::Version === other
-        return 0 if @version == other.version
+      segments.pop    while segments.any? { |s| String === s }
+      segments.pop    while segments.size > 2
+      segments.push 0 while segments.size < 2
 
-        lhsegments = segments
-        rhsegments = other.segments
+      "~> #{segments.join(".")}"
+    end
 
-        lhsize = lhsegments.size
-        rhsize = rhsegments.size
-        limit  = (lhsize > rhsize ? lhsize : rhsize) - 1
+    ##
+    # 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+.
 
-        i = 0
+    def <=> other
+      return unless Gem::Version === other
+      return 0 if @version == other.version
 
-        while i <= limit
-          lhs, rhs = lhsegments[i] || 0, rhsegments[i] || 0
-          i += 1
+      lhsegments = segments
+      rhsegments = other.segments
 
-          next      if lhs == rhs
-          return -1 if String  === lhs && Numeric === rhs
-          return  1 if Numeric === lhs && String  === rhs
+      lhsize = lhsegments.size
+      rhsize = rhsegments.size
+      limit  = (lhsize > rhsize ? lhsize : rhsize) - 1
 
-          return lhs <=> rhs
-        end
+      i = 0
 
-        0
+      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
+
+        return lhs <=> rhs
       end
-    end
 
+      return 0
+    end
   end
+
 end

data/lib/cocoapods-core/version.rb

@@ -57,7 +57,11 @@ module Pod
         version = Regexp.last_match[2]
         @head = true
       end
-      super(version)
+
+      raise ArgumentError, "Malformed version number string #{version}" unless
+        self.class.correct?(version)
+
+      @version = version.to_s.strip
     end
 
     # An instance that represents version 0.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.36.1
+  version: 0.36.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.15
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -78,6 +78,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/cocoapods-core.rb
 - lib/cocoapods-core/core_ui.rb
 - lib/cocoapods-core/dependency.rb
 - lib/cocoapods-core/gem_version.rb
@@ -86,37 +89,34 @@ files:
 - lib/cocoapods-core/lockfile.rb
 - lib/cocoapods-core/metrics.rb
 - lib/cocoapods-core/platform.rb
+- lib/cocoapods-core/podfile.rb
 - lib/cocoapods-core/podfile/dsl.rb
 - lib/cocoapods-core/podfile/target_definition.rb
-- lib/cocoapods-core/podfile.rb
 - lib/cocoapods-core/requirement.rb
+- lib/cocoapods-core/source.rb
 - lib/cocoapods-core/source/acceptor.rb
 - lib/cocoapods-core/source/aggregate.rb
 - lib/cocoapods-core/source/health_reporter.rb
-- lib/cocoapods-core/source.rb
+- lib/cocoapods-core/specification.rb
 - lib/cocoapods-core/specification/consumer.rb
+- lib/cocoapods-core/specification/dsl.rb
 - lib/cocoapods-core/specification/dsl/attribute.rb
 - lib/cocoapods-core/specification/dsl/attribute_support.rb
 - lib/cocoapods-core/specification/dsl/deprecations.rb
 - lib/cocoapods-core/specification/dsl/platform_proxy.rb
-- lib/cocoapods-core/specification/dsl.rb
 - lib/cocoapods-core/specification/json.rb
+- lib/cocoapods-core/specification/linter.rb
 - lib/cocoapods-core/specification/linter/analyzer.rb
 - lib/cocoapods-core/specification/linter/result.rb
-- lib/cocoapods-core/specification/linter.rb
 - lib/cocoapods-core/specification/root_attribute_accessors.rb
-- lib/cocoapods-core/specification/set/presenter.rb
 - lib/cocoapods-core/specification/set.rb
-- lib/cocoapods-core/specification.rb
+- lib/cocoapods-core/specification/set/presenter.rb
 - lib/cocoapods-core/standard_error.rb
+- lib/cocoapods-core/vendor.rb
 - lib/cocoapods-core/vendor/requirement.rb
 - lib/cocoapods-core/vendor/version.rb
-- lib/cocoapods-core/vendor.rb
 - lib/cocoapods-core/version.rb
 - lib/cocoapods-core/yaml_helper.rb
-- lib/cocoapods-core.rb
-- README.md
-- LICENSE
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
@@ -127,17 +127,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods