[PodfileValidator] Fix abstract-only dependency check

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 930de7aeb3f50eccf6d65b4d479daa3f5a956f87
+  revision: 9fd6c128f989655cf48b07f7145d73ad02ab0694
   branch: seg-podfile-refactor
   specs:
     cocoapods-core (0.39.0)

lib/cocoapods/installer/podfile_validator.rb

@@ -112,18 +112,11 @@ module Pod
       end
 
       def validate_no_abstract_only_pods!
-        abstract_pods = ->(target_definition) do
-          if !target_definition.abstract? || !target_definition.children.empty?
-            target_definition.children.flat_map do |td|
-              abstract_pods[td]
-            end
-          else
-            target_definition.dependencies
-          end
-        end
-        pods = podfile.root_target_definitions.flat_map(&abstract_pods).uniq
-        pods.each do |pod|
-          add_error "The dependency `#{pod}` is not used in any concrete target."
+        all_dependencies = podfile.dependencies
+        concrete_dependencies = podfile.target_definition_list.reject(&:abstract?).flat_map(&:dependencies).uniq
+        abstract_only_dependencies = all_dependencies - concrete_dependencies
+        abstract_only_dependencies.each do |dep|
+          add_error "The dependency `#{dep}` is not used in any concrete target."
         end
       end
     end

spec/unit/installer/podfile_validator_spec.rb

@@ -63,14 +63,124 @@ module Pod
       end
     end
 
-    it 'warns if the podfile does not contain any dependency' do
-      podfile = Pod::Podfile.new
-      validator = Installer::PodfileValidator.new(podfile)
-      validator.validate
-
-      validator.should.be.valid
-      validator.errors.should.be.empty
-      validator.warnings.should == ['The Podfile does not contain any dependencies.']
+    describe 'empty podfiles' do
+      it 'warns if the podfile does not contain any dependency' do
+        podfile = Pod::Podfile.new
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.be.valid
+        validator.errors.should.be.empty
+        validator.warnings.should == ['The Podfile does not contain any dependencies.']
+      end
+    end
+
+    describe 'abstract-only dependencies' do
+      it 'errors when there is only a root target' do
+        podfile = Pod::Podfile.new do
+          pod 'Alamofire'
+        end
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.not.be.valid
+        validator.errors.should == ['The dependency `Alamofire` is not used in any concrete target.']
+      end
+
+      it 'errors when there are only abstract targets' do
+        podfile = Pod::Podfile.new do
+          abstract_target 'Abstract' do
+            pod 'Alamofire'
+          end
+        end
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.not.be.valid
+        validator.errors.should == ['The dependency `Alamofire` is not used in any concrete target.']
+      end
+
+      it 'does not error when an abstract target has concrete children with complete inheritance' do
+        podfile = Pod::Podfile.new do
+          abstract_target 'Abstract' do
+            pod 'Alamofire'
+            target 'Concrete'
+          end
+        end
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.be.valid
+        validator.errors.should.be.empty
+      end
+
+      it 'errors when an abstract target has concrete children with no inheritance' do
+        podfile = Pod::Podfile.new do
+          abstract_target 'Abstract' do
+            pod 'Alamofire'
+            target 'Concrete' do
+              inherit! :none
+            end
+          end
+        end
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.not.be.valid
+        validator.errors.should == ['The dependency `Alamofire` is not used in any concrete target.']
+      end
+
+      it 'errors when an abstract target has concrete children with only search_paths inheritance' do
+        podfile = Pod::Podfile.new do
+          abstract_target 'Abstract' do
+            pod 'Alamofire'
+            target 'Concrete' do
+              inherit! :search_paths
+            end
+          end
+        end
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.not.be.valid
+        validator.errors.should == ['The dependency `Alamofire` is not used in any concrete target.']
+      end
+
+      it 'does not error when an abstract target has multiple children with varied inheritance' do
+        podfile = Pod::Podfile.new do
+          abstract_target 'Abstract' do
+            pod 'Alamofire'
+            target 'Concrete' do
+              inherit! :none
+            end
+            target 'Other Concrete' do
+            end
+          end
+        end
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.be.valid
+        validator.errors.should.be.empty
+      end
+
+      it 'does not error when an abstract target has multiple children with varied inheritance' do
+        podfile = Pod::Podfile.new do
+          abstract_target 'Abstract' do
+            pod 'Alamofire'
+            target 'Concrete' do
+              inherit! :search_paths
+            end
+            target 'Other Concrete' do
+            end
+          end
+        end
+        validator = Installer::PodfileValidator.new(podfile)
+        validator.validate
+
+        validator.should.be.valid
+        validator.errors.should.be.empty
+      end
     end
   end
 end