Merge pull request #347 from CocoaPods/t-296

Support for `header_dir` attr in subspecs.

.gitignore

@@ -13,6 +13,7 @@ examples/Pods
 examples/**/Pods
 examples/RelativePathProject/RelativePathProject/RelativePathProject.xcodeproj
 spec/fixtures/banana-lib
+spec/fixtures/chameleon
 spec/fixtures/integration/Headers/
 /concatenated.*
 spec/fixtures/mercurial-repo/.hg/*cache

Rakefile

@@ -145,7 +145,7 @@ namespace :gem do
     # Update the last version in CocoaPods-version.yml
     specs_branch = '0.6'
 
-    Dir.chdir ('../Specs') do
+    Dir.chdir('../Specs') do
       puts Dir.pwd
       sh "git checkout #{specs_branch}"
       sh "git pull"

lib/cocoapods/command/spec.rb

@@ -406,7 +406,7 @@ def process_xcode_build_output(output)
         def file_patterns_errors
           messages = []
           messages << "The sources did not match any file"                     if !@spec.source_files.empty? && @pod.source_files.empty?
-          messages << "The resources did not match any file"                   if !@spec.resources.empty? && @pod.resources.empty?
+          messages << "The resources did not match any file"                   if !@spec.resources.empty? && @pod.resource_files.empty?
           messages << "The preserve_paths did not match any file"              if !@spec.preserve_paths.empty? && @pod.preserve_paths.empty?
           messages << "The exclude_header_search_paths did not match any file" if !@spec.exclude_header_search_paths.empty? && @pod.headers_excluded_from_search_paths.empty?
           messages

lib/cocoapods/installer.rb

@@ -29,7 +29,7 @@ def project
       pods.each do |pod|
         # Add all source files to the project grouped by pod
         group = @project.add_pod_group(pod.name)
-        pod.source_files.each do |path|
+        pod.relative_source_files.each do |path|
           group.files.new('path' => path.to_s)
         end
       end

lib/cocoapods/installer/target_installer.rb

@@ -20,12 +20,12 @@ def xcconfig
       end
 
       def copy_resources_script_for(pods)
-        @copy_resources_script ||= Generator::CopyResourcesScript.new(pods.map { |p| p.resources }.flatten)
+        @copy_resources_script ||= Generator::CopyResourcesScript.new(pods.map { |p| p.relative_resource_files }.flatten)
       end
 
       def bridge_support_generator_for(pods, sandbox)
         Generator::BridgeSupport.new(pods.map do |pod|
-          pod.header_files.map { |header| sandbox.root + header }
+          pod.relative_header_files.map { |header| sandbox.root + header }
         end.flatten)
       end
 

lib/cocoapods/local_pod.rb

@@ -13,10 +13,13 @@ module Pod
   # safely cleaned by the pod.
   #
   # @example
-  #
   #     pod = LocalPod.new 'RestKit/Networking'
   #     pod.add_specification 'RestKit/UI'
   #
+  # @note
+  #   Unless otherwise specified in the name of the method the {LocalPod}
+  #   returns absolute paths.
+  #
   class LocalPod
 
     # @return [Specification] The specification that describes the pod.
@@ -140,6 +143,7 @@ def implode
     #
     def clean
       clean_paths.each { |path| FileUtils.rm_rf(path) }
+      @cleaned = true
     end
 
     # Finds the absolute paths, including hidden ones, of the files
@@ -148,7 +152,7 @@ def clean
     # @return [Array<Strings>] The paths that can be deleted.
     #
     def clean_paths
-      cached_used_paths = used_paths.map{ |path| path.to_s }
+      cached_used_paths = used_files
       files = Dir.glob(root + "**/*", File::FNM_DOTMATCH)
 
       files.reject! do |candidate|
@@ -159,51 +163,77 @@ def clean_paths
       files
     end
 
-    # @return [Array<Pathname>] The relative path of the files used by the pod.
+    # @return [Array<String>] The absolute path of the files used by the pod.
     #
-    def used_paths
-      files = [ source_files(false),
-                resources(false),
-                preserve_paths,
-                readme_file,
-                license_file,
-                prefix_header_file ]
+    def used_files
+      files = [ source_files, resource_files, preserve_files, readme_file, license_file, prefix_header_file ]
       files.compact!
       files.flatten!
+      files.map!{ |path| path.to_s }
       files
     end
 
     # @!group Files
 
-    # @param (see #source_files_by_spec)
-    #
     # @return [Array<Pathname>] The paths of the source files.
     #
-    def source_files(relative = true)
-      chained_expanded_paths(:source_files, :glob => '*.{h,m,mm,c,cpp}', :relative_to_sandbox => relative)
+    def source_files
+      source_files_by_spec.values.flatten
     end
 
-    # Finds the source files that every activated {Specification} requires.
+    # @return [Array<Pathname>] The *relative* paths of the source files.
     #
-    # @param [Boolean] relative Whether the paths should be returned relative
-    #  to the sandbox.
+    def relative_source_files
+      source_files.map{ |p| p.relative_path_from(@sandbox.root) }
+    end
+
+    # Finds the source files that every activated {Specification} requires.
     #
     # @note If the same file is required by two specifications the one at the
     #   higher level in the inheritance chain wins.
     #
+    # @return [Hash{Specification => Array<Pathname>}] The files grouped by
+    #   {Specification}.
+    #
+    def source_files_by_spec
+      options = {:glob => '*.{h,m,mm,c,cpp}'}
+      paths_by_spec(:source_files, options)
+    end
+
     # @return [Array<Pathname>] The paths of the header files.
     #
     def header_files
-      source_files.select { |f| f.extname == '.h' }
+      header_files_by_spec.values.flatten
+    end
+
+    # @return [Array<Pathname>] The *relative* paths of the source files.
+    #
+    def relative_header_files
+      header_files.map{ |p| p.relative_path_from(@sandbox.root) }
     end
 
     # @return [Hash{Specification => Array<Pathname>}] The paths of the header
     #   files grouped by {Specification}.
     #
+    def header_files_by_spec
+      result = {}
+      source_files_by_spec.each do |spec, paths|
+        headers = paths.select { |f| f.extname == '.h' }
+        result[spec] = headers unless headers.empty?
+      end
+      result
+    end
+
     # @return [Array<Pathname>] The paths of the resources.
     #
-    def resources(relative = true)
-      chained_expanded_paths(:resources, :relative_to_sandbox => relative)
+    def resource_files
+      paths_by_spec(:resources).values.flatten
+    end
+
+    # @return [Array<Pathname>] The *relative* paths of the resources.
+    #
+    def relative_resource_files
+      resource_files.map{ |p| p.relative_path_from(@sandbox.root) }
     end
 
     # @return [Pathname] The absolute path of the prefix header file
@@ -215,11 +245,15 @@ def prefix_header_file
     # @return [Array<Pathname>] The absolute paths of the files of the pod
     #   that should be preserved.
     #
-    def preserve_paths
-      chained_expanded_paths(:preserve_paths) + expanded_paths(%w[ *.podspec notice* NOTICE* CREDITS* ])
+    def preserve_files
+      paths  = paths_by_spec(:preserve_paths).values
+      paths += expanded_paths(%w[ *.podspec notice* NOTICE* CREDITS* ])
+      paths.compact!
+      paths.uniq!
+      paths
     end
 
-    # @return [Pathname] The automatically detected path of the README
+    # @return [Pathname] The automatically detected absolute path of the README
     #  file.
     #
     def readme_file
@@ -266,17 +300,25 @@ def xcconfig
     # @return [Array<Pathname>] The path of all the public headers of the pod.
     #
     def all_specs_public_header_files
-      #TODO: merge with #221
-      specs = top_specification.recursive_subspecs << top_specification
-      specs.map { |s| expanded_paths(s.source_files, :glob => '*.{h}') }.compact.flatten.select { |f| f.extname == '.h' }.uniq
+      if @cleaned
+        raise Informative, "The pod is cleaned and cannot compute the all the "\
+          "header files as they might be deleted."
+      end
+
+      all_specs = [ top_specification ] + top_specification.subspecs
+      options   = {:glob => '*.{h}'}
+      files     = paths_by_spec(:source_files, options, all_specs).values.flatten!
+      headers   = files.select { |f| f.extname == '.h' }
+      headers
     end
 
     # @!group Target integration
 
     # @return [void] Copies the pods headers to the sandbox.
     #
     def link_headers
-      copy_header_mappings.each do |namespaced_path, files|
+      @sandbox.add_header_search_path(headers_sandbox)
+      header_mappings.each do |namespaced_path, files|
         @sandbox.add_header_files(namespaced_path, files)
       end
     end
@@ -287,8 +329,9 @@ def link_headers
     # @return [void] Adds the pods source files to a given target.
     #
     def add_to_target(target)
-      sources_files_by_specification.each do | spec, files |
+      source_files_by_spec.each do | spec, files |
         files.each do |file|
+          file = file.relative_path_from(@sandbox.root)
           target.add_source_file(file, nil, spec.compiler_flags.strip)
         end
       end
@@ -306,7 +349,7 @@ def requires_arc?
     # (the files the need to compiled) of the pod.
     #
     def implementation_files
-      source_files.select { |f| f.extname != '.h' }
+      relative_source_files.select { |f| f.extname != '.h' }
     end
 
     # @return [Pathname] The path of the pod relative from the sandbox.
@@ -315,72 +358,74 @@ def relative_root
       root.relative_path_from(@sandbox.root)
     end
 
+    # @return Hash{Pathname => [Array<Pathname>]} A hash containing the headers
+    #   folders as the keys and the the absolute paths of the header files
+    #   as the values.
+    #
     # @todo this is being overridden in the RestKit 0.9.4 spec, need to do
     # something with that, and this method also still exists in Specification.
     #
     # @todo This is not overridden anymore in specification refactor and the
     #   code Pod::Specification#copy_header_mapping can be moved here.
-    def copy_header_mappings
-      search_path_headers = header_files - headers_excluded_from_search_paths
-      search_path_headers.inject({}) do |mappings, from|
-        from_without_prefix = from.relative_path_from(relative_root)
-        to = top_specification.header_dir + top_specification.copy_header_mapping(from_without_prefix)
-        (mappings[to.dirname] ||= []) << from
-        mappings
+    def header_mappings
+      mappings = {}
+      header_files_by_spec.each do |spec, paths|
+        paths = paths - headers_excluded_from_search_paths
+        paths.each do |from|
+          from_relative = from.relative_path_from(root)
+          to = headers_sandbox + (spec.header_dir) + spec.copy_header_mapping(from_relative)
+          (mappings[to.dirname] ||= []) << from
+        end
       end
+      mappings
     end
 
-    # Finds the source files that every activate {Specification} requires.
-    #
-    # @note The paths of the files are relative to the sandbox.
-    # @note If the same file is required by two specifications the one at the higher level in the inheritance chain wins.
-    #
-    # @return [Hash{Specification => Array<Pathname>}] The files grouped by {Specification}.
-    #
-    def sources_files_by_specification
-      files_by_spec   = {}
-      processed_files = []
-      specifications.sort_by { |s| s.name.length }.each do |spec|
-        files = []
-        expanded_paths(spec.source_files, :glob => '*.{h,m,mm,c,cpp}', :relative_to_sandbox => true).each do | file |
-          files << file unless processed_files.include?(file)
-        end
-        files_by_spec[spec] = files
-        processed_files    += files
-      end
-      files_by_spec
+    def headers_sandbox
+      @headers_sandbox ||= Pathname.new(top_specification.name)
     end
 
-    # @todo merge with #221
+    # @return [<Pathname>] The relative path of the headers that should not be
+    # included in the linker search paths.
     #
     def headers_excluded_from_search_paths
-      chained_expanded_paths(:exclude_header_search_paths, :glob => '*.h', :relative_to_sandbox => true)
+      options = { :glob => '*.h' }
+      paths = paths_by_spec(:exclude_header_search_paths, options)
+      paths.values.compact.uniq
     end
 
     # @!group Paths Patterns
 
-    # Finds all the paths patterns of a each activated specifications and
-    # converts them to the actual paths present in the pod.
+    # The paths obtained by resolving the patterns of an attribute
+    # groupped by spec.
     #
-    # @return [Array<Pathname>] A list of the paths.
+    # @param [Symbol] accessor The accessor to use to obtain the paths patterns.
+    # @param [Hash] options (see #expanded_paths)
     #
-    def chained_expanded_paths(accessor, options = {})
-      specifications.map { |s| expanded_paths(s.send(accessor), options) }.compact.flatten.uniq
+    def paths_by_spec(accessor, options = {}, specs = nil)
+      specs ||= specifications
+      paths_by_spec   = {}
+      processed_paths = []
+
+      specs = specs.sort_by { |s| s.name.length }
+      specs.each do |spec|
+        paths = expanded_paths(spec.send(accessor), options)
+        unless paths.empty?
+          paths_by_spec[spec] = paths - processed_paths
+          processed_paths += paths
+        end
+      end
+      paths_by_spec
     end
 
-    # The paths obtained by interpolating the patterns of a given attribute
-    # collected by spec.
-    #
-    # @todo implement case insensitive search
+    # Converts patterns of paths to the {Pathname} of the files present in the
+    #   pod.
     #
     # @param [String, FileList, Array<String, Pathname>] patterns
     #   The patterns to expand.
     # @param [Hash] options
     #   The options to used for expanding the paths patterns.
     # @option options [String] :glob
     #   The pattern to use for globing directories.
-    # @option options [Boolean] :relative_to_sandbox
-    #   Whether the paths should be returned relative to the sandbox.
     #
     # @raise [Informative] If the pod does not exists.
     #
@@ -405,11 +450,7 @@ def expanded_paths(patterns, options = {})
         end
 
         pattern.glob.map do |file|
-          if options[:relative_to_sandbox]
-            file.relative_path_from(@sandbox.root)
-          else
-            file
-          end
+          file
         end
       end.flatten
     end

lib/cocoapods/sandbox.rb

@@ -42,6 +42,16 @@ def header_search_paths
       @header_search_paths.uniq.map { |path| "${PODS_ROOT}/#{path}" }
     end
 
+    # Adds an header search path to the sandbox.
+    #
+    # @param path [Pathname] The path tho add.
+    #
+    # @return [void]
+    #
+    def add_header_search_path(path)
+      @header_search_paths << Pathname.new(HEADERS_DIR) + path
+    end
+
     def prepare_for_install
       headers_root.rmtree if headers_root.exist?
     end