melting-pot: cherry-pick child modules properly

ctrueden · ctrueden · commit e09487dff9be · 2015-07-30T18:15:05.000-04:00
If the SCM link was a multi-module project, let's cherry-pick the
relevant child module to include in the melting pot.

This makes some assumptions:
* The child module will be named the same as its artifactId.
* It will be exactly one directory lower than the repository toplevel.

Our main use case, TrakEM2, does conform to these expectations, though.
diff --git a/melting-pot.sh b/melting-pot.sh
@@ -419,6 +419,12 @@ pruneReactor() {
 	done
 }
 
+# Tests if the given directory contains the appropriate source code.
+isProject() {
+	local a="$(xpath "$1/pom.xml" project artifactId)"
+	test "$a" = "$(basename "$1")" && echo 1
+}
+
 # Generates an aggregator POM for all modules in the current directory.
 generatePOM() {
 	echo '<?xml version="1.0" encoding="UTF-8"?>' > pom.xml
@@ -439,8 +445,15 @@ generatePOM() {
 	local dir
 	for dir in */*
 	do
-		test -d "$dir" &&
+		if [ "$(isProject "$dir")" ]
+		then
 			echo "		<module>$dir</module>" >> pom.xml
+		else
+			# Check for a child component of a multi-module project.
+			local childDir="$dir/$(basename "$dir")"
+			test "$(isProject "$childDir")" &&
+				echo "		<module>$childDir</module>" >> pom.xml
+		fi
 	done
 	echo '	</modules>' >> pom.xml
 	echo '</project>' >> pom.xml
diff --git a/tests/melting-pot-multi.t b/tests/melting-pot-multi.t
@@ -1,4 +1,4 @@
-Test that recursive SCM retrieval works:
+Test that recursive SCM retrieval and multi-module projects work:
 
   $ sh "$TESTDIR/../melting-pot.sh" sc.fiji:TrakEM2_:1.0f -r http://maven.imagej.net/content/groups/public -i 'sc.fiji:TrakEM2_' -v -s -d -f
   [INFO] sc.fiji:TrakEM2_:1.0f: fetching project source
@@ -17,3 +17,6 @@ Test that recursive SCM retrieval works:
   melting-pot/pom.xml
   melting-pot/sc.fiji
   melting-pot/sc.fiji/TrakEM2_
+
+  $ grep '<module>sc.fiji/TrakEM2_/TrakEM2_</module>' melting-pot/pom.xml
+  \t\t<module>sc.fiji/TrakEM2_/TrakEM2_</module> (esc)
