Refactored validator to support more cli commands. Added bin to paren…

…t project.
Adam16 · Jan 2, 2017 · b0c7422 · b0c7422
1 parent 6605a8a
commit b0c7422
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/vendor/
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ copyright terms of the package contents.
 Quickly validate your project's compliance by following these steps:
 
 - Install package in your project: `composer require pds/skeleton @dev`
-- Run the validator: `./vendor/pds/skeleton/bin/validate`
+- Run the validator: `vendor/bin/pdsskeleton validate`
 
 ## Root-Level Directories
 

diff --git a/bin/pdsskeleton b/bin/pdsskeleton
@@ -0,0 +1,20 @@
+#!/usr/bin/env php
+
+<?php 
+
+$autoloadFiles = [
+    __DIR__ . '/../vendor/autoload.php',
+    __DIR__ . '/../../../autoload.php'
+];
+
+foreach ($autoloadFiles as $autoloadFile) {
+    if (file_exists($autoloadFile)) {
+        require_once $autoloadFile;
+        break;
+    }
+}
+
+use PDS\Skeleton\Console;
+
+$console = new Console();
+$console->execute($argv);
diff --git a/composer.json b/composer.json
@@ -3,5 +3,9 @@
     "type": "standard",
     "description": "Standard for PHP package skeletons.",
     "homepage": "https://github.com/php-pds/skeleton",
-    "license": "CC-BY-SA-4.0"
+    "license": "CC-BY-SA-4.0",
+    "autoload": {
+        "psr-4": { "PDS\\Skeleton\\": "src/PDS/Skeleton" }
+    },
+    "bin": ["bin/pdsskeleton"]
 }
diff --git a/bin/validate → src/PDS/Skeleton/ComplianceValidator.php b/bin/validate → src/PDS/Skeleton/ComplianceValidator.php
@@ -1,18 +1,6 @@
-#!/usr/bin/env php
-
 <?php
 
-if (!defined('ENV') || ENV != 'test') {
-    $lines = scandir(__DIR__ . "/../../../../");
-    foreach ($lines as $i => $line) {
-        if (is_dir($line)) {
-            $lines[$i] .= "/";
-        }
-    }
-    $validator = new ComplianceValidator();
-    $results = $validator->validate($lines);
-    $validator->outputResults($results);
-}
+namespace PDS\Skeleton;
 
 class ComplianceValidator
 {
@@ -21,6 +9,16 @@ class ComplianceValidator
     const STATE_REQUIRED_NOT_PRESENT = 3;
     const STATE_INCORRECT_PRESENT = 4;
 
+    protected $files = null;
+
+    public function execute()
+    {
+        $lines = $this->getFiles();
+        $results = $this->validate($lines);
+        $this->outputResults($results);
+        return true;
+    }
+
     public function validate($lines)
     {
         $complianceTests = [
@@ -53,6 +51,24 @@ public function validate($lines)
         return $results;
     }
 
+    /**
+     * Get list of files and directories previously set, or generate from parent project.
+     */
+    public function getFiles()
+    {
+        if ($this->files == null) {
+            $files = scandir(__DIR__ . "/../../../../");
+            foreach ($files as $i => $file) {
+                if (is_dir($file)) {
+                    $files[$i] .= "/";
+                }
+            }
+            $this->files = $files;
+        }
+
+        return $this->files;
+    }
+
     public function outputResults($results)
     {
         foreach ($results as $result) {
@@ -288,4 +304,4 @@ protected function checkResources($lines)
             'Ressources/',
         ]);
     }
-}
+}
diff --git a/src/PDS/Skeleton/Console.php b/src/PDS/Skeleton/Console.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace PDS\Skeleton;
+
+class Console
+{
+    protected $commandsWhitelist = [
+        'validate' => 'PDS\Skeleton\ComplianceValidator',
+    ];
+
+    public function execute($args)
+    {
+        if (count($args) > 1) {
+
+            $executable = array_shift($args);
+            $commandName = array_shift($args);
+
+            if (array_key_exists($commandName, $this->commandsWhitelist)) {
+                return $this->executeCommand($this->commandsWhitelist[$commandName], $args);
+            }
+
+            $this->outputHelp();
+            return false;
+        }
+
+        $this->outputHelp();
+        return false;
+    }
+
+    protected function executeCommand($commandClass, $args)
+    {
+        $command = new $commandClass();
+        return $command->execute($args);
+    }
+
+    protected function outputHelp()
+    {
+        echo 'Available commands:' . PHP_EOL;
+        foreach ($this->commandsWhitelist as $key => $value) {
+            echo 'pdsskeleton ' . $key . PHP_EOL;
+        }
+    }
+}
diff --git a/tests/ComplianceValidatorTest.php b/tests/ComplianceValidatorTest.php
@@ -1,7 +1,18 @@
 <?php
 
-define('ENV', 'test');
-require __DIR__ . "/../bin/validate";
+$autoloadFiles = [
+    __DIR__ . '/../vendor/autoload.php',
+    __DIR__ . '/../../../autoload.php'
+];
+
+foreach ($autoloadFiles as $autoloadFile) {
+    if (file_exists($autoloadFile)) {
+        require_once $autoloadFile;
+        break;
+    }
+}
+
+use PDS\Skeleton\ComplianceValidator;
 
 $tester = new ComplianceValidatorTest();
 // Test all 4 possible states.