cleanup

Author: daspilker

docs/Home.md

@@ -17,7 +17,6 @@ Have a look at the [Jenkins Job DSL Gradle example](https://github.com/sheehan/j
 
 ## Release Notes
 * 1.31 (unreleased)
- * Added support for the Execute NodeJS script included in the [NodeJS Plugin](https://wiki.jenkins-ci.org/display/JENKINS/NodeJS+Plugin)
  * Added support for [Build Node Column Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Build+Node+Column+Plugin)
  * Added support for [Pre-SCM Build Step Plugin](https://wiki.jenkins-ci.org/display/JENKINS/pre-scm-buildstep)
  * Added support for [Sonar Plugin](http://docs.sonarqube.org/display/SONAR/Jenkins+Plugin)
@@ -27,7 +26,8 @@ Have a look at the [Jenkins Job DSL Gradle example](https://github.com/sheehan/j
  * Added "Configure Project" column for [Extra Columns Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Extra+Columns+Plugin)
  * Added support for [PostBuildScript Plugin](https://wiki.jenkins-ci.org/display/JENKINS/PostBuildScript+Plugin)
  * Added support for [Xvfb Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Xvfb+Plugin)
- * Enhanced support for the [Credentials Binding Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Credentials+Binding+Plugin)
+ * Enhanced support for [NodeJS Plugin](https://wiki.jenkins-ci.org/display/JENKINS/NodeJS+Plugin)
+ * Enhanced support for [Credentials Binding Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Credentials+Binding+Plugin)
  * The enum argument of `localRepository` for the Maven job and context has changed, see [[Migration]]
  * Added partial support for [Plot Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Plot+Plugin)
 * 1.30 (March 08 2015)

docs/Job-reference.md

@@ -156,7 +156,7 @@ freeStyleJob(String name) { // since 1.30
         groovyCommand(String command, String groovyName, Closure groovyClosure = null)
         groovyScriptFile(String fileName, Closure groovyClosure = null)
         groovyScriptFile(String fileName, String groovyName, Closure groovyClosure = null)
-        nodejsCommand(String command, String nodeVersion)
+        nodejsCommand(String command, String nodeVersion) // since 1.31
         httpRequest(String url, Closure closure = null) // since 1.28
         maven(Closure mavenClosure) // since 1.20
         maven(String target = null, String pom = null, Closure configure = null)
@@ -2211,6 +2211,7 @@ job('example') {
 (since 1.27)
 
 ### NodeJS Command
+
 ```groovy
 job {
     steps {
@@ -2220,6 +2221,15 @@ job {
 ```
 
 Executes a NodeJS script. Requires the [NodeJS Plugin](https://wiki.jenkins-ci.org/display/JENKINS/NodeJS+Plugin).
+
+```groovy
+job {
+    steps {
+        nodejsCommand('console.log("Hello World!")', 'Node 0.12.0')
+    }
+}
+```
+
 (since 1.31)
 
 ### Golang

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/step/StepContext.groovy

@@ -1118,18 +1118,15 @@ class StepContext implements Context {
     }
 
     /**
-     * <jenkins.plugins.nodejs.NodeJsCommandInterpreter plugin="nodejs@0.2.1">
-     *     <command></command>
-     *     <nodeJSInstallationName></nodeJSInstallationName>
+     * <jenkins.plugins.nodejs.NodeJsCommandInterpreter>
+     *     <command>console.log("Hello World!")</command>
+     *     <nodeJSInstallationName>Node 0.12.0</nodeJSInstallationName>
      * </jenkins.plugins.nodejs.NodeJsCommandInterpreter>
      */
     void nodejsCommand(String commandScript, String installation) {
-        NodeBuilder nodeBuilder = new NodeBuilder()
-        stepNodes << nodeBuilder.'jenkins.plugins.nodejs.NodeJsCommandInterpreter' {
-            'command' commandScript
-            nodeJSInstallationName installation
+        stepNodes << new NodeBuilder().'jenkins.plugins.nodejs.NodeJsCommandInterpreter' {
+            command(commandScript)
+            nodeJSInstallationName(installation)
         }
-
     }
-
 }

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/step/StepContextSpec.groovy

@@ -2454,14 +2454,14 @@ still-another-dsl.groovy'''
 
     def 'call nodejsCommand method'() {
         when:
-        context.nodejsCommand('var test = require(\'node\');', 'node (0.0.1)')
+        context.nodejsCommand('var test = require("node");', 'node (0.0.1)')
 
         then:
-        context.stepNodes != null
-        context.stepNodes.size() == 1
-        def nodejsCommandStep = context.stepNodes[0]
-        nodejsCommandStep.name() == 'jenkins.plugins.nodejs.NodeJsCommandInterpreter'
-        nodejsCommandStep.command[0].value() == 'var test = require(\'node\');'
-        nodejsCommandStep.nodeJSInstallationName[0].value() == 'node (0.0.1)'
+        with(context.stepNodes[0]) {
+            name() == 'jenkins.plugins.nodejs.NodeJsCommandInterpreter'
+            children().size() == 2
+            command[0].value() == 'var test = require("node");'
+            nodeJSInstallationName[0].value() == 'node (0.0.1)'
+        }
     }
 }