cocoapods 1.4.0.beta.1 → 1.4.0.beta.2

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

@@ -0,0 +1,101 @@
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        # This class is responsible for integrating a pod target. This includes integrating
+        # the test targets included by each pod target.
+        #
+        class PodTargetIntegrator
+          # @return [PodTarget] the target that should be integrated.
+          #
+          attr_reader :target
+
+          # Init a new PodTargetIntegrator.
+          #
+          # @param  [PodTarget] target @see #target
+          #
+          def initialize(target)
+            @target = target
+          end
+
+          # Integrates the pod target.
+          #
+          # @return [void]
+          #
+          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)
+              end
+              specs = target.specs.reject(&:test_specification?)
+              UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(specs), target.native_target)
+            end
+          end
+
+          # @return [String] a string representation suitable for debugging.
+          #
+          def inspect
+            "#<#{self.class} for target `#{target.label}'>"
+          end
+
+          private
+
+          # @!group Integration steps
+          #---------------------------------------------------------------------#
+
+          # Find or create a 'Copy Pods Resources' build phase
+          #
+          # @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_test_dependent_targets.flat_map(&:resource_paths)
+            input_paths = []
+            output_paths = []
+            unless resource_paths.empty?
+              input_paths = [script_path, *resource_paths.flatten.uniq]
+              output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
+            end
+            UserProjectIntegrator::TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+          end
+
+          # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
+          #
+          # @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)}"
+            framework_paths = target.all_test_dependent_targets.flat_map(&:framework_paths)
+            input_paths = []
+            output_paths = []
+            unless framework_paths.empty?
+              input_paths = [script_path, *framework_paths.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
+              output_paths = framework_paths.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact
+            end
+            UserProjectIntegrator::TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+          end
+
+          # @return [String] the message that should be displayed for the target
+          #         integration.
+          #
+          def integration_message
+            "Integrating target `#{target.name}`"
+          end
+
+          # @param [Array<Specification] specs
+          #         the specs to return script phrases from.
+          #
+          # @return [Array<Hash<Symbol=>String>] an array of all combined script phases from the specs.
+          #
+          def script_phases_for_specs(specs)
+            specs.map { |spec| spec.consumer(target.platform) }.map(&:script_phases).flatten
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -136,12 +136,26 @@ module Pod
 
           # Creates the Info.plist file which sets public framework attributes
           #
+          # @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.
+          #
           # @return [void]
           #
-          def create_info_plist_file
-            path = target.info_plist_path
+          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(target)
+              generator = Generator::InfoPlistFile.new(version, platform, bundle_package_type)
               update_changed_file(generator, path)
               add_file_to_support_group(path)
 

data/lib/cocoapods/target.rb

@@ -6,6 +6,8 @@ module Pod
   # This class is used to represent both the targets and their libraries.
   #
   class Target
+    DEFAULT_VERSION = '1.0.0'.freeze
+
     # @return [Sandbox] The sandbox where the Pods should be installed.
     #
     attr_reader :sandbox
@@ -93,7 +95,7 @@ module Pod
     # @return [Boolean] Whether the target should build a static framework.
     #
     def static_framework?
-      !is_a?(Pod::AggregateTarget) && specs.any? && specs.all?(&:static_framework)
+      !is_a?(Pod::AggregateTarget) && specs.any? && specs.flat_map(&:root).all?(&:static_framework)
     end
 
     #-------------------------------------------------------------------------#
@@ -156,12 +158,6 @@ module Pod
       support_files_dir + "#{label}.modulemap"
     end
 
-    # @return [Pathname] the absolute path of the prefix header file.
-    #
-    def prefix_header_path
-      support_files_dir + "#{label}-prefix.pch"
-    end
-
     # @return [Pathname] the absolute path of the bridge support file.
     #
     def bridge_support_path
@@ -180,6 +176,12 @@ module Pod
       support_files_dir + "#{label}-dummy.m"
     end
 
+    # @return [String] The version associated with this target
+    #
+    def version
+      DEFAULT_VERSION
+    end
+
     #-------------------------------------------------------------------------#
 
     private

data/lib/cocoapods/target/aggregate_target.rb

@@ -205,7 +205,7 @@ module Pod
     def resource_paths_by_config
       @resource_paths_by_config ||= begin
         relevant_pod_targets = pod_targets.reject do |pod_target|
-          pod_target.should_build? && pod_target.requires_frameworks?
+          pod_target.should_build? && pod_target.requires_frameworks? && !pod_target.static_framework?
         end
         user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
           resources_by_config[config] = relevant_pod_targets.flat_map do |pod_target|

data/lib/cocoapods/target/pod_target.rb

@@ -163,7 +163,7 @@ module Pod
       @should_build = begin
         source_files = file_accessors.flat_map(&:source_files)
         source_files -= file_accessors.flat_map(&:headers)
-        !source_files.empty?
+        !source_files.empty? || contains_script_phases?
       end
     end
 
@@ -185,16 +185,47 @@ module Pod
       end
     end
 
+    # @return [Array<Hash{Symbol=>String}>] An array of hashes where each hash represents a single script phase.
+    #
+    def script_phases
+      spec_consumers.map(&:script_phases).flatten
+    end
+
+    # @return [Boolean] Whether the target contains any script phases.
+    #
+    def contains_script_phases?
+      !script_phases.empty?
+    end
+
+    # @return [Hash{Array => 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.group_by { |test_spec| native_target_for_spec(test_spec) }
+    end
+
     # @return [Boolean] Whether the target has any tests specifications.
     #
     def contains_test_specifications?
       specs.any?(&:test_specification?)
     end
 
+    # @return [Array<Specification>] All of the test specs within this target.
+    #
+    def test_specs
+      specs.select(&:test_specification?)
+    end
+
+    # @return [Array<Specification>] All of the non test specs within this target.
+    #
+    def non_test_specs
+      specs.reject(&:test_specification?)
+    end
+
     # @return [Array<Symbol>] All of the test supported types within this target.
     #
     def supported_test_types
-      specs.select(&:test_specification?).map(&:test_type).uniq
+      test_specs.map(&:test_type).uniq
     end
 
     # Returns the framework paths associated with this target. By default all paths include the framework paths
@@ -207,36 +238,35 @@ module Pod
     #         this target depends upon.
     #
     def framework_paths(include_test_spec_paths = true)
-      @framework_paths ||= Hash.new do |h, key|
-        h[key] = begin
-          accessors = file_accessors
-          accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
-          frameworks = []
-          accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
-            relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
-            framework = { :name => framework_path.basename.to_s,
-                          :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
-                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
-            # Until this can be configured, assume the dSYM file uses the file name as the framework.
-            # See https://github.com/CocoaPods/CocoaPods/issues/1698
-            dsym_name = "#{framework_path.basename}.dSYM"
-            dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
-            if dsym_path.exist?
-              framework[:dsym_name] = dsym_name
-              framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
-              framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
-            end
-            frameworks << framework
+      @framework_paths ||= {}
+      return @framework_paths[include_test_spec_paths] if @framework_paths.key?(include_test_spec_paths)
+      @framework_paths[include_test_spec_paths] = begin
+        accessors = file_accessors
+        accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
+        frameworks = []
+        accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
+          relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
+          framework = { :name => framework_path.basename.to_s,
+                        :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
+                        :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
+          # Until this can be configured, assume the dSYM file uses the file name as the framework.
+          # See https://github.com/CocoaPods/CocoaPods/issues/1698
+          dsym_name = "#{framework_path.basename}.dSYM"
+          dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
+          if dsym_path.exist?
+            framework[:dsym_name] = dsym_name
+            framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
+            framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
           end
-          if should_build? && requires_frameworks? && !static_framework?
-            frameworks << { :name => product_name,
-                            :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
-                            :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
-          end
-          frameworks
+          frameworks << framework
+        end
+        if should_build? && requires_frameworks? && !static_framework?
+          frameworks << { :name => product_name,
+                          :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
+                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
         end
+        frameworks
       end
-      @framework_paths[include_test_spec_paths]
     end
 
     # Returns the resource paths associated with this target. By default all paths include the resource paths
@@ -248,22 +278,21 @@ module Pod
     # @return [Array<String>] The resource and resource bundle paths this target depends upon.
     #
     def resource_paths(include_test_spec_paths = true)
-      @resource_paths ||= Hash.new do |h, key|
-        h[key] = begin
-          accessors = file_accessors
-          accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
-          resource_paths = accessors.flat_map do |accessor|
-            accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
-          end
-          resource_bundles = accessors.flat_map do |accessor|
-            prefix = Generator::XCConfig::XCConfigHelper::CONFIGURATION_BUILD_DIR_VARIABLE
-            prefix = configuration_build_dir unless accessor.spec.test_specification?
-            accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
-          end
-          resource_paths + resource_bundles
+      @resource_paths ||= {}
+      return @resource_paths[include_test_spec_paths] if @resource_paths.key?(include_test_spec_paths)
+      @resource_paths[include_test_spec_paths] = begin
+        accessors = file_accessors
+        accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
+        resource_paths = accessors.flat_map do |accessor|
+          accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
         end
+        resource_bundles = accessors.flat_map do |accessor|
+          prefix = Generator::XCConfig::XCConfigHelper::CONFIGURATION_BUILD_DIR_VARIABLE
+          prefix = configuration_build_dir unless accessor.spec.test_specification?
+          accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
+        end
+        resource_paths + resource_bundles
       end
-      @resource_paths[include_test_spec_paths]
     end
 
     # Returns the corresponding native target to use based on the provided specification.
@@ -346,6 +375,15 @@ module Pod
       "#{label}-#{test_type.capitalize}-Tests"
     end
 
+    # @param  [Symbol] test_type
+    #         The test type to use for producing the test label.
+    #
+    # @return [String] The label of the app host label to use given the platform and test type.
+    #
+    def app_host_label(test_type)
+      "AppHost-#{Platform.string_name(platform.symbolic_name)}-#{test_type.capitalize}-Tests"
+    end
+
     # @param  [Symbol] test_type
     #         The test type this embed frameworks script path is for.
     #
@@ -364,6 +402,21 @@ module Pod
       support_files_dir + "#{test_target_label(test_type)}-frameworks.sh"
     end
 
+    # @return [Pathname] the absolute path of the prefix header file.
+    #
+    def prefix_header_path
+      support_files_dir + "#{label}-prefix.pch"
+    end
+
+    # @param  [Symbol] test_type
+    #         The test type prefix header path is for.
+    #
+    # @return [Pathname] the absolute path of the prefix header file for the given test type.
+    #
+    def prefix_header_path_for_test_type(test_type)
+      support_files_dir + "#{test_target_label(test_type)}-prefix.pch"
+    end
+
     # @return [Array<String>] The names of the Pods on which this target
     #         depends.
     #
@@ -499,6 +552,13 @@ module Pod
       "${PODS_ROOT}/#{sandbox.pod_dir(pod_name).relative_path_from(sandbox.root)}"
     end
 
+    # @return [String] The version associated with this target
+    #
+    def version
+      version = root_spec.version
+      [version.major, version.minor, version.patch].join('.')
+    end
+
     private
 
     # @param  [TargetDefinition] target_definition

data/lib/cocoapods/validator.rb

@@ -16,7 +16,7 @@ module Pod
 
     # The default version of Swift to use when linting pods
     #
-    DEFAULT_SWIFT_VERSION = '3.0'.freeze
+    DEFAULT_SWIFT_VERSION = '3.2'.freeze
 
     # @return [Specification::Linter] the linter instance from CocoaPods
     #         Core.
@@ -256,7 +256,7 @@ module Pod
     # @return [String] the SWIFT_VERSION to use for validation.
     #
     def swift_version
-      return @swift_version if defined?(@swift_version)
+      return @swift_version unless @swift_version.nil?
       if version = dot_swift_version
         @swift_version = version
       else
@@ -277,11 +277,10 @@ module Pod
       swift_version_path.read.strip
     end
 
-    # @return [String] A string representing the Swift version used during linting
-    #                  or nil, if Swift was not used.
+    # @return [Boolean] Whether any of the pod targets part of this validator use Swift or not.
     #
-    def used_swift_version
-      swift_version if @installer.pod_targets.any?(&:uses_swift?)
+    def uses_swift?
+      @installer.pod_targets.any?(&:uses_swift?)
     end
 
     #-------------------------------------------------------------------------#
@@ -318,7 +317,7 @@ module Pod
           download_pod
           check_file_patterns
           install_pod
-          validate_dot_swift_version
+          validate_swift_version
           add_app_project_import
           validate_vendored_dynamic_frameworks
           build_pod
@@ -394,14 +393,21 @@ module Pod
       validate_url(spec.documentation_url) if spec.documentation_url
     end
 
-    def validate_dot_swift_version
-      if !used_swift_version.nil? && @swift_version.nil?
+    # Performs validation for which version of Swift is used during validation.
+    #
+    # The user will be warned that the default version of Swift was used if the following things are true:
+    #   - The project uses Swift at all
+    #   - The user did not supply a Swift version via a parameter
+    #   - There is no `.swift-version` file present either.
+    #
+    def validate_swift_version
+      if uses_swift? && @swift_version.nil? && dot_swift_version.nil?
         warning(:swift_version,
-                'The validator for Swift projects uses ' \
-                'Swift 3.0 by default, if you are using a different version of ' \
-                'swift you can use a `.swift-version` file to set the version for ' \
-                "your Pod. For example to use Swift 2.3, run: \n" \
-                '    `echo "2.3" > .swift-version`')
+                'The validator used ' \
+                "Swift #{DEFAULT_SWIFT_VERSION} by default because no Swift version was specified. " \
+                'If you want to use a different version of Swift during validation, then either use the `--swift-version` parameter ' \
+                'or use a `.swift-version` file to set the version of Swift to use for ' \
+                'your Pod. For example to use Swift 4.0, run: `echo "4.0" > .swift-version`.')
       end
     end
 
@@ -439,71 +445,24 @@ module Pod
 
     def create_app_project
       app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
-      app_project.new_target(:application, 'App', consumer.platform_name, deployment_target)
+      Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
       app_project.save
       app_project.recreate_user_schemes
     end
 
     def add_app_project_import
       app_project = Xcodeproj::Project.open(validation_dir + 'App.xcodeproj')
-      pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
-
-      source_file = write_app_import_source_file(pod_target)
-      source_file_ref = app_project.new_group('App', 'App').new_file(source_file)
       app_target = app_project.targets.first
-      app_target.add_file_references([source_file_ref])
-      add_swift_version(app_target)
-      add_xctest(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
+      pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
+      Pod::Generator::AppTargetHelper.add_app_project_import(app_project, app_target, pod_target, consumer.platform_name, use_frameworks)
+      Pod::Generator::AppTargetHelper.add_swift_version(app_target, swift_version)
+      Pod::Generator::AppTargetHelper.add_xctest_search_paths(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
       app_project.save
       Xcodeproj::XCScheme.share_scheme(app_project.path, 'App')
       # Share the pods xcscheme only if it exists. For pre-built vendored pods there is no xcscheme generated.
       Xcodeproj::XCScheme.share_scheme(@installer.pods_project.path, pod_target.label) if shares_pod_target_xcscheme?(pod_target)
     end
 
-    def add_swift_version(app_target)
-      app_target.build_configurations.each do |configuration|
-        configuration.build_settings['SWIFT_VERSION'] = swift_version
-      end
-    end
-
-    def add_xctest(app_target)
-      app_target.build_configurations.each do |configuration|
-        search_paths = configuration.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= '$(inherited)'
-        search_paths << ' "$(PLATFORM_DIR)/Developer/Library/Frameworks"'
-      end
-    end
-
-    def write_app_import_source_file(pod_target)
-      language = pod_target.uses_swift? ? :swift : :objc
-
-      if language == :swift
-        source_file = validation_dir.+('App/main.swift')
-        source_file.parent.mkpath
-        import_statement = use_frameworks && pod_target.should_build? ? "import #{pod_target.product_module_name}\n" : ''
-        source_file.open('w') { |f| f << import_statement }
-      else
-        source_file = validation_dir.+('App/main.m')
-        source_file.parent.mkpath
-        import_statement = if use_frameworks && pod_target.should_build?
-                             "@import #{pod_target.product_module_name};\n"
-                           else
-                             header_name = "#{pod_target.product_module_name}/#{pod_target.product_module_name}.h"
-                             if pod_target.sandbox.public_headers.root.+(header_name).file?
-                               "#import <#{header_name}>\n"
-                             else
-                               ''
-                             end
-        end
-        source_file.open('w') do |f|
-          f << "@import Foundation;\n"
-          f << "@import UIKit;\n" if consumer.platform_name == :ios || consumer.platform_name == :tvos
-          f << "@import Cocoa;\n" if consumer.platform_name == :osx
-          f << "#{import_statement}int main() {}\n"
-        end
-      end
-      source_file
-    end
-
     # It creates a podfile in memory and builds a library containing the pod
     # for all available platforms with xcodebuild.
     #