cocoapods 1.5.2 → 1.6.1

data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb

@@ -6,16 +6,22 @@ module Pod
         # the test targets included by each pod target.
         #
         class PodTargetIntegrator
-          # @return [PodTarget] the target that should be integrated.
+          # @return [TargetInstallationResult] the installation result of the target that should be integrated.
           #
-          attr_reader :target
+          attr_reader :target_installation_result
 
-          # Init a new PodTargetIntegrator.
+          # @return [InstallationOptions] the installation options from the Podfile.
           #
-          # @param  [PodTarget] target @see #target
+          attr_reader :installation_options
+
+          # Initialize a new instance
+          #
+          # @param  [TargetInstallationResult] target_installation_result @see #target_installation_result
+          # @param  [InstallationOptions] installation_options @see #installation_options
           #
-          def initialize(target)
-            @target = target
+          def initialize(target_installation_result, installation_options)
+            @target_installation_result = target_installation_result
+            @installation_options = installation_options
           end
 
           # Integrates the pod target.
@@ -24,13 +30,15 @@ module Pod
           #
           def integrate!
             UI.section(integration_message) do
-              target.test_specs_by_native_target.each do |native_target, test_specs|
-                add_embed_frameworks_script_phase(native_target)
-                add_copy_resources_script_phase(native_target)
-                UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(test_specs), native_target)
+              target_installation_result.test_specs_by_native_target.each do |test_native_target, test_specs|
+                test_specs.each do |test_spec|
+                  add_embed_frameworks_script_phase(test_native_target, test_spec)
+                  add_copy_resources_script_phase(test_native_target, test_spec)
+                end
+                UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(test_specs), test_native_target)
               end
               specs = target.non_test_specs
-              UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(specs), target.native_target)
+              UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(specs), target_installation_result.native_target)
             end
           end
 
@@ -49,19 +57,21 @@ module Pod
           #
           # @return [void]
           #
-          def add_copy_resources_script_phase(native_target)
-            test_type = target.test_type_for_product_type(native_target.symbol_type)
-            script_path = "${PODS_ROOT}/#{target.copy_resources_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
-            resource_paths = target.all_dependent_targets.flat_map do |dependent_target|
-              include_test_spec_paths = dependent_target == target
-              dependent_target.resource_paths(include_test_spec_paths)
-            end
+          def add_copy_resources_script_phase(native_target, test_spec)
+            script_path = "${PODS_ROOT}/#{target.copy_resources_script_path_for_test_spec(test_spec).relative_path_from(target.sandbox.root)}"
             input_paths = []
             output_paths = []
-            unless resource_paths.empty?
-              resource_paths_flattened = resource_paths.flatten.uniq
-              input_paths = [script_path, *resource_paths_flattened]
-              output_paths = UserProjectIntegrator::TargetIntegrator.resource_output_paths(resource_paths_flattened)
+            unless installation_options.disable_input_output_paths?
+              resource_paths = target.dependent_targets_for_test_spec(test_spec).flat_map do |dependent_target|
+                spec_paths_to_include = dependent_target.non_test_specs.map(&:name)
+                spec_paths_to_include << test_spec.name if dependent_target == target
+                dependent_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
+              end
+              unless resource_paths.empty?
+                resource_paths_flattened = resource_paths.flatten.uniq
+                input_paths = [script_path, *resource_paths_flattened]
+                output_paths = UserProjectIntegrator::TargetIntegrator.resource_output_paths(resource_paths_flattened)
+              end
             end
             UserProjectIntegrator::TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
             UserProjectIntegrator::TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
@@ -71,20 +81,22 @@ module Pod
           #
           # @return [void]
           #
-          def add_embed_frameworks_script_phase(native_target)
-            test_type = target.test_type_for_product_type(native_target.symbol_type)
-            script_path = "${PODS_ROOT}/#{target.embed_frameworks_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
-            all_dependent_targets = target.all_dependent_targets
-            framework_paths = all_dependent_targets.flat_map do |dependent_target|
-              include_test_spec_paths = dependent_target == target
-              dependent_target.framework_paths(include_test_spec_paths)
-            end
+          def add_embed_frameworks_script_phase(native_target, test_spec)
+            script_path = "${PODS_ROOT}/#{target.embed_frameworks_script_path_for_test_spec(test_spec).relative_path_from(target.sandbox.root)}"
             input_paths = []
             output_paths = []
-            unless framework_paths.empty?
-              input_paths = [script_path, *framework_paths.flat_map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.compact]
-              output_paths = framework_paths.flat_map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.compact
+            unless installation_options.disable_input_output_paths?
+              framework_paths = target.dependent_targets_for_test_spec(test_spec).flat_map do |dependent_target|
+                spec_paths_to_include = dependent_target.non_test_specs.map(&:name)
+                spec_paths_to_include << test_spec.name if dependent_target == target
+                dependent_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact.uniq
+              end
+              unless framework_paths.empty?
+                input_paths = [script_path, *framework_paths.flat_map { |fw| [fw.source_path, fw.dsym_path] }.compact]
+                output_paths = UserProjectIntegrator::TargetIntegrator.framework_output_paths(framework_paths)
+              end
             end
+
             UserProjectIntegrator::TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
             UserProjectIntegrator::TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
@@ -96,6 +108,12 @@ module Pod
             "Integrating target `#{target.name}`"
           end
 
+          # @return [PodTarget] the target part of the installation result.
+          #
+          def target
+            target_installation_result.target
+          end
+
           # @param [Array<Specification] specs
           #         the specs to return script phrases from.
           #

data/lib/cocoapods/installer/xcode/pods_project_generator/target_installation_result.rb

@@ -0,0 +1,93 @@
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        # A simple container produced after a target installation is completed.
+        #
+        class TargetInstallationResult
+          # @return [Target] target
+          #         The target this installation result is for.
+          #
+          attr_reader :target
+
+          # @return [PBXNativeTarget] native_target
+          #         The native target that was produced for this target.
+          #
+          attr_reader :native_target
+
+          # @return [Array<PBXNativeTarget>] resource_bundle_targets
+          #         The resource bundle targets that were produced for this target. Can be empty if the target had
+          #         no resource bundles.
+          #
+          attr_reader :resource_bundle_targets
+
+          # @return [Array<PBXNativeTarget>] test_native_targets
+          #         The test native targets that were produced for this target. Can be empty if there were no test
+          #         native targets created (e.g. no test specs present).
+          #
+          attr_reader :test_native_targets
+
+          # @return [Hash{String=>Array<PBXNativeTarget>}] test_resource_bundle_targets
+          #         The test resource bundle targets that were produced for this target keyed by test spec name.
+          #         Can be empty if the target had no resource bundles for any tests.
+          #
+          attr_reader :test_resource_bundle_targets
+
+          # @return [Array<PBXNativeTarget>] test_app_host_targets
+          #         The test app host native targets that were produced for this target. Can be empty.
+          #
+          attr_reader :test_app_host_targets
+
+          # Initialize a new instance
+          #
+          # @param [Target] target @see #target
+          # @param [PBXNativeTarget] native_target @see #native_target
+          # @param [Array<PBXNativeTarget>] resource_bundle_targets @see #resource_bundle_targets
+          # @param [Array<PBXNativeTarget>] test_native_targets @see #test_native_targets
+          # @param [Hash{String=>Array<PBXNativeTarget>}] test_resource_bundle_targets @see #test_resource_bundle_targets
+          # @param [Array<PBXNativeTarget>] test_app_host_targets @see #test_app_host_targets
+          #
+          def initialize(target, native_target, resource_bundle_targets = [], test_native_targets = [],
+                         test_resource_bundle_targets = {}, test_app_host_targets = [])
+            @target = target
+            @native_target = native_target
+            @resource_bundle_targets = resource_bundle_targets
+            @test_native_targets = test_native_targets
+            @test_resource_bundle_targets = test_resource_bundle_targets
+            @test_app_host_targets = test_app_host_targets
+          end
+
+          # Returns the corresponding native target to use based on the provided specification.
+          #
+          # @param  [Specification] spec
+          #         The specification to base from in order to find the native target.
+          #
+          # @return [PBXNativeTarget] the native target to use or `nil` if none is found.
+          #
+          def native_target_for_spec(spec)
+            return native_target unless spec.test_specification?
+            test_native_target_from_spec(spec)
+          end
+
+          # @return [Hash{PBXNativeTarget => Specification}] a hash where the keys are the test native targets and the value
+          #         an array of all the test specs associated with this native target.
+          #
+          def test_specs_by_native_target
+            test_specs_by_native_target = target.test_specs.group_by do |test_spec|
+              test_native_target_from_spec(test_spec)
+            end
+            test_specs_by_native_target.delete_if { |k, _| k.nil? }
+          end
+
+          private
+
+          def test_native_target_from_spec(spec)
+            test_native_targets.find do |test_native_target|
+              test_native_target.name == target.test_target_label(spec)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Pod
   class Installer
     class Xcode
@@ -7,11 +9,18 @@ module Pod
         # by the target.
         #
         class TargetInstaller
+          include TargetInstallerHelper
+
           # @return [Sandbox] sandbox
           #         The sandbox where the support files should be generated.
           #
           attr_reader :sandbox
 
+          # @return [Pod::Project]
+          #         The `Pods/Pods.xcodeproj` to install the target into.
+          #
+          attr_reader :project
+
           # @return [Target] target
           #         The library whose target needs to be generated.
           #
@@ -19,11 +28,13 @@ module Pod
 
           # Initialize a new instance
           #
-          # @param [Sandbox] sandbox @see sandbox
-          # @param [Target] target  @see target
+          # @param [Sandbox] sandbox @see #sandbox
+          # @param [Pod::Project] project @see #project
+          # @param [Target] target  @see #target
           #
-          def initialize(sandbox, target)
+          def initialize(sandbox, project, target)
             @sandbox = sandbox
+            @project = project
             @target = target
           end
 
@@ -38,28 +49,28 @@ module Pod
           #
           # @note   The `PODS_HEADERS_SEARCH_PATHS` overrides the xcconfig.
           #
-          # @return [void]
+          # @return [PBXNativeTarget] the native target that was added.
           #
           def add_target
             product_type = target.product_type
             name = target.label
             platform = target.platform.name
             language = target.uses_swift? ? :swift : :objc
-            @native_target = project.new_target(product_type, name, platform, deployment_target, nil, language)
+            native_target = project.new_target(product_type, name, platform, deployment_target, nil, language)
 
             product_name = target.product_name
-            product = @native_target.product_reference
+            product = native_target.product_reference
             product.name = product_name
 
             target.user_build_configurations.each do |bc_name, type|
-              @native_target.add_build_configuration(bc_name, type)
+              native_target.add_build_configuration(bc_name, type)
             end
 
-            @native_target.build_configurations.each do |configuration|
+            native_target.build_configurations.each do |configuration|
               configuration.build_settings.merge!(custom_build_settings)
             end
 
-            target.native_target = @native_target
+            native_target
           end
 
           # @return [String] The deployment target.
@@ -91,29 +102,6 @@ module Pod
             settings
           end
 
-          # @param [Generator] generator
-          #        the generator to use for generating the content.
-          #
-          # @param [Pathname] path
-          #        the pathname to save the content into.
-          #
-          # Saves the content the provided path unless the path exists and the contents are exactly the same.
-          #
-          # @return [Void]
-          #
-          def update_changed_file(generator, path)
-            path.dirname.mkpath
-            if path.exist?
-              generator.save_as(support_files_temp_dir)
-              unless FileUtils.identical?(support_files_temp_dir, path)
-                FileUtils.mv(support_files_temp_dir, path)
-              end
-            else
-              generator.save_as(path)
-            end
-            clean_support_files_temp_dir if support_files_temp_dir.exist?
-          end
-
           # Creates the directory where to store the support files of the target.
           #
           def create_support_files_dir
@@ -123,7 +111,7 @@ module Pod
           # Remove temp file whose store .prefix/config/dummy file.
           #
           def clean_support_files_temp_dir
-            support_files_temp_dir.rmtree
+            support_files_temp_dir.rmtree if support_files_temp_dir.exist?
           end
 
           # @return [String] The temp file path to store temporary files.
@@ -152,34 +140,36 @@ module Pod
           # @return [void]
           #
           def create_info_plist_file(path, native_target, version, platform, bundle_package_type = :fmwk)
-            UI.message "- Generating Info.plist file at #{UI.path(path)}" do
-              generator = Generator::InfoPlistFile.new(version, platform, bundle_package_type)
-              update_changed_file(generator, path)
-              add_file_to_support_group(path)
-
-              native_target.build_configurations.each do |c|
-                relative_path = path.relative_path_from(sandbox.root)
-                c.build_settings['INFOPLIST_FILE'] = relative_path.to_s
-              end
-            end
+            create_info_plist_file_with_sandbox(@sandbox, path, native_target, version, platform, bundle_package_type)
+            add_file_to_support_group(path)
           end
 
           # Creates the module map file which ensures that the umbrella header is
           # recognized with a customized path
           #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to link the module map file into.
+          #
           # @return [void]
           #
-          def create_module_map
-            path = target.module_map_path
+          def create_module_map(native_target)
+            path = target.module_map_path_to_write
             UI.message "- Generating module map file at #{UI.path(path)}" do
               generator = Generator::ModuleMap.new(target)
               yield generator if block_given?
               update_changed_file(generator, path)
               add_file_to_support_group(path)
 
+              linked_path = target.module_map_path
+              if path != linked_path
+                linked_path.dirname.mkpath
+                source = path.relative_path_from(linked_path.dirname)
+                FileUtils.ln_sf(source, linked_path)
+              end
+
+              relative_path_string = target.module_map_path.relative_path_from(sandbox.root).to_s
               native_target.build_configurations.each do |c|
-                relative_path = path.relative_path_from(sandbox.root)
-                c.build_settings['MODULEMAP_FILE'] = relative_path.to_s
+                c.build_settings['MODULEMAP_FILE'] = relative_path_string
               end
             end
           end
@@ -187,11 +177,16 @@ module Pod
           # Generates a header which ensures that all header files are exported
           # in the module map
           #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to link the umbrella header file into.
+          #
           # @yield_param [Generator::UmbrellaHeader]
           #              yielded once to configure the imports
           #
-          def create_umbrella_header
-            path = target.umbrella_header_path
+          # @return [void]
+          #
+          def create_umbrella_header(native_target)
+            path = target.umbrella_header_path_to_write
             UI.message "- Generating umbrella header at #{UI.path(path)}" do
               generator = Generator::UmbrellaHeader.new(target)
               yield generator if block_given?
@@ -200,10 +195,16 @@ module Pod
               # Add the file to the support group and the native target,
               # so it will been added to the header build phase
               file_ref = add_file_to_support_group(path)
-              native_target.add_file_references([file_ref])
+              build_file = native_target.headers_build_phase.add_file_reference(file_ref)
+
+              linked_path = target.umbrella_header_path
+              if path != linked_path
+                linked_path.dirname.mkpath
+                source = path.relative_path_from(linked_path.dirname)
+                FileUtils.ln_sf(source, linked_path)
+              end
 
               acl = target.requires_frameworks? ? 'Public' : 'Project'
-              build_file = native_target.headers_build_phase.build_file(file_ref)
               build_file.settings ||= {}
               build_file.settings['ATTRIBUTES'] = [acl]
             end
@@ -212,35 +213,27 @@ module Pod
           # Generates a dummy source file for each target so libraries that contain
           # only categories build.
           #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to link the dummy source file into.
+          #
           # @return [void]
           #
-          def create_dummy_source
+          def create_dummy_source(native_target)
             path = target.dummy_source_path
-            generator = Generator::DummySource.new(target.label)
-            update_changed_file(generator, path)
-            file_reference = add_file_to_support_group(path)
-            native_target.source_build_phase.add_file_reference(file_reference)
+            UI.message "- Generating dummy source at #{UI.path(path)}" do
+              generator = Generator::DummySource.new(target.label)
+              update_changed_file(generator, path)
+              file_reference = add_file_to_support_group(path)
+              native_target.source_build_phase.add_file_reference(file_reference)
+            end
           end
 
-          # @return [PBXNativeTarget] the target generated by the installation
-          #         process.
-          #
-          # @note   Generated by the {#add_target} step.
-          #
-          attr_reader :native_target
-
           private
 
           #-----------------------------------------------------------------------#
 
           # @!group Private helpers.
 
-          # @return [Project] the Pods project of the sandbox.
-          #
-          def project
-            sandbox.project
-          end
-
           # @return [PBXGroup] the group where the file references to the support
           #         files should be stored.
           #

data/lib/cocoapods/installer/xcode/pods_project_generator/target_installer_helper.rb

@@ -0,0 +1,72 @@
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        module TargetInstallerHelper
+          # @param [Generator] generator
+          #        the generator to use for generating the content.
+          #
+          # @param [Pathname] path
+          #        the pathname to save the content into.
+          #
+          # Saves the content the provided path unless the path exists and the contents are exactly the same.
+          #
+          def update_changed_file(generator, path)
+            if path.exist?
+              contents = generator.generate.to_s
+              content_stream = StringIO.new(contents)
+              identical = File.open(path, 'rb') { |f| FileUtils.compare_stream(f, content_stream) }
+              return if identical
+
+              File.open(path, 'w') { |f| f.write(contents) }
+            else
+              path.dirname.mkpath
+              generator.save_as(path)
+            end
+          end
+
+          # Creates the Info.plist file which sets public framework attributes
+          #
+          # @param  [Sandbox] sandbox @see #sandbox
+          #         The sandbox where the generated Info.plist file should be saved.
+          #
+          # @param  [Pathname] path
+          #         the path to save the generated Info.plist file.
+          #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to link the generated Info.plist file into.
+          #
+          # @param  [Version] version
+          #         the version to use for when generating this Info.plist file.
+          #
+          # @param  [Platform] platform
+          #         the platform to use for when generating this Info.plist file.
+          #
+          # @param  [Symbol] bundle_package_type
+          #         the CFBundlePackageType of the target this Info.plist file is for.
+          #
+          #  @param [Hash] additional_entries
+          #         any additional entries to include in this Info.plist file.
+          #
+          # @return [void]
+          #
+          def create_info_plist_file_with_sandbox(sandbox, path, native_target, version, platform,
+                                                  bundle_package_type = :fmwk, additional_entries = {})
+            UI.message "- Generating Info.plist file at #{UI.path(path)}" do
+              generator = Generator::InfoPlistFile.new(version, platform, bundle_package_type, additional_entries)
+              update_changed_file(generator, path)
+
+              relative_path_string = path.relative_path_from(sandbox.root).to_s
+              native_target.build_configurations.each do |c|
+                c.build_settings['INFOPLIST_FILE'] = relative_path_string
+              end
+            end
+          end
+
+          module_function :update_changed_file
+          module_function :create_info_plist_file_with_sandbox
+        end
+      end
+    end
+  end
+end