cocoapods 1.5.2 → 1.6.1

data/lib/cocoapods/resolver.rb

@@ -1,5 +1,4 @@
 require 'molinillo'
-require 'cocoapods/resolver/lazy_specification'
 
 module Pod
   class NoSpecFoundError < Informative
@@ -12,43 +11,8 @@ module Pod
   # by target for a given Podfile.
   #
   class Resolver
-    # A small container that wraps a resolved specification for a given target definition. Additional metadata
-    # is included here such as if the specification is only used by tests.
-    #
-    class ResolverSpecification
-      # @return [Specification] the specification that was resolved
-      #
-      attr_reader :spec
-
-      # @return [Source] the spec repo source the specification came from
-      #
-      attr_reader :source
-
-      # @return [Bool] whether this resolved specification is only used by tests.
-      #
-      attr_reader :used_by_tests_only
-      alias used_by_tests_only? used_by_tests_only
-
-      def initialize(spec, used_by_tests_only, source)
-        @spec = spec
-        @used_by_tests_only = used_by_tests_only
-        @source = source
-      end
-
-      def name
-        spec.name
-      end
-
-      def root
-        spec.root
-      end
-
-      def ==(other)
-        self.class == other &&
-          spec == other.spec &&
-          used_by_tests_only == other.test_only
-      end
-    end
+    require 'cocoapods/resolver/lazy_specification'
+    require 'cocoapods/resolver/resolver_specification'
 
     include Pod::Installer::InstallationOptions::Mixin
 
@@ -97,7 +61,11 @@ module Pod
       @specs_updated = specs_updated
       @podfile_dependency_cache = podfile_dependency_cache
       @platforms_by_dependency = Hash.new { |h, k| h[k] = [] }
+
       @cached_sets = {}
+      @podfile_requirements_by_root_name = @podfile_dependency_cache.podfile_dependencies.group_by(&:root_name).each_value { |a| a.map!(&:requirement) }
+      @search = {}
+      @validated_platforms = Set.new
     end
 
     #-------------------------------------------------------------------------#
@@ -133,19 +101,16 @@ module Pod
     #
     def resolver_specs_by_target
       @resolver_specs_by_target ||= {}.tap do |resolver_specs_by_target|
-        dependencies = {}
         @podfile_dependency_cache.target_definition_list.each do |target|
-          specs = @podfile_dependency_cache.target_definition_dependencies(target).flat_map do |dep|
-            name = dep.name
-            node = @activated.vertex_named(name)
-            (valid_dependencies_for_target_from_node(target, dependencies, node) << node).map { |s| [s, node.payload.test_specification?] }
-          end
+          # can't use vertex.root? since that considers _all_ targets
+          explicit_dependencies = @podfile_dependency_cache.target_definition_dependencies(target).map(&:name).to_set
+          vertices = valid_dependencies_for_target(target)
 
-          resolver_specs_by_target[target] = specs.
-            group_by(&:first).
-            map do |vertex, spec_test_only_tuples|
-              test_only = spec_test_only_tuples.all? { |tuple| tuple[1] }
+          resolver_specs_by_target[target] = vertices.
+            map do |vertex|
               payload = vertex.payload
+              test_only = (!explicit_dependencies.include?(vertex.name) || payload.test_specification?) &&
+                (vertex.recursive_predecessors & vertices).all? { |v| !explicit_dependencies.include?(v.name) || v.payload.test_specification? }
               spec_source = payload.respond_to?(:spec_source) && payload.spec_source
               ResolverSpecification.new(payload, test_only, spec_source)
             end.
@@ -170,11 +135,11 @@ module Pod
     # @param  [Dependency] dependency the dependency that is being searched for.
     #
     def search_for(dependency)
-      @search ||= {}
       @search[dependency] ||= begin
         locked_requirement = requirement_for_locked_pod_named(dependency.name)
-        additional_requirements = Array(locked_requirement)
-        specifications_for_dependency(dependency, additional_requirements)
+        podfile_deps = Array(@podfile_requirements_by_root_name[dependency.root_name])
+        podfile_deps << locked_requirement if locked_requirement
+        specifications_for_dependency(dependency, podfile_deps)
       end
       @search[dependency].dup
     end
@@ -235,31 +200,29 @@ module Pod
     def requirement_satisfied_by?(requirement, activated, spec)
       version = spec.version
       return false unless requirement.requirement.satisfied_by?(version)
-      shared_possibility_versions, prerelease_requirement = possibility_versions_for_root_name(requirement, activated)
-      return false if !shared_possibility_versions.empty? && !shared_possibility_versions.include?(version)
-      return false if version.prerelease? && !prerelease_requirement
+      return false unless valid_possibility_version_for_root_name?(requirement, activated, spec)
       return false unless spec_is_platform_compatible?(activated, requirement, spec)
       true
     end
 
-    def possibility_versions_for_root_name(requirement, activated)
-      prerelease_requirement = requirement.prerelease? || requirement.external_source
-      existing = activated.vertices.values.flat_map do |vertex|
+    def valid_possibility_version_for_root_name?(requirement, activated, spec)
+      return true if prerelease_requirement = requirement.prerelease? || requirement.external_source || !spec.version.prerelease?
+
+      activated.each do |vertex|
         next unless vertex.payload
         next unless Specification.root_name(vertex.name) == requirement.root_name
 
         prerelease_requirement ||= vertex.requirements.any? { |r| r.prerelease? || r.external_source }
 
-        if vertex.payload.respond_to?(:possibilities)
-          vertex.payload.possibilities.map(&:version)
-        else
-          vertex.payload.version
+        if vertex.payload.respond_to?(:version)
+          return true if vertex.payload.version == spec.version
+          break
         end
-      end.compact
+      end
 
-      [existing, prerelease_requirement]
+      prerelease_requirement
     end
-    private :possibility_versions_for_root_name
+    private :valid_possibility_version_for_root_name?
 
     # Sort dependencies so that the ones that are easiest to resolve are first.
     # Easiest to resolve is (usually) defined by:
@@ -386,7 +349,7 @@ module Pod
     #
     def find_cached_set(dependency)
       name = dependency.root_name
-      unless cached_sets[name]
+      cached_sets[name] ||= begin
         if dependency.external_source
           spec = sandbox.specification(name)
           unless spec
@@ -397,12 +360,13 @@ module Pod
         else
           set = create_set_from_sources(dependency)
         end
-        cached_sets[name] = set
+
         unless set
           raise Molinillo::NoSuchDependencyError.new(dependency) # rubocop:disable Style/RaiseArgs
         end
+
+        set
       end
-      cached_sets[name]
     end
 
     # @return [Requirement, Nil]
@@ -431,8 +395,11 @@ module Pod
     # @return [Source::Aggregate] The aggregate of the {#sources}.
     #
     def aggregate_for_dependency(dependency)
+      sources_manager = Config.instance.sources_manager
       if dependency && dependency.podspec_repo
-        return Config.instance.sources_manager.aggregate_for_dependency(dependency)
+        sources_manager.aggregate_for_dependency(dependency)
+      elsif (locked_vertex = @locked_dependencies.vertex_named(dependency.name)) && (locked_dependency = locked_vertex.payload) && locked_dependency.podspec_repo
+        sources_manager.aggregate_for_dependency(locked_dependency)
       else
         @aggregate ||= Source::Aggregate.new(sources)
       end
@@ -446,6 +413,7 @@ module Pod
     #
     def validate_platform(spec, target)
       return unless target_platform = target.platform
+      return unless @validated_platforms.add?([spec.object_id, target_platform])
       unless spec.available_platforms.any? { |p| target_platform.to_sym == p.to_sym }
         raise Informative, "The platform of the target `#{target.name}` "     \
           "(#{target.platform}) is not compatible with `#{spec}`, which does "  \
@@ -455,11 +423,6 @@ module Pod
 
     # Handles errors that come out of a {Molinillo::Resolver}.
     #
-    # @todo   The check for version conflicts coming from the {Lockfile}
-    #         requiring a pre-release version can be deleted for version 1.0,
-    #         as it is a migration step for Lockfiles coming from CocoaPods
-    #         versions before `0.35.0`.
-    #
     # @return [void]
     #
     # @param  [Molinillo::ResolverError] error
@@ -475,16 +438,7 @@ module Pod
           :version_for_spec => lambda(&:version),
           :additional_message_for_conflict => lambda do |o, name, conflict|
             local_pod_parent = conflict.requirement_trees.flatten.reverse.find(&:local?)
-            lockfile_reqs = conflict.requirements[name_for_locking_dependency_source]
-            if lockfile_reqs && lockfile_reqs.last && lockfile_reqs.last.prerelease? && !conflict.existing
-              o << "\nDue to the previous naïve CocoaPods resolver, " \
-                "you were using a pre-release version of `#{name}`, " \
-                'without explicitly asking for a pre-release version, which now leads to a conflict. ' \
-                'Please decide to either use that pre-release version by adding the ' \
-                'version requirement to your Podfile ' \
-                "(e.g. `pod '#{name}', '#{lockfile_reqs.map(&:requirement).join("', '")}'`) " \
-                "or revert to a stable version by running `pod update #{name}`."
-            elsif local_pod_parent && !specifications_for_dependency(conflict.requirement).empty? && !conflict.possibility && conflict.locked_requirement
+            if local_pod_parent && !specifications_for_dependency(conflict.requirement).empty? && !conflict.possibility && conflict.locked_requirement
               # Conflict was caused by a requirement from a local dependency.
               # Tell user to use `pod update`.
               o << "\nIt seems like you've changed the constraints of dependency `#{name}` " \
@@ -528,6 +482,17 @@ module Pod
             end
           end,
         )
+      when Molinillo::NoSuchDependencyError
+        message += <<-EOS
+
+
+You have either:
+ * out-of-date source repos which you can update with `pod repo update` or with `pod install --repo-update`.
+ * mistyped the name or version.
+ * not added the source repo that hosts the Podspec to your Podfile.
+
+Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by default.
+        EOS
       end
       raise type.new(message).tap { |e| e.set_backtrace(error.backtrace) }
     end
@@ -543,8 +508,12 @@ module Pod
     #
     # @return [Bool]
     def spec_is_platform_compatible?(dependency_graph, dependency, spec)
+      # This is safe since a pod will only be in locked dependencies if we're
+      # using the same exact version
+      return true if locked_dependencies.vertex_named(spec.name)
+
       vertex = dependency_graph.vertex_named(dependency.name)
-      predecessors = vertex.recursive_predecessors.select(&:root)
+      predecessors = vertex.recursive_predecessors.select(&:root?)
       predecessors << vertex if vertex.root?
       platforms_to_satisfy = predecessors.flat_map(&:explicit_requirements).flat_map { |r| @platforms_by_dependency[r] }.uniq
 
@@ -566,32 +535,44 @@ module Pod
     #         An array of target-appropriate nodes whose `payload`s are
     #         dependencies for `target`.
     #
-    def valid_dependencies_for_target_from_node(target, dependencies, node)
-      dependencies[[node.name, target.platform]] ||= begin
-        validate_platform(node.payload, target)
-        dependency_nodes = []
-        node.outgoing_edges.each do |edge|
-          next unless edge_is_valid_for_target_platform?(edge, target.platform)
-          dependency_nodes << edge.destination
-        end
+    def valid_dependencies_for_target(target)
+      dependencies = Set.new
+      @podfile_dependency_cache.target_definition_dependencies(target).each do |dep|
+        node = @activated.vertex_named(dep.name)
+        add_valid_dependencies_from_node(node, target, dependencies)
+      end
+      dependencies
+    end
 
-        dependency_nodes.flat_map do |item|
-          valid_dependencies_for_target_from_node(target, dependencies, item)
-        end.concat dependency_nodes
+    def add_valid_dependencies_from_node(node, target, dependencies)
+      return unless dependencies.add?(node)
+      validate_platform(node.payload, target)
+      node.outgoing_edges.each do |edge|
+        next unless edge_is_valid_for_target_platform?(edge, target.platform)
+        add_valid_dependencies_from_node(edge.destination, target, dependencies)
       end
     end
 
+    EdgeAndPlatform = Struct.new(:edge, :target_platform)
+    private_constant :EdgeAndPlatform
+
     # Whether the given `edge` should be followed to find dependencies for the
     # given `target_platform`.
     #
     # @return [Bool]
     #
     def edge_is_valid_for_target_platform?(edge, target_platform)
-      requirement_name = edge.requirement.name
+      @edge_validity ||= Hash.new do |hash, edge_and_platform|
+        e = edge_and_platform.edge
+        platform = edge_and_platform.target_platform
+        requirement_name = e.requirement.name
 
-      edge.origin.payload.all_dependencies(target_platform).any? do |dep|
-        dep.name == requirement_name
+        hash[edge_and_platform] = e.origin.payload.all_dependencies(platform).any? do |dep|
+          dep.name == requirement_name
+        end
       end
+
+      @edge_validity[EdgeAndPlatform.new(edge, target_platform)]
     end
   end
 end

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -1,4 +1,4 @@
-autoload :MachO, 'macho'
+require 'macho'
 
 module Pod
   class Sandbox
@@ -33,8 +33,8 @@ module Pod
 
       # Initialize a new instance
       #
-      # @param [Sandbox::PathList, Pathname] path_list @see path_list
-      # @param [Specification::Consumer] spec_consumer @see spec_consumer
+      # @param [Sandbox::PathList, Pathname] path_list @see #path_list
+      # @param [Specification::Consumer] spec_consumer @see #spec_consumer
       #
       def initialize(path_list, spec_consumer)
         if path_list.is_a?(PathList)
@@ -106,6 +106,13 @@ module Pod
         source_files - arc_source_files
       end
 
+      # @return [Array<Pathname] the source files that do not match any of the
+      #                          recognized file extensions
+      def other_source_files
+        extensions = SOURCE_FILE_EXTENSIONS
+        source_files.reject { |f| extensions.include?(f.extname) }
+      end
+
       # @return [Array<Pathname>] the headers of the specification.
       #
       def headers
@@ -413,9 +420,7 @@ module Pod
       #
       def expanded_paths(patterns, options = {})
         return [] if patterns.empty?
-        result = []
-        result << path_list.glob(patterns, options)
-        result.flatten.compact.uniq
+        path_list.glob(patterns, options).flatten.compact.uniq
       end
 
       # @param  [Pathname] binary

data/lib/cocoapods/sandbox/headers_store.rb

@@ -16,7 +16,7 @@ module Pod
       #
       attr_reader :sandbox
 
-      # @param  [Sandbox] @see sandbox
+      # @param  [Sandbox] @see #sandbox
       #
       # @param  [String] relative_path
       #         the relative path to the sandbox root and hence to the Pods
@@ -54,7 +54,7 @@ module Pod
         return @search_paths_cache[key] if @search_paths_cache.key?(key)
         search_paths = @search_paths.select do |entry|
           matches_platform = entry[:platform] == platform.name
-          matches_target = target_name.nil? || (entry[:path].basename.to_s == target_name)
+          matches_target = target_name.nil? || (File.basename(entry[:path]) == target_name)
           matches_platform && matches_target
         end
         headers_dir = root.relative_path_from(sandbox.root).dirname
@@ -63,7 +63,7 @@ module Pod
           paths << "${PODS_ROOT}/#{headers_dir}/#{@relative_path}" if !use_modular_headers || @visibility_scope == :public
           paths << "${PODS_ROOT}/#{headers_dir}/#{entry[:path]}" if !use_modular_headers || @visibility_scope == :private
           paths
-        end.uniq
+        end.tap(&:uniq!).freeze
       end
 
       # Removes the directory as it is regenerated from scratch during each
@@ -96,8 +96,9 @@ module Pod
       # @return [Array<Pathname>]
       #
       def add_files(namespace, relative_header_paths)
+        root.join(namespace).mkpath unless relative_header_paths.empty?
         relative_header_paths.map do |relative_header_path|
-          add_file(namespace, relative_header_path)
+          add_file(namespace, relative_header_path, :mkdir => false)
         end
       end
 
@@ -115,9 +116,9 @@ module Pod
       #
       # @return [Pathname]
       #
-      def add_file(namespace, relative_header_path)
+      def add_file(namespace, relative_header_path, mkdir: true)
         namespaced_path = root + namespace
-        namespaced_path.mkpath unless File.exist?(namespaced_path)
+        namespaced_path.mkpath if mkdir
 
         absolute_source = (sandbox.root + relative_header_path)
         source = absolute_source.relative_path_from(namespaced_path)
@@ -128,7 +129,7 @@ module Pod
       # Adds an header search path to the sandbox.
       #
       # @param  [Pathname] path
-      #         the path tho add.
+      #         the path to add.
       #
       # @param  [String] platform
       #         the platform the search path applies to
@@ -136,7 +137,7 @@ module Pod
       # @return [void]
       #
       def add_search_path(path, platform)
-        @search_paths << { :platform => platform.name, :path => (Pathname.new(@relative_path) + path) }
+        @search_paths << { :platform => platform.name, :path => File.join(@relative_path, path) }
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/sandbox/path_list.rb

@@ -16,11 +16,11 @@ module Pod
       # @return [Pathname] The root of the list whose files and directories
       #         are used to perform the matching operations.
       #
-      attr_accessor :root
+      attr_reader :root
 
       # Initialize a new instance
       #
-      # @param  [Pathname] root The root of the PathList.
+      # @param  [Pathname] root @see #root
       #
       def initialize(root)
         root_dir = ActiveSupport::Multibyte::Unicode.normalize(root.to_s)
@@ -88,7 +88,8 @@ module Pod
       # @return [Array<Pathname>]
       #
       def glob(patterns, options = {})
-        relative_glob(patterns, options).map { |p| root.join(p) }
+        cache_key = options.merge(:patterns => patterns)
+        @glob_cache[cache_key] ||= relative_glob(patterns, options).map { |p| root.join(p) }
       end
 
       # The list of relative paths that are case insensitively matched by a
@@ -115,10 +116,6 @@ module Pod
       def relative_glob(patterns, options = {})
         return [] if patterns.empty?
 
-        cache_key = options.merge(:patterns => patterns)
-        cached_value = @glob_cache[cache_key]
-        return cached_value if cached_value
-
         dir_pattern = options[:dir_pattern]
         exclude_patterns = options[:exclude_patterns]
         include_dirs = options[:include_dirs]
@@ -155,7 +152,7 @@ module Pod
           exclude_options = { :dir_pattern => '**/*', :include_dirs => include_dirs }
           list -= relative_glob(exclude_patterns, exclude_options)
         end
-        @glob_cache[cache_key] = list
+        list
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/sandbox.rb

@@ -52,7 +52,7 @@ module Pod
 
     # Initialize a new instance
     #
-    # @param [String, Pathname] root @see root
+    # @param [String, Pathname] root @see #root
     #
     def initialize(root)
       FileUtils.mkdir_p(root)
@@ -62,6 +62,7 @@ module Pod
       @checkout_sources = {}
       @development_pods = {}
       @pods_with_absolute_path = []
+      @stored_podspecs = {}
     end
 
     # @return [Lockfile] the manifest which contains the information about the
@@ -209,9 +210,9 @@ module Pod
     # @return [Specification] the specification if the file is found.
     #
     def specification(name)
-      if file = specification_path(name)
-        original_path = development_pods[name]
-        Specification.from_file(original_path || file)
+      @stored_podspecs[name] ||= if file = specification_path(name)
+                                   original_path = development_pods[name]
+                                   Specification.from_file(original_path || file)
       end
     end
 
@@ -242,7 +243,7 @@ module Pod
     # @param  [String] name
     #         the name of the pod
     #
-    # @param  [String, Pathname] podspec
+    # @param  [String, Pathname, Specification] podspec
     #         The contents of the specification (String) or the path to a
     #         podspec file (Pathname).
     #
@@ -252,23 +253,35 @@ module Pod
     def store_podspec(name, podspec, _external_source = false, json = false)
       file_name = json ? "#{name}.podspec.json" : "#{name}.podspec"
       output_path = specifications_root + file_name
-      output_path.dirname.mkpath
-      if podspec.is_a?(String)
-        output_path.open('w') { |f| f.puts(podspec) }
-      else
-        unless podspec.exist?
-          raise Informative, "No podspec found for `#{name}` in #{podspec}"
+
+      spec =
+        case podspec
+        when String
+          output_path.open('w') { |f| f.puts(podspec) }
+          Specification.from_file(output_path)
+        when Pathname
+          unless podspec.exist?
+            raise Informative, "No podspec found for `#{name}` in #{podspec}"
+          end
+          FileUtils.copy(podspec, output_path)
+          Specification.from_file(podspec)
+        when Specification
+          raise ArgumentError, 'can only store Specification objects as json' unless json
+          output_path.open('w') { |f| f.puts(podspec.to_pretty_json) }
+          podspec.dup
+        else
+          raise ArgumentError, "Unknown type for podspec: #{podspec.inspect}"
         end
-        FileUtils.copy(podspec, output_path)
-      end
 
-      Dir.chdir(podspec.is_a?(Pathname) ? File.dirname(podspec) : Dir.pwd) do
-        spec = Specification.from_file(output_path)
+      # we force the file to be the file in the sandbox, so specs that have been serialized to
+      # json maintain a consistent checksum.
+      # this is safe to do because `spec` is always a clean instance
+      spec.defined_in_file = output_path
 
-        unless spec.name == name
-          raise Informative, "The name of the given podspec `#{spec.name}` doesn't match the expected one `#{name}`"
-        end
+      unless spec.name == name
+        raise Informative, "The name of the given podspec `#{spec.name}` doesn't match the expected one `#{name}`"
       end
+      @stored_podspecs[spec.name] = spec
     end
 
     #-------------------------------------------------------------------------#
@@ -367,8 +380,6 @@ module Pod
     # @return [Hash{String=>Pathname}] The path of the Pods' podspecs with a local source
     #         grouped by their root name.
     #
-    # @todo   Rename (e.g. `pods_with_local_path`)
-    #
     attr_reader :development_pods
 
     # Checks if a Pod is locally sourced?
@@ -393,28 +404,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
-    public
-
-    # @!group Pods Helpers
-
-    # Creates the file accessors for the given Pod Targets.
-    #
-    # @param [Array<PodTarget>] pod_targets
-    #                           The Pod Targets to create file accessors for.
-    #
-    def create_file_accessors(pod_targets)
-      pod_targets.each do |pod_target|
-        pod_root = pod_dir(pod_target.root_spec.name)
-        path_list = PathList.new(pod_root)
-        file_accessors = pod_target.specs.map do |spec|
-          FileAccessor.new(path_list, spec.consumer(pod_target.platform))
-        end
-        pod_target.file_accessors ||= []
-        pod_target.file_accessors.concat(file_accessors)
-      end
-    end
-
-    #-------------------------------------------------------------------------#
   end
 end

data/lib/cocoapods/sources_manager.rb

@@ -31,7 +31,7 @@ module Pod
               "named `#{name}`.\n"
             message << "(#{e})\n" if Config.instance.verbose?
             message << 'You can try adding it manually in ' \
-              '`~/.cocoapods/repos` or via `pod repo add`.'
+              "`#{Config.instance.repos_dir}` or via `pod repo add`."
             raise Informative, message
           ensure
             UI.title_level = previous_title_level