feature: implement --now with job name

closes #80

Author: g105b

src/Cli/RunCommand.php

@@ -11,6 +11,8 @@
 use GT\Cron\CronException;
 use GT\Cron\CrontabNotFoundException;
 use GT\Cron\FunctionExecutionException;
+use GT\Cron\JobNotFoundException;
+use GT\Cron\Runner;
 use GT\Cron\RunnerFactory;
 use GT\Cron\ScriptExecutionException;
 
@@ -50,9 +52,9 @@ public function run(?ArgumentValueList $arguments = null):int {
 
 		$runner->setRunCallback([$this, "cronRunStep"]);
 
-		if($arguments->contains("now")) {
-			$numRunJobs = $runner->runAll();
-			$this->stream->writeLine("Ran $numRunJobs jobs now.");
+		$nowStatusCode = $this->runNowJobs($runner, $arguments);
+		if(!is_null($nowStatusCode)) {
+			return $nowStatusCode;
 		}
 
 		try {
@@ -76,6 +78,60 @@ public function run(?ArgumentValueList $arguments = null):int {
 		return 0;
 	}
 
+	private function runNowJobs(
+		Runner $runner,
+		ArgumentValueList $arguments
+	):?int {
+		if(!$arguments->contains("now")) {
+			return null;
+		}
+
+		$jobName = $arguments->get("now")->get();
+		try {
+			if($jobName) {
+				$numRunJobs = $this->runNamedJobNow($runner, $jobName);
+				$this->stream->writeLine(
+					"Ran $numRunJobs "
+					. ($numRunJobs === 1 ? "job" : "jobs")
+					. " now."
+				);
+
+				return $arguments->contains("watch") ? null : 0;
+			}
+
+			$numRunJobs = $runner->runAll();
+			$this->stream->writeLine("Ran $numRunJobs jobs now.");
+		}
+		catch(JobNotFoundException $exception) {
+			$this->stream->writeLine(
+				$exception->getMessage(),
+				Stream::ERROR
+			);
+			return 2;
+		}
+
+		return null;
+	}
+
+	private function runNamedJobNow(
+		Runner $runner,
+		string $jobName,
+	):int {
+		$jobName = trim($jobName);
+		$numRunJobs = $runner->runMatching(
+			fn(string $command):bool => $this->displayCommandName($command)
+				=== $jobName
+		);
+
+		if(!$numRunJobs) {
+			throw new JobNotFoundException(
+				"No cron job found matching \"$jobName\" in crontab."
+			);
+		}
+
+		return $numRunJobs;
+	}
+
 	/**
 	 * @param array<string> $runCommandList
 	 * @SuppressWarnings(PHPMD.ExitExpression)
@@ -140,6 +196,9 @@ protected function displayCommandName(string $command):string {
 		}
 
 		$script = preg_split("/\\s+/", $command, 2)[0];
+		[$script] = explode("?", $script, 2);
+		$script = preg_replace("/\\.php$/i", "", $script);
+
 		return basename(str_replace("\\", "/", $script));
 	}
 
@@ -262,7 +321,7 @@ public function getOptionalParameterList():array {
 				true,
 				"now",
 				"n",
-				"Run all tasks once now. Useful when using --watch for when developing locally."
+				"Run all tasks once now, or pass a job name to run only that task. Useful when using --watch for when developing locally." // phpcs:ignore Generic.Files.LineLength.TooLong
 			)
 		];
 	}

src/Queue.php

@@ -65,10 +65,15 @@ public function runDueJobsAndGetCommands():array {
 		return $commandList;
 	}
 
-	public function runAllJobs():int {
+	/** @param null|callable(string):bool $matches */
+	public function runAllJobs(?callable $matches = null):int {
 		$jobsRan = 0;
 
 		foreach($this->jobList as $job) {
+			if($matches && !$matches($job->getCommand())) {
+				continue;
+			}
+
 			$job->run();
 			$jobsRan++;
 		}

src/Runner.php

@@ -2,7 +2,6 @@
 namespace GT\Cron;
 
 use DateTime;
-use InvalidArgumentException;
 
 class Runner {
 	/** @var bool */
@@ -75,4 +74,9 @@ public function run(bool $continue = false):int {
 	public function runAll():int {
 		return $this->queue->runAllJobs();
 	}
+
+	/** @param callable(string):bool $matches */
+	public function runMatching(callable $matches):int {
+		return $this->queue->runAllJobs($matches);
+	}
 }