cocoapods 1.3.0.beta.2 → 1.3.0.beta.3

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

@@ -4,6 +4,7 @@ module Pod
       # The {PodsProjectGenerator} handles generation of the 'Pods/Pods.xcodeproj'
       #
       class PodsProjectGenerator
+        require 'cocoapods/installer/pods_project_integrator/pod_target_integrator'
         require 'cocoapods/installer/xcode/pods_project_generator/target_installer'
         require 'cocoapods/installer/xcode/pods_project_generator/pod_target_installer'
         require 'cocoapods/installer/xcode/pods_project_generator/file_references_installer'
@@ -62,6 +63,7 @@ module Pod
           prepare
           install_file_references
           install_libraries
+          integrate_test_targets
           set_target_dependencies
         end
 
@@ -73,7 +75,13 @@ module Pod
             if installation_options.deterministic_uuids?
               UI.message('- Generating deterministic UUIDs') { project.predictabilize_uuids }
             end
-            project.recreate_user_schemes(false)
+            library_product_types = [:framework, :dynamic_library, :static_library]
+            project.recreate_user_schemes(false) do |scheme, target|
+              next unless library_product_types.include? target.symbol_type
+              pod_target = pod_targets.find { |pt| pt.native_target == target }
+              next if pod_target.nil? || pod_target.test_native_targets.empty?
+              pod_target.test_native_targets.each { |test_native_target| scheme.add_test_target(test_native_target) }
+            end
             project.save
           end
         end
@@ -169,6 +177,17 @@ module Pod
           end
         end
 
+        def integrate_test_targets
+          pod_targets_with_test_targets = pod_targets.reject { |pt| pt.test_native_targets.empty? }
+          unless pod_targets_with_test_targets.empty?
+            UI.message '- Integrating test targets' do
+              pod_targets_with_test_targets.each do |pod_target|
+                Pod::Installer::PodTargetIntegrator.new(pod_target).integrate!
+              end
+            end
+          end
+        end
+
         def add_system_framework_dependencies
           # @TODO: Add Specs
           pod_targets.sort_by(&:name).each do |pod_target|
@@ -198,10 +217,8 @@ module Pod
               configure_app_extension_api_only_for_target(aggregate_target) if is_app_extension
 
               unless pod_target.should_build?
-                pod_target.resource_bundle_targets.each do |resource_bundle_target|
-                  aggregate_target.native_target.add_dependency(resource_bundle_target)
-                end
-
+                add_resource_bundles_to_native_target(pod_target, aggregate_target.native_target)
+                add_pod_target_test_dependencies(pod_target, frameworks_group)
                 next
               end
 
@@ -210,9 +227,7 @@ module Pod
 
               add_dependent_targets_to_native_target(pod_target.dependent_targets, pod_target.native_target, is_app_extension, pod_target.requires_frameworks?, frameworks_group)
 
-              pod_target.test_native_targets.each do |test_native_target|
-                add_dependent_targets_to_native_target([pod_target, *pod_target.test_dependent_targets], test_native_target, false, pod_target.requires_frameworks?, frameworks_group)
-              end
+              add_pod_target_test_dependencies(pod_target, frameworks_group)
             end
           end
         end
@@ -250,6 +265,16 @@ module Pod
 
         private
 
+        def add_pod_target_test_dependencies(pod_target, frameworks_group)
+          test_dependent_targets = [pod_target, *pod_target.test_dependent_targets]
+          pod_target.test_native_targets.each do |test_native_target|
+            test_dependent_targets.reject(&:should_build?).each do |test_dependent_target|
+              add_resource_bundles_to_native_target(test_dependent_target, test_native_target)
+            end
+            add_dependent_targets_to_native_target(test_dependent_targets, test_native_target, false, pod_target.requires_frameworks?, frameworks_group)
+          end
+        end
+
         def add_dependent_targets_to_native_target(dependent_targets, native_target, is_app_extension, requires_frameworks, frameworks_group)
           dependent_targets.each do |pod_dependency_target|
             next unless pod_dependency_target.should_build?
@@ -264,6 +289,13 @@ module Pod
           end
         end
 
+        def add_resource_bundles_to_native_target(dependent_target, native_target)
+          resource_bundle_targets = dependent_target.resource_bundle_targets + dependent_target.test_resource_bundle_targets
+          resource_bundle_targets.each do |resource_bundle_target|
+            native_target.add_dependency(resource_bundle_target)
+          end
+        end
+
         # Sets the APPLICATION_EXTENSION_API_ONLY build setting to YES for all
         # configurations of the given target
         #

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

@@ -84,7 +84,7 @@ module Pod
             native_target.build_configurations.each do |configuration|
               path = target.xcconfig_path(configuration.name)
               gen = Generator::XCConfig::AggregateXCConfig.new(target, configuration.name)
-              gen.save_as(path)
+              update_changed_file(gen, path)
               target.xcconfigs[configuration.name] = gen.xcconfig
               xcconfig_file_ref = add_file_to_support_group(path)
               configuration.base_configuration_reference = xcconfig_file_ref
@@ -104,7 +104,7 @@ module Pod
               path = target.bridge_support_path
               headers = native_target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
               generator = Generator::BridgeSupport.new(headers)
-              generator.save_as(path)
+              update_changed_file(generator, path)
               add_file_to_support_group(path)
             end
           end
@@ -120,7 +120,7 @@ module Pod
           def create_copy_resources_script
             path = target.copy_resources_script_path
             generator = Generator::CopyResourcesScript.new(target.resource_paths_by_config, target.platform)
-            generator.save_as(path)
+            update_changed_file(generator, path)
             add_file_to_support_group(path)
           end
 
@@ -136,7 +136,7 @@ module Pod
           def create_embed_frameworks_script
             path = target.embed_frameworks_script_path
             generator = Generator::EmbedFrameworksScript.new(target.framework_paths_by_config)
-            generator.save_as(path)
+            update_changed_file(generator, path)
             add_file_to_support_group(path)
           end
 
@@ -150,7 +150,7 @@ module Pod
               path = generator_class.path_from_basepath(basepath)
               file_accessors = target.pod_targets.map(&:file_accessors).flatten
               generator = generator_class.new(file_accessors)
-              generator.save_as(path)
+              update_changed_file(generator, path)
               add_file_to_support_group(path)
             end
           end

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

@@ -182,9 +182,10 @@ module Pod
               local = sandbox.local?(pod_name)
               paths = file_accessor.send(file_accessor_key)
               paths = allowable_project_paths(paths)
+              base_path = local ? common_path(paths) : nil
               paths.each do |path|
                 group = pods_project.group_for_spec(file_accessor.spec.name, group_key)
-                pods_project.add_file_reference(path, group, local && reflect_file_system_structure_for_development)
+                pods_project.add_file_reference(path, group, local && reflect_file_system_structure_for_development, base_path)
               end
             end
           end
@@ -240,6 +241,29 @@ module Pod
             allowable_paths + lproj_paths.subtract(lproj_paths_with_files).to_a
           end
 
+          # Returns a Pathname of the nearest parent from which all the given paths descend.
+          # Converts each Pathname to a string and finds the longest common prefix
+          #
+          # @param  [Array<Pathname>] paths
+          #         The paths to files or directories on disk. Must be absolute paths
+          #
+          # @return [Pathname] Pathname of the nearest parent shared by paths, or nil if none exists
+          #
+          def common_path(paths)
+            return nil if paths.empty?
+            strs = paths.map do |path|
+              unless path.absolute?
+                raise ArgumentError, "Paths must be absolute #{path}"
+              end
+              path.dirname.to_s
+            end
+            min, max = strs.minmax
+            idx = min.size.times { |i| break i if min[i] != max[i] }
+            result = Pathname.new(min[0...idx])
+            # Don't consider "/" a common path
+            return result unless result.to_s == '/'
+          end
+
           # Computes the destination sub-directory in the sandbox
           #
           # @param  [Pathname] headers_sandbox

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

@@ -18,8 +18,8 @@ module Pod
 
             UI.message "- Installing target `#{target.name}` #{target.platform}" do
               add_target
-              add_test_targets if target.contains_test_specifications?
               create_support_files_dir
+              add_test_targets if target.contains_test_specifications?
               add_resources_bundle_targets
               add_files_to_build_phases
               create_xcconfig_file
@@ -155,7 +155,7 @@ module Pod
                 add_header(build_file, public_headers, private_headers, native_target)
               end
 
-              other_file_refs = other_source_files.map { |sf| project.reference_for_path(sf) }
+              other_file_refs = project_file_references_array(other_source_files, 'other source')
               native_target.add_file_references(other_file_refs, nil)
 
               next unless target.requires_frameworks?
@@ -176,9 +176,9 @@ module Pod
             target.supported_test_types.each do |test_type|
               product_type = target.product_type_for_test_type(test_type)
               name = target.test_target_label(test_type)
-              platform = target.platform.name
+              platform_name = target.platform.name
               language = target.uses_swift? ? :swift : :objc
-              native_test_target = project.new_target(product_type, name, platform, deployment_target, nil, language)
+              native_test_target = project.new_target(product_type, name, platform_name, deployment_target, nil, language)
               native_test_target.product_reference.name = name
 
               target.user_build_configurations.each do |bc_name, type|
@@ -196,6 +196,10 @@ module Pod
                 configuration.build_settings['PRODUCT_NAME'] = name
               end
 
+              # Test native targets also need frameworks and resources to be copied over to their xctest bundle.
+              create_test_target_embed_frameworks_script(test_type)
+              create_test_target_copy_resources_script(test_type)
+
               target.test_native_targets << native_test_target
             end
           end
@@ -230,7 +234,13 @@ module Pod
                 end
                 bundle_target.deployment_target = deployment_target
 
-                target.resource_bundle_targets << bundle_target
+                test_specification = file_accessor.spec.test_specification?
+
+                if test_specification
+                  target.test_resource_bundle_targets << bundle_target
+                else
+                  target.resource_bundle_targets << bundle_target
+                end
 
                 if target.should_build?
                   native_target.add_dependency(bundle_target)
@@ -244,14 +254,19 @@ module Pod
                 path.dirname.mkdir unless path.dirname.exist?
                 info_plist_path = path.dirname + "ResourceBundle-#{bundle_name}-#{path.basename}"
                 generator = Generator::InfoPlistFile.new(target, :bundle_package_type => :bndl)
-                generator.save_as(info_plist_path)
+                update_changed_file(generator, info_plist_path)
                 add_file_to_support_group(info_plist_path)
 
                 bundle_target.build_configurations.each do |c|
                   c.build_settings['PRODUCT_NAME'] = bundle_name
                   relative_info_plist_path = info_plist_path.relative_path_from(sandbox.root)
                   c.build_settings['INFOPLIST_FILE'] = relative_info_plist_path.to_s
-                  c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir('$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)')
+                  # Do not set the CONFIGURATION_BUILD_DIR for resource bundles that are only meant for test targets.
+                  # This is because the test target itself also does not set this configuration build dir and it expects
+                  # all bundles to be copied from the default path.
+                  unless test_specification
+                    c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir('$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)')
+                  end
 
                   # Set the correct device family for this bundle, based on the platform
                   device_family_by_platform = {
@@ -275,19 +290,15 @@ module Pod
           def create_xcconfig_file
             path = target.xcconfig_path
             xcconfig_gen = Generator::XCConfig::PodXCConfig.new(target)
-            xcconfig_gen.save_as(path)
+            update_changed_file(xcconfig_gen, path)
             xcconfig_file_ref = add_file_to_support_group(path)
 
             native_target.build_configurations.each do |c|
               c.base_configuration_reference = xcconfig_file_ref
             end
 
-            # also apply the private config to resource targets
-            target.resource_bundle_targets.each do |rsrc_target|
-              rsrc_target.build_configurations.each do |rsrc_bc|
-                rsrc_bc.base_configuration_reference = xcconfig_file_ref
-              end
-            end
+            # also apply the private config to resource bundle targets.
+            apply_xcconfig_file_ref_to_resource_bundle_targets(target.resource_bundle_targets, xcconfig_file_ref)
           end
 
           # Generates the contents of the xcconfig file used for each test target type and saves it to disk.
@@ -298,7 +309,7 @@ module Pod
             target.supported_test_types.each do |test_type|
               path = target.xcconfig_path(test_type.to_s)
               xcconfig_gen = Generator::XCConfig::PodXCConfig.new(target, true)
-              xcconfig_gen.save_as(path)
+              update_changed_file(xcconfig_gen, path)
               xcconfig_file_ref = add_file_to_support_group(path)
 
               target.test_native_targets.each do |test_target|
@@ -307,9 +318,44 @@ module Pod
                   test_target_bc.base_configuration_reference = xcconfig_file_ref
                 end
               end
+
+              # also apply the private config to resource bundle test targets.
+              apply_xcconfig_file_ref_to_resource_bundle_targets(target.test_resource_bundle_targets, xcconfig_file_ref)
             end
           end
 
+          # Creates a script that copies the resources to the bundle of the test target.
+          #
+          # @param [Symbol] test_type
+          #        The test type to create the script for.
+          #
+          # @return [void]
+          #
+          def create_test_target_copy_resources_script(test_type)
+            path = target.copy_resources_script_path_for_test_type(test_type)
+            pod_targets = [target, *target.test_dependent_targets]
+            resource_paths_by_config = { 'Debug' => pod_targets.flat_map(&:resource_paths) }
+            generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
+            update_changed_file(generator, path)
+            add_file_to_support_group(path)
+          end
+
+          # Creates a script that embeds the frameworks to the bundle of the test target.
+          #
+          # @param [Symbol] test_type
+          #        The test type to create the script for.
+          #
+          # @return [void]
+          #
+          def create_test_target_embed_frameworks_script(test_type)
+            path = target.embed_frameworks_script_path_for_test_type(test_type)
+            pod_targets = [target, *target.test_dependent_targets]
+            framework_paths_by_config = { 'Debug' => pod_targets.flat_map(&:framework_paths) }
+            generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
+            update_changed_file(generator, path)
+            add_file_to_support_group(path)
+          end
+
           # Manually add `libswiftSwiftOnoneSupport.dylib` as it seems there is an issue with tests that do not include it for Debug configurations.
           # Possibly related to Swift module optimization.
           #
@@ -351,7 +397,7 @@ module Pod
           def create_prefix_header
             path = target.prefix_header_path
             generator = Generator::PrefixHeader.new(target.file_accessors, target.platform)
-            generator.save_as(path)
+            update_changed_file(generator, path)
             add_file_to_support_group(path)
 
             native_target.build_configurations.each do |c|
@@ -433,11 +479,21 @@ module Pod
             group.new_file(path)
           end
 
+          def apply_xcconfig_file_ref_to_resource_bundle_targets(resource_bundle_targets, xcconfig_file_ref)
+            resource_bundle_targets.each do |rsrc_target|
+              rsrc_target.build_configurations.each do |rsrc_bc|
+                rsrc_bc.base_configuration_reference = xcconfig_file_ref
+              end
+            end
+          end
+
           def create_module_map
             return super unless custom_module_map
             path = target.module_map_path
             UI.message "- Copying module map file to #{UI.path(path)}" do
-              FileUtils.cp(custom_module_map, path)
+              unless path.exist? && FileUtils.identical?(custom_module_map, path)
+                FileUtils.cp(custom_module_map, path)
+              end
               add_file_to_support_group(path)
 
               native_target.build_configurations.each do |c|

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

@@ -89,10 +89,44 @@ 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)
+            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
-            target.support_files_dir.mkdir
+            target.support_files_dir.mkpath
+          end
+
+          # Remove temp file whose store .prefix/config/dummy file.
+          #
+          def clean_support_files_temp_dir
+            support_files_temp_dir.rmtree
+          end
+
+          # @return [String] The temp file path to store temporary files.
+          #
+          def support_files_temp_dir
+            sandbox.target_support_files_dir('generated_files_tmp')
           end
 
           # Creates the Info.plist file which sets public framework attributes
@@ -103,7 +137,7 @@ module Pod
             path = target.info_plist_path
             UI.message "- Generating Info.plist file at #{UI.path(path)}" do
               generator = Generator::InfoPlistFile.new(target)
-              generator.save_as(path)
+              update_changed_file(generator, path)
               add_file_to_support_group(path)
 
               native_target.build_configurations.each do |c|
@@ -126,7 +160,7 @@ module Pod
             UI.message "- Generating module map file at #{UI.path(path)}" do
               generator = Generator::ModuleMap.new(target)
               yield generator if block_given?
-              generator.save_as(path)
+              update_changed_file(generator, path)
               add_file_to_support_group(path)
 
               native_target.build_configurations.each do |c|
@@ -147,7 +181,7 @@ module Pod
             UI.message "- Generating umbrella header at #{UI.path(path)}" do
               generator = Generator::UmbrellaHeader.new(target)
               yield generator if block_given?
-              generator.save_as(path)
+              update_changed_file(generator, path)
 
               # Add the file to the support group and the native target,
               # so it will been added to the header build phase
@@ -169,7 +203,7 @@ module Pod
           def create_dummy_source
             path = target.dummy_source_path
             generator = Generator::DummySource.new(target.label)
-            generator.save_as(path)
+            update_changed_file(generator, path)
             file_reference = add_file_to_support_group(path)
             native_target.source_build_phase.add_file_reference(file_reference)
           end