Framework: update -v output

Author: PeratX

src/iTXTech/SimpleFramework/Console/Command/PackModuleCommand.php

@@ -72,9 +72,10 @@ public function execute(string $command, array $args) : bool{
 			"api" => $info->getApi(),
 			"description" => $info->getDescription(),
 			"authors" => $info->getAuthors(),
+			"generator" => Framework::PROG_NAME . " " . Framework::PROG_VERSION,
 			"creationDate" => time()
 		]);
-		$phar->setStub('<?php echo "' . Framework::PROG_NAME . ' module ' . $info->getName() . ' v' . $info->getVersion() . '\nThis file has been generated using PackModule Command at ' . date("r") . '\n----------------\n";if(extension_loaded("phar")){$phar = new \Phar(__FILE__);foreach($phar->getMetadata() as $key => $value){echo ucfirst($key).": ".(is_array($value) ? implode(", ", $value):$value)."\n";}} __HALT_COMPILER();');
+		$phar->setStub('<?php echo "' . Framework::PROG_NAME . ' module ' . $info->getName() . ' v' . $info->getVersion() . '\n----------------\n";if(extension_loaded("phar")){$phar = new \Phar(__FILE__);foreach($phar->getMetadata() as $key => $value){echo ucfirst($key).": ".(is_array($value) ? implode(", ", $value):$value)."\n";}} __HALT_COMPILER();');
 		$phar->setSignatureAlgorithm(\Phar::SHA1);
 		$filePath = rtrim(str_replace("\\", "/", $module->getFile()), "/") . "/";
 		$phar->startBuffering();

src/iTXTech/SimpleFramework/Console/ConsoleReader.php

@@ -30,7 +30,6 @@ class ConsoleReader extends Thread{
 	private $shutdown = false;
 	private $type = self::TYPE_STREAM;
 
-
 	public function __construct(){
 		$this->buffer = new \Threaded;
 		$this->start();

src/iTXTech/SimpleFramework/Console/Terminal.php

@@ -16,7 +16,6 @@
 
 namespace iTXTech\SimpleFramework\Console;
 
-use iTXTech\SimpleFramework\Util\StringUtil;
 use iTXTech\SimpleFramework\Util\Util;
 
 abstract class Terminal{
@@ -52,7 +51,7 @@ public static function hasFormattingCodes(){
 			if((Util::getOS() !== Util::OS_WINDOWS and getenv("TERM") != "" and
 					(!function_exists("posix_ttyname") or !defined("STDOUT")
 						or posix_ttyname(STDOUT) !== false)) or
-				(Util::getOS() === Util::OS_WINDOWS and StringUtil::contains(php_uname("v"), "Windows 10"))){
+				(Util::getOS() === Util::OS_WINDOWS and php_uname("r") >= 10)){
 				self::$formattingCodes = true;
 			}
 		}

src/iTXTech/SimpleFramework/Framework.php

@@ -182,10 +182,19 @@ private function processCommandLineOptions(array $argv){
 				exit(0);
 			}
 			if($cmd->hasOption("version")){
+				$built = date("r") . " (Source)";
+				if(($phar = \Phar::running(true)) !== ""){
+					$phar = new \Phar($phar);
+					$built = date("r", $phar->getMetadata()["creationDate"]) . " (Phar)";
+				}
+
 				Util::println(Framework::PROG_NAME . " " . Framework::PROG_VERSION .
-					" \"" . Framework::CODENAME . "\" [PHP " . PHP_VERSION . "]");
-				Util::println(Framework::PROG_NAME . " API " . Framework::API_LEVEL);
+					" \"" . Framework::CODENAME . "\" (API " . Framework::API_LEVEL . ")");
+				Util::println("Built: " . $built);
+				Util::println("Copyright (C) 2016-2018 iTX Technologies");
 				Util::println(str_repeat("-", 30));
+				Util::println("OS => " . PHP_OS_FAMILY . " " . php_uname("r"));
+				Util::println("PHP => " . PHP_VERSION);
 				foreach(["curl", "Phar", "pthreads", "yaml", "swoole"] as $ext){
 					Util::println(Util::generateExtensionInfo($ext));
 				}
@@ -272,8 +281,11 @@ public function start(bool $useMainThreadTick = true, array $argv = []){
 				self::PROG_VERSION . TextFormat::GREEN . " [" . self::CODENAME . "]");
 			Logger::info(TextFormat::GOLD . "Licensed under GNU General Public License v3.0");
 
-			$this->moduleManager = new ModuleManager($this->classLoader,
-				$this->properties->modulePath, $this->properties->moduleDataPath);
+			//TODO: preload plugins before initialize
+			if($this->moduleManager === null){
+				$this->moduleManager = new ModuleManager($this->classLoader,
+					$this->properties->modulePath, $this->properties->moduleDataPath);
+			}
 
 			if(!\iTXTech\SimpleFramework\SINGLE_THREAD){
 				Logger::info("Starting ConsoleReader...");