Rebuilding...

src/Altax/Foundation/bootstrap.php

@@ -14,11 +14,12 @@
     ];
 }
 
-$env['server.port']     = 22;
-$env['server.key']      = getenv("HOME")."/.ssh/id_rsa";
-$env['server.username'] = getenv("USER");
-$env['command.shell']   = '/bin/bash -l -c';
-$env['script.working']  = sys_get_temp_dir()."/altax";
+$env['server.port']      = 22;
+$env['server.key']       = getenv("HOME")."/.ssh/id_rsa";
+$env['server.username']  = getenv("USER");
+$env['command.shell']    = '/bin/bash -l -c';
+$env['script.working']   = sys_get_temp_dir()."/altax";
+$env['process.parallel'] = true;
 
 $env['aliases'] = [
     'App'              => 'Altax\Facade\App',

src/Altax/Process/Executor.php

@@ -11,12 +11,15 @@ class Executor
 
     protected $console;
 
-    public function __construct($runtime, $servers, $output, $console)
+    protected $env;
+
+    public function __construct($runtime, $servers, $output, $console, $env)
     {
         $this->runtime = $runtime;
         $this->servers = $servers;
         $this->output = $output;
         $this->console = $console;
+        $this->env = $env;
     }
 
     public function on()
@@ -58,7 +61,7 @@ public function on()
             }
         }
 
-        $manager = new ProcessManager($this->runtime, $this->output);
+        $manager = new ProcessManager($this->runtime, $this->output, $this->env);
         $manager->execute($closure, $nodes);
     }
 

src/Altax/Process/ProcessManager.php

@@ -7,16 +7,24 @@ class ProcessManager
 
     protected $output;
 
+    protected $env;
+
     protected $isParallel;
 
     protected $childPids = array();
 
-    public function __construct($runtime, $output)
+    public function __construct($runtime, $output, $env)
     {
         $this->runtime = $runtime;
         $this->output = $output;
+        $this->env = $env;
 
-        if (!function_exists('pcntl_signal') || !function_exists('pcntl_fork') || !function_exists('pcntl_wait') || !function_exists('posix_kill')) {
+        if ($this->env->get('process.parallel', true) == false) {
+            $this->isParallel = false;
+            if ($this->output->isDebug()) {
+                $this->output->writeln("Running serial mode.");
+            }
+        } elseif (!function_exists('pcntl_signal') || !function_exists('pcntl_fork') || !function_exists('pcntl_wait') || !function_exists('posix_kill')) {
             $this->isParallel = false;
             if ($this->output->isDebug()) {
                 $this->output->writeln("Running serial mode.");

src/Altax/Process/ProcessServiceProvider.php

@@ -21,7 +21,9 @@ public function register()
                 $app['process.runtime'],
                 $app['servers'],
                 $app['output'],
-                $app['console']);
+                $app['console'],
+                $app['env']
+                );
         });
     }
 }

tests/Altax/RemoteFile/RemoteFileServiceProviderTest.php

@@ -0,0 +1,19 @@
+<?php
+namespace Test\Altax\RemoteFile;
+
+use Altax\RemoteFile\RemoteFileBuilder;
+
+class RemoteFileProviderTest extends \PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $this->app = bootAltaxApplication();
+    }
+
+    public function testRemoteFile()
+    {
+        $obj = $this->app["remote_file"];
+        $this->assertTrue($obj instanceof RemoteFileBuilder);
+    }
+
+}

tests/Altax/RemoteFile/RemoteFileTest.php

@@ -0,0 +1,46 @@
+<?php
+namespace Test\Altax\RemoteFile;
+
+use Symfony\Component\Console\Output\BufferedOutput;
+
+class CommandTest extends \PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $this->app = bootAltaxApplication();
+        $this->app->instance("output", new BufferedOutput());
+    }
+
+    public function testPutError()
+    {
+        $remoteFileBuilder = $this->app["remote_file"];
+        $remoteFile = $remoteFileBuilder->make();
+        try {
+            $remoteFile->put(__DIR__."/files/puttext.txt", "/tmp/puttext.txt");
+            $this->assertEquals(true, false);
+        } catch (\Exception $e) {
+            $this->assertTrue(true);
+        }
+    }
+
+    public function testPut()
+    {
+        $servers = $this->app['servers'];
+        $servers->node("127.0.0.1");
+        $env = $this->app['env'];
+        $env->set('process.parallel', false);
+
+        $executor = $this->app['process.executor'];
+        $executor->on(["127.0.0.1"], function(){
+
+            $remoteFileBuilder = $this->app["remote_file"];
+            $remoteFile = $remoteFileBuilder->make();
+            $remoteFile->put(__DIR__."/files/puttext.txt", __DIR__."/../../tmp/puttext.txt");
+
+        });
+
+        $this->assertTrue(file_exists(__DIR__."/../../tmp/puttext.txt"));
+        unlink(__DIR__."/../../tmp/puttext.txt");
+    }
+
+}

tests/Altax/RemoteFile/files/puttext.txt

@@ -0,0 +1 @@
+put ok

tests/Altax/Server/NodeTest.php

@@ -48,6 +48,7 @@ public function testReplaceTilda()
         $serverManager = $this->app["servers"];
         $node = $serverManager->makeNode("test_node_name");
 
+        $orgHome = getenv("HOME");
         putenv("HOME=/home/your");
         $node->setKey("~/path/to/private_key");
         $this->assertEquals("~/path/to/private_key", $node->getKey());
@@ -69,5 +70,7 @@ public function testReplaceTilda()
         $node->setKey("/path/to/private_key~");
         $this->assertEquals("/path/to/private_key~", $node->getKey());
         $this->assertEquals("/path/to/private_key~", $node->getKeyOrDefault());
+
+        putenv("HOME=$orgHome");
     }
 }

tests/Altax/Shell/CommandTest.php

@@ -0,0 +1,67 @@
+<?php
+namespace Test\Altax\Shell;
+
+use Symfony\Component\Console\Output\BufferedOutput;
+
+class CommandTest extends \PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $this->app = bootAltaxApplication();
+        $this->app->instance("output", new BufferedOutput());
+    }
+
+    public function testMakeAndRunOnLoccally()
+    {
+        $commandBuilder = $this->app["shell.command"];
+        $command = $commandBuilder->make("pwd");
+        $command->run();
+
+        $this->assertRegExp("/Run command locally:/", $this->app['output']->fetch());
+    }
+
+    public function testMakeAndRunOnRemotely()
+    {
+        $servers = $this->app['servers'];
+        $servers->node("127.0.0.1");
+        $env = $this->app['env'];
+        $env->set('process.parallel', false);
+
+        $executor = $this->app['process.executor'];
+        $executor->on(["127.0.0.1"], function(){
+
+            $commandBuilder = $this->app["shell.command"];
+            $command = $commandBuilder->make("pwd");
+            $command->run();
+
+        });
+
+        $this->assertRegExp("/Run command: pwd on 127.0.0.1/", $this->app['output']->fetch());
+    }
+
+    public function testRunOnLoccally()
+    {
+        $commandBuilder = $this->app["shell.command"];
+        $commandBuilder->run("pwd");
+
+        $this->assertRegExp("/Run command locally:/", $this->app['output']->fetch());
+    }
+
+    public function testRunOnRemotely()
+    {
+        $servers = $this->app['servers'];
+        $servers->node("127.0.0.1");
+        $env = $this->app['env'];
+        $env->set('process.parallel', false);
+
+        $executor = $this->app['process.executor'];
+        $executor->on(["127.0.0.1"], function(){
+
+            $commandBuilder = $this->app["shell.command"];
+            $commandBuilder->run("pwd");
+
+        });
+
+        $this->assertRegExp("/Run command: pwd on 127.0.0.1/", $this->app['output']->fetch());
+    }
+}

tests/Altax/Shell/ShellServiceProviderTest.php

@@ -2,7 +2,6 @@
 namespace Test\Altax\Shell;
 
 use Altax\Shell\CommandBuilder;
-use Altax\Shell\ScriptBuilder;
 
 class ShellServiceProviderTest extends \PHPUnit_Framework_TestCase
 {