Massive refactoring: separated backup actions (source, sync, crypter) from cli execution logic

Author: sebastianfeldmann

src/Backup/Cli.php

@@ -0,0 +1,55 @@
+<?php
+namespace phpbu\App\Backup;
+
+use phpbu\App\Cli\Executable;
+
+/**
+ * Base class for Actions using cli tools.
+ *
+ * @package    phpbu
+ * @subpackage Backup
+ * @author     Sebastian Feldmann <sebastian@phpbu.de>
+ * @copyright  Sebastian Feldmann <sebastian@phpbu.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://phpbu.de/
+ * @since      Class available since Release 2.0.2
+ */
+abstract class Cli
+{
+    /**
+     * Command to execute
+     *
+     * @var \phpbu\App\Cli\Executable
+     */
+    protected $executable;
+
+    /**
+     * Exec setter, mostly for test purposes.
+     *
+     * @param \phpbu\App\Cli\Executable $exec
+     */
+    public function setExecutable(Executable $exec)
+    {
+        $this->executable = $exec;
+    }
+
+    /**
+     * Executes the cli commands and handles compression
+     *
+     * @param  \phpbu\App\Backup\Target $target
+     * @return \phpbu\App\Cli\Result
+     * @throws \phpbu\App\Exception
+     */
+    protected function execute(Target $target)
+    {
+        return $this->getExecutable($target)->run();
+    }
+
+    /**
+     * Returns the executable for this action.
+     *
+     * @param  \phpbu\App\Backup\Target $target
+     * @return \phpbu\App\Cli\Executable
+     */
+    public abstract function getExecutable(Target $target);
+}

src/Backup/Cli/Binary.php

@@ -2,8 +2,6 @@
 namespace phpbu\App\Backup;
 
 use phpbu\App\Exception;
-use phpbu\App\Backup\Cli\Cmd;
-use phpbu\App\Backup\Cli\Exec;
 
 /**
  * Compressor
@@ -83,33 +81,11 @@ public function __construct($cmd, $pathToCmd = null)
     /**
      * Return the cli command.
      *
-     * @param  boolean $includingPath
      * @return string
      */
-    public function getCommand($includingPath = true)
+    public function getCommand()
     {
-        return ($includingPath ? $this->path : '') . $this->cmd;
-    }
-
-    /**
-     * Return Exec to actually execute the compressor command.
-     *
-     * @param  string $fileToCompress
-     * @param  array  $options
-     * @return \phpbu\App\Backup\CLi\Exec
-     */
-    public function getExec($fileToCompress, array $options = array())
-    {
-        $cmd = new Cmd($this->getCommand());
-        foreach ($options as $opt) {
-            $cmd->addOption($opt);
-        }
-        $cmd->addArgument($fileToCompress);
-
-        $exec = new Exec();
-        $exec->addCommand($cmd);
-
-        return $exec;
+        return $this->cmd;
     }
 
     /**