Merge pull request #402 from CoreMedia/build-node-column

added support for Build Node Column Plugin

Author: daspilker

docs/Home.md

@@ -17,6 +17,7 @@ Have a look at the [Jenkins Job DSL Gradle example](https://github.com/sheehan/j
 
 ## Release Notes
 * 1.31 (unreleased)
+ * 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 `ignorePostCommitHooks` option for SCM trigger
  * The enum argument of `localRepository` for the Maven job and context has changed, see [[Migration]]

docs/View-Reference.md

@@ -39,6 +39,7 @@ listView(String name) { // since 1.30
         buildButton()
         lastBuildConsole() // since 1.23, requires the Extra Columns Plugin
         claim()            // since 1.29, requires the Claim Plugin
+        lastBuildNode()    // since 1.31, requires the Build Node Column Plugin
     }
 }
 view(type: ListView, Closure viewClosure) // since 1.21, deprecated since 1.30
@@ -468,6 +469,7 @@ columns {
     buildButton()
     lastBuildConsole() // since 1.23, requires the Extra Columns Plugin
     claim()            // since 1.29, requires the Claim Plugin
+    lastBuildNode()    // since 1.31, requires the Build Node Column Plugin
 }
 ```
 

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/views/ColumnsContext.groovy

@@ -1,10 +1,16 @@
 package javaposse.jobdsl.dsl.views
 
 import javaposse.jobdsl.dsl.Context
+import javaposse.jobdsl.dsl.JobManagement
 
 class ColumnsContext implements Context {
+    private final JobManagement jobManagement
     List<Node> columnNodes = []
 
+    ColumnsContext(JobManagement jobManagement) {
+        this.jobManagement = jobManagement
+    }
+
     void status() {
         columnNodes << new Node(null, 'hudson.views.StatusColumn')
     }
@@ -40,4 +46,9 @@ class ColumnsContext implements Context {
     void claim() {
         columnNodes << new Node(null, 'hudson.plugins.claim.ClaimColumn')
     }
+
+    void lastBuildNode() {
+        jobManagement.requireMinimumPluginVersion('build-node-column', '0.1')
+        columnNodes << new Node(null, 'org.jenkins.plugins.column.LastBuildNodeColumn')
+    }
 }

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/views/ListView.groovy

@@ -47,7 +47,7 @@ class ListView extends View {
     }
 
     void columns(@DslContext(ColumnsContext) Closure columnsClosure) {
-        ColumnsContext context = new ColumnsContext()
+        ColumnsContext context = new ColumnsContext(jobManagement)
         executeInContext(columnsClosure, context)
 
         execute {

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/views/ListViewSectionContext.groovy

@@ -2,6 +2,7 @@ package javaposse.jobdsl.dsl.views
 
 import javaposse.jobdsl.dsl.Context
 import javaposse.jobdsl.dsl.DslContext
+import javaposse.jobdsl.dsl.JobManagement
 
 import static com.google.common.base.Preconditions.checkArgument
 import static javaposse.jobdsl.dsl.ContextHelper.executeInContext
@@ -10,12 +11,17 @@ class ListViewSectionContext implements Context {
     private static final List<String> VALID_WIDTHS = ['FULL', 'HALF', 'THIRD', 'TWO_THIRDS']
     private static final List<String> VALID_ALIGNMENTS = ['CENTER', 'LEFT', 'RIGHT']
 
+    private final JobManagement jobManagement
     String name
     String width = 'FULL'
     String alignment = 'CENTER'
     JobsContext jobsContext = new JobsContext()
     JobFiltersContext jobFiltersContext = new JobFiltersContext()
-    ColumnsContext columnsContext = new ColumnsContext()
+    ColumnsContext columnsContext = new ColumnsContext(jobManagement)
+
+    ListViewSectionContext(JobManagement jobManagement) {
+        this.jobManagement = jobManagement
+    }
 
     void name(String name) {
         this.name = name

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/views/SectionedView.groovy

@@ -12,7 +12,7 @@ class SectionedView extends View {
     }
 
     void sections(@DslContext(SectionsContext) Closure sectionsClosure) {
-        SectionsContext context = new SectionsContext()
+        SectionsContext context = new SectionsContext(jobManagement)
         executeInContext(sectionsClosure, context)
 
         execute {

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/views/SectionsContext.groovy

@@ -2,13 +2,19 @@ package javaposse.jobdsl.dsl.views
 
 import javaposse.jobdsl.dsl.Context
 import javaposse.jobdsl.dsl.DslContext
+import javaposse.jobdsl.dsl.JobManagement
 
 import static java.lang.String.CASE_INSENSITIVE_ORDER
 import static javaposse.jobdsl.dsl.ContextHelper.executeInContext
 
 class SectionsContext implements Context {
+    private final JobManagement jobManagement
     List<Node> sectionNodes = []
 
+    SectionsContext(JobManagement jobManagement) {
+        this.jobManagement = jobManagement
+    }
+
     /**
      * <hudson.plugins.sectioned__view.ListViewSection>
      *     <jobNames>
@@ -32,7 +38,7 @@ class SectionsContext implements Context {
      * </hudson.plugins.sectioned__view.ListViewSection>
      */
     void listView(@DslContext(ListViewSectionContext) Closure listViewSectionClosure) {
-        ListViewSectionContext context = new ListViewSectionContext()
+        ListViewSectionContext context = new ListViewSectionContext(jobManagement)
         executeInContext(listViewSectionClosure, context)
 
         sectionNodes << new NodeBuilder().'hudson.plugins.sectioned__view.ListViewSection' {

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/views/BuildMonitorViewSpec.groovy

@@ -2,7 +2,7 @@ package javaposse.jobdsl.dsl.views
 
 class BuildMonitorViewSpec extends ListViewSpec {
     def setup() {
-        view = new BuildMonitorView()
+        view = new BuildMonitorView(jobManagement)
     }
 
     protected String getDefaultXml() {

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/views/ListViewSpec.groovy

@@ -1,5 +1,6 @@
 package javaposse.jobdsl.dsl.views
 
+import javaposse.jobdsl.dsl.JobManagement
 import javaposse.jobdsl.dsl.views.jobfilter.RegexMatchValue
 import javaposse.jobdsl.dsl.views.jobfilter.Status
 import spock.lang.Specification
@@ -15,7 +16,8 @@ import static org.custommonkey.xmlunit.XMLUnit.compareXML
 import static org.custommonkey.xmlunit.XMLUnit.setIgnoreWhitespace
 
 class ListViewSpec extends Specification {
-    ListView view = new ListView()
+    JobManagement jobManagement = Mock(JobManagement)
+    ListView view = new ListView(jobManagement)
 
     def 'defaults'() {
         when:
@@ -203,12 +205,13 @@ class ListViewSpec extends Specification {
             lastDuration()
             buildButton()
             claim()
+            lastBuildNode()
         }
 
         then:
         Node root = view.node
         root.columns.size() == 1
-        root.columns[0].value().size() == 8
+        root.columns[0].value().size() == 9
         root.columns[0].value()[0].name() == 'hudson.views.StatusColumn'
         root.columns[0].value()[1].name() == 'hudson.views.WeatherColumn'
         root.columns[0].value()[2].name() == 'hudson.views.JobColumn'
@@ -217,6 +220,8 @@ class ListViewSpec extends Specification {
         root.columns[0].value()[5].name() == 'hudson.views.LastDurationColumn'
         root.columns[0].value()[6].name() == 'hudson.views.BuildButtonColumn'
         root.columns[0].value()[7].name() == 'hudson.plugins.claim.ClaimColumn'
+        root.columns[0].value()[8].name() == 'org.jenkins.plugins.column.LastBuildNodeColumn'
+        _ * jobManagement.requireMinimumPluginVersion('build-node-column', '0.1')
     }
 
     def 'call columns twice'() {