From 194e62bde3c1888986e6ba2107c8c300eb89a17c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sun, 17 Jan 2016 20:23:27 +0000
Subject: [PATCH] =?UTF-8?q?Remove=20assumption=20that=20working=20director?=
 =?UTF-8?q?y=20will=20be=20the=20project=E2=80=99s=20root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The plugin for building the samples assumed that the current working
directory would be the directory containing the project’s build.gradle.
While this is generally true on the command line (it isn’t if
-project-dir is used), it isn’t true in Gradle’s IDE integration. This
was leading to an NPE as the sampleBuild task was being configured
to depend on a null task as a result of not finding the sample’s pom.xml
or build.grade file.

This commit corrects the main build.gradle to configure each sample’s
working directory relative to the root project’s directory, rather
than relying on the working directory. It also improves
SampleBuildConfigurer so that it will throw an exception if it fails to
find a sample’s build.gradle or pom.xml rather than continuing
and triggering an NPE inside Gradle.

Closes gh-185
---
 build.gradle                                   |  4 ++--
 .../build/SampleBuildConfigurer.groovy         | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2e078797..743c45bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -156,11 +156,11 @@ samples {
 	dependOn 'spring-restdocs-mockmvc:install'
 
 	restNotesSpringHateoas {
-		workingDir 'samples/rest-notes-spring-hateoas'
+		workingDir "$projectDir/samples/rest-notes-spring-hateoas"
 	}
 
 	restNotesSpringDataRest {
-		workingDir 'samples/rest-notes-spring-data-rest'
+		workingDir "$projectDir/samples/rest-notes-spring-data-rest"
 	}
 }
 
diff --git a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy
index db94081e..5ddd17ab 100644
--- a/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/restdocs/build/SampleBuildConfigurer.groovy
@@ -38,17 +38,21 @@ public class SampleBuildConfigurer {
 	}
 
 	Task createTask(Project project, Object... dependencies) {
+		File sampleDir = new File(this.workingDir).absoluteFile
 		Task verifyIncludes
-		if (new File(this.workingDir, 'build.gradle').isFile()) {
+		if (new File(sampleDir, 'build.gradle').isFile()) {
 			Task gradleBuild = createGradleBuild(project, dependencies)
-			verifyIncludes = createVerifyIncludes(project, new File(this.workingDir, 'build/asciidoc'))
+			verifyIncludes = createVerifyIncludes(project, new File(sampleDir, 'build/asciidoc'))
 			verifyIncludes.dependsOn gradleBuild
 		}
-		if (new File(this.workingDir, 'pom.xml').isFile()) {
-			Task mavenBuild = createMavenBuild(project, dependencies)
-			verifyIncludes = createVerifyIncludes(project, new File(this.workingDir, 'target/generated-docs'))
+		else if (new File(sampleDir, 'pom.xml').isFile()) {
+			Task mavenBuild = createMavenBuild(project, sampleDir, dependencies)
+			verifyIncludes = createVerifyIncludes(project, new File(sampleDir, 'target/generated-docs'))
 			verifyIncludes.dependsOn(mavenBuild)
 		}
+		else {
+			throw new IllegalStateException("No pom.xml or build.gradle was found in $sampleDir")
+		}
 		Task sampleBuild = project.tasks.create name
 		sampleBuild.description = "Builds the ${name} sample"
 		sampleBuild.group = "Build"
@@ -56,12 +60,12 @@ public class SampleBuildConfigurer {
 		return sampleBuild
 	}
 
-	private Task createMavenBuild(Project project, Object... dependencies) {
+	private Task createMavenBuild(Project project, File sampleDir, Object... dependencies) {
 		Task mavenBuild = project.tasks.create("${name}Maven", Exec)
 		mavenBuild.description = "Builds the ${name} sample with Maven"
 		mavenBuild.group = "Build"
 		mavenBuild.workingDir = this.workingDir
-		mavenBuild.commandLine = [isWindows() ? "${new File(this.workingDir).absolutePath}/mvnw.cmd" : './mvnw', 'clean', 'package']
+		mavenBuild.commandLine = [isWindows() ? "${sampleDir.absolutePath}/mvnw.cmd" : './mvnw', 'clean', 'package']
 		mavenBuild.dependsOn dependencies
 
 		mavenBuild.doFirst {