cocoapods-core 0.39.0 → 1.0.0.beta.1

data/lib/cocoapods-core/specification.rb

@@ -62,18 +62,12 @@ module Pod
     # @return [Bool] Whether the specifications are equal.
     #
     def ==(other)
-      # TODO
-      # self.class === other &&
-      #   attributes_hash == other.attributes_hash &&
-      #   subspecs == other.subspecs &&
-      to_s == other.to_s
+      other.is_a?(self.class) &&
+        name == other.name &&
+        version == other.version
     end
 
-    # @see ==
-    #
-    def eql?(other)
-      self == other
-    end
+    alias_method :eql?, :==
 
     # Return the hash value for this specification according to its attributes
     # hash.
@@ -86,7 +80,7 @@ module Pod
     # @return [Fixnum] The hash value.
     #
     def hash
-      to_s.hash
+      (name.hash * 53) ^ version.hash
     end
 
     # @return [String] A string suitable for representing the specification in
@@ -115,7 +109,6 @@ module Pod
     # @example  Input examples
     #
     #           "libPusher (1.0)"
-    #           "libPusher (HEAD based on 1.0)"
     #           "RestKit/JSON (1.0)"
     #
     # @return   [Array<String, Version>] the name and the version of a
@@ -326,12 +319,11 @@ module Pod
 
     # @!group DSL helpers
 
-    # @return [Bool] whether the specification should use a directory as it
+    # @return [Bool] whether the specification should use a directory as its
     #         source.
     #
     def local?
       return true if source[:path]
-      return true if source[:local]
       false
     end
 

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

@@ -104,15 +104,15 @@ module Pod
 
       # @!method cocoapods_version=(cocoapods_version)
       #
-      #   The version of CocoaPods that the sepcification supports.
+      #   The version of CocoaPods that the specification supports.
       #
-      # @example
+      #   @example
       #
-      #   spec.cocoapods_version = '>= 0.36'
+      #     spec.cocoapods_version = '>= 0.36'
       #
-      # @param  [String] cocoapods_version
-      #         the CocoaPods version that the specification supports.
-      #         CocoaPods follows [semantic versioning](http://semver.org).
+      #   @param  [String] cocoapods_version
+      #           the CocoaPods version that the specification supports.
+      #           CocoaPods follows [semantic versioning](http://semver.org).
       #
       root_attribute :cocoapods_version
 
@@ -170,19 +170,6 @@ module Pod
       #
       root_attribute :social_media_url
 
-      # @!method docset_url=(docset_url)
-      #
-      #   The URL for the docset for the Pod
-      #
-      #   @example
-      #
-      #     spec.docset_url = 'http://example.org/KFData/1.0.0/xcode-docset.atom'
-      #
-      #   @param  [String] docset_url
-      #           the docset URL.
-      #
-      root_attribute :docset_url
-
       #------------------#
 
       # The keys accepted by the license attribute.
@@ -483,7 +470,7 @@ module Pod
 
       # @!group Platform
       #
-      #   A specification should indicate the platforms and the correspondent
+      #   A specification should indicate the platform and the correspondent
       #   deployment targets on which the library is supported.
       #
       #   If not defined in a subspec the attributes of this group inherit the
@@ -504,7 +491,8 @@ module Pod
                 :inherited => true
 
       # The platform on which this Pod is supported. Leaving this blank
-      # means the Pod is supported on all platforms.
+      # means the Pod is supported on all platforms. When supporting multiple
+      # platforms you should use deployment_target below instead.
       #
       # @example
       #
@@ -1156,7 +1144,7 @@ module Pod
       #   We strongly **recommend** library developers to adopt [resource
       #   bundles](http://guides.cocoapods.org/syntax/podspec.html#resource_bundles)
       #   as there can be name collisions using the resources attribute.
-      #   Moreover resources specified with this attribute are copied
+      #   Moreover, resources specified with this attribute are copied
       #   directly to the client target and therefore they are not
       #   optimised by Xcode.
       #

data/lib/cocoapods-core/specification/dsl/deprecations.rb

@@ -4,12 +4,6 @@ module Pod
       # Provides warning and errors for the deprecated attributes of the DSL.
       #
       module Deprecations
-        def preferred_dependency=(name)
-          self.default_subspecs = [name]
-          CoreUI.warn "[#{self}] `preferred_dependency` has been renamed "\
-            'to `default_subspecs`.'
-        end
-
         DSL.attribute :xcconfig,
                       :container => Hash,
                       :inherited => true

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

@@ -22,20 +22,15 @@ module Pod
       #
       def to_hash
         hash = attributes_hash.dup
+        if root? || available_platforms != parent.available_platforms
+          platforms = Hash[available_platforms.map { |p| [p.name.to_s, p.deployment_target && p.deployment_target.to_s] }]
+          hash['platforms'] = platforms
+        end
         unless subspecs.empty?
           hash['subspecs'] = subspecs.map(&:to_hash)
         end
         hash
       end
-
-      # @return [Bool] Whether the specification can be converted to a hash
-      #         without loss of information.
-      #
-      # TODO: remove
-      #
-      def safe_to_hash?
-        true
-      end
     end
 
     # Configures a new specification from the given JSON representation.

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

@@ -77,12 +77,6 @@ module Pod
           attributes_hash['social_media_url']
         end
 
-        # @return [String] The docset URL.
-        #
-        def docset_url
-          attributes_hash['docset_url']
-        end
-
         # @return [Hash] A hash containing the license information of the Pod.
         #
         # @note   The indentation is stripped from the license text.

data/lib/cocoapods-core/version.rb

@@ -38,24 +38,15 @@ module Pod
     VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z\-]+)*'
     ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/
 
-    # @return [Bool] whether the version represents the `head` of repository.
-    #
-    attr_accessor :head
-    alias_method :head?, :head
-
     # @param  [String,Version] version
     #         A string representing a version, or another version.
     #
-    # @todo   The `from` part of the regular expression should be remove in
-    #         CocoaPods 1.0.0.
+    # @todo   Remove the `HEAD` code once everyone has migrated past 1.0.
     #
     def initialize(version)
-      if version.is_a?(Version) && version.head?
-        version = version.version
-        @head = true
-      elsif version.is_a?(String) && version =~ /HEAD (based on|from) (.*)/
-        version = Regexp.last_match[2]
-        @head = true
+      if version.is_a?(String) && version =~ /HEAD based on (.*)/
+        CoreUI.warn "Ignoring obsolete HEAD specifier in `#{version}`"
+        version = Regexp.last_match[1]
       end
 
       raise ArgumentError, "Malformed version number string #{version}" unless
@@ -68,19 +59,6 @@ module Pod
     #
     ZERO = new('0')
 
-    # @return [String] a string representation that indicates if the version is
-    #         head.
-    #
-    # @note   The raw version string is still accessible with the {#version}
-    #         method.
-    #
-    # @todo   Adding the head information to the string representation creates
-    #         issues (see Dependency#requirement).
-    #
-    def to_s
-      head? ? "HEAD based on #{super}" : super
-    end
-
     # @return [String] a string representation suitable for debugging.
     #
     def inspect
@@ -151,6 +129,68 @@ module Pod
     # @note   Attempts to compare something that's not a {Version} return nil
     #
     def <=>(other)
+      comparison = compare_segments(other)
+      comparison == 0 ? version <=> other.version : comparison
+    end
+
+    # @private
+    #
+    # Compares the versions for equality.
+    #
+    # @param  [Version] other
+    #         The other version to compare.
+    #
+    # @return [Boolean] whether the receiver is equal to other.
+    #
+    # @note   Attempts to compare something that's not a {Version} return nil
+    #
+    def ==(other)
+      compare_segments(other) == 0
+    end
+
+    # @private
+    #
+    # Compares the versions for equality.
+    #
+    # @param  [Version] other
+    #         The other version to compare.
+    #
+    # @return [Boolean] whether the receiver is greater than or equal to other.
+    #
+    # @note   Attempts to compare something that's not a {Version} return nil
+    #
+    def >=(other)
+      comparison = compare_segments(other)
+      comparison >= 0
+    end
+
+    # @private
+    #
+    # Compares the versions for equality.
+    #
+    # @param  [Version] other
+    #         The other version to compare.
+    #
+    # @return [Boolean] whether the receiver is less than or equal to other.
+    #
+    # @note   Attempts to compare something that's not a {Version} return nil
+    #
+    def <=(other)
+      comparison = compare_segments(other)
+      comparison <= 0
+    end
+
+    protected
+
+    def numeric_segments
+      segments.take_while { |s| s.is_a?(Numeric) }.reverse_each.drop_while { |s| s == 0 }.reverse
+    end
+
+    def prerelease_segments
+      segments.drop_while { |s| s.is_a?(Numeric) }
+    end
+
+    def compare_segments(other)
       return unless other.is_a?(Pod::Version)
       return 0 if @version == other.version
 
@@ -170,18 +210,7 @@ module Pod
 
       compare[numeric_segments, other.numeric_segments]
       compare[prerelease_segments, other.prerelease_segments]
-
-      version <=> other.version
-    end
-
-    protected
-
-    def numeric_segments
-      segments.take_while { |s| s.is_a?(Numeric) }.reverse_each.drop_while { |s| s == 0 }.reverse
-    end
-
-    def prerelease_segments
-      segments.drop_while { |s| s.is_a?(Numeric) }
+      0
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods-core/yaml_helper.rb

@@ -96,7 +96,7 @@ module Pod
         case value
         when Array      then process_array(value)
         when Hash       then process_hash(value, hash_keys_hint)
-        else                 YAML.dump(value).sub(/\A---/, '').sub(/[.]{3}\s*\Z/, '').strip
+        else                 YAML.dump(value, :line_width => -1).sub(/\A---/, '').sub(/[.]{3}\s*\Z/, '')
         end.strip
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 1.0.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods