cocoapods 1.11.3 → 1.12.0

data/lib/cocoapods/installer/pod_source_downloader.rb

@@ -0,0 +1,159 @@
+
+module Pod
+  class Installer
+    # Controller class responsible for downloading the activated specifications
+    # of a single Pod.
+    #
+    # @note This class needs to consider all the activated specs of a Pod.
+    #
+    class PodSourceDownloader
+      UNENCRYPTED_PROTOCOLS = %w(http git).freeze
+
+      # @return [Sandbox] The installation target.
+      #
+      attr_reader :sandbox
+
+      # @return [Podfile] the podfile that should be integrated with the user
+      #         projects.
+      #
+      attr_reader :podfile
+
+      # @return [Hash{Symbol=>Array}] The specifications that need to be
+      #         installed grouped by platform.
+      #
+      attr_reader :specs_by_platform
+
+      # @return [Boolean] Whether the installer is allowed to touch the cache.
+      #
+      attr_reader :can_cache
+      alias can_cache? can_cache
+
+      # Initialize a new instance
+      #
+      # @param [Sandbox] sandbox @see #sandbox
+      # @param [Podfile] podfile @see #podfile
+      # @param [Hash{Symbol=>Array}] specs_by_platform @see #specs_by_platform
+      # @param [Boolean] can_cache @see #can_cache
+      #
+      def initialize(sandbox, podfile, specs_by_platform, can_cache: true)
+        @sandbox = sandbox
+        @podfile = podfile
+        @specs_by_platform = specs_by_platform
+        @can_cache = can_cache
+      end
+
+      # @return [String] A string suitable for debugging.
+      #
+      def inspect
+        "<#{self.class} sandbox=#{sandbox.root} pod=#{root_spec.name}"
+      end
+
+      # @return [String] The name of the pod this downloader is downloading.
+      #
+      def name
+        root_spec.name
+      end
+
+      #-----------------------------------------------------------------------#
+
+      public
+
+      # @!group Downloading
+
+      # Creates the target in the Pods project and the relative support files.
+      #
+      # @return [void]
+      #
+      def download!
+        verify_source_is_secure(root_spec)
+        download_result = Downloader.download(download_request, root, :can_cache => can_cache?)
+
+        if (specific_source = download_result.checkout_options) && specific_source != root_spec.source
+          sandbox.store_checkout_source(root_spec.name, specific_source)
+        end
+
+        sandbox.store_downloaded_pod(root_spec.name)
+      end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
+      # @!group Download Steps
+
+      # Verify the source of the spec is secure, which is used to show a warning to the user if that isn't the case
+      # This method doesn't verify all protocols, but currently only prohibits unencrypted 'http://' and 'git://''
+      # connections.
+      #
+      # @return [void]
+      #
+      def verify_source_is_secure(root_spec)
+        return if root_spec.source.nil? || (root_spec.source[:http].nil? && root_spec.source[:git].nil?)
+        source = if !root_spec.source[:http].nil?
+                   URI(root_spec.source[:http].to_s)
+                 elsif !root_spec.source[:git].nil?
+                   git_source = root_spec.source[:git].to_s
+                   return unless git_source =~ /^#{URI::DEFAULT_PARSER.make_regexp}$/
+                   URI(git_source)
+                 end
+        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.'
+        end
+      end
+
+      def download_request
+        Downloader::Request.new(
+          :spec => root_spec,
+          :released => released?,
+        )
+      end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
+      # @!group Convenience methods.
+
+      # @return [Array<Specifications>] the specification of the Pod used in
+      #         this installation.
+      #
+      def specs
+        specs_by_platform.values.flatten
+      end
+
+      # @return [Specification] the root specification of the Pod.
+      #
+      def root_spec
+        specs.first.root
+      end
+
+      # @return [Pathname] the folder where the source of the Pod is located.
+      #
+      def root
+        sandbox.pod_dir(root_spec.name)
+      end
+
+      # @return [Boolean] whether the source has been pre downloaded in the
+      #         resolution process to retrieve its podspec.
+      #
+      def predownloaded?
+        sandbox.predownloaded_pods.include?(root_spec.name)
+      end
+
+      # @return [Boolean] whether the pod uses the local option and thus
+      #         CocoaPods should not interfere with the files of the user.
+      #
+      def local?
+        sandbox.local?(root_spec.name)
+      end
+
+      def released?
+        sandbox.specification(root_spec.name) != root_spec
+      end
+
+      #-----------------------------------------------------------------------#
+    end
+  end
+end

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -8,8 +8,6 @@ module Pod
     # @note This class needs to consider all the activated specs of a Pod.
     #
     class PodSourceInstaller
-      UNENCRYPTED_PROTOCOLS = %w(http git).freeze
-
       # @return [Sandbox] The installation target.
       #
       attr_reader :sandbox
@@ -114,43 +112,12 @@ module Pod
       # @return [void]
       #
       def download_source
-        verify_source_is_secure(root_spec)
-        download_result = Downloader.download(download_request, root, :can_cache => can_cache?)
-
-        if (specific_source = download_result.checkout_options) && specific_source != root_spec.source
-          sandbox.store_checkout_source(root_spec.name, specific_source)
+        unless downloaded?
+          downloader = PodSourceDownloader.new(sandbox, podfile, specs_by_platform, :can_cache => can_cache?)
+          downloader.download!
         end
       end
 
-      # Verify the source of the spec is secure, which is used to show a warning to the user if that isn't the case
-      # This method doesn't verify all protocols, but currently only prohibits unencrypted 'http://' and 'git://''
-      # connections.
-      #
-      # @return [void]
-      #
-      def verify_source_is_secure(root_spec)
-        return if root_spec.source.nil? || (root_spec.source[:http].nil? && root_spec.source[:git].nil?)
-        source = if !root_spec.source[:http].nil?
-                   URI(root_spec.source[:http].to_s)
-                 elsif !root_spec.source[:git].nil?
-                   git_source = root_spec.source[:git].to_s
-                   return unless git_source =~ /^#{URI.regexp}$/
-                   URI(git_source)
-                 end
-        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.'
-        end
-      end
-
-      def download_request
-        Downloader::Request.new(
-          :spec => root_spec,
-          :released => released?,
-        )
-      end
-
       #-----------------------------------------------------------------------#
 
       private
@@ -186,6 +153,13 @@ module Pod
         sandbox.pod_dir(root_spec.name)
       end
 
+      # @return [Boolean] whether the source has already been downloaded prior
+      #         to the installation process.
+      #
+      def downloaded?
+        sandbox.downloaded_pods.include?(root_spec.name)
+      end
+
       # @return [Boolean] whether the source has been pre downloaded in the
       #         resolution process to retrieve its podspec.
       #

data/lib/cocoapods/installer/project_cache/project_cache_analyzer.rb

@@ -38,7 +38,7 @@ module Pod
         #
         attr_reader :installation_options
 
-        # @return [Bool] Flag indicating if we want to ignore the cache and force a clean installation.
+        # @return [Boolean] Flag indicating if we want to ignore the cache and force a clean installation.
         #
         attr_reader :clean_install
 
@@ -52,7 +52,7 @@ module Pod
         # @param [Array<PodTarget>] pod_targets @see #pod_targets
         # @param [Array<AggregateTarget>] aggregate_targets @see #aggregate_targets
         # @param [Hash<Symbol, Object>] installation_options @see #installation_options
-        # @param [Bool] clean_install @see #clean_install
+        # @param [Boolean] clean_install @see #clean_install
         #
         def initialize(sandbox, cache, build_configurations, project_object_version, podfile_plugins, pod_targets, aggregate_targets, installation_options,
                        clean_install: false)

data/lib/cocoapods/installer/project_cache/target_cache_key.rb

@@ -109,7 +109,7 @@ module Pod
         # @param [PodTarget] pod_target
         #        The pod target used to construct a TargetCacheKey object.
         #
-        # @param [Bool] is_local_pod
+        # @param [Boolean] is_local_pod
         #        Used to also include its local files in the cache key.
         #
         # @param [Hash] checkout_options

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

@@ -21,7 +21,7 @@ module Pod
           #
           attr_reader :pods_project
 
-          # @return [Bool] add support for preserving the file structure of externally sourced pods, in addition to local pods.
+          # @return [Boolean] add support for preserving the file structure of externally sourced pods, in addition to local pods.
           #
           attr_reader :preserve_pod_file_structure
 
@@ -30,7 +30,7 @@ module Pod
           # @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
+          # @param [Boolean] preserve_pod_file_structure @see #preserve_pod_file_structure
           #
           def initialize(sandbox, pod_targets, pods_project, preserve_pod_file_structure = false)
             @sandbox = sandbox
@@ -207,7 +207,7 @@ module Pod
           # @param  [Symbol] group_key
           #         The key of the group of the Pods project.
           #
-          # @param  [Bool] reflect_file_system_structure
+          # @param  [Boolean] reflect_file_system_structure
           #         Whether organizing a local pod's files in subgroups inside
           #         the pod's group is allowed.
           #
@@ -243,6 +243,10 @@ module Pod
           def allowable_project_paths(paths)
             lproj_paths = Set.new
             lproj_paths_with_files = Set.new
+
+            # Remove all file ref under .docc folder, but preserve the .docc folder
+            paths = merge_to_docc_folder(paths)
+
             allowable_paths = paths.select do |path|
               path_str = path.to_s
 
@@ -327,3 +331,33 @@ module Pod
     end
   end
 end
+
+# If we have an non-empty .docc folder, remove all paths under the folder
+# but keep the folder itself
+#
+# @param [Array<Pathname>] paths the paths to inspect
+#
+# @return [Array<Pathname>] The resulted list of paths.
+#
+def merge_to_docc_folder(paths)
+  docc_paths_with_files = Set.new
+  allowable_paths = paths.select do |path|
+    path_str = path.to_s
+
+    if path_str =~ /\.docc(\/|$)/i
+
+      # we want folder with files
+      next if path.directory?
+
+      # remove everything after ".docc", but keep ".docc"
+      folder_path = path_str.split("\.docc")[0] + "\.docc"
+
+      docc_paths_with_files << Pathname(folder_path)
+      next
+
+    end
+    true
+  end
+
+  allowable_paths + docc_paths_with_files.to_a
+end

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

@@ -600,6 +600,9 @@ module Pod
                   # classes from the parent module.
                   configuration.build_settings['IBSC_MODULE'] = target.product_module_name
 
+                  # Xcode 14.x throws an error about code signing on resource bundles, turn it off for now.
+                  configuration.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+
                   # Set the `SWIFT_VERSION` build setting for resource bundles that could have resources that get
                   # compiled such as an `xcdatamodeld` file which has 'Swift' as its code generation language.
                   if contains_compile_phase_refs && file_accessors.any? { |fa| target.uses_swift_for_spec?(fa.spec) }
@@ -1010,6 +1013,9 @@ module Pod
             error_message_for_missing_reference = lambda do |sf, target|
               "Unable to find #{file_type} ref for `#{sf.basename}` for target `#{target.name}`."
             end
+
+            # Remove all file ref under .docc folder, but preserve the .docc folder
+            files = merge_to_docc_folder(files)
             files.map do |sf|
               begin
                 project.reference_for_path(sf).tap do |ref|

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

@@ -38,7 +38,7 @@ module Pod
         #
         attr_reader :podfile_path
 
-        # @return [Bool] Bool indicating if this project is a pod target subproject.
+        # @return [Boolean] Bool indicating if this project is a pod target subproject.
         # Used by `generate_multiple_pod_projects` installation option.
         #
         attr_reader :pod_target_subproject

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

@@ -195,7 +195,7 @@ module Pod
 
         # @param  [String] pod The root name of the development pod.
         #
-        # @return [Bool] whether the scheme for the given development pod should be
+        # @return [Boolean] whether the scheme for the given development pod should be
         #         shared.
         #
         def share_scheme_for_development_pod?(pod)
@@ -265,6 +265,10 @@ module Pod
               if scheme_configuration.key?(:code_coverage)
                 scheme.test_action.code_coverage_enabled = scheme_configuration[:code_coverage]
               end
+              if scheme_configuration.key?(:parallelizable)
+                scheme.test_action.testables.each { |testable| testable.parallelizable = scheme_configuration[:parallelizable] }
+              end
+              set_scheme_build_configurations(scheme, scheme_configuration.fetch(:build_configurations, {}))
 
               hosted_test_specs_by_host[spec].each do |hosted_spec|
                 # We are an app spec which hosts this test spec.
@@ -285,6 +289,37 @@ module Pod
             Xcodeproj::XCScheme.share_scheme(project.path, scheme_name) if share_scheme
           end
         end
+
+        # @param [Xcodeproj::XCSheme] scheme
+        # scheme to apply configuration to
+        #
+        # @param [Hash{String => String}] configuration
+        # action => build configuration to use for the action
+        #
+        # @return [void]
+        #
+        def set_scheme_build_configurations(scheme, configuration)
+          configuration.each do |k, v|
+            unless @build_configurations.include?(v)
+              raise Informative, "Unable to set `#{v}` as a build configuration as " \
+              "it doesn't match with any of your projects build configurations."
+            end
+
+            case k
+            when 'Run'
+              scheme.launch_action.build_configuration = v
+            when 'Test'
+              scheme.test_action.build_configuration = v
+            when 'Analyze'
+              scheme.analyze_action.build_configuration = v
+            when 'Archive'
+              scheme.archive_action.build_configuration = v
+            else
+              raise Informative, "#{k} is not a valid scheme action " \
+              "only one of ['run', 'test', 'analyze', 'archive'] is available"
+            end
+          end
+        end
       end
     end
   end

data/lib/cocoapods/installer.rb

@@ -39,6 +39,7 @@ module Pod
     autoload :PreIntegrateHooksContext,     'cocoapods/installer/pre_integrate_hooks_context'
     autoload :SourceProviderHooksContext,   'cocoapods/installer/source_provider_hooks_context'
     autoload :PodfileValidator,             'cocoapods/installer/podfile_validator'
+    autoload :PodSourceDownloader,          'cocoapods/installer/pod_source_downloader'
     autoload :PodSourceInstaller,           'cocoapods/installer/pod_source_installer'
     autoload :PodSourcePreparer,            'cocoapods/installer/pod_source_preparer'
     autoload :UserProjectIntegrator,        'cocoapods/installer/user_project_integrator'
@@ -161,8 +162,10 @@ module Pod
       resolve_dependencies
       download_dependencies
       validate_targets
+      clean_sandbox
       if installation_options.skip_pods_project_generation?
         show_skip_pods_project_generation_message
+        run_podfile_post_install_hooks
       else
         integrate
       end
@@ -296,7 +299,10 @@ module Pod
       pod_targets_to_generate = cache_analysis_result.pod_targets_to_generate
       aggregate_targets_to_generate = cache_analysis_result.aggregate_targets_to_generate
 
-      clean_sandbox(pod_targets_to_generate)
+      pod_targets_to_generate.each do |pod_target|
+        pod_target.build_headers.implode_path!(pod_target.headers_sandbox)
+        sandbox.public_headers.implode_path!(pod_target.headers_sandbox)
+      end
 
       create_and_save_projects(pod_targets_to_generate, aggregate_targets_to_generate,
                                cache_analysis_result.build_configurations, cache_analysis_result.project_object_version)
@@ -443,23 +449,30 @@ module Pod
       end
     end
 
-    # @return [void] In this step we clean all the header folders for pod targets that will be
-    #         regenerated from scratch and cleanup any pods that have been removed.
+    # @return [void] Performs a general clean up of the sandbox related to the sandbox state that was
+    #                calculated. For example, pods that were marked for deletion are removed.
     #
-    def clean_sandbox(pod_targets)
-      pod_targets.each do |pod_target|
-        pod_target.build_headers.implode_path!(pod_target.headers_sandbox)
-        sandbox.public_headers.implode_path!(pod_target.headers_sandbox)
-      end
-
+    def clean_sandbox
       unless sandbox_state.deleted.empty?
         title_options = { :verbose_prefix => '-> '.red }
         sandbox_state.deleted.each do |pod_name|
           UI.titled_section("Removing #{pod_name}".red, title_options) do
-            sandbox.clean_pod(pod_name)
+            root_name = Specification.root_name(pod_name)
+            pod_dir = sandbox.local?(root_name) ? nil : sandbox.pod_dir(root_name)
+            sandbox.clean_pod(pod_name, pod_dir)
           end
         end
       end
+
+      # Check any changed pods that became local pods and used to be remote pods and
+      # ensure the sandbox is cleaned up.
+      unless sandbox_state.changed.empty?
+        sandbox_state.changed.each do |pod_name|
+          previous_spec_repo = sandbox.manifest.spec_repo(pod_name)
+          should_clean = !previous_spec_repo.nil? && sandbox.local?(pod_name)
+          sandbox.clean_pod(pod_name, sandbox.sources_root + Specification.root_name(pod_name)) if should_clean
+        end
+      end
     end
 
     # @raise [Informative] If there are any Podfile changes
@@ -490,26 +503,38 @@ module Pod
     # @return [void]
     #
     def install_pod_sources
+      @downloaded_specs = []
       @installed_specs = []
       pods_to_install = sandbox_state.added | sandbox_state.changed
       title_options = { :verbose_prefix => '-> '.green }
-      root_specs.sort_by(&:name).each do |spec|
-        if pods_to_install.include?(spec.name)
-          if sandbox_state.changed.include?(spec.name) && sandbox.manifest
-            current_version = spec.version
-            previous_version = sandbox.manifest.version(spec.name)
-            has_changed_version = current_version != previous_version
-            current_repo = analysis_result.specs_by_source.detect { |key, values| break key if values.map(&:name).include?(spec.name) }
-            current_repo &&= (Pod::TrunkSource::TRUNK_REPO_NAME if current_repo.name == Pod::TrunkSource::TRUNK_REPO_NAME) || current_repo.url || current_repo.name
-            previous_spec_repo = sandbox.manifest.spec_repo(spec.name)
-            has_changed_repo = !previous_spec_repo.nil? && current_repo && !current_repo.casecmp(previous_spec_repo).zero?
-            title = "Installing #{spec.name} #{spec.version}"
-            title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
-            title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
-            title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
-          else
-            title = "Installing #{spec}"
+
+      sorted_root_specs = root_specs.sort_by(&:name)
+
+      # Download pods in parallel before installing if the option is set
+      if installation_options.parallel_pod_downloads
+        require 'concurrent/executor/fixed_thread_pool'
+        thread_pool_size = installation_options.parallel_pod_download_thread_pool_size
+        thread_pool = Concurrent::FixedThreadPool.new(thread_pool_size, :idletime => 300)
+
+        sorted_root_specs.each do |spec|
+          if pods_to_install.include?(spec.name)
+            title = section_title(spec, 'Downloading')
+            UI.titled_section(title.green, title_options) do
+              thread_pool.post do
+                download_source_of_pod(spec.name)
+              end
+            end
           end
+        end
+
+        thread_pool.shutdown
+        thread_pool.wait_for_termination
+      end
+
+      # Install pods, which includes downloading only if parallel_pod_downloads is set to false
+      sorted_root_specs.each do |spec|
+        if pods_to_install.include?(spec.name)
+          title = section_title(spec, 'Installing')
           UI.titled_section(title.green, title_options) do
             install_source_of_pod(spec.name)
           end
@@ -521,13 +546,32 @@ module Pod
       end
     end
 
+    def section_title(spec, current_action)
+      if sandbox_state.changed.include?(spec.name) && sandbox.manifest
+        current_version = spec.version
+        previous_version = sandbox.manifest.version(spec.name)
+        has_changed_version = current_version != previous_version
+        current_repo = analysis_result.specs_by_source.detect { |key, values| break key if values.map(&:name).include?(spec.name) }
+        current_repo &&= (Pod::TrunkSource::TRUNK_REPO_NAME if current_repo.name == Pod::TrunkSource::TRUNK_REPO_NAME) || current_repo.url || current_repo.name
+        previous_spec_repo = sandbox.manifest.spec_repo(spec.name)
+        has_changed_repo = !previous_spec_repo.nil? && current_repo && !current_repo.casecmp(previous_spec_repo).zero?
+        title = "#{current_action} #{spec.name} #{spec.version}"
+        title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
+        title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
+        title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
+      else
+        title = "#{current_action} #{spec}"
+      end
+      title
+    end
+
     def create_pod_installer(pod_name)
       specs_by_platform = specs_for_pod(pod_name)
 
       if specs_by_platform.empty?
         requiring_targets = pod_targets.select { |pt| pt.recursive_dependent_targets.any? { |dt| dt.pod_name == pod_name } }
         message = "Could not install '#{pod_name}' pod"
-        message += ", dependended upon by #{requiring_targets.to_sentence}" unless requiring_targets.empty?
+        message += ", depended upon by #{requiring_targets.to_sentence}" unless requiring_targets.empty?
         message += '. There is either no platform to build for, or no target to build.'
         raise StandardError, message
       end
@@ -537,6 +581,20 @@ module Pod
       pod_installer
     end
 
+    def create_pod_downloader(pod_name)
+      specs_by_platform = specs_for_pod(pod_name)
+
+      if specs_by_platform.empty?
+        requiring_targets = pod_targets.select { |pt| pt.recursive_dependent_targets.any? { |dt| dt.pod_name == pod_name } }
+        message = "Could not download '#{pod_name}' pod"
+        message += ", depended upon by #{requiring_targets.to_sentence}" unless requiring_targets.empty?
+        message += '. There is either no platform to build for, or no target to build.'
+        raise StandardError, message
+      end
+
+      PodSourceDownloader.new(sandbox, podfile, specs_by_platform, :can_cache => installation_options.clean?)
+    end
+
     # The specifications matching the specified pod name
     #
     # @param  [String] pod_name the name of the pod
@@ -564,8 +622,19 @@ module Pod
       @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
     end
 
-    # Cleans the sources of the Pods if the config instructs to do so.
+    # Download the pod unless it is local or has been predownloaded from an
+    # external source.
+    #
+    # @return [void]
     #
+    def download_source_of_pod(pod_name)
+      return if sandbox.local?(pod_name) || sandbox.predownloaded?(pod_name)
+
+      pod_downloader = create_pod_downloader(pod_name)
+      pod_downloader.download!
+    end
+
+    # Cleans the sources of the Pods if the config instructs to do so.
     #
     def clean_pod_sources
       return unless installation_options.clean?
@@ -633,7 +702,7 @@ module Pod
     #
     def run_plugins_pre_integrate_hooks
       if any_plugin_pre_integrate_hooks?
-        context = PreIntegrateHooksContext.generate(sandbox, pods_project, aggregate_targets)
+        context = PreIntegrateHooksContext.generate(sandbox, pods_project, pod_target_subprojects, aggregate_targets)
         HooksManager.run(:pre_integrate, context, plugins)
       end
     end
@@ -645,7 +714,7 @@ module Pod
       if any_plugin_post_install_hooks?
         unlock_pod_sources
 
-        context = PostInstallHooksContext.generate(sandbox, pods_project, aggregate_targets)
+        context = PostInstallHooksContext.generate(sandbox, pods_project, pod_target_subprojects, aggregate_targets)
         HooksManager.run(:post_install, context, plugins)
       end
 
@@ -656,7 +725,7 @@ module Pod
     #
     def run_plugins_post_integrate_hooks
       if any_plugin_post_integrate_hooks?
-        context = PostIntegrateHooksContext.generate(sandbox, pods_project, aggregate_targets)
+        context = PostIntegrateHooksContext.generate(sandbox, pods_project, pod_target_subprojects, aggregate_targets)
         HooksManager.run(:post_integrate, context, plugins)
       end
     end
@@ -893,10 +962,9 @@ module Pod
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
-    # Runs the post integrate hooks of the installed specs and of the Podfile.
+    # Runs the pre integrate hooks of the installed specs and of the Podfile.
     #
-    # @note   Post integrate hooks run _after_ saving of project, so that they
-    #         can alter it after it is written to the disk.
+    # @note   Pre integrate hooks run _before_ generation of the Pods project.
     #
     # @return [void]
     #

data/lib/cocoapods/native_target_extension.rb

@@ -43,7 +43,7 @@ module Pod
     # @param  [TargetMetadata] cached_target
     #         the target to search for.
     #
-    # @return [Bool]
+    # @return [Boolean]
     #
     def self.dependency_for_cached_target?(sandbox, target, cached_target)
       target.dependencies.find do |dep|

data/lib/cocoapods/open-uri.rb

@@ -24,7 +24,7 @@ module OpenURI
   # @param [URI::Generic] uri2
   #        the target uri where to where the redirect points to
   #
-  # @return [Bool]
+  # @return [Boolean]
   #
   def self.redirectable?(uri1, uri2)
     uri1.scheme.downcase == uri2.scheme.downcase ||