[FileReferencesInstaller] Ensure that headers from vendored frameworks do not…

[FileReferencesInstaller] Ensure that headers from vendored frameworks do not end up in the HEADER_SEARCH_PATH when using modules.

CHANGELOG.md

@@ -12,8 +12,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
-* None.  
-
+* Headers from vendored frameworks no longer end up in the HEADER_SEARCH_PATH when 
+  using frameworks. They are assumed to be already present as modular headers in the
+  framework itself.  
+  [Mark Spanbroek](https://github.com/markspanbroek)
+  [#5146](https://github.com/CocoaPods/CocoaPods/pull/5146)
 
 ## 1.0.0.beta.7 (2016-04-15)
 

lib/cocoapods/installer/file_references_installer.rb

@@ -135,8 +135,10 @@ module Pod
                 end
               end
 
-              vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files|
-                sandbox.public_headers.add_files(namespaced_path, files)
+              unless pod_target.requires_frameworks?
+                vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files|
+                  sandbox.public_headers.add_files(namespaced_path, files)
+                end
               end
             end
           end

spec/unit/installer/file_references_installer_spec.rb

@@ -106,6 +106,14 @@ module Pod
         monkey_header = headers_root + 'monkey/monkey.h'
         monkey_header.should.exist
       end
+
+      it "doesn't link public headers from vendored framework, when frameworks required" do
+        Target.any_instance.stubs(:requires_frameworks?).returns(true)
+        @installer.install!
+        headers_root = config.sandbox.public_headers.root
+        framework_header = headers_root + 'BananaLib/Bananalib/Bananalib.h'
+        framework_header.should.not.exist
+      end
     end
 
     #-------------------------------------------------------------------------#