Merge pull request #29 from nmccann/feature/subspec_dependency_fix

Issue 1460 Subspec dependency checking should no longer produce false-po...

lib/cocoapods-core/specification/dsl.rb

@@ -498,7 +498,17 @@ def deployment_target=(*args)
       def dependency(*args)
         name, *version_requirements = args
         raise Informative, "A specification can't require itself as a subspec" if name == self.name
-        raise Informative, "A subspec can't require one of its parents specifications" if @parent && @parent.name.include?(name)
+        if @parent
+          composed_name = ""
+          @parent.name.split("/").each do |component|
+            composed_name << component
+            if name == composed_name
+              raise Informative, "A subspec can't require one of its parents specifications"
+              break
+            end
+            composed_name << "/"
+          end
+        end
         raise Informative, "Unsupported version requirements" unless version_requirements.all? { |req| req.is_a?(String) }
         attributes_hash["dependencies"] ||= {}
         attributes_hash["dependencies"][name] = version_requirements

spec/specification/dsl_spec.rb

@@ -131,6 +131,15 @@ module Pod
           @spec.attributes_hash["dependencies"].should == {'SVStatusHUD' => []}
         end
 
+        it "allows a dependency whose name matches part of one of its parents names" do
+          @spec.subspec 'subspectest' do |sp|
+            sp.subspec 'subsubspec' do |ssp|
+              ssp.dependency('subspec')
+              ssp.attributes_hash["dependencies"].should == {'subspec' => []}
+            end
+          end
+        end
+
         it "raises if the specification requires itself" do
           should.raise Informative do
             @spec.dependency('Pod')
@@ -144,6 +153,15 @@ module Pod
           should.raise Informative do
             subspec.dependency('Pod')
           end.message.should.match /can't require one of its parents/
+
+          #Ensure nested subspecs are prevented from requiring one of their parents
+          @spec.subspec 'subspec' do |sp|
+            sp.subspec 'subsubspec' do |ssp|
+              should.raise Informative do
+                ssp.dependency('Pod/subspec')
+              end.message.should.match /can't require one of its parents/
+            end
+          end
         end
 
         it "raises if the requirements are not supported" do