cocoapods-core 0.17.0.rc2 → 0.17.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a836c9588ccd3360f815711c6fa330f3ba985bf
-  data.tar.gz: d73fd15ad606d93ed8341ca3ef011685cdfc4ca4
+  metadata.gz: 3fe88a6f9588e89807e637665aaa1e67f6c1b1dc
+  data.tar.gz: 87c2e36c0d9f900e0b812a5fa2d31f5d8c5e8aac
 SHA512:
-  metadata.gz: 97eec73f16675a02d3aec24c4c8256b48d78be78ecf8fddbc837707ae913d2c2a632fcc2e301476cefce9806ecd70c4accf23d89775ca6228ad9022aea964bce
-  data.tar.gz: 701710ba878f52dbfb270ec94430a2820085fa60abff0accc27a9b256920be72a5f664a72fd420487d7efabd0ef2cf491930e45e787931443d9161b2274c1d15
+  metadata.gz: 274290c605f8e34c8dd2aebaa8e5cf3b87ae49f53c0e8a922ee475d65e7e65091d4d064fc54d53e6a57b5aef6f9382722ffc586f01ea45201f5bd090e48894df
+  data.tar.gz: 908d53de3c53997e9e2d249a06104888468469f32144880cfb188387aab1a51cfdfcc1939e65ee67b181bb61376df3cc0a9e8f12082399516fdd5b0ebb4697c0

data/lib/cocoapods-core/gem_version.rb

@@ -2,5 +2,5 @@ module Pod
 
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '0.17.0.rc2' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '0.17.0.rc3' unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/lockfile.rb

@@ -53,6 +53,12 @@ module Pod
     #
     attr_accessor :defined_in_file
 
+    # @return [Bool] Whether the Podfiles are equal.
+    #
+    def ==(other)
+      other && self.to_hash == other.to_hash
+    end
+
     # @return [String] a string representation suitable for UI output.
     #
     def to_s

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

@@ -10,10 +10,6 @@ module Pod
     #
     class TargetDefinition
 
-      # @return [String, Symbol] the name of the target definition.
-      #
-      attr_reader :name
-
       # @return [TargetDefinition, Podfile] the parent target definition or the
       #         Podfile if the receiver is root.
       #
@@ -28,12 +24,14 @@ module Pod
       # @option options [Bool] :exclusive
       #         @see exclusive?
       #
-      def initialize(name, parent, internal_hash = {})
-        @name = name
+      def initialize(name, parent, internal_hash = nil)
+        @internal_hash = internal_hash || {}
         @parent = parent
-        @internal_hash = internal_hash
         @children = []
 
+        unless internal_hash
+          self.name = name 
+        end
         if parent.is_a?(TargetDefinition)
           parent.children << self
         end
@@ -98,7 +96,7 @@ module Pod
       #         name.
       #
       def label
-        if root? && name == :default
+        if root? && name == "Pods"
           "Pods"
         elsif exclusive? || parent.nil?
           "Pods-#{name}"
@@ -125,6 +123,27 @@ module Pod
 
       # @!group Attributes
 
+      # @return [String] the path of the project this target definition should
+      #         link with.
+      #
+      def name
+        get_hash_value('name')
+      end
+
+      # Sets the path of the user project this target definition should link
+      # with.
+      #
+      # @param  [String] path
+      #         The path of the project.
+      #
+      # @return [void]
+      #
+      def name=(name)
+        set_hash_value('name', name)
+      end
+
+      #--------------------------------------#
+
       # Returns whether the target definition should inherit the dependencies
       # of the parent.
       #
@@ -156,11 +175,12 @@ module Pod
 
       #--------------------------------------#
 
-      # @return [Array<String>] the list of the names of the Xcode targets with
+      # @return [Array<String>] The list of the names of the Xcode targets with
       #         which this target definition should be linked with.
       #
       def link_with
-        get_hash_value('link_with')
+        value = get_hash_value('link_with')
+        value unless value.nil? || value.empty?
       end
 
       # Sets the client targets that should be integrated by this definition.
@@ -176,6 +196,33 @@ module Pod
 
       #--------------------------------------#
 
+      # Returns whether the target definition should link with the first target
+      # of the project.
+      #
+      # @note   This option is ignored if {link_with} is set.
+      #
+      # @return [Bool] whether is exclusive.
+      #
+      def link_with_first_target?
+        get_hash_value('link_with_first_target') unless link_with
+      end
+
+      # Sets whether the target definition should link with the first target of
+      # the project.
+      #
+      # @note   This option is ignored if {link_with} is set.
+      #
+      # @param  [Bool] flag
+      #         Whether the definition should link with the first target.
+      #
+      # @return [void]
+      #
+      def link_with_first_target=(flag)
+        set_hash_value('link_with_first_target', flag)
+      end
+
+      #--------------------------------------#
+
       # @return [String] the path of the project this target definition should
       #         link with.
       #
@@ -357,10 +404,12 @@ module Pod
       #         target definition.
       #
       HASH_KEYS = [
+        'name',
         'platform',
         'podspecs',
         'exclusive',
         'link_with',
+        'link_with_first_target',
         'inhibit_all_warnings',
         'user_project_path',
         'build_configurations',
@@ -373,7 +422,7 @@ module Pod
       def to_hash
         hash = internal_hash.dup
         unless children.empty?
-          hash['children'] = Hash[children.map { |child| [child.name, child.to_hash] }]
+          hash['children'] = children.map(&:to_hash)
         end
         hash
       end
@@ -385,12 +434,12 @@ module Pod
       #
       # @return [TargetDefinition] the new target definition
       #
-      def self.from_hash(name, hash, parent)
+      def self.from_hash(hash, parent)
         internal_hash = hash.dup
-        children_hashes = internal_hash.delete('children') || {}
-        definition = TargetDefinition.new(name, parent, internal_hash)
-        children_hashes.each do |child_name, child_hash|
-          TargetDefinition.from_hash(child_name, child_hash, definition)
+        children_hashes = internal_hash.delete('children') || []
+        definition = TargetDefinition.new(nil, parent, internal_hash)
+        children_hashes.each do |child_hash|
+          TargetDefinition.from_hash(child_hash, definition)
         end
         definition
       end

data/lib/cocoapods-core/podfile.rb

@@ -46,7 +46,8 @@ module Pod
       self.defined_in_file = defined_in_file
       @internal_hash = internal_hash
       if block
-        default_target_def = TargetDefinition.new(:default, 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
         instance_eval(&block)
@@ -182,7 +183,7 @@ module Pod
     #
     def to_hash
       hash = {}
-      hash['target_definitions'] = Hash[root_target_definitions.map { |child| [child.name, child.to_hash] }]
+      hash['target_definitions'] = root_target_definitions.map(&:to_hash)
       hash.merge!(internal_hash)
       hash
     end
@@ -262,8 +263,8 @@ module Pod
       internal_hash = hash.dup
       target_definitions = internal_hash.delete('target_definitions') || []
       podfile = Podfile.new(path,internal_hash)
-      target_definitions.each do |name, definition_hash|
-        definition = TargetDefinition.from_hash(name, definition_hash, podfile)
+      target_definitions.each do |definition_hash|
+        definition = TargetDefinition.from_hash(definition_hash, podfile)
         podfile.root_target_definitions << definition
       end
       podfile

data/lib/cocoapods-core/source.rb

@@ -44,7 +44,7 @@ module Pod
       name <=> other.name
     end
 
-    #---------------------------------------------------------------------------#
+    #-------------------------------------------------------------------------#
 
     # @!group Queering the source
 
@@ -79,19 +79,33 @@ module Pod
 
     # @return [Specification] the specification for a given version of Pod.
     #
+    # @param  @see specification_path
+    #
+    def specification(name, version)
+      Specification.from_file(specification_path(name, version))
+    end
+
+    # Returns the path of the specification with the given name and version.
+    #
     # @param  [String] name
     #         the name of the Pod.
     #
     # @param  [Version,String] version
     #         the version for the specification.
     #
-    def specification(name, version)
+    # @return [Pathname] The path of the specification.
+    #
+    def specification_path(name, version)
       path = repo + name + version.to_s
       specification_path = path + "#{name}.podspec.yaml"
       unless specification_path.exist?
         specification_path = path + "#{name}.podspec"
       end
-      Specification.from_file(specification_path)
+      unless specification_path.exist?
+        raise StandardError, "Unable to find the specification #{name} " \
+          "(#{version}) in the #{name} source."
+      end
+      specification_path
     end
 
     # @return [Array<Specification>] all the specifications contained by the

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

@@ -144,7 +144,13 @@ module Pod
       def dependencies
         value = value_for_attribute(:dependencies)
         value.map do |name, requirements|
-          Dependency.new(name, requirements)
+          if Array(requirements).all?{ |req| req.is_a?(String) }
+            Dependency.new(name, requirements)
+          else
+            raise Informative, "Unsupported parameters for `#{name}` " \
+              "dependency `#{requirements.to_s}` in #{spec}.\n" \
+              "Specifications don't support external sources"
+          end
         end
       end
 

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

@@ -54,7 +54,8 @@ module Pod
       # @raise  If the versions requirement of the dependency are not
       #         compatible with the previously stored dependencies.
       #
-      # @todo   This should simply return a boolean. Is cocoaPods that should raise.
+      # @todo   This should simply return a boolean. Is CocoaPods that should
+      #         raise.
       #
       # @return [void]
       #
@@ -84,13 +85,16 @@ module Pod
       #         used to disambiguate.
       #
       def specification
-        unless @specification
-          sources = []
-          versions_by_source.each{ |source, versions| sources << source if versions.include?(required_version) }
-          source = sources.sort_by(&:name).first
-          @specification = source.specification(name, required_version)
+        @specification ||= Specification.from_file(specification_path_for_version(required_version))
+      end
+
+      def specification_path_for_version(version)
+        sources = []
+        versions_by_source.each do |source, source_versions|
+          sources << source if source_versions.include?(required_version)
         end
-        @specification
+        source = sources.sort_by(&:name).first
+        source.specification_path(name, required_version)
       end
 
       # @return [Version] the highest version that satisfies the stored
@@ -99,8 +103,12 @@ module Pod
       # @todo   This should simply return nil. CocoaPods should raise instead.
       #
       def required_version
-        versions.find { |v| dependency.match?(name, v) } ||
-          (raise StandardError, "Required version (#{dependency}) not found for `#{name}'.\nAvailable versions: #{versions.join(', ')}")
+        version = versions.find { |v| dependency.match?(name, v) }
+        unless version
+          raise StandardError, "Required version (#{dependency}) not found " \
+            "for `#{name}`.\nAvailable versions: #{versions.join(', ')}"
+        end
+        version
       end
 
       # @return [Array<Version>] all the available versions for the Pod, sorted
@@ -110,6 +118,18 @@ module Pod
         versions_by_source.values.flatten.uniq.sort.reverse
       end
 
+      # @return [Version] The highest version known of the specification.
+      #
+      def highest_version
+        versions.first
+      end
+
+      # @return [Pathname] The path of the highest version.
+      #
+      def highest_version_spec_path
+        specification_path_for_version(highest_version)
+      end
+
       # @return [Hash{Source => Version}] all the available versions for the
       #         Pod grouped by source.
       #
@@ -130,7 +150,30 @@ module Pod
       end
       alias_method :inspect, :to_s
 
-      #-------------------------------------------------------------------------#
+      # Returns a hash representation of the set composed by dumb data types.
+      #
+      # @example
+      #
+      #   "name" => "CocoaLumberjack",
+      #   "versions" => { "master" => [ "1.6", "1.3.3"] },
+      #   "highest_version" => "1.6",
+      #   "highest_version_spec" => 'REPO/CocoaLumberjack/1.6/CocoaLumberjack.podspec'
+      #
+      # @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
+        end
+        {
+          'name' => name,
+          'versions' => versions,
+          'highest_version' => highest_version.to_s,
+          'highest_version_spec' => highest_version_spec_path.to_s
+        }
+      end
+
+      #-----------------------------------------------------------------------#
 
       # The Set::External class handles Pods from external sources. Pods from
       # external sources don't use the {Source} and are initialized by a given

data/lib/cocoapods-core/specification.rb

@@ -66,7 +66,7 @@ module Pod
     #         go. This is used by the installer to group specifications by root
     #         spec.
     #
-    # @return [Bool] whether the specifications are equal.
+    # @return [Bool] Whether the specifications are equal.
     #
     def ==(other)
       # TODO

data/lib/cocoapods-core.rb

@@ -3,6 +3,14 @@
 module Pod
   require 'cocoapods-core/gem_version'
 
+  # Indicates a runtime error **not** caused by a bug.
+  #
+  class PlainInformative < StandardError; end
+
+  # Indicates an user error.
+  #
+  class Informative < PlainInformative; end
+
   require 'pathname'
   require 'cocoapods-core/vendor'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.17.0.rc2
+  version: 0.17.0.rc3
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport