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

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

@@ -10,12 +10,18 @@ module Pod
           #
           attr_reader :target_installation_result
 
+          # @return [InstallationOptions] the installation options from the Podfile.
+          #
+          attr_reader :installation_options
+
           # Initialize a new instance
           #
           # @param  [TargetInstallationResult] target_installation_result @see #target_installation_result
+          # @param  [InstallationOptions] installation_options @see #installation_options
           #
-          def initialize(target_installation_result)
+          def initialize(target_installation_result, installation_options)
             @target_installation_result = target_installation_result
+            @installation_options = installation_options
           end
 
           # Integrates the pod target.
@@ -53,17 +59,19 @@ module Pod
           #
           def add_copy_resources_script_phase(native_target, test_spec)
             script_path = "${PODS_ROOT}/#{target.copy_resources_script_path_for_test_spec(test_spec).relative_path_from(target.sandbox.root)}"
-            resource_paths = target.dependent_targets_for_test_spec(test_spec).flat_map do |dependent_target|
-              spec_paths_to_include = dependent_target.non_test_specs.map(&:name)
-              spec_paths_to_include << test_spec.name if dependent_target == target
-              dependent_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
-            end
             input_paths = []
             output_paths = []
-            unless resource_paths.empty?
-              resource_paths_flattened = resource_paths.flatten.uniq
-              input_paths = [script_path, *resource_paths_flattened]
-              output_paths = UserProjectIntegrator::TargetIntegrator.resource_output_paths(resource_paths_flattened)
+            unless installation_options.disable_input_output_paths?
+              resource_paths = target.dependent_targets_for_test_spec(test_spec).flat_map do |dependent_target|
+                spec_paths_to_include = dependent_target.non_test_specs.map(&:name)
+                spec_paths_to_include << test_spec.name if dependent_target == target
+                dependent_target.resource_paths.values_at(*spec_paths_to_include).flatten.compact
+              end
+              unless resource_paths.empty?
+                resource_paths_flattened = resource_paths.flatten.uniq
+                input_paths = [script_path, *resource_paths_flattened]
+                output_paths = UserProjectIntegrator::TargetIntegrator.resource_output_paths(resource_paths_flattened)
+              end
             end
             UserProjectIntegrator::TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
             UserProjectIntegrator::TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
@@ -75,17 +83,20 @@ module Pod
           #
           def add_embed_frameworks_script_phase(native_target, test_spec)
             script_path = "${PODS_ROOT}/#{target.embed_frameworks_script_path_for_test_spec(test_spec).relative_path_from(target.sandbox.root)}"
-            framework_paths = target.dependent_targets_for_test_spec(test_spec).flat_map do |dependent_target|
-              spec_paths_to_include = dependent_target.non_test_specs.map(&:name)
-              spec_paths_to_include << test_spec.name if dependent_target == target
-              dependent_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact.uniq
-            end
             input_paths = []
             output_paths = []
-            unless framework_paths.empty?
-              input_paths = [script_path, *framework_paths.flat_map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.compact]
-              output_paths = framework_paths.flat_map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.compact
+            unless installation_options.disable_input_output_paths?
+              framework_paths = target.dependent_targets_for_test_spec(test_spec).flat_map do |dependent_target|
+                spec_paths_to_include = dependent_target.non_test_specs.map(&:name)
+                spec_paths_to_include << test_spec.name if dependent_target == target
+                dependent_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact.uniq
+              end
+              unless framework_paths.empty?
+                input_paths = [script_path, *framework_paths.flat_map { |fw| [fw.source_path, fw.dsym_path] }.compact]
+                output_paths = UserProjectIntegrator::TargetIntegrator.framework_output_paths(framework_paths)
+              end
             end
+
             UserProjectIntegrator::TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
             UserProjectIntegrator::TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end

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

@@ -112,7 +112,7 @@ module Pod
           end.compact
 
           unless error_messages.empty?
-            raise Informative, "Unable to determine Swift version for the following pods:\n\n #{error_messages.join('\n')}"
+            raise Informative, "Unable to determine Swift version for the following pods:\n\n#{error_messages.join("\n")}"
           end
         end
 

data/lib/cocoapods/project.rb

@@ -252,6 +252,8 @@ module Pod
       file_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
       file_ref.explicit_file_type = 'text.script.ruby'
       file_ref.last_known_file_type = 'text'
+      file_ref.tab_width = '2'
+      file_ref.indent_width = '2'
     end
 
     # Adds a new build configuration to the project and populates it with

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
 
     #-------------------------------------------------------------------------#
@@ -167,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
@@ -238,7 +206,7 @@ module Pod
     end
 
     def valid_possibility_version_for_root_name?(requirement, activated, spec)
-      prerelease_requirement = requirement.prerelease? || requirement.external_source || !spec.version.prerelease?
+      return true if prerelease_requirement = requirement.prerelease? || requirement.external_source || !spec.version.prerelease?
 
       activated.each do |vertex|
         next unless vertex.payload
@@ -381,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
@@ -392,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]
@@ -426,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
@@ -441,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 "  \
@@ -509,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
@@ -569,17 +553,26 @@ module Pod
       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/resolver/resolver_specification.rb

@@ -0,0 +1,41 @@
+module Pod
+  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.class &&
+          spec == other.spec &&
+          used_by_tests_only? == other.used_by_tests_only?
+      end
+    end
+  end
+end

data/lib/cocoapods/sandbox.rb

@@ -254,25 +254,29 @@ module Pod
       file_name = json ? "#{name}.podspec.json" : "#{name}.podspec"
       output_path = specifications_root + file_name
 
-      case podspec
-      when String
-        output_path.open('w') { |f| f.puts(podspec) }
-      when Pathname
-        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
-        spec = Specification.from_file(podspec)
-        FileUtils.copy(podspec, output_path)
-      when Specification
-        raise ArgumentError, 'can only store Specification objects as json' unless json
-        output_path.open('w') { |f| f.puts(podspec.to_pretty_json) }
-        spec = podspec.dup
-      else
-        raise ArgumentError, "Unknown type for podspec: #{podspec.inspect}"
-      end
 
-      spec ||= Specification.from_file(output_path)
-      spec.defined_in_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}`"

data/lib/cocoapods/target/aggregate_target.rb

@@ -1,3 +1,5 @@
+require 'cocoapods/target/framework_paths'
+
 module Pod
   # Stores the information relative to the target used to cluster the targets
   # of the single Pods. The client targets will then depend on this one.
@@ -222,7 +224,7 @@ module Pod
       !framework_paths_by_config.values.all?(&:empty?)
     end
 
-    # @return [Hash{String => Array<Hash{Symbol => [String]}>}] The vendored dynamic artifacts and framework target
+    # @return [Hash{String => Array<FrameworkPaths>}] The vendored dynamic artifacts and framework target
     #         input and output paths grouped by config
     #
     def framework_paths_by_config

data/lib/cocoapods/target/build_settings.rb

@@ -552,7 +552,7 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :weak_frameworks_to_import, :memoized => true, :sorted => true, :uniqued => true do
-          []
+          spec_consumers.flat_map(&:weak_frameworks)
         end
 
         # @return [Array<String>]
@@ -564,6 +564,12 @@ module Pod
           paths
         end
 
+        # @return [String]
+        define_build_settings_method :framework_header_search_path, :memoized => true do
+          return unless target.requires_frameworks?
+          "#{target.build_product_path}/Headers"
+        end
+
         # @return [Array<String>]
         define_build_settings_method :vendored_framework_search_paths, :memoized => true do
           file_accessors.flat_map(&:vendored_frameworks).map { |f| File.join '${PODS_ROOT}', f.dirname.relative_path_from(target.sandbox.root) }
@@ -690,6 +696,11 @@ module Pod
           target.header_search_paths(:include_dependent_targets_for_test_spec => test_spec)
         end
 
+        # @return [Array<String>]
+        define_build_settings_method :public_header_search_paths, :memoized => true, :sorted => true do
+          target.header_search_paths(:include_dependent_targets_for_test_spec => test_xcconfig?, :include_private_headers => false)
+        end
+
         #-------------------------------------------------------------------------#
 
         # @!group Swift
@@ -907,6 +918,12 @@ module Pod
             paths.concat target.sandbox.public_headers.search_paths(target.platform)
           end
 
+          # Make frameworks headers discoverable with any syntax (quotes,
+          # brackets, @import, etc.)
+          paths.concat pod_targets.
+            select { |pt| pt.requires_frameworks? && pt.should_build? }.
+            map { |pt| pt.build_settings.framework_header_search_path }
+
           paths.concat target.search_paths_aggregate_targets.flat_map { |at| at.build_settings(configuration_name).header_search_paths }
 
           paths
@@ -915,18 +932,24 @@ module Pod
         # @return [Array<String>]
         define_build_settings_method :other_cflags, :build_setting => true, :memoized => true do
           flags = super()
-          flags +
-            header_search_paths.flat_map { |p| ['-isystem', p] } +
-            framework_header_paths_for_iquote.flat_map { |p| ['-iquote', p] }
-        end
 
-        # @return [Array<String>]
-        define_build_settings_method :framework_header_paths_for_iquote, :memoized => true, :sorted => true, :uniqued => true do
-          paths = pod_targets.
-                    select { |pt| pt.should_build? && pt.requires_frameworks? }.
-                    map { |pt| "#{pt.build_product_path}/Headers" }
-          paths.concat target.search_paths_aggregate_targets.flat_map { |at| at.build_settings(configuration_name).framework_header_paths_for_iquote }
-          paths
+          pod_targets_inhibiting_warnings = pod_targets.select(&:inhibit_warnings?)
+
+          silenced_headers = []
+          silenced_frameworks = []
+          pod_targets_inhibiting_warnings.each do |pt|
+            if pt.requires_frameworks? && pt.should_build?
+              silenced_headers.append pt.build_settings.framework_header_search_path
+            else
+              silenced_headers.concat pt.build_settings.public_header_search_paths
+            end
+            silenced_frameworks.concat pt.build_settings.framework_search_paths_to_import
+          end
+
+          flags += silenced_headers.uniq.flat_map { |p| ['-isystem', p] }
+          flags += silenced_frameworks.uniq.flat_map { |p| ['-iframework', p] }
+
+          flags
         end
 
         # @return [Array<String>]