cocoapods 0.13.0 → 0.14.0.rc1

data/lib/cocoapods/specification.rb

@@ -174,6 +174,12 @@ module Pod
     end
     attr_writer :name
 
+    # @return [String] The name of the pod.
+    #
+    def pod_name
+      top_level_parent.name
+    end
+
     ### Attributes that return the first value defined in the chain
 
     def platform
@@ -387,14 +393,14 @@ module Pod
       # Remove this spec's name from the beginning of the name we’re looking for
       # and take the first component from the remainder, which is the spec we need
       # to find now.
-      remainder = name[self.name.size+1..-1].split('/')
-      subspec_name = remainder.shift
+      remainder = name[self.name.size+1..-1]
+      raise Informative, "Unable to find a specification named `#{name}' in `#{pod_name}'." unless remainder
+      subspec_name = remainder.split('/').shift
       subspec = subspecs.find { |s| s.name == "#{self.name}/#{subspec_name}" }
+      raise Informative, "Unable to find a specification named `#{name}' in `#{pod_name}'." unless subspec
       # If this was the last component in the name, then return the subspec,
       # otherwise we recursively keep calling subspec_by_name until we reach the
       # last one and return that
-
-      raise Informative, "Unable to find a subspec named `#{name}'." unless subspec
       remainder.empty? ? subspec : subspec.subspec_by_name(name)
     end
 
@@ -402,16 +408,8 @@ module Pod
       !source.nil? && !source[:local].nil?
     end
 
-    def local_path
-      Pathname.new(File.expand_path(source[:local]))
-    end
-
     def pod_destroot
-      if local?
-        local_path
-      else
-        config.project_pods_root + top_level_parent.name
-      end
+      config.project_pods_root + top_level_parent.name
     end
 
     def self.pattern_list(patterns)

data/lib/cocoapods/specification/set.rb

@@ -8,22 +8,18 @@ module Pod
       def initialize(pod_dir)
         @pod_dir = pod_dir
         @required_by = []
+        @dependencies = []
       end
 
-      def required_by(specification)
-        # Skip subspecs because the can't require a different version of the top level parent
-        return if !specification.podfile? && specification.top_level_parent.name == name
-
-        dependency = specification.dependency_by_top_level_spec_name(name)
-        # TODO we don’t actually do anything in our Version subclass. Maybe we should just remove that.
+      def required_by(dependency, dependent_name)
         unless @required_by.empty? || dependency.requirement.satisfied_by?(Gem::Version.new(required_version.to_s))
-          # TODO add graph that shows which dependencies led to this.
-          raise Informative, "#{specification} tries to activate `#{dependency}', " \
+          raise Informative, "#{dependent_name} tries to activate `#{dependency}', " \
                              "but already activated version `#{required_version}' " \
                              "by #{@required_by.to_sentence}."
         end
         @specification = nil
-        @required_by << specification
+        @required_by << dependent_name
+        @dependencies << dependency
       end
 
       def specification_by_name(name)
@@ -31,8 +27,8 @@ module Pod
       end
 
       def dependency
-        @required_by.inject(Dependency.new(name)) do |previous, spec|
-          previous.merge(spec.dependency_by_top_level_spec_name(name).to_top_level_spec_dependency)
+        @dependencies.inject(Dependency.new(name)) do |previous, dependency|
+          previous.merge(dependency.to_top_level_spec_dependency)
         end
       end
 
@@ -76,6 +72,7 @@ module Pod
         def initialize(specification)
           @specification = specification
           @required_by = []
+          @dependencies = []
         end
 
         def name
@@ -86,9 +83,9 @@ module Pod
           self.class === other && name == other.name
         end
 
-        def required_by(specification)
+        def required_by(dependency, dependent_name)
           before = @specification
-          super(specification)
+          super(dependency, dependent_name)
         ensure
           @specification = before
         end

data/lib/cocoapods/version.rb

@@ -1,9 +1,26 @@
-
-
 module Pod
   class Version < Gem::Version
+
+    # @returns A Version described by its #to_s method.
+    #
+    # @TODO The `from' part of the regexp should be remove before 1.0.0.
+    #
+    def self.from_string(string)
+      if string =~ /HEAD (based on|from) (.*)/
+        v = Version.new($2)
+        v.head = true
+        v
+      else
+        Version.new(string)
+      end
+    end
+
     attr_accessor :head
     alias_method :head?, :head
+
+    def to_s
+      head? ? "HEAD based on #{super}" : super
+    end
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.13.0
-  prerelease: 
+  version: 0.14.0.rc1
+  prerelease: 7
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -191,6 +191,7 @@ files:
 - lib/cocoapods/command/install.rb
 - lib/cocoapods/command/linter.rb
 - lib/cocoapods/command/list.rb
+- lib/cocoapods/command/outdated.rb
 - lib/cocoapods/command/presenter/cocoa_pod.rb
 - lib/cocoapods/command/presenter.rb
 - lib/cocoapods/command/push.rb
@@ -198,6 +199,7 @@ files:
 - lib/cocoapods/command/search.rb
 - lib/cocoapods/command/setup.rb
 - lib/cocoapods/command/spec.rb
+- lib/cocoapods/command/update.rb
 - lib/cocoapods/command.rb
 - lib/cocoapods/config.rb
 - lib/cocoapods/dependency.rb
@@ -219,6 +221,7 @@ files:
 - lib/cocoapods/installer/user_project_integrator.rb
 - lib/cocoapods/installer.rb
 - lib/cocoapods/local_pod.rb
+- lib/cocoapods/lockfile.rb
 - lib/cocoapods/open_uri.rb
 - lib/cocoapods/platform.rb
 - lib/cocoapods/podfile.rb
@@ -250,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4262586361152659558
+      hash: 202149505213323645
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: