update command names

basemkhirat · Feb 24, 2017 · 4fa9125 · 4fa9125
1 parent 2540450
commit 4fa9125
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 28 deletions.
diff --git a/readme.md b/readme.md
@@ -181,54 +181,58 @@ These are all available commands:
 ##### List All indices on server.
 
 ```
-php artisan es:indices 
+php artisan es:indices:list
 
-+--------+--------+----------+------------------------+-----+-----+------------+--------------+------------+----------------+
-| health | status | index    | uuid                   | pri | rep | docs.count | docs.deleted | store.size | pri.store.size |
-+--------+--------+----------+------------------------+-----+-----+------------+--------------+------------+----------------+
-| green  | open   | my_index | 5URW60KJQNionAJgL6Q2TQ | 1   | 0   | 0          | 0            | 260b       | 260b           |
-+--------+--------+----------+------------------------+-----+-----+------------+--------------+------------+----------------+
++----------------------+--------+--------+----------+------------------------+-----+-----+------------+--------------+------------+----------------+
+| configured (es.php)  | health | status | index    | uuid                   | pri | rep | docs.count | docs.deleted | store.size | pri.store.size |
++----------------------+--------+--------+----------+------------------------+-----+-----+------------+--------------+------------+----------------+
+| yes                  | green  | open   | my_index | 5URW60KJQNionAJgL6Q2TQ | 1   | 0   | 0          | 0            | 260b       | 260b           |
++----------------------+--------+--------+----------+------------------------+-----+-----+------------+--------------+------------+----------------+
 
 ```
 
-##### Create a new index using defined settings and mapping in `es.php` config file.
+##### Create indices defined in `es.php` config file.
+
+Note that creating operation skips the index if exists.
 
 ```
 # Create all indices in config file.
 
-php artisan es:index:create
+php artisan es:indices:create
 
 # Create only 'my_index' index in config file
 
-php artisan es:index:create my_index 
+php artisan es:indices:create my_index 
 
 ```
 
-##### Update index using defined settings and mapping in `es.php` config file.
+##### Update indices defined in `es.php` config file.
+
+Note that updating operation recreates the index if exists.
 
 ```
 # Update all indices in config file.
 
-php artisan es:index:update
+php artisan es:indices:update
 
 # Update only 'my_index' index in config file
 
-php artisan es:index:update my_index 
+php artisan es:indices:update my_index 
 
 ```
 
 ##### Drop index.
 
-Running Drop command with `--force` option will skip all confirmation messages.
+Running drop command with `--force` option will skip all confirmation messages.
 
 ```
 # Drop all indices in config file.
 
-php artisan es:index:drop
+php artisan es:indices:drop
 
-# Drop specific index on sever. Not matter to be in config file.
+# Drop specific index on sever. Not matter to be exist in config file.
 
-php artisan es:index:drop my_index 
+php artisan es:indices:drop my_index 
 
 ```
 

diff --git a/src/Commands/CreateIndexCommand.php b/src/Commands/CreateIndexCommand.php
@@ -12,7 +12,7 @@ class CreateIndexCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'es:index:create {index?}{--connection= : Elasticsearch connection}';
+    protected $signature = 'es:indices:create {index?}{--connection= : Elasticsearch connection}';
 
     /**
      * The console command description.

diff --git a/src/Commands/DropIndexCommand.php b/src/Commands/DropIndexCommand.php
@@ -12,7 +12,7 @@ class DropIndexCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'es:index:drop {index?}
+    protected $signature = 'es:indices:drop {index?}
                             {--connection= : Elasticsearch connection}
                             {--force : Drop indices without any confirmation messages}';
 
@@ -47,11 +47,8 @@ public function handle()
                 continue;
             }
 
-
             if($force or $this->confirm("Are you sure to drop \"$index\" index")) {
 
-                // Create index with settings from config file
-
                 $this->info("Dropping index: {$index}");
 
                 $client->indices()->delete(['index' => $index]);

diff --git a/src/Commands/ListIndicesCommand.php b/src/Commands/ListIndicesCommand.php
@@ -13,7 +13,7 @@ class ListIndicesCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'es:indices {--connection= : Elasticsearch connection}';
+    protected $signature = 'es:indices:list {--connection= : Elasticsearch connection}';
 
     /**
      * The console command description.
@@ -26,7 +26,7 @@ class ListIndicesCommand extends Command
      * Indices headers
      * @var array
      */
-    protected $headers = ["health", "status", "index", "uuid", "pri", "rep", "docs.count", "docs.deleted", "store.size", "pri.store.size"];
+    protected $headers = ["configured (es.php)", "health", "status", "index", "uuid", "pri", "rep", "docs.count", "docs.deleted", "store.size", "pri.store.size"];
 
 
     /**
@@ -73,13 +73,17 @@ function getIndices($indices){
             foreach ($line_array as $item){
 
                 if(trim($item) != ""){
-
                     $row[] = $item;
-
                 }
 
             }
 
+            if(in_array($row[2], array_keys(config("es.indices")))){
+                $row = array_prepend($row, "yes");
+            }else{
+                $row = array_prepend($row, "no");
+            }
+
             $data[] = $row;
         }
 

diff --git a/src/Commands/UpdateIndexCommand.php b/src/Commands/UpdateIndexCommand.php
@@ -12,7 +12,7 @@ class UpdateIndexCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'es:index:update {index?}{--connection= : Elasticsearch connection}';
+    protected $signature = 'es:indices:update {index?}{--connection= : Elasticsearch connection}';
 
     /**
      * The console command description.
@@ -52,7 +52,7 @@ public function handle()
 
                 $this->warn("Index \"{$index}\" exists, dropping!");
 
-                $this->call("es:index:drop", [
+                $this->call("es:indices:drop", [
                     "index" => $index,
                     "--force" => true
                 ]);
@@ -61,7 +61,7 @@ public function handle()
 
             // Create index with settings from config file
 
-            $this->call("es:index:create", [
+            $this->call("es:indices:create", [
                 "index" => $index
             ]);