cocoapods-core 1.2.0.beta.1 → 1.2.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69ea19b7583e1f450229e3d27a04ad04e3ea3d6
-  data.tar.gz: 068a342ddf1e3d9838dad052d04a87f5817686fe
+  metadata.gz: bcdc0738fd8535af76dcbfe33470090242d5dff8
+  data.tar.gz: 647aa799e28ec1c7400b726cdad6eef4c97abb6c
 SHA512:
-  metadata.gz: 95e31e5d32d740d247a2bf84383a067e053eb0fcc2ae6ef0301aeb2d987a95ea3537eb708068511e0217fda095cca11de5a607324e7fc531f9ff4c5631433374
-  data.tar.gz: 105e1bc517d0023b2ddd69deb89473b3fc8e38dbd2ead258e2693013d996c211c134edc5bf04cc302538999de58e269d32fc91f3bdf1ebd8e19104e90c7d4643
+  metadata.gz: 52c74ad3721c8150a5e629a4dc7558e5f547cd4ca2b08b9ac4d28a4019b67dd585a2ab6986925ba6f63d0a969d7e7a246ac5bfd0bb23bb1691c4a6bbc8256da6
+  data.tar.gz: 0fe89c693ad63eb5ad815f1301530138cb0517d807130c45d28575b0334575df4dee83e50a32ab2a83dfac8b3f39f4f30a4218d1dc884ee638c2d05b5be40090

data/lib/cocoapods-core/gem_version.rb

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

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

@@ -193,6 +193,9 @@ module Pod
         if root?
           raise Informative, 'Cannot set inheritance for the root target definition.'
         end
+        if abstract?
+          raise Informative, 'Cannot set inheritance for abstract target definition.'
+        end
         set_hash_value('inheritance', inheritance)
       end
 

data/lib/cocoapods-core/specification.rb

@@ -25,6 +25,10 @@ module Pod
     #
     attr_reader :parent
 
+    # @return [Integer] the cached hash value for this spec.
+    #
+    attr_reader :hash_value
+
     # @param  [Specification] parent @see parent
     #
     # @param  [String] name
@@ -35,6 +39,7 @@ module Pod
       @subspecs = []
       @consumers = {}
       @parent = parent
+      @hash_value = nil
       attributes_hash['name'] = name
 
       yield self if block_given?
@@ -80,7 +85,10 @@ module Pod
     # @return [Fixnum] The hash value.
     #
     def hash
-      (name.hash * 53) ^ version.hash
+      if @hash_value.nil?
+        @hash_value = (name.hash * 53) ^ version.hash
+      end
+      @hash_value
     end
 
     # @return [String] A string suitable for representing the specification in
@@ -582,6 +590,35 @@ module Pod
       @defined_in_file = file
     end
 
+    # Sets the name of the `podspec`.
+    #
+    # @param  [String] name
+    #         the `podspec` name.
+    #
+    # @return [void]
+    #
+    # @visibility private
+    #
+    def name=(name)
+      @hash_value = nil
+      attributes_hash['name'] = name
+    end
+
+    # Sets the version of the `podspec`.
+    #
+    # @param  [String] version
+    #         the `podspec` version.
+    #
+    # @return [void]
+    #
+    # @visibility private
+    #
+    def version=(version)
+      @hash_value = nil
+      attributes_hash['version'] = version
+      @version = nil
+    end
+
     # @!group Validation
 
     # Validates the cocoapods_version in the specification against the current version of Core.

data/lib/cocoapods-core/version.rb

@@ -30,12 +30,14 @@ module Pod
   # 4. 0.9
   #
   class Version < Pod::Vendor::Gem::Version
-    # Override the constants defined by the superclass to add Semantic
-    # Versioning prerelease support (with a dash). E.g.: 1.0.0-alpha1
+    # Override the constants defined by the superclass to add:
+    # - Semantic Versioning prerelease support (with a dash). E.g.: 1.0.0-alpha1
+    # - Semantic Versioning metadata support (with a +) E.g: 1.0.0+96ef7ed
     #
     # For more info, see: http://semver.org
     #
-    VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z\-]+)*'
+    METADATA_PATTERN = '(\+[0-9a-zA-Z\-\.]+)'
+    VERSION_PATTERN = "[0-9]+(\\.[0-9a-zA-Z\\-]+)*#{METADATA_PATTERN}?"
     ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/
 
     # @param  [String,Version] version
@@ -86,7 +88,7 @@ module Pod
 
     # @!group Semantic Versioning
 
-    SEMVER_PATTERN = '[0-9]+(\.[0-9]+(\.[0-9]+(-[0-9A-Za-z\-\.]+)?)?)?'
+    SEMVER_PATTERN = "[0-9]+(\\.[0-9]+(\\.[0-9]+(-[0-9A-Za-z\\-\\.]+)?#{METADATA_PATTERN}?)?)?"
     ANCHORED_SEMANTIC_VERSION_PATTERN = /\A\s*(#{SEMVER_PATTERN})*\s*\z/
 
     # @return [Bool] Whether the version conforms to the Semantic Versioning
@@ -182,6 +184,19 @@ module Pod
 
     protected
 
+    # This overrides the Gem::Version implementation of `_segments` to drop the
+    # metadata from comparisons as per http://semver.org/#spec-item-10
+    #
+    def _segments
+      # segments is lazy so it can pick up version values that come from
+      # old marshaled versions, which don't go through marshal_load.
+      # since this version object is cached in @@all, its @segments should be frozen
+
+      @segments ||= @version.sub(/#{METADATA_PATTERN}$/, '').scan(/[0-9]+|[a-z]+/i).map do |s|
+        /^\d+$/ =~ s ? s.to_i : s
+      end.freeze
+    end
+
     def numeric_segments
       segments.take_while { |s| s.is_a?(Numeric) }.reverse_each.drop_while { |s| s == 0 }.reverse
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta.1
+  version: 1.2.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,68 +9,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.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: |-
@@ -136,17 +136,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.6.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods