Release 0.2.0

README.md

@@ -2,18 +2,18 @@
 
 Display the differences between all of the files in two PHP Archives.
 
-Copyright 2015 [Paragon Initiative Enterprises](https://paragonie.com)
+Copyright (c) 2015 [Paragon Initiative Enterprises](https://paragonie.com)
 
 ## Set up
 
-```sh
-ln -s ./pharaoh /usr/bin/pharaoh
-```
+1. Edit your php.ini file and set `phar.readonly` to `0` for PHP's CLI.
+2. Optionally, symlink `/usr/bin/pharaoh` to the `pharaoh` file in the current
+   directory.
 
 ## Example
 
 ```sh
-pharaoh composer.phar composer-from-source.phar
+pharaoh composer-from-source.phar composer.phar
 ```
 
 ## Why?

composer.json

@@ -1,11 +1,13 @@
 {
     "name":         "paragonie/pharaoh",
     "description":  "Compare PHARs from the Command Line",
-    "version":      "0.1.2",
+    "version":      "0.2.0",
     "keywords": [
             "tool",
             "utility",
             "phar",
+            "security",
+            "auditing",
             "diff"
         ],
     "license":      "MIT",

pharaoh

@@ -24,6 +24,8 @@ if (!empty($opts['c'])) {
     $diff->listChecksums($opts['c']);
 } elseif (!empty($opts['check'])) {
     $diff->listChecksums($opts['check']);
+} elseif (isset($opts['d']) || isset($opts['diff'])) {
+    $diff->printGnuDiff();
 } else {
     $diff->printGitDiff();
 }

src/Pharaoh/PharDiff.php

@@ -39,6 +39,19 @@ public function printGitDiff()
         exit;
     }
 
+    /**
+     * Prints a git-formatted diff of the two phars
+     */
+    public function printGnuDiff()
+    {
+        // Lazy way. Will replace with custom implementaiton later.
+
+        $argA = \escapeshellarg($this->phars[0]->tmp);
+        $argB = \escapeshellarg($this->phars[1]->tmp);
+        echo `diff $argA $argB`;
+        exit;
+    }
+
     public function listChecksums($algo)
     {
         list($pharA, $pharB) = $this->hashChildren(