Merge pull request #5 from pmclain/hotfix/patch-errors

 Dry run revert to test if patch is applied

Author: toddbc

composer.json

@@ -2,7 +2,7 @@
     "name": "jamescowie/composer-patcher",
     "description": "Apply patches using composer",
     "license": "MIT",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "authors": [
         {
             "name": "jamescowie",

src/Inviqa/Patch/Patch.php

@@ -36,7 +36,7 @@ public function __construct(SplFileInfo $fileInfo)
      */
     final public function apply()
     {
-        if ($this->canApply()) {
+        if (!$this->isApplied() && $this->canApply()) {
             $res = (bool)$this->doApply();
 
             if ($res) {
@@ -79,6 +79,28 @@ protected function canApply()
         }
     }
 
+    /**
+     * @return bool
+     */
+    protected function isApplied()
+    {
+        $patchPath = ProcessUtils::escapeArgument($this->fileInfo->getRealPath());
+        $process = new Process("patch --dry-run -p 1 -R < $patchPath");
+        try {
+            $process->mustRun();
+            $result = $process->getExitCode() === 0;
+
+            if ($result) {
+                $this->getOutput()->writeln("<info>Patch {$this->fileInfo->getFilename()} already applied.</info>");
+            }
+
+            return $result;
+        } catch (\Exception $e) {
+            $this->getOutput()->writeln("<comment>{$e->getMessage()}</comment>");
+            return false;
+        }
+    }
+
     /**
      * @return Output
      */