Merge pull request #3 from adhocore/develop

Develop

Author: adhocore

.gitignore

@@ -8,3 +8,4 @@ coverage.xml
 clover.xml
 test.php
 *.ttf.png
+*.phar

bin/clish

@@ -13,6 +13,12 @@ if (\Phar::running() && !\extension_loaded('zlib')) {
     exit(1);
 }
 
+if (!\extension_loaded('gd')) {
+    echo "clish requires gd extension for exporting highlighted code to png image\n";
+
+    exit(1);
+}
+
 if (\file_exists(__DIR__ . '/../../../autoload.php')) {
     require __DIR__ . '/../../../autoload.php';
 } elseif (\file_exists(__DIR__ . '/../../autoload.php')) {

box.json

@@ -0,0 +1,20 @@
+{
+    "chmod": "0755",
+
+    "check-requirements": false,
+
+    "banner": [
+        "Clish is a PHP code highlight and/or export tool."
+    ],
+
+    "files": [
+        "VERSION"
+    ],
+
+    "directories-bin": [
+        "font"
+    ],
+
+    "compression": "GZ",
+    "datetime": "release-date"
+}

composer.json

@@ -27,7 +27,7 @@
         "php": ">=7.0.0",
         "ext-dom": "*",
         "ext-gd": "*",
-        "adhocore/cli": "^0.6.0"
+        "adhocore/cli": "^0.7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5 || ^7.5"

src/Console/ClishCommand.php

@@ -25,17 +25,17 @@ public function __construct()
         parent::__construct('clish', 'PHP CLI syntax highlight and/or export.');
 
         $this
-            ->option('-o --output', 'Output filepath where PNG image is exported')
-            ->option('-e --echo', 'Forces echo to STDOUT when --output is passed')
+            ->option('-o --output', 'Output filepath where PNG image is exported', null, '')
+            ->option('-e --echo', 'Forces echo to STDOUT when --output is passed', null, '')
             ->option('-f --file', \implode("\n", [
                 'Input PHP file to highlight and/or export',
                 '(will read from piped input if file not given)',
-            ]))
-            ->option('-F --font', 'Font to use for export to png')
+            ]), null, '')
+            ->option('-F --font', 'Font to use for export to png', null, '')
             ->usage(
                 '<bold>  $0</end> <comment>--file file.php</end> ## print<eol/>'
-                . '<bold>  cat file.php | $0</end> ## from piped stream<eol/>'
-                . '<bold>  $0</end> <comment>< file.php ## from redirected stdin<eol/>'
+                . '<comment>  cat file.php |</end> <bold>$0</end> ## from piped stream<eol/>'
+                . '<bold>  $0</end> <comment>< file.php</end> ## from redirected stdin<eol/>'
                 . '<bold>  $0</end> <comment>--file file.php --output file.png</end> ## export<eol/>'
                 . '<bold>  $0</end> <comment>--file file.php --output file.png --echo</end> ## print + export<eol/>'
                 . '<bold>  $0</end> <comment>-f file.php -o file.png -F dejavu</end> ## export in dejavu font<eol/>'
@@ -44,7 +44,7 @@ public function __construct()
 
     public function interact(Interactor $io)
     {
-        if (\is_string($this->file)) {
+        if ($this->file) {
             return;
         }
 
@@ -92,6 +92,23 @@ protected function doExport(string $code = null)
             \mkdir(\dirname($this->output), 0755, true);
         }
 
-        (new Exporter($code))->export($this->output, \array_filter(['font' => $this->font]));
+        $options = ['font' => $this->fixFont($this->font ?: 'ubuntu')];
+
+        (new Exporter($code))->export($this->output, $options);
+    }
+
+    /** @codeCoverageIgnore */
+    protected function fixFont(string $font): string
+    {
+        if (\Phar::running()) {
+            $basename = \basename($font, '.ttf');
+            $pharfont = __DIR__ . "/../../font/$basename.ttf";
+
+            if (!\is_file($font) && \is_file($pharfont)) {
+                \copy($pharfont, $font = sys_get_temp_dir() . '/clish.ttf');
+            }
+        }
+
+        return $font;
     }
 }

src/Exporter.php

@@ -68,13 +68,14 @@ protected function setOptions(array $options)
             return;
         }
 
-        $font = $options['font'];
-        if (!\is_file($font)) {
-            $basename = \basename($font, '.ttf');
-            $font     = __DIR__ . "/../font/$basename.ttf";
+        if (\is_file($options['font'])) {
+            $this->font = $options['font'];
+
+            return;
         }
 
-        if (!\is_file($font)) {
+        $base = \basename($options['font'], '.ttf');
+        if (!\is_file($font = __DIR__ . "/../font/$base.ttf")) {
             throw new \InvalidArgumentException('The given font doesnot exist.');
         }
 

tests/ExporterTest.php

@@ -51,6 +51,14 @@ public function testSetOptions()
         // $this->assertSame(\file_get_contents($this->ref), \file_get_contents($this->out));
     }
 
+    public function testSetOptionsFont()
+    {
+        Exporter::for(__DIR__ . '/../example.php')->export($this->out, ['font' => __DIR__ . '/../font/dejavu.ttf']);
+
+        $this->assertFileExists($this->out, 'It should export with given font');
+        // $this->assertSame(\file_get_contents($this->ref), \file_get_contents($this->out));
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage The given font doesnot exist.