cocoapods 1.10.0 → 1.16.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/podfile_validator.rb

@@ -8,11 +8,11 @@ module Pod
       #
       attr_reader :podfile
 
-      # @return [Array<String>] any errors that have occured during the validation
+      # @return [Array<String>] any errors that have occurred during the validation
       #
       attr_reader :errors
 
-      # @return [Array<String>] any warnings that have occured during the validation
+      # @return [Array<String>] any warnings that have occurred during the validation
       #
       attr_reader :warnings
 

data/lib/cocoapods/installer/pre_integrate_hooks_context.rb

@@ -0,0 +1,9 @@
+module Pod
+  class Installer
+    # Context object designed to be used with the HooksManager which describes
+    # the context of the installer.
+    #
+    class PreIntegrateHooksContext < BaseInstallHooksContext
+    end
+  end
+end

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

@@ -34,7 +34,11 @@ module Pod
         #
         attr_reader :aggregate_targets
 
-        # @return [Bool] Flag indicating if we want to ignore the cache and force a clean installation.
+        # @return [Hash<Symbol, Object>] Hash of installation options.
+        #
+        attr_reader :installation_options
+
+        # @return [Boolean] Flag indicating if we want to ignore the cache and force a clean installation.
         #
         attr_reader :clean_install
 
@@ -47,9 +51,10 @@ module Pod
         # @param [Hash<String, Hash>] podfile_plugins @see #podfile_plugins
         # @param [Array<PodTarget>] pod_targets @see #pod_targets
         # @param [Array<AggregateTarget>] aggregate_targets @see #aggregate_targets
-        # @param [Bool] clean_install @see #clean_install
+        # @param [Hash<Symbol, Object>] installation_options @see #installation_options
+        # @param [Boolean] clean_install @see #clean_install
         #
-        def initialize(sandbox, cache, build_configurations, project_object_version, podfile_plugins, pod_targets, aggregate_targets,
+        def initialize(sandbox, cache, build_configurations, project_object_version, podfile_plugins, pod_targets, aggregate_targets, installation_options,
                        clean_install: false)
           @sandbox = sandbox
           @cache = cache
@@ -58,6 +63,7 @@ module Pod
           @pod_targets = pod_targets
           @aggregate_targets = aggregate_targets
           @project_object_version = project_object_version
+          @installation_options = installation_options
           @clean_install = clean_install
         end
 
@@ -78,7 +84,8 @@ module Pod
           # Bail out early since these properties affect all targets and their associate projects.
           if cache.build_configurations != build_configurations ||
               cache.project_object_version != project_object_version ||
-              YAMLHelper.convert(cache.podfile_plugins) != YAMLHelper.convert(podfile_plugins)
+              YAMLHelper.convert(cache.podfile_plugins) != YAMLHelper.convert(podfile_plugins) ||
+              YAMLHelper.convert(cache.installation_options) != YAMLHelper.convert(installation_options)
             UI.message 'Ignoring project cache due to project configuration changes.'
             return full_install_results
           end
@@ -132,10 +139,10 @@ module Pod
             when PodTarget
               local = sandbox.local?(target.pod_name)
               checkout_options = sandbox.checkout_sources[target.pod_name]
-              [label, TargetCacheKey.from_pod_target(sandbox, target, :is_local_pod => local,
-                                                                      :checkout_options => checkout_options)]
+              [label, TargetCacheKey.from_pod_target(sandbox, target_by_label, target,
+                                                     :is_local_pod => local, :checkout_options => checkout_options)]
             when AggregateTarget
-              [label, TargetCacheKey.from_aggregate_target(sandbox, target)]
+              [label, TargetCacheKey.from_aggregate_target(sandbox, target_by_label, target)]
             else
               raise "[BUG] Unknown target type #{target}"
             end

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

@@ -26,18 +26,25 @@ module Pod
         #
         attr_reader :podfile_plugins
 
+        # @return [Hash<Symbol, Object>]
+        #         Configured installation options
+        #
+        attr_reader :installation_options
+
         # Initializes a new instance.
         #
         # @param [Hash{String => TargetCacheKey}] cache_key_by_target_label @see #cache_key_by_target_label
         # @param [Hash{String => Symbol}] build_configurations @see #build_configurations
         # @param [Integer] project_object_version @see #project_object_version
         # @param [Hash<String, Hash>] podfile_plugins @see #podfile_plugins
+        # @param [Hash<Symbol, Object>] installation_options @see #installation_options
         #
-        def initialize(cache_key_by_target_label = {}, build_configurations = nil, project_object_version = nil, podfile_plugins = {})
+        def initialize(cache_key_by_target_label = {}, build_configurations = nil, project_object_version = nil, podfile_plugins = {}, installation_options = {})
           @cache_key_by_target_label = cache_key_by_target_label
           @build_configurations = build_configurations
           @project_object_version = project_object_version
           @podfile_plugins = podfile_plugins
+          @installation_options = installation_options
         end
 
         def update_cache_key_by_target_label!(cache_key_by_target_label)
@@ -56,6 +63,10 @@ module Pod
           @podfile_plugins = podfile_plugins
         end
 
+        def update_installation_options!(installation_options)
+          @installation_options = installation_options
+        end
+
         def save_as(path)
           Pathname(path).dirname.mkpath
           Sandbox.update_changed_file(path, YAMLHelper.convert(to_hash))
@@ -71,7 +82,8 @@ module Pod
           project_object_version = contents['OBJECT_VERSION']
           build_configurations = contents['BUILD_CONFIGURATIONS']
           podfile_plugins = contents['PLUGINS']
-          ProjectInstallationCache.new(cache_key_by_target_label, build_configurations, project_object_version, podfile_plugins)
+          installation_options = contents['INSTALLATION_OPTIONS']
+          ProjectInstallationCache.new(cache_key_by_target_label, build_configurations, project_object_version, podfile_plugins, installation_options)
         end
 
         def to_hash
@@ -82,6 +94,7 @@ module Pod
           contents['BUILD_CONFIGURATIONS'] = build_configurations if build_configurations
           contents['OBJECT_VERSION'] = project_object_version if project_object_version
           contents['PLUGINS'] = podfile_plugins if podfile_plugins
+          contents['INSTALLATION_OPTIONS'] = installation_options if installation_options
           contents
         end
       end

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

@@ -58,6 +58,10 @@ module Pod
             other_files = other.key_hash['FILES']
             return :project if this_files != other_files
 
+            this_resources = key_hash['RESOURCES']
+            other_resources = other.key_hash['RESOURCES']
+            return :project if this_resources != other_resources
+
             this_build_settings = key_hash['BUILD_SETTINGS_CHECKSUM']
             other_build_settings = other.key_hash['BUILD_SETTINGS_CHECKSUM']
             return :project if this_build_settings != other_build_settings
@@ -98,6 +102,9 @@ module Pod
           if specs = cache_hash['SPECS']
             cache_hash['SPECS'] = specs.sort_by(&:downcase)
           end
+          if resources = cache_hash['RESOURCES']
+            cache_hash['RESOURCES'] = resources.sort_by(&:downcase)
+          end
           type = cache_hash['CHECKSUM'] ? :pod_target : :aggregate
           TargetCacheKey.new(sandbox, type, cache_hash)
         end
@@ -106,10 +113,13 @@ module Pod
         #
         # @param [Sandbox] sandbox The sandbox to use to construct a TargetCacheKey object.
         #
+        # @param [Hash] target_by_label
+        #        Maps target names to PodTarget objects.
+        #
         # @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
@@ -117,7 +127,7 @@ module Pod
         #
         # @return [TargetCacheKey]
         #
-        def self.from_pod_target(sandbox, pod_target, is_local_pod: false, checkout_options: nil)
+        def self.from_pod_target(sandbox, target_by_label, pod_target, is_local_pod: false, checkout_options: nil)
           build_settings = {}
           build_settings[pod_target.label.to_s] = Hash[pod_target.build_settings.map do |k, v|
             [k, Digest::MD5.hexdigest(v.xcconfig.to_s)]
@@ -129,6 +139,20 @@ module Pod
             build_settings[name] = Hash[settings_by_config.map { |k, v| [k, Digest::MD5.hexdigest(v.xcconfig.to_s)] }]
           end
 
+          # find resources from upstream dependencies that will be named in the `{name}-resources.sh` script
+          resource_dependencies = []
+          pod_target.dependencies.each do |name|
+            next unless target_by_label[name]
+
+            upstream = target_by_label[name]
+
+            # pod target
+            resource_dependencies.append(upstream.resource_paths.values.flatten) if upstream.respond_to?(:resource_paths)
+
+            # aggregate target
+            resource_dependencies.append(upstream.resource_paths_by_config.values.flatten) if upstream.respond_to?(:resource_paths_by_config)
+          end
+
           contents = {
             'CHECKSUM' => pod_target.root_spec.checksum,
             'SPECS' => pod_target.specs.map(&:to_s).sort_by(&:downcase),
@@ -136,10 +160,11 @@ module Pod
             'PROJECT_NAME' => pod_target.project_name,
           }
           if is_local_pod
-            relative_file_paths = pod_target.all_files.map { |f| Pathname.new(f).relative_path_from(sandbox.root).to_s }
+            relative_file_paths = pod_target.all_files.map { |f| f.relative_path_from(sandbox.root).to_s }
             contents['FILES'] = relative_file_paths.sort_by(&:downcase)
           end
           contents['CHECKOUT_OPTIONS'] = checkout_options if checkout_options
+          contents['RESOURCES'] = resource_dependencies.flatten.uniq.sort_by(&:downcase) if resource_dependencies.any?
           TargetCacheKey.new(sandbox, :pod_target, contents)
         end
 
@@ -152,18 +177,34 @@ module Pod
         #
         # @return [TargetCacheKey]
         #
-        def self.from_aggregate_target(sandbox, aggregate_target)
+        def self.from_aggregate_target(sandbox, target_by_label, aggregate_target)
           build_settings = {}
           aggregate_target.user_build_configurations.keys.each do |configuration|
             build_settings[configuration] = Digest::MD5.hexdigest(aggregate_target.build_settings(configuration).xcconfig.to_s)
           end
 
+          # find resources from upstream dependencies that will be named in the `{name}-resources.sh` script
+          resource_dependencies = []
+          aggregate_target.pod_targets.each do |name|
+            upstream = target_by_label[name]
+
+            # pod target
+            resource_dependencies.append(upstream.resource_paths.values.flatten) if upstream.respond_to?(:resource_paths)
+
+            # aggregate target
+            resource_dependencies.append(upstream.resource_paths_by_config.values.flatten) if upstream.respond_to?(:resource_paths_by_config)
+          end
+
           contents = {
             'BUILD_SETTINGS_CHECKSUM' => build_settings,
           }
-          if aggregate_target.includes_resources?
-            relative_file_paths = aggregate_target.resource_paths_by_config.values.flatten.uniq
-            contents['FILES'] = relative_file_paths.sort_by(&:downcase)
+          if aggregate_target.includes_resources? || aggregate_target.includes_on_demand_resources?
+            relative_resource_file_paths = aggregate_target.resource_paths_by_config.values.flatten.uniq
+            relative_on_demand_resource_file_paths = aggregate_target.on_demand_resources.map do |res|
+              res.relative_path_from(sandbox.project_path.dirname).to_s
+            end
+            contents['FILES'] = (relative_resource_file_paths + relative_on_demand_resource_file_paths).sort_by(&:downcase)
+            contents['RESOURCES'] = resource_dependencies.flatten.uniq.sort_by(&:downcase) if resource_dependencies.any?
           end
           TargetCacheKey.new(sandbox, :aggregate, contents)
         end