Merge pull request #499 from rundeck/RUN-1580

RUN-1580: Fix run --at parsing

Author: gschueler

rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Run.java

@@ -161,7 +161,7 @@ public Integer call() throws IOException, InputError {
             request.setOptions(jobopts);
             if (options.isRunAtDate()) {
                 try {
-                    runat = options.getRunAtDate().toDate("yyyy-MM-dd'T'HH:mm:ssXX");
+                    runat = options.getRunAtDate().toDate();
                     request.setRunAtTime(runat);
                 } catch (ParseException e) {
                     throw new InputError("-@/--at date format is not valid", e);

rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java

@@ -47,9 +47,17 @@ public boolean isUser() {
         return user != null;
     }
 
-    //XXX: test for picocli
+
+    static class DateInfoConverter implements CommandLine.ITypeConverter<DateInfo> {
+        public DateInfo convert(String value) {
+            return new DateInfo(value);
+        }
+    }
+
     @CommandLine.Option(names = {"-@", "--at"},
-            description = "Run the job at the specified date/time. ISO8601 format (yyyy-MM-dd'T'HH:mm:ssXX)")
+            description = "Run the job at the specified date/time. ISO8601 format (yyyy-MM-dd'T'HH:mm:ssXX)",
+            converter = DateInfoConverter.class
+    )
     private DateInfo runAtDate;
 
     public boolean isRunAtDate() {

rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy

@@ -17,6 +17,7 @@
 package org.rundeck.client.tool.commands
 
 import org.rundeck.client.api.RundeckApi
+import org.rundeck.client.api.model.DateInfo
 import org.rundeck.client.api.model.ExecOutput
 import org.rundeck.client.api.model.Execution
 import org.rundeck.client.api.model.JobFileUploadResult
@@ -33,6 +34,9 @@ import retrofit2.Retrofit
 import retrofit2.mock.Calls
 import spock.lang.Specification
 import spock.lang.Unroll
+
+import java.text.SimpleDateFormat
+
 /**
  * @author greg
  * @since 12/13/16
@@ -111,6 +115,43 @@ class RunSpec extends Specification {
         0 * api._(*_)
         result == 0
 
+    }
+    def "run at time supports multiple formats"() {
+
+        given:
+        //round to seconds, since the date format does not include milliseconds
+        long millis = Math.floor(System.currentTimeMillis() / 1000L).toLong()
+        Date timeToRun = new Date((millis*1000L)+(3L*1000L*60L*24L))
+        String dateString = new SimpleDateFormat(dateFormat).format(timeToRun)
+
+        def api = Mock(RundeckApi)
+        RdTool rdTool = setupMock(api, 20)
+        def out = Mock(CommandOutput)
+        Run command = new Run()
+        command.rdTool = rdTool
+        command.rdOutput = out
+
+        command.options.project = 'ProjectName'
+        command.options.job = 'a group/path/a job'
+        command.options.setRunAtDate(new DateInfo(dateString))
+
+        when:
+        def result = command.call()
+
+        then:
+        1 * api.listJobs('ProjectName', null, null, 'a job', 'a group/path') >>
+                Calls.response([new JobItem(id: 'fakeid')])
+        1 * api.runJob('fakeid', {
+            it.runAtTime==timeToRun
+        }) >> Calls.response(new Execution(id: 123, description: ''))
+        0 * api._(*_)
+        result == 0
+        where:
+        dateFormat    | _
+        DateInfo.ISO  | _
+        DateInfo.ISO1 | _
+        DateInfo.ISO2 | _
+
     }
 
     def "run command loglevel debug"() {