[PathList] Wait to resolve symlinks until checking header ACL

lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb

@@ -182,8 +182,8 @@ module Pod
 
               native_target = target.native_target_for_spec(consumer.spec)
               headers = file_accessor.headers
-              public_headers = file_accessor.public_headers
-              private_headers = file_accessor.private_headers
+              public_headers = file_accessor.public_headers.map(&:realpath)
+              private_headers = file_accessor.private_headers.map(&:realpath)
               other_source_files = file_accessor.source_files.reject { |sf| SOURCE_FILE_EXTENSIONS.include?(sf.extname) }
 
               {

lib/cocoapods/sandbox/path_list.rb

@@ -88,7 +88,7 @@ module Pod
       # @return [Array<Pathname>]
       #
       def glob(patterns, options = {})
-        relative_glob(patterns, options).map { |p| (root + p).realpath }
+        relative_glob(patterns, options).map { |p| root.join(p) }
       end
 
       # The list of relative paths that are case insensitively matched by a

spec/unit/sandbox/path_list_spec.rb

@@ -192,6 +192,13 @@ module Pod
           Resources/sub_dir
         )
       end
+
+      it 'can glob for exact matches' do
+        paths = @path_list.relative_glob('libBananalib.a').map(&:to_s)
+        paths.sort.should == %w(
+          libBananalib.a
+        )
+      end
     end
 
     describe 'Reading file system' do
@@ -291,14 +298,27 @@ module Pod
         @path_list.instance_variable_set(:@files, nil)
         File.symlink(@tmpfile, @symlink_file)
 
-        @path_list.files.map(&:to_s).include?('Classes/symlinked.h').should == true
+        @path_list.files.map(&:to_s).should.include?('Classes/symlinked.h')
+      end
+
+      it 'includes symlinked file with a different basename' do
+        orange_h = @path_list.root.join('Classes', 'Orange.h')
+        File.symlink('Banana.h', orange_h)
+
+        begin
+          @path_list.glob('Classes/Orange.h').should == [
+            orange_h,
+          ]
+        ensure
+          FileUtils.remove_entry(orange_h)
+        end
       end
 
       it 'includes symlinked dir' do
         @path_list.instance_variable_set(:@dirs, nil)
         File.symlink(@tmpdir, @symlink_dir)
 
-        @path_list.dirs.map(&:to_s).include?('Classes/symlinked').should == true
+        @path_list.dirs.map(&:to_s).should.include?('Classes/symlinked')
       end
 
       it 'doesn\'t include file in symlinked dir' do
@@ -306,7 +326,7 @@ module Pod
         @path_list.instance_variable_set(:@dirs, nil)
         File.symlink(@tmpdir, @symlink_dir)
 
-        @path_list.files.map(&:to_s).include?('Classes/symlinked/someheader.h').should == false
+        @path_list.files.map(&:to_s).should.not.include?('Classes/symlinked/someheader.h')
       end
     end