Start working with progress bar

Author: piotrooo

lib/Psf/Helpers/ProgressBar.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * ProgressBar
+ *
+ * @author Piotr Olaszewski
+ */
+namespace Psf\Helpers;
+
+use Psf\Output\Writer;
+
+class ProgressBar
+{
+    /**
+     * @var Writer
+     */
+    private $_output;
+    private $_size = 0;
+    private $_current = 0;
+    private $_percent = 0;
+    private $_counterMask = '{current}/{all} ({percent}%)';
+
+    public function initialize(Writer $output, $size)
+    {
+        $this->_output = $output;
+        $this->_size = $size;
+    }
+
+    public function increment()
+    {
+        $this->_current++;
+        $this->_calculatePercent();
+        if ($this->_current == $this->_size) {
+            $this->_output->writeMessage($this->_fillMask());
+        } else {
+            $this->_output->writeMessage($this->_fillMask(), 1, Writer::CR);
+        }
+    }
+
+    private function _calculatePercent()
+    {
+        $this->_percent = round($this->_current * 100 / $this->_size);
+    }
+
+    private function _fillMask()
+    {
+        $matches = array(
+            '{current}' => $this->_current,
+            '{all}' => $this->_size,
+            '{percent}' => $this->_percent
+        );
+        return str_replace(array_keys($matches), array_values($matches), $this->_counterMask);
+    }
+}

lib/Psf/Output/Writer.php

@@ -15,6 +15,8 @@ class Writer
     const VERBOSITY_QUIET = 0;
     const VERBOSITY_NORMAL = 1;
     const VERBOSITY_VERBOSE = 2;
+    const LF = PHP_EOL;
+    const CR = "\r";
 
     private $_streamHandle;
     private $_formatters = array();
@@ -31,12 +33,12 @@ public function setFormatter($xmlTag, StyleFormatter $formatter)
         $this->_formatters[$xmlTag] = $formatter;
     }
 
-    public function writeMessage($message, $numberOfNewLines = 1)
+    public function writeMessage($message, $numberOfNewLines = 1, $eol = self::LF)
     {
         if ($this->_checkVerbosityCanNotWrite()) {
             return false;
         }
-        $messageWithNewLines = $message . str_repeat(PHP_EOL, $numberOfNewLines);
+        $messageWithNewLines = $message . str_repeat($eol, $numberOfNewLines);
         $parsedMessage = $this->_parseMessage($messageWithNewLines);
         fwrite($this->_streamHandle, $parsedMessage);
     }

psf.php

@@ -1,14 +1,25 @@
 #!/usr/bin/env php
 <?php
+error_reporting(E_ALL);
+$isComposer = true;
+
 use Psf\Dispatcher;
 use Psf\Loader;
 
-error_reporting(E_ALL);
 define('ROOT_PATH', realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR);
-define('APPLICATION_PATH', __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
 
-$psfConfig = require_once APPLICATION_PATH . 'psf.conf.php';
-require_once ROOT_PATH . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'Psf' . DIRECTORY_SEPARATOR . 'Loader.php';
+if ($isComposer) {
+    define('APPLICATION_PATH', __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+    /** @noinspection PhpIncludeInspection */
+    $psfConfig = require_once APPLICATION_PATH . 'psf.conf.php';
+} else {
+    define('APPLICATION_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+    /** @noinspection PhpIncludeInspection */
+    $psfConfig = require_once APPLICATION_PATH . 'config/psf.conf.php';
+}
+
+/** @noinspection PhpIncludeInspection */
+require_once ROOT_PATH . 'lib' . DIRECTORY_SEPARATOR . 'Psf' . DIRECTORY_SEPARATOR . 'Loader.php';
 
 $loader = new Loader();
 $loader