Fixed composer.json and added translated messages on console command …

…line
vluzrmos · Jun 24, 2015 · 6ddf107 · 6ddf107
1 parent 22ce17f
commit 6ddf107
Show file tree

Hide file tree

Showing 9 changed files with 449 additions and 337 deletions.
diff --git a/app/Console/Commands/Command.php b/app/Console/Commands/Command.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command as IlluminateCommand;
+
+abstract class Command extends IlluminateCommand
+{
+
+
+    /**
+     * Prints an horizontal table
+     * @param array $rows
+     */
+    protected function horizontalTable(array $rows)
+    {
+        $rows = array_dot($rows);
+
+        $lines = [];
+
+        foreach($rows as $key => $value) {
+            $lines[] = $this->getTableLine($key, $value);
+        }
+
+        $linesMaxLength = $this->getStringsMaxLength($lines);
+
+        $this->writeTableLine($linesMaxLength);
+
+        foreach($lines as $line) {
+            $this->output->writeln($line);
+        }
+
+        $this->writeTableLine($linesMaxLength);
+    }
+
+    /**
+     *
+     * Get a string for a given row (header, content)
+     *
+     * @param string $header Title of the header
+     * @param string $content content of the header
+     *
+     * @return string
+     */
+    private function getTableLine($header, $content)
+    {
+        return sprintf("<info>%s:</info> %s", $header, $content);
+    }
+
+    /**
+     * Get max length of strings on a given array of headers
+     *
+     * @param array $strings
+     *
+     * @return int
+     */
+    private function getStringsMaxLength(array $strings)
+    {
+        $size = 0;
+
+        foreach($strings as $string) {
+            $size = max($size, strlen($string));
+        }
+
+        return $size;
+    }
+
+    /**
+     * Writes a line with a given separator
+     * @param int $length Length of the line
+     * @param string $separator Chacactere used for the line
+     */
+    private function writeTableLine($length, $separator = '-') {
+        $this->output->writeln(substr(str_repeat($separator, $length), 0, $length));
+    }
+}
diff --git a/app/Console/Commands/SlackStatusCommand.php b/app/Console/Commands/SlackStatusCommand.php
@@ -3,7 +3,6 @@
 namespace App\Console\Commands;
 
 use App\Services\SlackStatusService;
-use Illuminate\Console\Command;
 
 class SlackStatusCommand extends Command
 {
@@ -39,10 +38,24 @@ public function __construct(SlackStatusService $slack)
      */
     public function fire()
     {
-        $this->info('Checking for new status...');
+        $this->info(trans('slackin.updating_status'));
 
-        $this->slack->refreshUsersStatus();
+        $status = $this->slack->refreshUsersStatus();
 
-        $this->info('Done!');
+        $this->infoStatusUser($status);
+
+        $this->info(trans('slackin.command_done'));
+    }
+
+    /**
+     * Show info message about status of users
+     *
+     * @param array $status
+     */
+    public function infoStatusUser(array $status)
+    {
+        $message = strip_tags(trans_choice('slackin.users_online', $status['active'], $status));
+
+        $this->info($message);
     }
 }
diff --git a/app/Console/Commands/SlackTeamInfoCommand.php b/app/Console/Commands/SlackTeamInfoCommand.php
@@ -3,7 +3,6 @@
 namespace App\Console\Commands;
 
 use App\Services\SlackStatusService;
-use Illuminate\Console\Command;
 
 class SlackTeamInfoCommand extends Command
 {
@@ -39,10 +38,12 @@ public function __construct(SlackStatusService $slack)
      */
     public function fire()
     {
-        $this->info('Checking slack team info...');
+        $this->info(trans('slackin.updating_team_info'));
 
-        $this->slack->refreshTeamInfo();
+        $info = $this->slack->refreshTeamInfo();
 
-        $this->info('Done!');
+        $this->horizontalTable($info);
+
+        $this->info(trans('slackin.command_done'));
     }
 }
diff --git a/artisan b/artisan
@@ -17,6 +17,10 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
 $app = require __DIR__.'/bootstrap/app.php';
 
+if(class_exists('Vluzrmos\Tinker\TinkerServiceProvider')) {
+    $app->register('Vluzrmos\Tinker\TinkerServiceProvider');
+}
+
 /*
 |--------------------------------------------------------------------------
 | Run The Artisan Application

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -83,14 +83,12 @@
 
 $app->register('App\Providers\ValidationServiceProvider');
 
-$app->register('\App\Providers\TranslatorServiceProvider');
+$app->register('App\Providers\TranslatorServiceProvider');
 
 $app->register('Vluzrmos\SlackApi\SlackApiServiceProvider');
 
 $app->register('Vluzrmos\BadgePoser\BadgePoserServiceProvider');
 
-$app->register('Vluzrmos\Tinker\TinkerServiceProvider');
-
 /*
 |--------------------------------------------------------------------------
 | Load The Application Routes

diff --git a/composer.json b/composer.json
@@ -10,12 +10,11 @@
         "vluzrmos/badge-poser": "1.0.*",
         "predis/predis": "1.0.*",
         "illuminate/redis": "5.0.*",
-        "badges/poser": "1.1.*",
-        "vluzrmos/slack-api": "0.4.*",
-        "vluzrmos/tinker":"1.0.*"
+        "vluzrmos/slack-api": "0.4.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "~4.0",
+        "vluzrmos/tinker":"1.0.*"
     },
     "autoload": {
         "psr-4": {