cocoapods 1.5.2 → 1.6.1

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

@@ -8,21 +8,21 @@ module Pod
         class AggregateTargetInstaller < TargetInstaller
           # Creates the target in the Pods project and the relative support files.
           #
-          # @return [void]
+          # @return [TargetInstallationResult] the result of the installation of this target.
           #
           def install!
             UI.message "- Installing target `#{target.name}` #{target.platform}" do
-              add_target
+              native_target = add_target
               create_support_files_dir
               create_support_files_group
-              create_xcconfig_file
+              create_xcconfig_file(native_target)
               if target.requires_frameworks?
                 create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
-                create_module_map
-                create_umbrella_header
+                create_module_map(native_target)
+                create_umbrella_header(native_target)
               elsif target.uses_swift?
-                create_module_map
-                create_umbrella_header
+                create_module_map(native_target)
+                create_umbrella_header(native_target)
               end
               # Because embedded targets live in their host target, CocoaPods
               # copies all of the embedded target's pod_targets to its host
@@ -30,11 +30,13 @@ module Pod
               # cause an App Store rejection because frameworks cannot be
               # embedded in embedded targets.
               #
-              create_embed_frameworks_script unless target.requires_host_target?
-              create_bridge_support_file
-              create_copy_resources_script
+              create_embed_frameworks_script if target.includes_frameworks? && !target.requires_host_target?
+              create_bridge_support_file(native_target)
+              create_copy_resources_script if target.includes_resources?
               create_acknowledgements
-              create_dummy_source
+              create_dummy_source(native_target)
+              clean_support_files_temp_dir
+              TargetInstallationResult.new(target, native_target)
             end
           end
 
@@ -87,14 +89,18 @@ module Pod
 
           # Generates the contents of the xcconfig file and saves it to disk.
           #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to link the module map file into.
+          #
           # @return [void]
           #
-          def create_xcconfig_file
+          def create_xcconfig_file(native_target)
             native_target.build_configurations.each do |configuration|
+              next unless target.user_build_configurations.key?(configuration.name)
               path = target.xcconfig_path(configuration.name)
-              gen = Generator::XCConfig::AggregateXCConfig.new(target, configuration.name)
-              update_changed_file(gen, path)
-              target.xcconfigs[configuration.name] = gen.xcconfig
+              build_settings = target.build_settings(configuration.name)
+              update_changed_file(build_settings, path)
+              target.xcconfigs[configuration.name] = build_settings.xcconfig
               xcconfig_file_ref = add_file_to_support_group(path)
               configuration.base_configuration_reference = xcconfig_file_ref
             end
@@ -106,9 +112,12 @@ module Pod
           #         target because it is needed for environments interpreted at
           #         runtime.
           #
+          # @param  [PBXNativeTarget] native_target
+          #         the native target to add the bridge support file into.
+          #
           # @return [void]
           #
-          def create_bridge_support_file
+          def create_bridge_support_file(native_target)
             if target.podfile.generate_bridge_support?
               path = target.bridge_support_path
               headers = native_target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }

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

@@ -0,0 +1,104 @@
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        # Installs an app host target to a given project.
+        #
+        class AppHostInstaller
+          include TargetInstallerHelper
+
+          # @return [Sandbox]
+          #         The sandbox used for this installation.
+          #
+          attr_reader :sandbox
+
+          # @return [Pod::Project]
+          #         The `Pods/Pods.xcodeproj` to install the app host into.
+          #
+          attr_reader :project
+
+          # @return [Platform] the platform to use for this app host.
+          #
+          attr_reader :platform
+
+          # @return [String] the name to use for this app host target.
+          #
+          attr_reader :name
+
+          # @return [String] the name of the pod the app host installer will be installing within.
+          #
+          attr_reader :pod_name
+
+          # Initialize a new instance
+          #
+          # @param [Sandbox] sandbox @see #sandbox
+          # @param [Pod::Project] project @see #project
+          # @param [Platform] platform @see #platform
+          # @param [String] name @see #name
+          # @param [String] pod_name @see #pod_name
+          #
+          def initialize(sandbox, project, platform, name, pod_name)
+            @sandbox = sandbox
+            @project = project
+            @platform = platform
+            @name = name
+            @pod_name = pod_name
+            target_group = project.pod_group(pod_name)
+            @group = target_group[name] || target_group.new_group(name)
+          end
+
+          # @return [PBXNativeTarget] the app host native target that was installed.
+          #
+          def install!
+            platform_name = platform.name
+            app_host_target = Pod::Generator::AppTargetHelper.add_app_target(project, platform_name, deployment_target,
+                                                                             name)
+            app_host_target.build_configurations.each do |configuration|
+              configuration.build_settings['PRODUCT_NAME'] = name
+              configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
+              configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if platform == :osx
+              configuration.build_settings['CURRENT_PROJECT_VERSION'] = '1'
+            end
+
+            Pod::Generator::AppTargetHelper.add_app_host_main_file(project, app_host_target, platform_name, @group, name)
+            Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, deployment_target, name) if platform == :ios
+            additional_entries = platform == :ios ? ADDITIONAL_IOS_INFO_PLIST_ENTRIES : {}
+            create_info_plist_file_with_sandbox(sandbox, app_host_info_plist_path, app_host_target, '1.0.0', platform,
+                                                :appl, additional_entries)
+            @group.new_file(app_host_info_plist_path)
+            app_host_target
+          end
+
+          private
+
+          ADDITIONAL_IOS_INFO_PLIST_ENTRIES = {
+            'UILaunchStoryboardName' => 'LaunchScreen',
+            'UISupportedInterfaceOrientations' => %w(
+              UIInterfaceOrientationPortrait
+              UIInterfaceOrientationLandscapeLeft
+              UIInterfaceOrientationLandscapeRight
+            ),
+            'UISupportedInterfaceOrientations~ipad' => %w(
+              UIInterfaceOrientationPortrait
+              UIInterfaceOrientationPortraitUpsideDown
+              UIInterfaceOrientationLandscapeLeft
+              UIInterfaceOrientationLandscapeRight
+            ),
+          }.freeze
+
+          # @return [Pathname] The absolute path of the Info.plist to use for an app host.
+          #
+          def app_host_info_plist_path
+            project.path.dirname.+(name).+("#{name}-Info.plist")
+          end
+
+          # @return [String] The deployment target.
+          #
+          def deployment_target
+            platform.deployment_target.to_s
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -18,16 +18,22 @@ module Pod
           #
           attr_reader :pods_project
 
+          # @return [Bool] add support for preserving the file structure of externally sourced pods, in addition to local pods.
+          #
+          attr_reader :preserve_pod_file_structure
+
           # Initialize a new instance
           #
-          # @param [Sandbox] sandbox @see sandbox
-          # @param [Array<PodTarget>] pod_targets @see pod_targets
-          # @param [Project] pods_project @see pod_project
+          # @param [Sandbox] sandbox @see #sandbox
+          # @param [Array<PodTarget>] pod_targets @see #pod_targets
+          # @param [Project] pods_project @see #pods_project
+          # @param [Bool] preserve_pod_file_structure @see #preserve_pod_file_structure
           #
-          def initialize(sandbox, pod_targets, pods_project)
+          def initialize(sandbox, pod_targets, pods_project, preserve_pod_file_structure = false)
             @sandbox = sandbox
             @pod_targets = pod_targets
             @pods_project = pods_project
+            @preserve_pod_file_structure = preserve_pod_file_structure
           end
 
           # Installs the file references.
@@ -115,8 +121,9 @@ module Pod
                 next unless sandbox.local?(pod_name)
                 root_name = Specification.root_name(pod_name)
                 paths = file_accessor.developer_files
+                next if paths.empty?
+                group = pods_project.group_for_spec(root_name, :developer)
                 paths.each do |path|
-                  group = pods_project.group_for_spec(root_name, :developer)
                   ref = pods_project.add_file_reference(path, group, false)
                   if path.extname == '.podspec'
                     pods_project.mark_ruby_file_ref(ref)
@@ -143,7 +150,8 @@ module Pod
                 added_build_headers = false
                 added_public_headers = false
 
-                pod_target.file_accessors.each do |file_accessor|
+                file_accessors = pod_target.file_accessors.reject { |fa| fa.spec.test_specification? }
+                file_accessors.each do |file_accessor|
                   # Private headers will always end up in Pods/Headers/Private/PodA/*.h
                   # This will allow for `""` imports to work.
                   header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
@@ -157,13 +165,6 @@ module Pod
                     added_public_headers = true
                     sandbox.public_headers.add_files(namespaced_path, files)
                   end
-
-                  unless pod_target.requires_frameworks?
-                    vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files|
-                      added_public_headers = true
-                      sandbox.public_headers.add_files(namespaced_path, files)
-                    end
-                  end
                 end
 
                 pod_target.build_headers.add_search_path(headers_sandbox, pod_target.platform) if added_build_headers
@@ -195,22 +196,24 @@ module Pod
           # @param  [Symbol] group_key
           #         The key of the group of the Pods project.
           #
-          # @param  [Bool] reflect_file_system_structure_for_development
+          # @param  [Bool] reflect_file_system_structure
           #         Whether organizing a local pod's files in subgroups inside
           #         the pod's group is allowed.
           #
           # @return [void]
           #
-          def add_file_accessors_paths_to_pods_group(file_accessor_key, group_key = nil, reflect_file_system_structure_for_development = false)
+          def add_file_accessors_paths_to_pods_group(file_accessor_key, group_key = nil, reflect_file_system_structure = false)
             file_accessors.each do |file_accessor|
-              pod_name = file_accessor.spec.name
-              local = sandbox.local?(pod_name)
               paths = file_accessor.send(file_accessor_key)
               paths = allowable_project_paths(paths)
-              base_path = local ? common_path(paths) : nil
+              next if paths.empty?
+
+              pod_name = file_accessor.spec.name
+              preserve_pod_file_structure_flag = (sandbox.local?(pod_name) || preserve_pod_file_structure)
+              base_path = preserve_pod_file_structure_flag ? common_path(paths) : nil
+              group = pods_project.group_for_spec(pod_name, group_key)
               paths.each do |path|
-                group = pods_project.group_for_spec(pod_name, group_key)
-                pods_project.add_file_reference(path, group, local && reflect_file_system_structure_for_development, base_path)
+                pods_project.add_file_reference(path, group, preserve_pod_file_structure_flag && reflect_file_system_structure, base_path)
               end
             end
           end
@@ -329,36 +332,6 @@ module Pod
             mappings
           end
 
-          # Computes the destination sub-directory in the sandbox for headers
-          # from inside vendored frameworks.
-          #
-          # @param  [Pathname] headers_sandbox
-          #         The sandbox where the header links should be stored for this
-          #         Pod.
-          #
-          # @param  [Sandbox::FileAccessor] file_accessor
-          #         The consumer file accessor for which the headers need to be
-          #         linked.
-          #
-          def vendored_frameworks_header_mappings(headers_sandbox, file_accessor)
-            mappings = {}
-            file_accessor.vendored_frameworks.each do |framework|
-              headers_dir = Sandbox::FileAccessor.vendored_frameworks_headers_dir(framework)
-              headers = Sandbox::FileAccessor.vendored_frameworks_headers(framework)
-              framework_name = framework.basename(framework.extname)
-              dir = headers_sandbox + framework_name
-              headers.each do |header|
-                # the relative path of framework headers should be kept,
-                # not flattened like is done for most public headers.
-                relative_path = header.relative_path_from(headers_dir)
-                sub_dir = dir + relative_path.dirname
-                mappings[sub_dir] ||= []
-                mappings[sub_dir] << header
-              end
-            end
-            mappings
-          end
-
           #-----------------------------------------------------------------------#
         end
       end