cocoapods 1.6.0.beta.1 → 1.6.0.beta.2

data/lib/cocoapods/installer/analyzer.rb

@@ -96,10 +96,13 @@ module Pod
         podfile_state = generate_podfile_state
 
         store_existing_checkout_options
-        if allow_fetches
+        if allow_fetches == :outdated
+          # special-cased -- we're only really resolving for outdated, rather than doing a full analysis
+        elsif allow_fetches == true
           fetch_external_sources(podfile_state)
         elsif !dependencies_to_fetch(podfile_state).all?(&:local?)
-          raise Informative, 'Cannot analyze without fetching dependencies since the sandbox is not up-to-date. Run `pod install` to ensure all dependencies have been fetched.'
+          raise Informative, 'Cannot analyze without fetching dependencies since the sandbox is not up-to-date. Run `pod install` to ensure all dependencies have been fetched.' \
+            "\n    The missing dependencies are:\n    \t#{dependencies_to_fetch(podfile_state).reject(&:local?).join("\n    \t")}"
         end
 
         locked_dependencies = generate_version_locking_dependencies(podfile_state)
@@ -252,7 +255,7 @@ module Pod
         end
       end
 
-      # Copies the pod_targets of any of the app embedded aggregate targets into
+      # Copies the pod targets of any of the app embedded aggregate targets into
       # their potential host aggregate target, if that potential host aggregate target's
       # user_target hosts any of the app embedded aggregate targets' user_targets
       #
@@ -271,7 +274,6 @@ module Pod
       #
       def embedded_target_pod_targets_by_host(aggregate_target, embedded_aggregate_targets, libraries_only)
         return {} if aggregate_target.requires_host_target?
-        pod_target_names = Set.new(aggregate_target.pod_targets.map(&:name))
         aggregate_user_target_uuids = Set.new(aggregate_target.user_targets.map(&:uuid))
         embedded_pod_targets_by_build_config = Hash.new([].freeze)
         embedded_aggregate_targets.each do |embedded_aggregate_target|
@@ -289,8 +291,12 @@ module Pod
             !aggregate_user_target_uuids.intersection(host_target_uuids).empty?
           end
           embedded_aggregate_target.user_build_configurations.keys.each do |configuration_name|
+            pod_target_names = Set.new(aggregate_target.pod_targets_for_build_configuration(configuration_name).map(&:name))
             embedded_pod_targets = embedded_aggregate_target.pod_targets_for_build_configuration(configuration_name).select do |pod_target|
-              !pod_target_names.include? pod_target.name
+              if !pod_target_names.include?(pod_target.name) &&
+                 aggregate_target.pod_targets.none? { |aggregate_pod_target| (pod_target.specs - aggregate_pod_target.specs).empty? }
+                pod_target.name
+              end
             end
             embedded_pod_targets_by_build_config[configuration_name] = embedded_pod_targets
           end
@@ -447,7 +453,7 @@ module Pod
           target_inspection = target_inspections[target_definition]
           raise "missing inspection: #{target_definition.name}" unless target_inspection
           user_project = target_inspection.project
-          client_root = user_project.path.dirname.realpath
+          client_root = target_inspection.client_root
           user_target_uuids = target_inspection.project_target_uuids
           user_build_configurations = target_inspection.build_configurations
           archs = target_requires_64_bit ? ['$(ARCHS_STANDARD_64_BIT)'] : target_inspection.archs
@@ -783,11 +789,12 @@ module Pod
       #
       def fetch_external_sources(podfile_state)
         verify_no_pods_with_different_sources!
-        unless dependencies_to_fetch(podfile_state).empty?
-          UI.section 'Fetching external sources' do
-            dependencies_to_fetch(podfile_state).sort.each do |dependency|
-              fetch_external_source(dependency, !pods_to_fetch(podfile_state).include?(dependency.root_name))
-            end
+        deps = dependencies_to_fetch(podfile_state)
+        pods = pods_to_fetch(podfile_state)
+        return if deps.empty?
+        UI.section 'Fetching external sources' do
+          deps.sort.each do |dependency|
+            fetch_external_source(dependency, !pods.include?(dependency.root_name))
           end
         end
       end
@@ -803,8 +810,7 @@ module Pod
       end
 
       def fetch_external_source(dependency, use_lockfile_options)
-        checkout_options = lockfile.checkout_options_for_pod_named(dependency.root_name) if lockfile
-        source = if checkout_options && use_lockfile_options
+        source = if use_lockfile_options && lockfile && checkout_options = lockfile.checkout_options_for_pod_named(dependency.root_name)
                    ExternalSources.from_params(checkout_options, dependency, podfile.defined_in_file, installation_options.clean?)
                  else
                    ExternalSources.from_dependency(dependency, podfile.defined_in_file, installation_options.clean?)

data/lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb

@@ -53,6 +53,11 @@ module Pod
             pods_to_update.each do |u|
               dependency_graph.detach_vertex_named(u)
             end
+
+            dependency_graph.each do |vertex|
+              next unless dep = vertex.payload
+              dep.podspec_repo ||= lockfile.spec_repo(dep.root_name)
+            end
           end
 
           dependency_graph

data/lib/cocoapods/installer/analyzer/target_inspection_result.rb

@@ -30,6 +30,10 @@ module Pod
         #
         attr_reader :archs
 
+        # @return [Pathname] the path to the root of the project containing the user target
+        #
+        attr_reader :client_root
+
         # Initialize a new instance
         #
         # @param [TargetDefinition] target_definition @see #target_definition
@@ -46,6 +50,7 @@ module Pod
           @build_configurations = build_configurations
           @platform = platform
           @archs = archs
+          @client_root = project.project_dir.realpath
         end
       end
     end

data/lib/cocoapods/installer/installation_options.rb

@@ -108,6 +108,8 @@ module Pod
       option :lock_pod_sources, true
       option :warn_for_multiple_pod_sources, true
       option :share_schemes_for_development_pods, false
+      option :disable_input_output_paths, false
+      option :preserve_pod_file_structure, false
 
       module Mixin
         module ClassMethods

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -123,7 +123,7 @@ module Pod
                    return unless git_source =~ /^#{URI.regexp}$/
                    URI(git_source)
                  end
-        if UNENCRYPTED_PROTOCOLS.include?(source.scheme)
+        if UNENCRYPTED_PROTOCOLS.include?(source.scheme) && source.host != 'localhost'
           UI.warn "'#{root_spec.name}' uses the unencrypted '#{source.scheme}' protocol to transfer the Pod. " \
                 'Please be sure you\'re in a safe network with only trusted hosts. ' \
                 'Otherwise, please reach out to the library author to notify them of this security issue.'

data/lib/cocoapods/installer/post_install_hooks_context.rb

@@ -61,7 +61,7 @@ module Pod
         new(sandbox, sandbox.root.to_s, sandbox.project, umbrella_targets_descriptions)
       end
 
-      # Pure data class which describes and umbrella target.
+      # Pure data class which describes an umbrella target.
       #
       class UmbrellaTargetDescription
         # @return [Xcodeproj::Project] The user project into which this target

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -13,6 +13,10 @@ module Pod
     class UserProjectIntegrator
       autoload :TargetIntegrator, 'cocoapods/installer/user_project_integrator/target_integrator'
 
+      include InstallationOptions::Mixin
+
+      delegate_installation_options { podfile }
+
       # @return [Podfile] the podfile that should be integrated with the user
       #         projects.
       #
@@ -42,7 +46,7 @@ module Pod
       # @param  [Podfile]  podfile @see #podfile
       # @param  [Sandbox]  sandbox @see #sandbox
       # @param  [Pathname] installation_root @see #installation_root
-      # @param  [Array<AggregateTarget>]  targets @see #targets
+      # @param  [Array<AggregateTarget>] targets @see #targets
       #
       def initialize(podfile, sandbox, installation_root, targets)
         @podfile = podfile
@@ -111,7 +115,7 @@ module Pod
       #
       def integrate_user_targets
         target_integrators = targets_to_integrate.sort_by(&:name).map do |target|
-          TargetIntegrator.new(target)
+          TargetIntegrator.new(target, installation_options)
         end
 
         Config.instance.with_changes(:silent => true) do

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/string/inflections'
+require 'cocoapods/target/framework_paths'
 
 module Pod
   class Installer
@@ -48,12 +49,18 @@ module Pod
         #
         attr_reader :target
 
+        # @return [InstallationOptions] the installation options from the Podfile.
+        #
+        attr_reader :installation_options
+
         # Init a new TargetIntegrator
         #
         # @param  [AggregateTarget] target @see #target
+        # @param  [InstallationOptions] installation_options @see #installation_options
         #
-        def initialize(target)
+        def initialize(target, installation_options)
           @target = target
+          @installation_options = installation_options
         end
 
         class << self
@@ -254,6 +261,23 @@ module Pod
               File.join(base_path, File.basename(basename, extname) + output_extension)
             end.uniq
           end
+
+          # Returns the framework output paths for the given input paths
+          #
+          # @param  [Array<Target::FrameworkPaths>] framework_input_paths
+          #         The framework input paths to map to output paths.
+          #
+          # @return [Array<String>] The framework output paths
+          #
+          def framework_output_paths(framework_input_paths)
+            framework_input_paths.flat_map do |framework_path|
+              framework_output_path = "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{File.basename(framework_path.source_path)}"
+              dsym_path = if (dsym_input_path = framework_path.dsym_path)
+                            "${DWARF_DSYM_FOLDER_PATH}/#{File.basename(dsym_input_path)}"
+                          end
+              [framework_output_path, dsym_path]
+            end.compact.uniq
+          end
         end
 
         # Integrates the user project targets. Only the targets that do **not**
@@ -327,14 +351,16 @@ module Pod
             end
             return
           end
-
           script_path = target.copy_resources_script_relative_path
-          resource_paths_by_config = target.resource_paths_by_config
-          resource_paths_flattened = resource_paths_by_config.values.flatten.uniq
-          input_paths = [target.copy_resources_script_relative_path, *resource_paths_flattened]
-          output_paths = TargetIntegrator.resource_output_paths(resource_paths_flattened)
+          input_paths = []
+          output_paths = []
+          unless installation_options.disable_input_output_paths?
+            resource_paths_by_config = target.resource_paths_by_config
+            resource_paths_flattened = resource_paths_by_config.values.flatten.uniq
+            input_paths = [target.copy_resources_script_relative_path, *resource_paths_flattened]
+            output_paths = TargetIntegrator.resource_output_paths(resource_paths_flattened)
+          end
           TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
-
           native_targets.each do |native_target|
             # Static library targets cannot include resources. Skip this phase from being added instead.
             next if native_target.symbol_type == :static_library
@@ -368,12 +394,16 @@ module Pod
             end
             return
           end
-
           script_path = target.embed_frameworks_script_relative_path
-          framework_paths_by_config = target.framework_paths_by_config.values.flatten.uniq
-          input_paths = [target.embed_frameworks_script_relative_path, *framework_paths_by_config.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
-          output_paths = framework_paths_by_config.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact.uniq
-          TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
+          input_paths = []
+          output_paths = []
+          unless installation_options.disable_input_output_paths?
+            framework_paths = target.framework_paths_by_config.values.flatten.uniq
+            framework_input_paths = framework_paths.flat_map { |path| [path.source_path, path.dsym_path] }.compact
+            input_paths = [target.embed_frameworks_script_relative_path, *framework_input_paths]
+            output_paths = TargetIntegrator.framework_output_paths(framework_paths)
+            TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
+          end
 
           native_targets_to_embed_in.each do |native_target|
             TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)

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

@@ -165,14 +165,12 @@ module Pod
               build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
               build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
               build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
-              build_configuration.build_settings['CODE_SIGNING_REQUIRED'] = 'NO'
-              build_configuration.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
             end
           end
         end
 
         def install_file_references
-          installer = FileReferencesInstaller.new(sandbox, pod_targets, project)
+          installer = FileReferencesInstaller.new(sandbox, pod_targets, project, installation_options.preserve_pod_file_structure)
           installer.install!
         end
 
@@ -212,7 +210,7 @@ module Pod
           unless pod_installations_to_integrate.empty?
             UI.message '- Integrating targets' do
               pod_installations_to_integrate.each do |pod_target_installation_result|
-                PodTargetIntegrator.new(pod_target_installation_result).integrate!
+                PodTargetIntegrator.new(pod_target_installation_result, installation_options).integrate!
               end
             end
           end

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

@@ -25,18 +25,26 @@ module Pod
           #
           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)
+          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.
@@ -51,12 +59,13 @@ module Pod
               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, name)
-            Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, name) if platform == :ios
+
+            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, 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)
-            project[name].new_file(app_host_info_plist_path)
+            @group.new_file(app_host_info_plist_path)
             app_host_target
           end
 
@@ -80,7 +89,7 @@ module Pod
           # @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")
+            project.path.dirname.+(name).+("#{name}-Info.plist")
           end
 
           # @return [String] The deployment target.

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 #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.
@@ -190,24 +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|
               paths = file_accessor.send(file_accessor_key)
               paths = allowable_project_paths(paths)
               next if paths.empty?
 
               pod_name = file_accessor.spec.name
-              local = sandbox.local?(pod_name)
-              base_path = local ? common_path(paths) : nil
+              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|
-                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

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

@@ -50,6 +50,7 @@ module Pod
               test_resource_bundle_targets = add_resources_bundle_targets(test_file_accessors)
 
               add_files_to_build_phases(native_target, test_native_targets)
+              validate_targets_contain_sources(test_native_targets + [native_target])
 
               create_xcconfig_file(native_target, resource_bundle_targets)
               create_test_xcconfig_files(test_native_targets, test_resource_bundle_targets)
@@ -90,12 +91,14 @@ module Pod
 
               unless skip_pch?(target.non_test_specs)
                 path = target.prefix_header_path
-                create_prefix_header(path, file_accessors, target.platform, [native_target])
+                create_prefix_header(path, file_accessors, target.platform, native_target)
               end
               unless skip_pch?(target.test_specs)
                 target.test_specs.each do |test_spec|
                   path = target.prefix_header_path_for_test_spec(test_spec)
-                  create_prefix_header(path, test_file_accessors, target.platform, test_native_targets)
+                  test_spec_consumer = test_spec.consumer(target.platform)
+                  test_native_target = test_native_target_from_spec_consumer(test_spec_consumer, test_native_targets)
+                  create_prefix_header(path, test_file_accessors, target.platform, test_native_target)
                 end
               end
               create_dummy_source(native_target)
@@ -285,6 +288,9 @@ module Pod
                 # requires frameworks. For tests we always use the test target name as the product name
                 # irrelevant to whether we use frameworks or not.
                 configuration.build_settings['PRODUCT_NAME'] = name
+                # target_installer sets 'MACH_O_TYPE' for static frameworks ensure this does not propagate
+                # to test target.
+                configuration.build_settings.delete('MACH_O_TYPE')
                 # Use xcode default product module name, which is $(PRODUCT_NAME:c99extidentifier)
                 # this gives us always valid name that is distinct from the parent spec module name
                 # which allow tests to use either import or @testable import to access the parent framework
@@ -323,7 +329,7 @@ module Pod
             target.test_spec_consumers.select(&:requires_app_host?).group_by(&:test_type).map do |test_type, test_spec_consumers|
               platform = target.platform
               name = "AppHost-#{target.label}-#{test_type.capitalize}-Tests"
-              app_host_target = AppHostInstaller.new(sandbox, project, platform, name).install!
+              app_host_target = AppHostInstaller.new(sandbox, project, platform, name, target.pod_name).install!
               # Wire test native targets to the generated app host.
               test_spec_consumers.each do |test_spec_consumer|
                 test_native_target = test_native_target_from_spec_consumer(test_spec_consumer, test_native_targets)
@@ -560,21 +566,19 @@ module Pod
           # @param [Platform] platform
           #        the platform to use for this prefix header.
           #
-          # @param [Array<PBXNativeTarget>] native_targets
-          #        the native targets on which the prefix header should be configured for.
+          # @param [PBXNativeTarget] native_target
+          #        the native target on which the prefix header should be configured for.
           #
           # @return [void]
           #
-          def create_prefix_header(path, file_accessors, platform, native_targets)
+          def create_prefix_header(path, file_accessors, platform, native_target)
             generator = Generator::PrefixHeader.new(file_accessors, platform)
             update_changed_file(generator, path)
             add_file_to_support_group(path)
 
-            native_targets.each do |native_target|
-              native_target.build_configurations.each do |c|
-                relative_path = path.relative_path_from(project.path.dirname)
-                c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
-              end
+            relative_path = path.relative_path_from(project.path.dirname)
+            native_target.build_configurations.each do |c|
+              c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
             end
           end
 
@@ -818,6 +822,13 @@ module Pod
             )
           end
 
+          def validate_targets_contain_sources(native_targets)
+            native_targets.each do |native_target|
+              next unless native_target.source_build_phase.files.empty?
+              raise Informative, "Unable to install the `#{target.label}` pod, because the `#{native_target}` target in Xcode would have no sources to compile."
+            end
+          end
+
           #-----------------------------------------------------------------------#
         end
       end