Merge pull request #5451 from mercadolibre/5362-circular_targets

[PodTarget] Make #recursive_dependent_targets handle cyclic dependencies

CHANGELOG.md

@@ -39,6 +39,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Boris Bügling](https://github.com/neonichu)
   [#5445](https://github.com/CocoaPods/CocoaPods/issues/5445)
 
+* Resolve cyclic dependencies when creating pod targets.  
+  [Juan Civile](https://github.com/champo)
+  [#5362](https://github.com/CocoaPods/CocoaPods/issues/5362)
+
 
 ## 1.0.1 (2016-06-02)
 

lib/cocoapods/target/pod_target.rb

@@ -189,8 +189,14 @@ module Pod
     #         dependency upon.
     #
     def recursive_dependent_targets
-      targets = dependent_targets + dependent_targets.flat_map(&:recursive_dependent_targets)
-      targets.uniq!
+      targets = dependent_targets.clone
+
+      targets.each do |target|
+        target.dependent_targets.each do |t|
+          targets.push(t) unless t == self || targets.include?(t)
+        end
+      end
+
       targets
     end
 

cocoapods-integration-specs @ 409958a7

-Subproject commit 4c7f2413a2cf1a8175c544555d000bfb6511e943
+Subproject commit 409958a75378ff70582af2fbabb1441c551ed1c7

spec/integration.rb

@@ -306,6 +306,11 @@ describe_cli 'pod' do
       behaves_like cli_spec 'install_search_paths_inheritance',
                             'install --no-repo-update'
     end
+
+    describe 'Integrates a Pod with circular subspec dependencies' do
+      behaves_like cli_spec 'install_circular_subspec_dependency',
+                            'install --no-repo-update'
+    end
   end
 
   #--------------------------------------#

spec/unit/target/pod_target_spec.rb

@@ -281,6 +281,29 @@ module Pod
           @pod_target.requires_frameworks?.should == true
         end
       end
+
+      describe 'With dependencies' do
+        before do
+          @pod_dependency = fixture_pod_target('orange-framework/OrangeFramework.podspec')
+          @pod_target.dependent_targets = [@pod_dependency]
+        end
+
+        it 'resolves simple dependencies' do
+          @pod_target.recursive_dependent_targets.should == [@pod_dependency]
+        end
+
+        describe 'With cyclic dependencies' do
+          before do
+            @pod_dependency = fixture_pod_target('orange-framework/OrangeFramework.podspec')
+            @pod_dependency.dependent_targets = [@pod_target]
+            @pod_target.dependent_targets = [@pod_dependency]
+          end
+
+          it 'resolves the cycle' do
+            @pod_target.recursive_dependent_targets.should == [@pod_dependency]
+          end
+        end
+      end
     end
   end
 end