Merge pull request #940 from jwarlander/add-next-launch-column-support

Author: daspilker

docs/Home.md

@@ -32,6 +32,9 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
    ([JENKINS-38637](https://issues.jenkins-ci.org/browse/JENKINS-38637))
  * Fixed a problem with relative job names
    ([JENKINS-39137](https://issues.jenkins-ci.org/browse/JENKINS-39137))
+ * Added "Next Launch" and "Next Possible Launch" columns for
+   [Next Executions Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Next+Executions)
+   ([#940](https://github.com/jenkinsci/job-dsl-plugin/pull/940))
 * 1.52 (October 17 2016)
  * Increased the minimum supported Jenkins version to 1.642
  * Enhanced support for the [Exclusion Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Exclusion-Plugin)

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

@@ -253,4 +253,28 @@ class ColumnsContext extends AbstractExtensibleContext {
             useIcon(icon)
         }
     }
+
+    /**
+     * Adds a column showing job's next launch.
+     *
+     * @since 1.53
+     */
+    @RequiresPlugin(id = 'next-executions', minimumVersion = '1.0.12')
+    void nextLaunch() {
+        columnNodes << new NodeBuilder().'hudson.plugins.nextexecutions.columns.NextExecutionColumn' {
+          triggerClass('hudson.triggers.TimerTrigger')
+        }
+    }
+
+    /**
+     * Adds a column showing job's next possible launch.
+     *
+     * @since 1.53
+     */
+    @RequiresPlugin(id = 'next-executions', minimumVersion = '1.0.12')
+    void nextPossibleLaunch() {
+        columnNodes << new NodeBuilder().'hudson.plugins.nextexecutions.columns.PossibleNextExecutionColumn' {
+          triggerClass('hudson.triggers.SCMTrigger')
+        }
+    }
 }

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

@@ -783,6 +783,36 @@ class ListViewSpec<T extends ListView> extends Specification {
         1 * jobManagement.requireMinimumPluginVersion('extra-columns', '1.6')
     }
 
+    def 'next launch column'() {
+        when:
+        view.columns {
+            nextLaunch()
+        }
+
+        then:
+        Node root = view.node
+        root.columns.size() == 1
+        root.columns[0].value().size() == 1
+        root.columns[0].value()[0].name() == 'hudson.plugins.nextexecutions.columns.NextExecutionColumn'
+        root.columns[0].value().triggerClass[0].value() == 'hudson.triggers.TimerTrigger'
+        1 * jobManagement.requireMinimumPluginVersion('next-executions', '1.0.12')
+    }
+
+    def 'next possible launch column'() {
+        when:
+        view.columns {
+            nextPossibleLaunch()
+        }
+
+        then:
+        Node root = view.node
+        root.columns.size() == 1
+        root.columns[0].value().size() == 1
+        root.columns[0].value()[0].name() == 'hudson.plugins.nextexecutions.columns.PossibleNextExecutionColumn'
+        root.columns[0].value().triggerClass[0].value() == 'hudson.triggers.SCMTrigger'
+        1 * jobManagement.requireMinimumPluginVersion('next-executions', '1.0.12')
+    }
+
     protected String getDefaultXml() {
         '''<?xml version='1.0' encoding='UTF-8'?>
 <hudson.model.ListView>