Remove the usage of Project.afterEvaluate in the plugin tasks. Issue #39

.
node-gradle · Oct 7, 2019 · 6efe0f4 · 6efe0f4
1 parent 1b842f6
commit 6efe0f4
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 62 deletions.
diff --git a/src/main/groovy/com/moowork/gradle/node/NodePlugin.groovy b/src/main/groovy/com/moowork/gradle/node/NodePlugin.groovy
@@ -72,18 +72,10 @@ class NodePlugin
     private void addNpmRule()
     {
         // note this rule also makes it possible to specify e.g. "dependsOn npm_install"
-        def workingDir
-        this.project.afterEvaluate {
-            workingDir = this.project.node.nodeModulesDir
-        }
         project.getTasks().addRule( 'Pattern: "npm_<command>": Executes an NPM command.' ) { String taskName ->
             if ( taskName.startsWith( "npm_" ) )
             {
                 NpmTask npmTask = project.getTasks().create( taskName, NpmTask.class )
-                if ( workingDir )
-                {
-                    npmTask.afterEvaluate( workingDir )
-                }
 
                 String[] tokens = taskName.split( '_' ).tail() // all except first
                 npmTask.npmCommand = tokens

diff --git a/src/main/groovy/com/moowork/gradle/node/exec/ExecRunner.groovy b/src/main/groovy/com/moowork/gradle/node/exec/ExecRunner.groovy
@@ -54,16 +54,13 @@ abstract class ExecRunner
         def realExec = exec
         def realArgs = args
         def execEnvironment = computeExecEnvironment()
+        def execWorkingDir = computeWorkingDir()
         return this.project.exec( {
             it.executable = realExec
             it.args = realArgs
             it.environment = execEnvironment
             it.ignoreExitValue = this.ignoreExitValue
-
-            if ( this.workingDir != null )
-            {
-                it.workingDir = this.workingDir
-            }
+            it.workingDir = execWorkingDir
 
             if ( this.execOverrides != null )
             {
@@ -72,6 +69,16 @@ abstract class ExecRunner
         } )
     }
 
+    private File computeWorkingDir()
+    {
+        File workingDir = this.workingDir != null ? this.workingDir : this.project.node.nodeModulesDir
+        if (!workingDir.exists())
+        {
+            workingDir.mkdirs()
+        }
+        return workingDir
+    }
+
     private Map<Object, Object> computeExecEnvironment()
     {
         def environment = [:]

diff --git a/src/main/groovy/com/moowork/gradle/node/exec/NodeExecRunner.groovy b/src/main/groovy/com/moowork/gradle/node/exec/NodeExecRunner.groovy
@@ -27,7 +27,7 @@ class NodeExecRunner
     {
         if (this.ext.download)
         {
-            return  this.variant.nodeBinDir.getAbsolutePath()
+            return this.variant.nodeBinDir.getAbsolutePath()
         }
         return null
     }

diff --git a/src/main/groovy/com/moowork/gradle/node/npm/NpmTask.groovy b/src/main/groovy/com/moowork/gradle/node/npm/NpmTask.groovy
@@ -25,22 +25,6 @@ class NpmTask
         this.group = NodePlugin.NODE_GROUP
         this.runner = new NpmExecRunner( this.project )
         dependsOn( NpmSetupTask.NAME )
-
-        this.project.afterEvaluate {
-            afterEvaluate( this.project.node.nodeModulesDir )
-        }
-    }
-
-    void afterEvaluate(nodeModulesDir) {
-        if ( !this.runner.workingDir )
-        {
-            setWorkingDir( nodeModulesDir )
-        }
-
-        if ( !this.runner.workingDir.exists() )
-        {
-            this.runner.workingDir.mkdirs();
-        }
     }
 
     void setArgs( final Iterable<?> value )

diff --git a/src/main/groovy/com/moowork/gradle/node/npm/NpxTask.groovy b/src/main/groovy/com/moowork/gradle/node/npm/NpxTask.groovy
@@ -24,22 +24,6 @@ class NpxTask
         this.group = NodePlugin.NODE_GROUP
         this.runner = new NpxExecRunner( this.project )
         dependsOn( NpmSetupTask.NAME )
-
-        this.project.afterEvaluate {
-            afterEvaluate( this.project.node.nodeModulesDir )
-        }
-    }
-
-    void afterEvaluate(nodeModulesDir) {
-        if ( !this.runner.workingDir )
-        {
-            setWorkingDir( nodeModulesDir )
-        }
-
-        if ( !this.runner.workingDir.exists() )
-        {
-            this.runner.workingDir.mkdirs();
-        }
     }
 
     void setArgs( final Iterable<?> value )

diff --git a/src/main/groovy/com/moowork/gradle/node/yarn/YarnTask.groovy b/src/main/groovy/com/moowork/gradle/node/yarn/YarnTask.groovy
@@ -25,19 +25,6 @@ class YarnTask
         this.group = NodePlugin.NODE_GROUP
         this.runner = new YarnExecRunner( this.project )
         dependsOn( YarnSetupTask.NAME )
-
-        this.project.afterEvaluate {
-            if ( !this.runner.workingDir )
-            {
-                def workingDir = this.project.node.nodeModulesDir
-                setWorkingDir( workingDir )
-            }
-
-            if ( !this.runner.workingDir.exists() )
-            {
-                this.runner.workingDir.mkdirs();
-            }
-        }
     }
 
     void setArgs( final Iterable<?> value )

diff --git a/src/test/groovy/com/moowork/gradle/node/npm/NpmTask_integTest.groovy b/src/test/groovy/com/moowork/gradle/node/npm/NpmTask_integTest.groovy
@@ -128,5 +128,6 @@ class NpmTask_integTest
         result8.task(":pwd").outcome == TaskOutcome.SUCCESS
         def expectedWorkingDirectory = "${projectDir}${File.separator}build${File.separator}customWorkingDirectory"
         result8.output.contains("Working directory is '${expectedWorkingDirectory}'")
+        new File(expectedWorkingDirectory).isDirectory()
     }
 }
diff --git a/src/test/groovy/com/moowork/gradle/node/npm/NpxTask_integTest.groovy b/src/test/groovy/com/moowork/gradle/node/npm/NpxTask_integTest.groovy
@@ -162,5 +162,6 @@ class NpxTask_integTest
         result8.task(":pwd").outcome == TaskOutcome.SUCCESS
         def expectedWorkingDirectory = "${projectDir}${File.separator}build${File.separator}customWorkingDirectory"
         result8.output.contains("Working directory is '${expectedWorkingDirectory}'")
+        new File(expectedWorkingDirectory).isDirectory()
     }
 }
diff --git a/src/test/groovy/com/moowork/gradle/node/task/NodeTask_integTest.groovy b/src/test/groovy/com/moowork/gradle/node/task/NodeTask_integTest.groovy
@@ -153,12 +153,14 @@ class NodeTask_integTest
         result9.task(":env").outcome == TaskOutcome.UP_TO_DATE
 
         when:
-        def result10 = buildAndFail("env", "-DchangeWorkingDir=true", "--rerun-tasks")
+        def result10 = build("env", "-DchangeWorkingDir=true", "--rerun-tasks")
 
         then:
         result10.task(":nodeSetup").outcome == TaskOutcome.SUCCESS
-        result10.task(":env").outcome == TaskOutcome.FAILED
-        result10.output.contains("A problem occurred starting process")
+        result10.task(":env").outcome == TaskOutcome.SUCCESS
+        def expectedWorkingDir = "${projectDir}${File.separator}build${File.separator}notExisting"
+        result10.output.contains("Current working directory: ${expectedWorkingDir}")
+        new File(expectedWorkingDir).isDirectory()
 
         when:
         // Reset build arguments to ensure the next change is not up-to-date

diff --git a/src/test/groovy/com/moowork/gradle/node/yarn/YarnTask_integTest.groovy b/src/test/groovy/com/moowork/gradle/node/yarn/YarnTask_integTest.groovy
@@ -128,5 +128,6 @@ class YarnTask_integTest
         result8.task(":pwd").outcome == TaskOutcome.SUCCESS
         def expectedWorkingDirectory = "${projectDir}${File.separator}build${File.separator}customWorkingDirectory"
         result8.output.contains("Working directory is '${expectedWorkingDirectory}'")
+        new File(expectedWorkingDirectory).isDirectory()
     }
 }
diff --git a/src/test/resources/fixtures/node-env/env.js b/src/test/resources/fixtures/node-env/env.js
@@ -9,3 +9,5 @@ if (customEnvironmentVariable) {
 } else {
     console.log('No custom environment');
 }
+
+console.log(`Current working directory: ${process.cwd()}`);