cocoapods 1.4.0 → 1.5.0.beta.1

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

@@ -11,6 +11,11 @@ module Pod
         #
         attr_accessor :specs_by_target
 
+        # @return [Hash{Source => Array<Specification>}] the
+        #         specifications grouped by spec repo source.
+        #
+        attr_accessor :specs_by_source
+
         # @return [Array<Specification>] the specifications of the resolved
         #         version of Pods that should be installed.
         #
@@ -28,8 +33,14 @@ module Pod
 
         # @return [Hash{TargetDefinition => Array<TargetInspectionResult>}] the
         #         results of inspecting the user targets
+        #
         attr_accessor :target_inspections
 
+        # @return [PodfileDependencyCache] the cache of all dependencies in the
+        #         podfile.
+        #
+        attr_accessor :podfile_dependency_cache
+
         # @return [Hash{String=>Symbol}] A hash representing all the user build
         #         configurations across all integration targets. Each key
         #         corresponds to the name of a configuration and its value to

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

@@ -33,10 +33,9 @@ module Pod
           dependency_graph = Molinillo::DependencyGraph.new
 
           if lockfile
-            explicit_dependencies = lockfile.to_hash['DEPENDENCIES'] || []
-            explicit_dependencies.each do |string|
-              dependency = Dependency.new(string)
-              dependency_graph.add_vertex(dependency.name, nil, true)
+            explicit_dependencies = lockfile.dependencies
+            explicit_dependencies.each do |dependency|
+              dependency_graph.add_vertex(dependency.name, dependency, true)
             end
 
             pods = lockfile.to_hash['PODS'] || []
@@ -46,7 +45,7 @@ module Pod
 
             pods_to_update = pods_to_update.flat_map do |u|
               root_name = Specification.root_name(u).downcase
-              dependency_graph.vertices.keys.select { |n| Specification.root_name(n).downcase == root_name }
+              dependency_graph.vertices.each_key.select { |n| Specification.root_name(n).downcase == root_name }
             end
 
             pods_to_update.each do |u|
@@ -73,7 +72,9 @@ module Pod
           if pods_to_unlock.include?(dependency.root_name)
             dependency = Dependency.new(dependency.name)
           end
-          dependency_graph.add_child_vertex(dependency.name, parents.empty? ? dependency : nil, parents, nil)
+          vertex = dependency_graph.add_child_vertex(dependency.name, nil, parents, nil)
+          dependency = vertex.payload.merge(dependency) if vertex.payload
+          vertex.payload = dependency
           dependency
         end
 

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

@@ -5,19 +5,19 @@ module Pod
       class PodVariant
         # @return [Array<Specification>] the spec and subspecs for the target
         #
-        attr_accessor :specs
+        attr_reader :specs
 
         # @return [Array<Specification>] the test specs for the target
         #
-        attr_accessor :test_specs
+        attr_reader :test_specs
 
         # @return [Platform] the platform
         #
-        attr_accessor :platform
+        attr_reader :platform
 
         # @return [Bool] whether this pod should be built as framework
         #
-        attr_accessor :requires_frameworks
+        attr_reader :requires_frameworks
         alias_method :requires_frameworks?, :requires_frameworks
 
         # @return [Specification] the root specification
@@ -34,10 +34,10 @@ module Pod
         # @param [Bool] requires_frameworks        @see #requires_frameworks?
         #
         def initialize(specs, test_specs, platform, requires_frameworks = false)
-          self.specs = specs
-          self.test_specs = test_specs
-          self.platform = platform
-          self.requires_frameworks = requires_frameworks
+          @specs = specs
+          @test_specs = test_specs
+          @platform = platform
+          @requires_frameworks = requires_frameworks
         end
 
         # @note Test specs are intentionally not included as part of the equality for pod variants since a

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

@@ -5,16 +5,16 @@ module Pod
     class Analyzer
       # Collects all {PodVariant}.
       class PodVariantSet
-        # @return [Array<PodVariant>] the different variants.
+        # @return [Array<PodVariant>] the different variants within this set.
         #
-        attr_accessor :variants
+        attr_reader :variants
 
         # Initialize a new instance.
         #
         # @param [Array<PodVariant>] variants  @see #variants
         #
         def initialize(variants)
-          self.variants = variants
+          @variants = variants
         end
 
         # Describes what makes each {PodVariant} distinct among the others.

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

@@ -0,0 +1,54 @@
+module Pod
+  class Installer
+    class Analyzer
+      # Caches podfile & target definition dependencies, so they do not need to be re-computed
+      # from the internal hash on each access
+      #
+      class PodfileDependencyCache
+        # @return [Array<Pod::Dependency>]
+        #         All the dependencies in the podfile
+        #
+        attr_reader :podfile_dependencies
+
+        def initialize(podfile_dependencies, dependencies_by_target_definition)
+          @podfile_dependencies = podfile_dependencies
+          @dependencies_by_target_definition = dependencies_by_target_definition
+        end
+
+        # Returns the dependencies for the given target definition
+        #
+        def target_definition_dependencies(target_definition)
+          @dependencies_by_target_definition[target_definition] ||
+            raise(ArgumentError, "dependencies for #{target_definition.inspect} do not exist in the cache")
+        end
+
+        # Returns a list of all of the target definitions in the Podfile
+        #
+        def target_definition_list
+          @dependencies_by_target_definition.keys
+        end
+
+        # Creates a {PodfileDependencyCache} from the given {Podfile}
+        #
+        # @param [Podfile] podfile
+        #        The {Podfile} from which dependencies should be cached
+        #
+        # @return [PodfileDependencyCache]
+        #         A warmed, immutable cache of all the dependencies in the {Podfile}
+        #
+        def self.from_podfile(podfile)
+          podfile_dependencies = []
+          dependencies_by_target_definition = {}
+          podfile.target_definition_list.each do |target_definition|
+            deps = target_definition.dependencies.freeze
+            podfile_dependencies.concat deps
+            dependencies_by_target_definition[target_definition] = deps
+          end
+          podfile_dependencies.uniq!
+
+          new(podfile_dependencies.freeze, dependencies_by_target_definition.freeze)
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,22 @@ module Pod
       #       subspecs are added instead of the name of the Pods.
       #
       class SpecsState
+        # @return [Set<String>] the names of the pods that were added.
+        #
+        attr_reader :added
+
+        # @return [Set<String>] the names of the pods that were changed.
+        #
+        attr_reader :changed
+
+        # @return [Set<String>] the names of the pods that were deleted.
+        #
+        attr_reader :deleted
+
+        # @return [Set<String>] the names of the pods that were unchanged.
+        #
+        attr_reader :unchanged
+
         # Initialize a new instance
         #
         # @param  [Hash{Symbol=>String}] pods_by_state
@@ -38,22 +54,6 @@ module Pod
           end
         end
 
-        # @return [Set<String>] the names of the pods that were added.
-        #
-        attr_accessor :added
-
-        # @return [Set<String>] the names of the pods that were changed.
-        #
-        attr_accessor :changed
-
-        # @return [Set<String>] the names of the pods that were deleted.
-        #
-        attr_accessor :deleted
-
-        # @return [Set<String>] the names of the pods that were unchanged.
-        #
-        attr_accessor :unchanged
-
         # Displays the state of each pod.
         #
         # @return [void]

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

@@ -8,11 +8,12 @@ module Pod
 
         # @return [TargetDefinition] the target definition to inspect
         #
-        attr_accessor :target_definition
+        attr_reader :target_definition
 
         # @return [Pathname] the root of the CocoaPods installation where the
         #         Podfile is located
-        attr_accessor :installation_root
+        #
+        attr_reader :installation_root
 
         # Initialize a new instance
         #
@@ -33,7 +34,7 @@ module Pod
         #
         # @return [TargetInspectionResult]
         #
-        def compute_results
+        def compute_results(user_project)
           raise ArgumentError, 'Cannot compute results without a user project set' unless user_project
 
           targets = compute_targets(user_project)
@@ -81,11 +82,6 @@ module Pod
           path
         end
 
-        # @return [Xcodeproj::Project] the user's Xcode project, used for target
-        #         inspection
-        #
-        attr_accessor :user_project
-
         #-----------------------------------------------------------------------#
 
         private
@@ -115,7 +111,7 @@ module Pod
           [target]
         end
 
-        # @param  [Array<PBXNativeTarget] the user's targets of the project of
+        # @param  [Array<PBXNativeTarget] user_targets the user's targets of the project of
         #         #target_definition which needs to be integrated
         #
         # @return [Hash{String=>Symbol}] A hash representing the user build
@@ -132,7 +128,7 @@ module Pod
           end
         end
 
-        # @param  [Array<PBXNativeTarget] the user's targets of the project of
+        # @param  [Array<PBXNativeTarget] user_targets the user's targets of the project of
         #         #target_definition which needs to be integrated
         #
         # @return [Platform] The platform of the user's targets
@@ -171,7 +167,7 @@ module Pod
 
         # Computes the architectures relevant for the user's targets.
         #
-        # @param  [Array<PBXNativeTarget] the user's targets of the project of
+        # @param  [Array<PBXNativeTarget] user_targets the user's targets of the project of
         #         #target_definition which needs to be integrated
         #
         # @return [Array<String>]

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -132,9 +132,8 @@ module Pod
       #
       def verify_source_is_secure(root_spec)
         return if root_spec.source.nil? || root_spec.source[:http].nil?
-        http_source = root_spec.source[:http]
-        return if http_source.downcase.start_with?('https://')
-
+        http_source = URI(root_spec.source[:http])
+        return if http_source.scheme == 'https' || http_source.scheme == 'file'
         UI.warn "'#{root_spec.name}' uses the unencrypted http protocol to transfer the Pod. " \
                 'Please be sure you\'re in a safe network with only trusted hosts in there. ' \
                 'Please reach out to the library author to notify them of this security issue.'

data/lib/cocoapods/installer/podfile_validator.rb

@@ -17,11 +17,16 @@ module Pod
       attr_reader :warnings
 
       # Initialize a new instance
+      #
       # @param [Podfile] podfile
       #        The podfile to validate
       #
-      def initialize(podfile)
+      # @param [Analyzer::PodfileDependencyCache] podfile_dependency_cache
+      #        An (optional) cache of all the dependencies in the podfile
+      #
+      def initialize(podfile, podfile_dependency_cache = Analyzer::PodfileDependencyCache.from_podfile(podfile))
         @podfile = podfile
+        @podfile_dependency_cache = podfile_dependency_cache
         @errors = []
         @warnings = []
         @validated = false
@@ -67,11 +72,7 @@ module Pod
       end
 
       def validate_pod_directives
-        dependencies = podfile.target_definitions.flat_map do |_, target|
-          target.dependencies
-        end.uniq
-
-        dependencies.each do |dependency|
+        @podfile_dependency_cache.podfile_dependencies.each do |dependency|
           validate_conflicting_external_sources!(dependency)
         end
       end
@@ -106,7 +107,7 @@ module Pod
       # @return [void]
       #
       def validate_dependencies_are_present!
-        if podfile.target_definitions.values.all?(&:empty?)
+        if @podfile_dependency_cache.target_definition_list.all?(&:empty?)
           add_warning 'The Podfile does not contain any dependencies.'
         end
       end
@@ -116,8 +117,8 @@ module Pod
       # target, or be inherited by a target where `inheritance == complete`.
       #
       def validate_no_abstract_only_pods!
-        all_dependencies = podfile.dependencies
-        concrete_dependencies = podfile.target_definition_list.reject(&:abstract?).flat_map(&:dependencies).uniq
+        all_dependencies = @podfile_dependency_cache.podfile_dependencies
+        concrete_dependencies = @podfile_dependency_cache.target_definition_list.reject(&:abstract?).flat_map { |td| @podfile_dependency_cache.target_definition_dependencies(td) }
         abstract_only_dependencies = all_dependencies - concrete_dependencies
         abstract_only_dependencies.each do |dep|
           add_error "The dependency `#{dep}` is not used in any concrete target."
@@ -125,7 +126,7 @@ module Pod
       end
 
       def validate_no_duplicate_targets!
-        podfile.target_definition_list.group_by { |td| [td.name, td.user_project_path] }.
+        @podfile_dependency_cache.target_definition_list.group_by { |td| [td.name, td.user_project_path] }.
           each do |(name, project), definitions|
           next unless definitions.size > 1
           error = "The target `#{name}` is declared twice"

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

@@ -40,6 +40,10 @@ module Pod
         #
         COPY_PODS_RESOURCES_PHASE_NAME = 'Copy Pods Resources'.freeze
 
+        # @return [Integer] the maximum number of input and output paths to use for a script phase
+        #
+        MAX_INPUT_OUTPUT_PATHS = 1000
+
         # @return [AggregateTarget] the target that should be integrated.
         #
         attr_reader :target
@@ -71,15 +75,11 @@ module Pod
           #
           # @return [void]
           #
-          def add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
+          def create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
             phase = TargetIntegrator.create_or_update_build_phase(native_target, BUILD_PHASE_PREFIX + EMBED_FRAMEWORK_PHASE_NAME)
             phase.shell_script = %("#{script_path}"\n)
-            unless input_paths.empty?
-              phase.input_paths = input_paths
-            end
-            unless output_paths.empty?
-              phase.output_paths = output_paths
-            end
+            phase.input_paths = input_paths
+            phase.output_paths = output_paths
           end
 
           # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
@@ -111,16 +111,23 @@ module Pod
           #
           # @return [void]
           #
-          def add_copy_resources_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
+          def create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths = [], output_paths = [])
             phase_name = COPY_PODS_RESOURCES_PHASE_NAME
             phase = TargetIntegrator.create_or_update_build_phase(native_target, BUILD_PHASE_PREFIX + phase_name)
             phase.shell_script = %("#{script_path}"\n)
-            unless input_paths.empty?
-              phase.input_paths = input_paths
-            end
-            unless output_paths.empty?
-              phase.output_paths = output_paths
-            end
+            phase.input_paths = input_paths
+            phase.output_paths = output_paths
+          end
+
+          # Delete a 'Copy Pods Resources' script phase if present
+          #
+          # @param [PBXNativeTarget] native_target
+          #        The native target to remove the script phase from.
+          #
+          def remove_copy_resources_script_phase_from_target(native_target)
+            build_phase = native_target.shell_script_build_phases.find { |bp| bp.name && bp.name.end_with?(COPY_PODS_RESOURCES_PHASE_NAME) }
+            return unless build_phase.present?
+            native_target.build_phases.delete(build_phase)
           end
 
           # Creates or update a shell script build phase for the given target.
@@ -191,9 +198,31 @@ module Pod
             end
           end
 
+          # Script phases can have a limited number of input and output paths due to each one being exported to `env`.
+          # A large number can cause a build failure because of limitations in `env`. See issue
+          # https://github.com/CocoaPods/CocoaPods/issues/7362.
+          #
+          # @param [Array<String>] input_paths
+          #        The input paths to trim.
+          #
+          # @param [Array<String>] output_paths
+          #        The output paths to trim.
+          #
+          # @return [void]
+          #
+          def validate_input_output_path_limit(input_paths, output_paths)
+            if (input_paths.count + output_paths.count) > MAX_INPUT_OUTPUT_PATHS
+              input_paths.clear
+              output_paths.clear
+            end
+          end
+
           # Returns an extension in the target that corresponds to the
           # resource's input extension.
           #
+          # @param [String] input_extension
+          #        The input extension to map to.
+          #
           # @return [String] The output extension.
           #
           def output_extension_for_resource(input_extension)
@@ -204,9 +233,27 @@ module Pod
             when '.xcdatamodel'       then '.mom'
             when '.xcdatamodeld'      then '.momd'
             when '.xcmappingmodel'    then '.cdm'
+            when '.xcassets'          then '.car'
             else                      input_extension
             end
           end
+
+          # Returns the resource output paths for all given input paths.
+          #
+          # @param [Array<String>] resource_input_paths
+          #        The input paths to map to.
+          #
+          # @return [Array<String>] The resource output paths.
+          #
+          def resource_output_paths(resource_input_paths)
+            resource_input_paths.map do |resource_input_path|
+              base_path = '${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}'
+              extname = File.extname(resource_input_path)
+              basename = extname == '.xcassets' ? 'Assets' : File.basename(resource_input_path)
+              output_extension = TargetIntegrator.output_extension_for_resource(extname)
+              File.join(base_path, File.basename(basename, extname) + output_extension)
+            end.uniq
+          end
         end
 
         # Integrates the user project targets. Only the targets that do **not**
@@ -277,19 +324,15 @@ module Pod
           native_targets.each do |native_target|
             script_path = target.copy_resources_script_relative_path
             resource_paths_by_config = target.resource_paths_by_config
-            input_paths = []
-            output_paths = []
-            unless resource_paths_by_config.values.all?(&:empty?)
+            if resource_paths_by_config.values.all?(&:empty?)
+              TargetIntegrator.remove_copy_resources_script_phase_from_target(native_target)
+            else
               resource_paths_flattened = resource_paths_by_config.values.flatten.uniq
               input_paths = [target.copy_resources_script_relative_path, *resource_paths_flattened]
-              # convert input paths to output paths according to extensions
-              output_paths = resource_paths_flattened.map do |input_path|
-                base_path = '${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}'
-                output_extension = TargetIntegrator.output_extension_for_resource(File.extname(input_path))
-                File.join(base_path, File.basename(input_path, File.extname(input_path)) + output_extension)
-              end.uniq
+              output_paths = TargetIntegrator.resource_output_paths(resource_paths_flattened)
+              TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
+              TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
             end
-            TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end
 
@@ -316,13 +359,14 @@ module Pod
           native_targets_to_embed_in.each do |native_target|
             script_path = target.embed_frameworks_script_relative_path
             framework_paths_by_config = target.framework_paths_by_config.values.flatten.uniq
-            input_paths = []
-            output_paths = []
-            unless framework_paths_by_config.all?(&:empty?)
+            if framework_paths_by_config.all?(&:empty?)
+              TargetIntegrator.remove_embed_frameworks_script_phase_from_target(native_target)
+            else
               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)
+              TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
             end
-            TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
         end