#22 fix cycle check, fix parallel build tests

Author: balmaster

src/main/groovy/repo/build/ComponentDependencyGraph.groovy

@@ -17,7 +17,7 @@ import repo.build.maven.MavenComponent
 class ComponentDependencyGraph {
     private final Map<MavenArtifactRef, MavenComponent> componentsMap
     private final DirectedGraph<MavenComponent, DefaultEdge> graph = new DefaultDirectedGraph<>(DefaultEdge.class)
-    private final Map<MavenComponent, Set<MavenComponent>> cycleRefs = new HashMap<>()
+    private final CycleDetector<MavenComponent, DefaultEdge> cycleDetector = new CycleDetector<>(graph)
 
     ComponentDependencyGraph(Map<MavenArtifactRef, MavenComponent> componentsMap) {
         this.componentsMap = componentsMap
@@ -55,24 +55,24 @@ class ComponentDependencyGraph {
 
     private void addComponentRef(MavenComponent component, MavenArtifactRef ref) {
         MavenComponent refComponent = componentsMap.get(ref)
-        if (refComponent) {
+        if (refComponent && !component.equals(refComponent)) {
             add(refComponent)
-            DefaultEdge e = graph.addEdge(component, refComponent)
-            if (hasCycles()) {
-                graph.removeEdge(e)
-                if (!cycleRefs.containsKey(component)) {
-                    cycleRefs.put(component, new HashSet<MavenComponent>())
-                }
-                cycleRefs.get(component).add(refComponent)
-            }
+            graph.addEdge(component, refComponent)
         }
     }
 
     boolean hasCycles() {
-        CycleDetector<MavenComponent, DefaultEdge> cycleDetector = new CycleDetector<>(graph)
         return cycleDetector.detectCycles()
     }
 
+    Set<MavenComponent> findCycles() {
+        return cycleDetector.findCycles()
+    }
+
+    Set<MavenComponent> findCycles(MavenComponent v) {
+        return cycleDetector.findCyclesContainingVertex(v)
+    }
+
     List<MavenComponent> sort() {
         TopologicalOrderIterator<MavenComponent, DefaultEdge> i = new TopologicalOrderIterator<>(graph)
         List<MavenComponent> items = new ArrayList<>()
@@ -83,10 +83,6 @@ class ComponentDependencyGraph {
         return items
     }
 
-    Map<MavenComponent, Set<MavenComponent>> getCycleRefs() {
-        return cycleRefs
-    }
-
     List<MavenComponent> getIncoming(MavenComponent component) {
         return graph.incomingEdgesOf(component)
                 .collect { graph.getEdgeSource(it) }

src/main/groovy/repo/build/ExecuteProcess.groovy

@@ -42,7 +42,7 @@ class ExecuteProcess {
 
         def exitValue = process.waitFor()
         // for read process output
-        Thread.sleep(100)
+        Thread.sleep(100L)
 
         def outStream = new AnsiOutputStream(System.out)
         if (bufferStream.size() > 0) {
@@ -83,7 +83,7 @@ class ExecuteProcess {
 
             def exitValue = process.waitFor()
             // for read process output
-            Thread.sleep(100)
+            Thread.sleep(100L)
 
             if (checkErrorCode && exitValue != 0) {
                 throw new RepoBuildException("name '$cmd' has exit code $exitValue");

src/main/groovy/repo/build/maven/Build.groovy

@@ -27,9 +27,9 @@ class Build {
         // check circular dependencies
         def graph = ComponentDependencyGraph.build(components)
         if (graph.hasCycles()) {
-            for (def entry : graph.cycleRefs) {
-                def component = entry.getKey()
-                def error = new RepoBuildException("Project ${component.@path} has circular ref to ${entry.getValue()}")
+            for (def component : graph.findCycles()) {
+                def componentCycle = graph.findCycles(component).collect { it.path }
+                def error = new RepoBuildException("Component ${component.@path} has circular refs in cycle ${componentCycle}")
                 context.addError(error)
             }
             throw new RepoBuildException("project has circular dependencies")

src/test/groovy/repo/build/MavenFeatureTest.groovy

@@ -397,31 +397,32 @@ class MavenFeatureTest extends BaseTestCase {
     }
 
     @Test
-    @Ignore
     void testBuildParallelCircularDepsFail() {
         def url = new File(sandbox.env.basedir, 'manifest')
-        GitFeature.cloneManifest(context, url.getAbsolutePath(), 'master')
-        GitFeature.sync(context)
-        GitFeature.switch(context, 'feature/1')
 
-        sandbox.component('parent',
+        sandbox.component('c1',
                 { Sandbox sandbox, File dir ->
-                    Maven.execute(sandbox.context, new File(dir, 'pom.xml'),
-                            { InvocationRequest req ->
-                                req.setGoals(Arrays.asList("versions:set"))
-                                req.setInteractive(false)
-                                Properties properties = new Properties()
-                                properties.put("newVersion", version)
-                                properties.put('generateBackupPoms', 'false')
-                                req.setProperties(properties)
-                            }
-                    )
-                    Git.add(sandbox.context, dir, 'pom.xml')
-                    Git.commit(sandbox.context, dir, 'vup')
+                    Git.checkout(sandbox.context,dir, "feature/1")
+                    def ant = new AntBuilder()
+                    ant.copy(todir: dir, overwrite: true) {
+                        fileset(dir: 'src/test/resources/circular/c1') {
+                            include(name: '**/**')
+                        }
+                    }
+                    Git.add(sandbox.context, dir, '*.*')
+                    Git.commit(sandbox.context, dir, 'add')
                 })
 
+        GitFeature.cloneManifest(context, url.getAbsolutePath(), 'master')
+        GitFeature.sync(context)
+        GitFeature.switch(context, 'feature/1')
 
-        assertTrue(MavenFeature.buildParallel(context))
+        try {
+            MavenFeature.buildParallel(context)
+            fail()
+        } catch (RepoBuildException e) {
+
+        }
     }
 
 }