cocoapods 0.34.4 → 0.35.0.rc1

data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -47,11 +47,11 @@ module Pod
         # @return [Xcodeproj::Config]
         #
         def generate
-          header_search_path_flags = target.sandbox.public_headers.search_paths
+          header_search_path_flags = target.sandbox.public_headers.search_paths(target.platform)
           @xcconfig = Xcodeproj::Config.new(
                                               'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
                                               'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
-                                              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(target.sandbox.public_headers.search_paths),
+                                              'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_path_flags),
                                               'PODS_ROOT' => target.relative_pods_root,
                                               'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
                                               'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_path_flags, '-isystem')

data/lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb

@@ -45,7 +45,10 @@ module Pod
         # @return [Xcodeproj::Config]
         #
         def generate
-          search_paths = target.build_headers.search_paths.concat(target.sandbox.public_headers.search_paths)
+          target_search_paths = target.build_headers.search_paths(target.platform)
+          sandbox_search_paths = target.sandbox.public_headers.search_paths(target.platform)
+          search_paths = target_search_paths.concat(sandbox_search_paths).uniq
+
           config = {
             'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
             'PODS_ROOT'  => '${SRCROOT}',

data/lib/cocoapods/hooks/library_representation.rb

@@ -69,7 +69,7 @@ module Pod
       #         process.
       #
       def target
-        library.target
+        library.native_target
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/installer.rb

@@ -418,7 +418,7 @@ module Pod
         pod_targets.sort_by(&:name).each do |pod_target|
           pod_target.file_accessors.each do |file_accessor|
             file_accessor.spec_consumer.frameworks.each do |framework|
-              pod_target.target.add_system_framework(framework)
+              pod_target.native_target.add_system_framework(framework)
             end
           end
         end
@@ -428,7 +428,7 @@ module Pod
     def set_target_dependencies
       aggregate_targets.each do |aggregate_target|
         aggregate_target.pod_targets.each do |pod_target|
-          aggregate_target.target.add_dependency(pod_target.target)
+          aggregate_target.native_target.add_dependency(pod_target.native_target)
           pod_target.dependencies.each do |dep|
 
             unless dep == pod_target.pod_name
@@ -437,7 +437,7 @@ module Pod
               unless pod_dependency_target
                 puts "[BUG] DEP: #{dep}"
               end
-              pod_target.target.add_dependency(pod_dependency_target.target)
+              pod_target.native_target.add_dependency(pod_dependency_target.native_target)
             end
           end
         end

data/lib/cocoapods/installer/analyzer.rb

@@ -8,6 +8,8 @@ module Pod
 
       autoload :SandboxAnalyzer, 'cocoapods/installer/analyzer/sandbox_analyzer'
 
+      autoload :LockingDependencyAnalyzer, 'cocoapods/installer/analyzer/locking_dependency_analyzer'
+
       # @return [Sandbox] The sandbox where the Pods should be installed.
       #
       attr_reader :sandbox
@@ -149,17 +151,13 @@ module Pod
           pods_state = nil
           UI.section 'Finding Podfile changes' do
             pods_by_state = lockfile.detect_changes_with_podfile(podfile)
-            pods_by_state.dup.each do |state, full_names|
-              pods = full_names.map { |fn| Specification.root_name(fn) }.uniq
-              pods_by_state[state] = pods
-            end
             pods_state = SpecsState.new(pods_by_state)
             pods_state.print
           end
           pods_state
         else
           state = SpecsState.new
-          state.added.concat(podfile.dependencies.map(&:root_name).uniq)
+          state.added.concat(podfile.dependencies.map(&:name).uniq)
           state
         end
       end
@@ -231,21 +229,17 @@ module Pod
       # is in update mode, to prevent it from upgrading the Pods that weren't
       # changed in the {Podfile}.
       #
-      # @return [Array<Dependency>] the dependencies generate by the lockfile
-      #         that prevent the resolver to update a Pod.
+      # @return [Molinillo::DependencyGraph<Dependency>] the dependencies
+      #         generated by the lockfile that prevent the resolver to update
+      #         a Pod.
       #
       def generate_version_locking_dependencies
-        if update_mode == :all
-          []
+        if update_mode == :all || !lockfile
+          LockingDependencyAnalyzer.unlocked_dependency_graph
         else
-          locking_pods = result.podfile_state.unchanged
-          if update_mode == :selected
-            # If selected Pods should been updated, filter them out of the list
-            locking_pods = locking_pods.select { |pod| !update[:pods].include?(pod) }
-          end
-          locking_pods.map do |pod|
-            lockfile.dependencies_to_lock_pod_named(pod)
-          end.flatten
+          pods_to_update = result.podfile_state.changed + result.podfile_state.deleted
+          pods_to_update += update[:pods] if update_mode == :selected
+          LockingDependencyAnalyzer.generate_version_locking_dependencies(lockfile, pods_to_update)
         end
       end
 
@@ -274,6 +268,11 @@ module Pod
         deps_to_fetch_if_needed = []
         deps_with_external_source = podfile.dependencies.select(&:external_source)
 
+        deps_with_different_sources = podfile.dependencies.group_by(&:root_name).select { |_root_name, dependencies| dependencies.map(&:external_source).uniq.count > 1 }
+        deps_with_different_sources.each do |root_name, dependencies|
+          raise Informative, "There are multiple dependencies with different sources for `#{root_name}` in #{UI.path podfile.defined_in_file}:\n\n- #{dependencies.map(&:to_s).join("\n- ")}"
+        end
+
         if update_mode == :all
           deps_to_fetch = deps_with_external_source
         else
@@ -281,14 +280,14 @@ module Pod
           if update_mode == :selected
             pods_to_fetch += update[:pods]
           end
-          deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.root_name) }
-          deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.root_name) }
-          deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? || !sandbox.pod_dir(dep.root_name).directory? }
+          deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.name) }
+          deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.name) }
+          deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? || !sandbox.pod_dir(dep.name).directory? }
         end
 
         unless deps_to_fetch.empty?
           UI.section 'Fetching external sources' do
-            deps_to_fetch.uniq.sort.each do |dependency|
+            deps_to_fetch.uniq(&:root_name).sort.each do |dependency|
               source = ExternalSources.from_dependency(dependency, podfile.defined_in_file)
               source.fetch(sandbox)
             end
@@ -316,6 +315,13 @@ module Pod
       #         grouped by target.
       #
       def resolve_dependencies
+        duplicate_dependencies = podfile.dependencies.group_by(&:name).
+          select { |_name, dependencies| dependencies.count > 1 }
+        duplicate_dependencies.each do |name, dependencies|
+          UI.warn "There are duplicate dependencies on `#{name}` in #{UI.path podfile.defined_in_file}:\n\n" \
+           "- #{dependencies.map(&:to_s).join("\n- ")}"
+        end
+
         specs_by_target = nil
         UI.section "Resolving dependencies of #{UI.path podfile.defined_in_file}" do
           resolver = Resolver.new(sandbox, podfile, locked_dependencies, sources)
@@ -352,8 +358,9 @@ module Pod
 
       # @!group Analysis internal products
 
-      # @return [Array<Dependency>] the dependencies generate by the lockfile
-      #         that prevent the resolver to update a Pod.
+      # @return [Molinillo::DependencyGraph<Dependency>] the dependencies
+      #         generated by the lockfile that prevent the resolver to update a
+      #         Pod.
       #
       attr_reader :locked_dependencies
 
@@ -363,23 +370,17 @@ module Pod
 
       # Returns the sources used to query for specifications
       #
-      # @note Currently, this defaults to {SourcesManager.all} when no
-      #       Podfile sources are defined, but this implicit declaration of
-      #       sources is deprecated.
+      # When no explicit Podfile sources are defined, this defaults to all
+      # available sources ({SourcesManager.all}).
       #
       # @return [Array<Source>] the sources to be used in finding
-      #         specifications, as specified by the {#podfile}.
+      #         specifications, as specified by the {#podfile} or all sources.
       #
       def sources
         @sources ||= begin
           sources = podfile.sources
           if sources.empty?
-            SourcesManager.all.tap do |all|
-              UI.warn all.reduce("The use of implicit sources has been " \
-                "deprecated. To continue using all of the sources currently " \
-                "on your machine, add the following to the top of your " \
-                "Podfile:\n") { |w, s| w << "\n    source '#{s.url}'" } + "\n"
-            end
+            SourcesManager.all
           else
             sources.map do |url|
               SourcesManager.find_or_create_source_with_url(url)
@@ -604,7 +605,7 @@ module Pod
       #
       class SpecsState
         # @param  [Hash{Symbol=>String}] pods_by_state
-        #         The **root** name of the pods grouped by their state
+        #         The name of the pods grouped by their state
         #         (`:added`, `:removed`, `:changed` or `:unchanged`).
         #
         def initialize(pods_by_state = nil)
@@ -656,12 +657,9 @@ module Pod
         # @param  [Symbol]
         #         the state of the Pod.
         #
-        # @raise  If there is an attempt to add the name of a subspec.
-        #
         # @return [void]
         #
         def add_name(name, state)
-          raise '[Bug] Attempt to add subspec to the pods state' if name.include?('/')
           send(state) << name
         end
       end

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

@@ -0,0 +1,72 @@
+require 'molinillo/dependency_graph'
+
+module Pod
+  class Installer
+    class Analyzer
+      # Generates dependencies that require the specific version of the Pods
+      # that haven't changed in the {Lockfile}.
+      module LockingDependencyAnalyzer
+        # Generates dependencies that require the specific version of the Pods
+        # that haven't changed in the {Lockfile}.
+        #
+        # These dependencies are passed to the {Resolver}, unless the installer
+        # is in update mode, to prevent it from upgrading the Pods that weren't
+        # changed in the {Podfile}.
+        #
+        # @return [Molinillo::DependencyGraph<Dependency>] the dependencies
+        #         generated by the lockfile that prevent the resolver to update
+        #         a Pod.
+        #
+        def self.generate_version_locking_dependencies(lockfile, pods_to_update)
+          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_root_vertex(dependency.name, nil)
+            end
+
+            pods = lockfile.to_hash['PODS'] || []
+            pods.each do |pod|
+              add_to_dependency_graph(pod, [], dependency_graph)
+            end
+
+            pods_to_update.each { |u| dependency_graph.detach_vertex_named(u) }
+          end
+
+          dependency_graph
+        end
+
+        # Generates a completely 'unlocked' dependency graph.
+        #
+        # @return [Molinillo::DependencyGraph<Dependency>] an empty dependency
+        #         graph
+        #
+        def self.unlocked_dependency_graph
+          Molinillo::DependencyGraph.new
+        end
+
+        private
+
+        def self.add_child_vertex_to_graph(dependency_string, parents, dependency_graph)
+          dependency = Dependency.from_string(dependency_string)
+          dependency_graph.add_child_vertex(dependency.name, parents.empty? ? dependency : nil, parents, nil)
+          dependency
+        end
+
+        def self.add_to_dependency_graph(object, parents, dependency_graph)
+          case object
+          when String
+            add_child_vertex_to_graph(object, parents, dependency_graph)
+          when Hash
+            object.each do |key, value|
+              dependency = add_child_vertex_to_graph(key, parents, dependency_graph)
+              value.each { |v| add_to_dependency_graph(v, [dependency.name], dependency_graph) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/installer/file_references_installer.rb

@@ -8,7 +8,7 @@ module Pod
       #
       attr_reader :sandbox
 
-      # @return [Array<Library>] The libraries of the installation.
+      # @return [Array<PodTarget>] The libraries of the installation.
       #
       attr_reader :libraries
 
@@ -17,7 +17,7 @@ module Pod
       attr_reader :pods_project
 
       # @param [Sandbox] sandbox @see sandbox
-      # @param [Array<Library>] libraries @see libraries
+      # @param [Array<PodTarget>] libraries @see libraries
       # @param [Project] libraries @see libraries
       #
       def initialize(sandbox, libraries, pods_project)
@@ -114,15 +114,15 @@ module Pod
           libraries.each do |library|
             library.file_accessors.each do |file_accessor|
               headers_sandbox = Pathname.new(file_accessor.spec.root.name)
-              library.build_headers.add_search_path(headers_sandbox)
-              sandbox.public_headers.add_search_path(headers_sandbox)
+              library.build_headers.add_search_path(headers_sandbox, library.platform)
+              sandbox.public_headers.add_search_path(headers_sandbox, library.platform)
 
               header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
-                library.build_headers.add_files(namespaced_path, files)
+                library.build_headers.add_files(namespaced_path, files, library.platform)
               end
 
               header_mappings(headers_sandbox, file_accessor, file_accessor.public_headers).each do |namespaced_path, files|
-                sandbox.public_headers.add_files(namespaced_path, files)
+                sandbox.public_headers.add_files(namespaced_path, files, library.platform)
               end
             end
           end
@@ -167,11 +167,12 @@ module Pod
       # Computes the destination sub-directory in the sandbox
       #
       # @param  [Pathname] headers_sandbox
-      #         The sandbox where the headers links should be stored for this
+      #         The sandbox where the header links should be stored for this
       #         Pod.
       #
-      # @param  [Specification::Consumer] consumer
-      #         The consumer for which the headers need to be linked.
+      # @param  [Sandbox::FileAccessor] file_accessor
+      #         The consumer file accessor for which the headers need to be
+      #         linked.
       #
       # @param  [Array<Pathname>] headers
       #         The absolute paths of the headers which need to be mapped.

data/lib/cocoapods/installer/target_installer.rb

@@ -10,16 +10,16 @@ module Pod
       #
       attr_reader :sandbox
 
-      # @return [Library] The library whose target needs to be generated.
+      # @return [Target] The library whose target needs to be generated.
       #
-      attr_reader :library
+      attr_reader :target
 
       # @param  [Project] project @see project
-      # @param  [Library] library @see library
+      # @param  [Target]  target  @see target
       #
-      def initialize(sandbox, library)
+      def initialize(sandbox, target)
         @sandbox = sandbox
-        @library = library
+        @target = target
       end
 
       private
@@ -36,31 +36,31 @@ module Pod
       # @return [void]
       #
       def add_target
-        name = library.label
-        platform = library.platform.name
-        deployment_target = library.platform.deployment_target.to_s
-        @target = project.new_target(:static_library, name, platform, deployment_target)
+        name = target.label
+        platform = target.platform.name
+        deployment_target = target.platform.deployment_target.to_s
+        @native_target = project.new_target(:static_library, name, platform, deployment_target)
 
-        library.user_build_configurations.each do |bc_name, type|
-          configuration = @target.add_build_configuration(bc_name, type)
+        target.user_build_configurations.each do |bc_name, type|
+          configuration = @native_target.add_build_configuration(bc_name, type)
         end
 
         settings = { 'OTHER_LDFLAGS' => '', 'OTHER_LIBTOOLFLAGS' => '' }
-        if library.archs
-          settings['ARCHS'] = library.archs
+        if target.archs
+          settings['ARCHS'] = target.archs
         end
 
-        @target.build_configurations.each do |configuration|
+        @native_target.build_configurations.each do |configuration|
           configuration.build_settings.merge!(settings)
         end
 
-        library.target = @target
+        target.native_target = @native_target
       end
 
       # Creates the directory where to store the support files of the target.
       #
       def create_support_files_dir
-        library.support_files_dir.mkdir
+        target.support_files_dir.mkdir
       end
 
       # Generates a dummy source file for each target so libraries that contain
@@ -69,11 +69,11 @@ module Pod
       # @return [void]
       #
       def create_dummy_source
-        path = library.dummy_source_path
-        generator = Generator::DummySource.new(library.label)
+        path = target.dummy_source_path
+        generator = Generator::DummySource.new(target.label)
         generator.save_as(path)
         file_reference = add_file_to_support_group(path)
-        target.source_build_phase.add_file_reference(file_reference)
+        native_target.source_build_phase.add_file_reference(file_reference)
       end
 
       # @return [PBXNativeTarget] the target generated by the installation
@@ -81,7 +81,7 @@ module Pod
       #
       # @note   Generated by the {#add_target} step.
       #
-      attr_reader :target
+      attr_reader :native_target
 
       private
 
@@ -98,7 +98,7 @@ module Pod
       # @return [TargetDefinition] the target definition of the library.
       #
       def target_definition
-        library.target_definition
+        target.target_definition
       end
 
       # @return [PBXGroup] the group where the file references to the support

data/lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -9,7 +9,7 @@ module Pod
       # @return [void]
       #
       def install!
-        UI.message "- Installing target `#{library.name}` #{library.platform}" do
+        UI.message "- Installing target `#{target.name}` #{target.platform}" do
           add_target
           create_support_files_dir
           create_suport_files_group
@@ -33,8 +33,8 @@ module Pod
       #
       def create_suport_files_group
         parent = project.support_files_group
-        name = library.name
-        dir = library.support_files_dir
+        name = target.name
+        dir = target.support_files_dir
         @support_files_group = parent.new_group(name, dir)
       end
 
@@ -43,11 +43,11 @@ module Pod
       # @return [void]
       #
       def create_xcconfig_file
-        target.build_configurations.each do |configuration|
-          path = library.xcconfig_path(configuration.name)
-          gen = Generator::XCConfig::AggregateXCConfig.new(library, configuration.name)
+        native_target.build_configurations.each do |configuration|
+          path = target.xcconfig_path(configuration.name)
+          gen = Generator::XCConfig::AggregateXCConfig.new(target, configuration.name)
           gen.save_as(path)
-          library.xcconfigs[configuration.name] = gen.xcconfig
+          target.xcconfigs[configuration.name] = gen.xcconfig
           xcconfig_file_ref = add_file_to_support_group(path)
           configuration.base_configuration_reference = xcconfig_file_ref
         end
@@ -57,8 +57,8 @@ module Pod
       # pods and the installed specifications of a pod.
       #
       def create_target_environment_header
-        path = library.target_environment_header_path
-        generator = Generator::TargetEnvironmentHeader.new(library.specs_by_build_configuration)
+        path = target.target_environment_header_path
+        generator = Generator::TargetEnvironmentHeader.new(target.specs_by_build_configuration)
         generator.save_as(path)
         add_file_to_support_group(path)
       end
@@ -66,15 +66,15 @@ module Pod
       # Generates the bridge support metadata if requested by the {Podfile}.
       #
       # @note   The bridge support metadata is added to the resources of the
-      #         library because it is needed for environments interpreted at
+      #         target because it is needed for environments interpreted at
       #         runtime.
       #
       # @return [void]
       #
       def create_bridge_support_file
         if target_definition.podfile.generate_bridge_support?
-          path = library.bridge_support_path
-          headers = target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
+          path = target.bridge_support_path
+          headers = native_target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
           generator = Generator::BridgeSupport.new(headers)
           generator.save_as(path)
           add_file_to_support_group(path)
@@ -91,15 +91,15 @@ module Pod
       # @return [void]
       #
       def create_copy_resources_script
-        path = library.copy_resources_script_path
-        file_accessors = library.pod_targets.map(&:file_accessors).flatten
+        path = target.copy_resources_script_path
+        file_accessors = target.pod_targets.map(&:file_accessors).flatten
         resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map { |res| res.relative_path_from(project.path.dirname) } }.flatten
         resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }.flatten
         resources = []
         resources.concat(resource_paths)
         resources.concat(resource_bundles)
         resources << bridge_support_file if bridge_support_file
-        generator = Generator::CopyResourcesScript.new(resources, library.platform)
+        generator = Generator::CopyResourcesScript.new(resources, target.platform)
         generator.save_as(path)
         add_file_to_support_group(path)
       end
@@ -109,10 +109,10 @@ module Pod
       # @return [void]
       #
       def create_acknowledgements
-        basepath = library.acknowledgements_basepath
+        basepath = target.acknowledgements_basepath
         Generator::Acknowledgements.generators.each do |generator_class|
           path = generator_class.path_from_basepath(basepath)
-          file_accessors = library.pod_targets.map(&:file_accessors).flatten
+          file_accessors = target.pod_targets.map(&:file_accessors).flatten
           generator = generator_class.new(file_accessors)
           generator.save_as(path)
           add_file_to_support_group(path)