cocoapods 1.5.3 → 1.6.0.beta.1

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/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

data/lib/cocoapods/target.rb

@@ -1,3 +1,5 @@
+require 'cocoapods/target/build_settings'
+
 module Pod
   # Model class which describes a Pods target.
   #
@@ -7,6 +9,8 @@ module Pod
   #
   class Target
     DEFAULT_VERSION = '1.0.0'.freeze
+    DEFAULT_NAME = 'Default'.freeze
+    DEFAULT_BUILD_CONFIGURATIONS = { 'Release' => :release, 'Debug' => :debug }.freeze
 
     # @return [Sandbox] The sandbox where the Pods should be installed.
     #
@@ -15,13 +19,43 @@ module Pod
     # @return [Boolean] Whether the target needs to be implemented as a framework.
     #         Computed by analyzer.
     #
-    attr_accessor :host_requires_frameworks
+    attr_reader :host_requires_frameworks
     alias_method :host_requires_frameworks?, :host_requires_frameworks
 
+    # @return [Hash{String=>Symbol}] A hash representing the user build
+    #         configurations where each key corresponds to the name of a
+    #         configuration and its value to its type (`:debug` or `:release`).
+    #
+    attr_reader :user_build_configurations
+
+    # @return [Array<String>] The value for the ARCHS build setting.
+    #
+    attr_reader :archs
+
+    # @return [Platform] the platform of this target.
+    #
+    attr_reader :platform
+
+    # @return [BuildSettings] the build settings for this target.
+    #
+    attr_reader :build_settings
+
     # Initialize a new target
     #
-    def initialize
-      @archs = []
+    # @param [Sandbox] sandbox @see #sandbox
+    # @param [Boolean] host_requires_frameworks @see #host_requires_frameworks
+    # @param [Hash{String=>Symbol}] user_build_configurations @see #user_build_configurations
+    # @param [Array<String>] archs @see #archs
+    # @param [Platform] platform @see #platform
+    #
+    def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform)
+      @sandbox = sandbox
+      @host_requires_frameworks = host_requires_frameworks
+      @user_build_configurations = user_build_configurations
+      @archs = archs
+      @platform = platform
+
+      @build_settings = create_build_settings
     end
 
     # @return [String] the name of the library.
@@ -30,6 +64,40 @@ module Pod
       label
     end
 
+    alias to_s name
+
+    # @return [String] the label for the target.
+    #
+    def label
+      DEFAULT_NAME
+    end
+
+    # @return [String] The version associated with this target
+    #
+    def version
+      DEFAULT_VERSION
+    end
+
+    # @return [Boolean] Whether the target uses Swift code
+    #
+    def uses_swift?
+      false
+    end
+
+    # @return [Boolean] Whether the target should build a static framework.
+    #
+    def static_framework?
+      false
+    end
+
+    # @return [String] the name to use for the source code module constructed
+    #         for this target, and which will be used to import the module in
+    #         implementation source files.
+    #
+    def product_module_name
+      c99ext_identifier(label)
+    end
+
     # @return [String] the name of the product.
     #
     def product_name
@@ -85,6 +153,8 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
+    # @!group Framework support
+
     # @return [Boolean] whether the generated target needs to be implemented
     #         as a framework
     #
@@ -92,33 +162,6 @@ module Pod
       host_requires_frameworks? || false
     end
 
-    # @return [Boolean] Whether the target should build a static framework.
-    #
-    def static_framework?
-      return if is_a?(Pod::AggregateTarget)
-      return if specs.empty?
-      specs.all? { |spec| spec.root.static_framework }
-    end
-
-    #-------------------------------------------------------------------------#
-
-    # @!group Information storage
-
-    # @return [Hash{String=>Symbol}] A hash representing the user build
-    #         configurations where each key corresponds to the name of a
-    #         configuration and its value to its type (`:debug` or `:release`).
-    #
-    attr_accessor :user_build_configurations
-
-    # @return [PBXNativeTarget] the target generated in the Pods project for
-    #         this library.
-    #
-    attr_accessor :native_target
-
-    # @return [Array<String>] The value for the ARCHS build setting.
-    #
-    attr_accessor :archs
-
     #-------------------------------------------------------------------------#
 
     # @!group Support files
@@ -153,10 +196,24 @@ module Pod
       module_map_path.parent + "#{label}-umbrella.h"
     end
 
+    def umbrella_header_path_to_write
+      module_map_path_to_write.parent + "#{label}-umbrella.h"
+    end
+
     # @return [Pathname] the absolute path of the LLVM module map file that
     #         defines the module structure for the compiler.
     #
     def module_map_path
+      module_map_path_to_write
+    end
+
+    # @!private
+    #
+    # @return [Pathname] the absolute path of the module map file that
+    #         CocoaPods writes. This can be different from `module_map_path`
+    #         if the module map gets symlinked.
+    #
+    def module_map_path_to_write
       basename = "#{label}.modulemap"
       support_files_dir + basename
     end
@@ -170,7 +227,7 @@ module Pod
     # @return [Pathname] the absolute path of the Info.plist file.
     #
     def info_plist_path
-      support_files_dir + 'Info.plist'
+      support_files_dir + "#{label}-Info.plist"
     end
 
     # @return [Pathname] the path of the dummy source generated by CocoaPods
@@ -179,12 +236,6 @@ module Pod
       support_files_dir + "#{label}-dummy.m"
     end
 
-    # @return [String] The version associated with this target
-    #
-    def version
-      DEFAULT_VERSION
-    end
-
     #-------------------------------------------------------------------------#
 
     private
@@ -202,5 +253,9 @@ module Pod
     def c99ext_identifier(name)
       name.gsub(/^([0-9])/, '_\1').gsub(/[^a-zA-Z0-9_]/, '_')
     end
+
+    def create_build_settings
+      BuildSettings.new(self)
+    end
   end
 end

data/lib/cocoapods/target/aggregate_target.rb

@@ -3,30 +3,109 @@ module Pod
   # of the single Pods. The client targets will then depend on this one.
   #
   class AggregateTarget < Target
+    # Product types where the product's frameworks must be embedded in a host target
+    #
+    EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES = [:app_extension, :framework, :static_library, :messages_extension, :watch_extension, :xpc_service].freeze
+
     # @return [TargetDefinition] the target definition of the Podfile that
     #         generated this target.
+    #
     attr_reader :target_definition
 
-    # Product types where the product's frameworks must be embedded in a host target
+    # @return [Pathname] the folder where the client is stored used for
+    #         computing the relative paths. If integrating it should be the
+    #         folder where the user project is stored, otherwise it should
+    #         be the installation root.
     #
-    EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES = [:app_extension, :framework, :static_library, :messages_extension, :watch_extension, :xpc_service].freeze
+    attr_reader :client_root
 
-    # Initialize a new instance
+    # @return [Xcodeproj::Project] the user project that this target will
+    #         integrate as identified by the analyzer.
     #
-    # @param [TargetDefinition] target_definition @see target_definition
-    # @param [Sandbox] sandbox @see sandbox
+    attr_reader :user_project
+
+    # @return [Array<String>] the list of the UUIDs of the user targets that
+    #         will be integrated by this target as identified by the analyzer.
+    #
+    # @note   The target instances are not stored to prevent editing different
+    #         instances.
+    #
+    attr_reader :user_target_uuids
+
+    # @return [Hash<String, Xcodeproj::Config>] Map from configuration name to
+    #         configuration file for the target
+    #
+    # @note   The configurations are generated by the {TargetInstaller} and
+    #         used by {UserProjectIntegrator} to check for any overridden
+    #         values.
     #
-    def initialize(target_definition, sandbox)
-      raise "Can't initialize an AggregateTarget with an abstract TargetDefinition" if target_definition.abstract?
-      super()
+    attr_reader :xcconfigs
+
+    # @return [Array<PodTarget>] The dependencies for this target.
+    #
+    attr_reader :pod_targets
+
+    # @return [Array<AggregateTarget>] The aggregate targets whose pods this
+    #         target must be able to import, but will not directly link against.
+    #
+    attr_reader :search_paths_aggregate_targets
+
+    # Initialize a new instance
+    #
+    # @param [Sandbox] sandbox @see Target#sandbox
+    # @param [Boolean] host_requires_frameworks @see Target#host_requires_frameworks
+    # @param [Hash{String=>Symbol}] user_build_configurations @see Target#user_build_configurations
+    # @param [Array<String>] archs @see Target#archs
+    # @param [Platform] platform @see #Target#platform
+    # @param [TargetDefinition] target_definition @see #target_definition
+    # @param [Pathname] client_root @see #client_root
+    # @param [Xcodeproj::Project] user_project @see #user_project
+    # @param [Array<String>] user_target_uuids @see #user_target_uuids
+    # @param [Hash{String=>Array<PodTarget>}] pod_targets_for_build_configuration @see #pod_targets_for_build_configuration
+    #
+    def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, target_definition,
+                   client_root, user_project, user_target_uuids, pod_targets_for_build_configuration)
+      super(sandbox, host_requires_frameworks, user_build_configurations, archs, platform)
+      raise "Can't initialize an AggregateTarget without a TargetDefinition!" if target_definition.nil?
+      raise "Can't initialize an AggregateTarget with an abstract TargetDefinition!" if target_definition.abstract?
       @target_definition = target_definition
-      @sandbox = sandbox
-      @pod_targets = []
+      @client_root = client_root
+      @user_project = user_project
+      @user_target_uuids = user_target_uuids
+      @pod_targets_for_build_configuration = pod_targets_for_build_configuration
+      @pod_targets = pod_targets_for_build_configuration.values.flatten.uniq
       @search_paths_aggregate_targets = []
-      @file_accessors = []
       @xcconfigs = {}
     end
 
+    # Merges this aggregate target with additional pod targets that are part of embedded aggregate targets.
+    #
+    # @param  [Hash{String=>Array<PodTarget>}] embedded_pod_targets_for_build_configuration
+    #         The pod targets to merge with.
+    #
+    # @return [AggregateTarget] a new instance of this aggregate target with additional pod targets to be used from
+    #         pod targets of embedded aggregate targets.
+    #
+    def merge_embedded_pod_targets(embedded_pod_targets_for_build_configuration)
+      merged = @pod_targets_for_build_configuration.merge(embedded_pod_targets_for_build_configuration) do |_, before, after|
+        (before + after).uniq
+      end
+      AggregateTarget.new(sandbox, host_requires_frameworks, user_build_configurations, archs, platform,
+                          target_definition, client_root, user_project, user_target_uuids, merged).tap do |aggregate_target|
+        aggregate_target.search_paths_aggregate_targets.concat(search_paths_aggregate_targets).freeze
+      end
+    end
+
+    def build_settings(configuration_name = nil)
+      if configuration_name
+        @build_settings[configuration_name] ||
+          raise(ArgumentError, "#{self} does not contain a build setting for the #{configuration_name.inspect} configuration, only #{@build_settings.keys.inspect}")
+      else
+        @build_settings.each_value.first ||
+          raise(ArgumentError, "#{self} does not contain any build settings")
+      end
+    end
+
     # @return [Boolean] True if the user_target refers to a
     #         library (framework, static or dynamic lib).
     #
@@ -61,38 +140,12 @@ module Pod
       target_definition.label.to_s
     end
 
-    # @return [String] the name to use for the source code module constructed
-    #         for this target, and which will be used to import the module in
-    #         implementation source files.
-    #
-    def product_module_name
-      c99ext_identifier(label)
-    end
-
-    # @return [Platform] the platform for this target.
-    #
-    def platform
-      @platform ||= target_definition.platform
-    end
-
     # @return [Podfile] The podfile which declares the dependency
     #
     def podfile
       target_definition.podfile
     end
 
-    # @return [Pathname] the folder where the client is stored used for
-    #         computing the relative paths. If integrating it should be the
-    #         folder where the user project is stored, otherwise it should
-    #         be the installation root.
-    #
-    attr_accessor :client_root
-
-    # @return [Xcodeproj::Project] the user project that this target will
-    #         integrate as identified by the analyzer.
-    #
-    attr_accessor :user_project
-
     # @return [Pathname] the path of the user project that this target will
     #         integrate as identified by the analyzer.
     #
@@ -100,14 +153,6 @@ module Pod
       user_project.path if user_project
     end
 
-    # @return [Array<String>] the list of the UUIDs of the user targets that
-    #         will be integrated by this target as identified by the analyzer.
-    #
-    # @note   The target instances are not stored to prevent editing different
-    #         instances.
-    #
-    attr_accessor :user_target_uuids
-
     # List all user targets that will be integrated by this #target.
     #
     # @return [Array<PBXNativeTarget>]
@@ -124,24 +169,6 @@ module Pod
       end
     end
 
-    # @return [Hash<String, Xcodeproj::Config>] Map from configuration name to
-    #         configuration file for the target
-    #
-    # @note   The configurations are generated by the {TargetInstaller} and
-    #         used by {UserProjectIntegrator} to check for any overridden
-    #         values.
-    #
-    attr_reader :xcconfigs
-
-    # @return [Array<PodTarget>] The dependencies for this target.
-    #
-    attr_accessor :pod_targets
-
-    # @return [Array<AggregateTarget>] The aggregate targets whose pods this
-    #         target must be able to import, but will not directly link against.
-    #
-    attr_reader :search_paths_aggregate_targets
-
     # @param  [String] build_configuration The build configuration for which the
     #         the pod targets should be returned.
     #
@@ -149,14 +176,7 @@ module Pod
     #         configuration.
     #
     def pod_targets_for_build_configuration(build_configuration)
-      @pod_targets_for_build_configuration ||= {}
-      @pod_targets_for_build_configuration[build_configuration] ||= pod_targets.select do |pod_target|
-        pod_target.include_in_build_config?(target_definition, build_configuration)
-      end
-    end
-
-    def pod_targets_to_link
-      @pod_targets_to_link ||= pod_targets.to_set - search_paths_aggregate_targets.flat_map(&:pod_targets)
+      @pod_targets_for_build_configuration[build_configuration] || []
     end
 
     # @return [Array<Specification>] The specifications used by this aggregate target.
@@ -189,6 +209,19 @@ module Pod
       pod_targets.any?(&:uses_swift?)
     end
 
+    # @return [Boolean] Whether the target contains any resources
+    #
+    def includes_resources?
+      !resource_paths_by_config.values.all?(&:empty?)
+    end
+
+    # @return [Boolean] Whether the target contains framework to be embedded into
+    #         the user target
+    #
+    def includes_frameworks?
+      !framework_paths_by_config.values.all?(&:empty?)
+    end
+
     # @return [Hash{String => Array<Hash{Symbol => [String]}>}] The vendored dynamic artifacts and framework target
     #         input and output paths grouped by config
     #
@@ -197,7 +230,10 @@ module Pod
         framework_paths_by_config = {}
         user_build_configurations.keys.each do |config|
           relevant_pod_targets = pod_targets_for_build_configuration(config)
-          framework_paths_by_config[config] = relevant_pod_targets.flat_map { |pt| pt.framework_paths(false) }
+          framework_paths_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
+            non_test_specs = pod_target.non_test_specs.map(&:name)
+            pod_target.framework_paths.values_at(*non_test_specs).flatten.compact.uniq
+          end
         end
         framework_paths_by_config
       end
@@ -211,8 +247,12 @@ module Pod
           pod_target.should_build? && pod_target.requires_frameworks? && !pod_target.static_framework?
         end
         user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
-          resources_by_config[config] = (relevant_pod_targets & pod_targets_for_build_configuration(config)).flat_map do |pod_target|
-            (pod_target.resource_paths(false) + [bridge_support_file].compact).uniq
+          targets = relevant_pod_targets & pod_targets_for_build_configuration(config)
+          resources_by_config[config] = targets.flat_map do |pod_target|
+            non_test_specs = pod_target.non_test_specs.map(&:name)
+            resource_paths = pod_target.resource_paths.values_at(*non_test_specs).flatten
+            resource_paths << bridge_support_file
+            resource_paths.compact.uniq
           end
         end
       end
@@ -256,11 +296,17 @@ module Pod
       "$(DERIVED_FILE_DIR)/#{label}-checkManifestLockResult.txt"
     end
 
+    # @return [Pathname] The relative path of the Pods directory from user project's directory.
+    #
+    def relative_pods_root_path
+      sandbox.root.relative_path_from(client_root)
+    end
+
     # @return [String] The xcconfig path of the root from the `$(SRCROOT)`
     #         variable of the user's project.
     #
     def relative_pods_root
-      "${SRCROOT}/#{sandbox.root.relative_path_from(client_root)}"
+      "${SRCROOT}/#{relative_pods_root_path}"
     end
 
     # @return [String] The path of the Podfile directory relative to the
@@ -278,21 +324,21 @@ module Pod
     #         the user project.
     #
     def xcconfig_relative_path(config_name)
-      relative_to_srcroot(xcconfig_path(config_name)).to_s
+      xcconfig_path(config_name).relative_path_from(client_root).to_s
     end
 
     # @return [String] The path of the copy resources script relative to the
-    #         root of the user project.
+    #         root of the Pods project.
     #
     def copy_resources_script_relative_path
-      "${SRCROOT}/#{relative_to_srcroot(copy_resources_script_path)}"
+      "${PODS_ROOT}/#{relative_to_pods_root(copy_resources_script_path)}"
     end
 
     # @return [String] The path of the embed frameworks relative to the
-    #         root of the user project.
+    #         root of the Pods project.
     #
     def embed_frameworks_script_relative_path
-      "${SRCROOT}/#{relative_to_srcroot(embed_frameworks_script_path)}"
+      "${PODS_ROOT}/#{relative_to_pods_root(embed_frameworks_script_path)}"
     end
 
     private
@@ -300,16 +346,26 @@ module Pod
     # @!group Private Helpers
     #-------------------------------------------------------------------------#
 
-    # Computes the relative path of a sandboxed file from the `$(SRCROOT)`
-    # variable of the user's project.
+    # Computes the relative path of a sandboxed file from the `$(PODS_ROOT)`
+    # variable of the Pods's project.
     #
     # @param  [Pathname] path
     #         A relative path from the root of the sandbox.
     #
     # @return [String] The computed path.
     #
-    def relative_to_srcroot(path)
-      path.relative_path_from(client_root).to_s
+    def relative_to_pods_root(path)
+      path.relative_path_from(sandbox.root).to_s
+    end
+
+    def create_build_settings
+      settings = {}
+
+      user_build_configurations.each_key do |configuration_name|
+        settings[configuration_name] = BuildSettings::AggregateTargetSettings.new(self, configuration_name)
+      end
+
+      settings
     end
   end
 end