Integrate product_refs of generated frameworks

lib/cocoapods/installer/target_installer.rb

@@ -36,7 +36,7 @@ module Pod
       # @return [void]
       #
       def add_target
-        product_type = target.requires_framework? ? :framework : :static_library
+        product_type = target.product_type
         name = target.label
         platform = target.platform.name
         deployment_target = target.platform.deployment_target.to_s

lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -102,7 +102,7 @@ module Pod
           frameworks = user_project.frameworks_group
           native_targets_to_integrate.each do |native_target|
             library = frameworks.files.select { |f| f.path == target.product_name }.first ||
-              frameworks.new_product_ref_for_target(target.name, :static_library)
+              frameworks.new_product_ref_for_target(target.name, target.product_type)
             unless native_target.frameworks_build_phase.files_references.include?(library)
               native_target.frameworks_build_phase.add_file_reference(library)
             end

lib/cocoapods/target.rb

@@ -27,11 +27,22 @@ module Pod
       label
     end
 
-    # @return [String] the name of the library.
+    # @return [String] the name of the product.
     #
     def product_name
+      if requires_framework?
+        "#{label}.framework"
+      else
         "lib#{label}.a"
       end
+    end
+
+    # @return [Symbol] either :framework or :static_library, depends on
+    #         #requires_framework?.
+    #
+    def product_type
+      requires_framework? ? :framework : :static_library
+    end
 
     # @return [String] the XCConfig namespaced prefix.
     #

spec/unit/target/aggregate_target_spec.rb

@@ -133,12 +133,24 @@ module Pod
             @target.host_requires_framework = true
           end
 
+          it 'returns the product name' do
+            @target.product_name.should == 'Pods.framework'
+          end
+
+          it 'returns :framework as product type' do
+            @target.product_type.should == :framework
+          end
+
           it 'returns that it requires being built as framework' do
             @target.requires_framework?.should == true
           end
         end
 
         describe 'Host does not requires frameworks' do
+          it 'returns the product name' do
+            @target.product_name.should == 'libPods.a'
+          end
+
           it 'returns :static_library as product type' do
             @target.product_type.should == :static_library
           end
@@ -160,6 +172,14 @@ module Pod
           @target.uses_swift?.should == true
         end
 
+        it 'returns the product name' do
+          @target.product_name.should == 'Pods.framework'
+        end
+
+        it 'returns :framework as product type' do
+          @target.product_type.should == :framework
+        end
+
         it 'returns that it requires being built as framework' do
           @target.requires_framework?.should == true
         end

spec/unit/target/pod_target_spec.rb

@@ -117,12 +117,28 @@ module Pod
             @pod_target.host_requires_framework = true
           end
 
+          it 'returns the product name' do
+            @pod_target.product_name.should == 'Pods-BananaLib.framework'
+          end
+
+          it 'returns :framework as product type' do
+            @pod_target.product_type.should == :framework
+          end
+
           it 'returns that it requires being built as framework' do
             @pod_target.requires_framework?.should == true
           end
         end
 
         describe 'Host does not requires frameworks' do
+          it 'returns the product name' do
+            @pod_target.product_name.should == 'libPods-BananaLib.a'
+          end
+
+          it 'returns :static_library as product type' do
+            @pod_target.product_type.should == :static_library
+          end
+
           it 'returns that it does not require being built as framework' do
             @pod_target.requires_framework?.should == false
           end
@@ -138,6 +154,14 @@ module Pod
           @pod_target.uses_swift?.should == true
         end
 
+        it 'returns the product name' do
+          @pod_target.product_name.should == 'Pods-OrangeFramework.framework'
+        end
+
+        it 'returns :framework as product type' do
+          @pod_target.product_type.should == :framework
+        end
+
         it 'returns that it requires being built as framework' do
           @pod_target.requires_framework?.should == true
         end