Skip to content

Run executing events + bug fixes #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 29, 2016
Merged

Run executing events + bug fixes #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dab97e
Make sure to configure exercise when in run mode
AydinHassan Jan 28, 2016
9bb716b
Dispatch event when executing in run mode
AydinHassan Jan 28, 2016
8447c12
Remove new line
AydinHassan Jan 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Event/CgiExecuteEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ class CgiExecuteEvent extends Event
/**
* @param string $name
* @param RequestInterface $request
* @param array $parameters
*/
public function __construct($name, RequestInterface $request)
public function __construct($name, RequestInterface $request, array $parameters = [])
{
parent::__construct($name, ['request' => $request]);
$parameters['request'] = $request;
parent::__construct($name, $parameters);
$this->request = $request;
}

Expand Down
6 changes: 4 additions & 2 deletions src/Event/CliExecuteEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ class CliExecuteEvent extends Event
/**
* @param string $name
* @param ArrayObject $args
* @param array $parameters
*/
public function __construct($name, ArrayObject $args)
public function __construct($name, ArrayObject $args, array $parameters = [])
{
parent::__construct($name, ['args' => $args]);
$parameters['args'] = $args;
parent::__construct($name, $parameters);
$this->args = $args;
}

Expand Down
1 change: 1 addition & 0 deletions src/ExerciseDispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ public function verify(ExerciseInterface $exercise, $fileName)
*/
public function run(ExerciseInterface $exercise, $fileName, OutputInterface $output)
{
$exercise->configure($this);
$this->eventDispatcher->dispatch(new Event('run.start', compact('exercise', 'fileName')));

$exitStatus = $this->runnerFactory
Expand Down
6 changes: 4 additions & 2 deletions src/ExerciseRunner/CgiRunner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public function run($fileName, OutputInterface $output)
{
$success = true;
foreach ($this->exercise->getRequests() as $i => $request) {
$event = $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.run.usr-execute.pre', $request));
$event = $this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.run.user-execute.pre', $request));
$process = $this->getProcess($fileName, $event->getRequest());

$output->writeTitle("Request");
Expand All @@ -202,7 +202,9 @@ public function run($fileName, OutputInterface $output)

$output->writeTitle("Output");
$output->emptyLine();
$process->run(function ($outputType, $outputBuffer) use ($output) {
$process->start();
$this->eventDispatcher->dispatch(new CgiExecuteEvent('cgi.run.executing', $request, ['output' => $output]));
$process->wait(function ($outputType, $outputBuffer) use ($output) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

$output->write($outputBuffer);
});
$output->emptyLine();
Expand Down
6 changes: 4 additions & 2 deletions src/ExerciseRunner/CliRunner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,11 @@ public function run($fileName, OutputInterface $output)
$output->write(implode($glue, $args->getArrayCopy()));
}

$output->writeTitle("\nOutput");
$output->writeTitle("Output");
$process = $this->getPhpProcess($fileName, $args);
$process->run(function ($outputType, $outputBuffer) use ($output) {
$process->start();
$this->eventDispatcher->dispatch(new CliExecuteEvent('cli.run.executing', $args, ['output' => $output]));
$process->wait(function ($outputType, $outputBuffer) use ($output) {
$output->writeLine($outputBuffer);
});

Expand Down
2 changes: 1 addition & 1 deletion test/ExerciseRunner/CliRunnerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function testRunPassesOutputAndReturnsSuccessIfScriptIsSuccessful()

$exp = "\n\e[1m\e[4mArguments\e[0m\e[0m\n";
$exp .= "1, 2, 3\n";
$exp .= "\e[1m\e[4m\n";
$exp .= "\e[1m\e[4m";
$exp .= "Output\e[0m\e[0m\n";
$exp .= "6\n";

Expand Down