[Installer] Add target dependencies explicitely [WIP]

See #1165

Gemfile.lock

@@ -17,7 +17,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: 5a729b8c406bae502cb942e31738467a00191776
+  revision: a5dd638c3da221871269199abc214f9216b9bdbf
   branch: master
   specs:
     xcodeproj (0.7.1)

lib/cocoapods/installer.rb

@@ -111,6 +111,7 @@ module Pod
         prepare_pods_project
         install_file_references
         install_libraries
+        set_target_dependencies
         link_aggregate_target
         run_post_install_hooks
         write_pod_project
@@ -332,6 +333,43 @@ module Pod
       end
     end
 
+    def set_target_dependencies
+      aggregate_targets.each do |aggregate_target|
+        aggregate_target.pod_targets.each do |pod_target|
+          add_dependency(aggregate_target, pod_target)
+          pod_target.dependencies.each do |dep|
+
+            pod_dependency_target = aggregate_target.pod_targets.find { |target| target.root_spec.name == dep }
+            add_dependency(pod_target, pod_dependency_target)
+          end
+        end
+      end
+    end
+
+    # TODO: tmp - move
+    #
+    def add_dependency(dependent_target, dependency_target)
+      container_proxy = pods_project.new(Xcodeproj::Project::PBXContainerItemProxy)
+      # container_proxy.container_portal = '224D2C1BCDE44D8F9B674AD5'
+      container_proxy.proxy_type = '1'
+      # container_proxy.remote_global_id_string = 'F8D3306CA0564CA3861B2D4E'
+      # container_proxy.remote_info = 'Pods-AFHTTPRequestOperationLogger'
+
+
+      # reference_proxy = pods_project.new(Xcodeproj::Project::PBXReferenceProxy)
+      # reference_proxy.path =
+      # reference_proxy.file_type =
+      # reference_proxy.remote_ref = container_proxy
+      # reference_proxy.source_tree = BUILT_PRODUCTS_DIR
+
+      dependency = pods_project.new(Xcodeproj::Project::PBXTargetDependency)
+      dependency.target = dependency_target.target
+      # dependency.targetProxy = container_proxy
+
+      dependent_target.target.dependencies << dependency
+    end
+
+
     # Links the aggregate targets with all the dependent libraries.
     #
     # @note   This is run in the integration step to ensure that targets

lib/cocoapods/target/pod_target.rb

@@ -49,5 +49,14 @@ module Pod
       specs.first.root
     end
 
+    # @return [Array<String>] The names of the Pods on which this target
+    #         depends.
+    #
+    def dependencies
+      specs.map do |spec|
+        spec.consumer(platform).dependencies.map { |dep| dep.name }
+      end.flatten
+    end
+
   end
 end

spec/unit/installer/target_installer/aggregate_target_installer_spec.rb

@@ -163,7 +163,7 @@ module Pod
       it "creates a dummy source to ensure the creation of a single base library" do
         @installer.install!
         build_files = @installer.library.target.source_build_phase.files
-        build_file = build_files.find { |bf| bf.file_ref.name == 'Pods-dummy.m' }
+        build_file = build_files.find { |bf| bf.file_ref.path.include?('Pods-dummy.m') }
         build_file.should.be.not.nil
         build_file.file_ref.path.should == 'Pods-dummy.m'
         dummy = config.sandbox.root + 'Pods-dummy.m'

spec/unit/installer/target_installer/pod_target_installer_spec.rb

@@ -116,7 +116,7 @@ module Pod
 
       it 'adds the source files of each pod to the target of the Pod library' do
         @installer.install!
-        names = @installer.library.target.source_build_phase.files.map { |bf| bf.file_ref.name }
+        names = @installer.library.target.source_build_phase.files.map { |bf| bf.file_ref.display_name }
         names.should.include("Banana.m")
       end
 
@@ -156,7 +156,7 @@ module Pod
       it "creates a dummy source to ensure the compilation of libraries with only categories" do
         @installer.install!
         build_files = @installer.library.target.source_build_phase.files
-        build_file = build_files.find { |bf| bf.file_ref.name == 'Pods-BananaLib-dummy.m' }
+        build_file = build_files.find { |bf| bf.file_ref.display_name == 'Pods-BananaLib-dummy.m' }
         build_file.should.be.not.nil
         build_file.file_ref.path.should == 'Pods-BananaLib-dummy.m'
         dummy = config.sandbox.root + 'Pods-BananaLib-dummy.m'

spec/unit/installer_spec.rb

@@ -64,6 +64,7 @@ module Pod
         @installer.stubs(:install_libraries)
         @installer.stubs(:link_aggregate_target)
         @installer.stubs(:write_lockfiles)
+        @installer.stubs(:aggregate_targets).returns([])
         @installer.unstub(:generate_pods_project)
         def @installer.run_post_install_hooks
           @hook_called = true
@@ -226,8 +227,7 @@ module Pod
           @installer.stubs(:aggregate_targets).returns([])
           config.stubs(:podfile_path).returns(Pathname.new('/Podfile'))
           @installer.send(:prepare_pods_project)
-          f = @installer.pods_project['Podfile']
-          f.name.should == 'Podfile'
+          @installer.pods_project['Podfile'].should.be.not.nil
         end
 
         it "sets the deployment target for the whole project" do

spec/unit/project_spec.rb

@@ -99,7 +99,6 @@ module Pod
       it "adds the Podfile configured as a Ruby file" do
         @project.add_podfile(config.sandbox.root + '../Podfile')
         f = @project['Podfile']
-        f.name.should == 'Podfile'
         f.source_tree.should == 'SOURCE_ROOT'
         f.xc_language_specification_identifier.should == 'xcode.lang.ruby'
         f.path.should == '../Podfile'

spec/unit/target/pod_target_spec.rb

@@ -25,6 +25,14 @@ module Pod
       it "returns the spec consumers for the pod targets" do
         @pod_target.spec_consumers.should.not == nil
       end
+
+      it "returns the root spec" do
+        @pod_target.root_spec.name.should == 'BananaLib'
+      end
+
+      it "returns the name of the Pods on which this target depends" do
+        @pod_target.dependencies.should == ["monkey"]
+      end
     end
 
     describe "Support files" do