Add option for disabling shorten Closes dg#110

readme.md

@@ -31,6 +31,10 @@ And what does the `deployment.ini` file contain? **Only the `remote` item is req
 ; log file (defaults to config file with .log extension)
 log = ...
 
+; Show full log in command line (Defaults to no)
+; Yes to disable shortening or list any of: http, local, remote, upload, exception
+fullCliLog = http exception
+
 ; directory for temporary files (defaults to system's temporary directory)
 tempDir = /temp/deployment
 

src/Deployment/CliRunner.php

@@ -62,6 +62,7 @@ public function run(): ?int
  $this->logger = new Logger($config['log']);
  $this->logger->useColors = (bool) $config['colors'];
  $this->logger->showProgress = (bool) $config['progress'];
+ $this->logger->fullCliLog = $config['fullclilog'];
 
  if (!is_dir($tempDir = $config['tempdir'])) {
  $this->logger->log("Creating temporary directory $tempDir");
@@ -185,7 +186,7 @@ private function setupPhp(): void
  });
 
  set_exception_handler(function ($e) {
- $this->logger->log("Error: {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}\n\n$e", 'red');
+ $this->logger->log("Error: {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}\n\n$e", 'red', $this->logger->shortenFor("exception"));
  exit(1);
  });
  }
@@ -249,12 +250,18 @@ private function loadConfig(): ?array
 
  $config = array_change_key_case($config, CASE_LOWER) + [
  'log' => preg_replace('#\.\w+$#', '.log', $this->configFile),
+ 'fullclilog' => [],
  'tempdir' => sys_get_temp_dir() . '/deployment',
  'progress' => true,
  'colors' => (PHP_SAPI === 'cli' && ((function_exists('posix_isatty') && posix_isatty(STDOUT))
  || getenv('ConEmuANSI') === 'ON' || getenv('ANSICON') !== false)),
  ];
  $config['progress'] = $options['--no-progress'] ? false : $config['progress'];
+ if (is_string($config['fullclilog'])) {
+ $config['fullclilog'] = $config['fullclilog'] === "1"
+ ? [ "*" ]
+ : preg_split("/[\s,]+/", $config['fullclilog']);
+ }
  return $config;
  }
 

src/Deployment/Deployer.php

@@ -406,7 +406,7 @@ private function runJobs(array $jobs): void
  }
 
  if ($out != null) { // intentionally ==
- $this->logger->log("-> $out", 'gray');
+ $this->logger->log("-> $out", 'gray', $this->logger->shortenFor($m[1]));
  }
  if ($err) {
  throw new \RuntimeException('Job failed, ' . $err);

src/Deployment/Logger.php

@@ -25,6 +25,9 @@ class Logger
  /** @var resource */
  private $file;
 
+ /** @var array */
+ public $fullCliLog = [];
+
  /** @var array */
  private $colors = [
  'black' => '0;30',
@@ -52,11 +55,11 @@ public function __construct(string $file)
  }
 
 
- public function log(string $s, string $color = null, bool $shorten = true): void
+ public function log(string $s, string $color = null, bool $shorten = null): void
  {
  fwrite($this->file, $s . "\n");
 
- if ($shorten && preg_match('#^\n?.*#', $s, $m)) {
+ if (($shorten ?? $this->shortenFor("*")) && preg_match('#^\n?.*#', $s, $m)) {
  $s = $m[0];
  }
  $s .= " \n";
@@ -78,4 +81,25 @@ public function progress(string $message): void
  echo $message, "\x0D";
  }
  }
+
+ /**
+ * Check if given action should be shortened
+ *
+ * @param string $action
+ * @return bool
+ */
+ public function shortenFor(string $action)
+ {
+ $aliases = [
+ "https" => "http"
+ ];
+ if (in_array("*", $this->fullCliLog)) {
+ return false;
+ }
+ if (isset($aliases[$action])) {
+ $action = $aliases[$action];
+ }
+ // If action is present in list, return false to disable shortening
+ return in_array($action, $this->fullCliLog) ? false : true;
+ }
 }