Skip to content

Add vagrant support and environemnt variables #4

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

Open
geromueller wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add vagrant support and environemnt variables #4

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
2b9370e
add simple vagrant support
geromueller Jul 6, 2018
7a75558
add env to shell commands
geromueller Jul 13, 2018
e8acf7c
symphony<3.3 compatibility
geromueller Jul 13, 2018
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: 5 additions & 1 deletion lib/Extension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ public function configure(ArrayNodeDefinition $builder)
$builder
->prototype('array')
->children()
->enumNode('type')->values(['local', 'remote', 'docker'])->defaultValue('local')->end()
->enumNode('type')->values(['local', 'remote', 'docker', 'vagrant'])->defaultValue('local')->end()
->scalarNode('base_dir')->defaultNull()->end()
->arrayNode('env')
->prototype('scalar')->end()
->end()
->scalarNode('ssh_command')->defaultValue('ssh')->end()
->scalarNode('scp_command')->defaultValue('scp')->end()
->scalarNode('ssh_options')->defaultNull()->end()
Expand All @@ -49,6 +52,7 @@ public function configure(ArrayNodeDefinition $builder)
->scalarNode('docker_command')->defaultValue('docker')->end()
->scalarNode('docker_options')->defaultNull()->end()
->scalarNode('docker_containername')->defaultNull()->end()
->scalarNode('vagrant_cwd')->defaultNull()->end()
->end()
->end();
}
Expand Down
61 changes: 61 additions & 0 deletions lib/ShellContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public function initializeFeatureFilePath(ScenarioScope $scope)
*/
public function iRun($command, $server = 'default')
{
$server = str_replace('-', '_', $server);
Copy link
Contributor

@DrSchimke DrSchimke Jul 16, 2018

Choose a reason for hiding this comment

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

Why do you replace minus signs by underscore here?


if (!isset($this->config[$server])) {
throw new \Exception(sprintf('Configuration not found for server "%s"', $server));
}
Expand Down Expand Up @@ -177,6 +179,10 @@ private function createProcess($command, array $serverConfig)
$process = $this->createDockerProcess($command, $serverConfig);
break;

case 'vagrant':
$process = $this->createVagrantProcess($command, $serverConfig);
break;

default:
$process = $this->createLocalProcess($command, $serverConfig);
break;
Expand All @@ -189,6 +195,21 @@ private function createProcess($command, array $serverConfig)
return $process;
}

/**
* @param string $command
* @param array $nv
*
* @return string
*/
private function prefixEnvToCommand($command, $env)
{
$prefix = '';
foreach ($env as $key => $value) {
$prefix .= sprintf("%s=%s ", $key, escapeshellarg($value));
}
return $prefix . $command;
}

/**
* @param string $command
* @param array $serverConfig
Expand All @@ -197,6 +218,10 @@ private function createProcess($command, array $serverConfig)
*/
private function createLocalProcess($command, array $serverConfig)
{
if ($serverConfig['env']) {
$command = $this->prefixEnvToCommand($command, $serverConfig['env']);
}

return new Process($command, $serverConfig['base_dir']);
}

Expand All @@ -208,6 +233,10 @@ private function createLocalProcess($command, array $serverConfig)
*/
private function createRemoteProcess($command, array $serverConfig)
{
if ($serverConfig['env']) {
$command = $this->prefixEnvToCommand($command, $serverConfig['env']);
}

if ($serverConfig['base_dir']) {
$command = sprintf('cd %s ; %s', $serverConfig['base_dir'], $command);
}
Expand All @@ -223,6 +252,34 @@ private function createRemoteProcess($command, array $serverConfig)
return new Process($command);
}

/**
* @param string $command
* @param array $serverConfig
*
* @return Process
*/
private function createVagrantProcess($command, array $serverConfig)
{
if ($serverConfig['env']) {
$command = $this->prefixEnvToCommand($command, $serverConfig['env']);
}

if ($serverConfig['base_dir']) {
$command = sprintf('cd %s ; %s', $serverConfig['base_dir'], $command);
}

$command = sprintf(
'vagrant ssh -- %s',
escapeshellarg($command)
);

if ($serverConfig['vagrant_cwd']) {
return new Process($command, $serverConfig['vagrant_cwd']);
} else {
return new Process($command);
}
}

/**
* @param string $command
* @param array $serverConfig
Expand All @@ -231,6 +288,10 @@ private function createRemoteProcess($command, array $serverConfig)
*/
private function createDockerProcess($command, array $serverConfig)
{
if ($serverConfig['env']) {
$command = $this->prefixEnvToCommand($command, $serverConfig['env']);
}

if ($serverConfig['base_dir']) {
$command = sprintf('cd %s ; %s', $serverConfig['base_dir'], $command);
}
Expand Down