cli: CLI Refactor

* Adopt the client package changes * Simplify the command handling * Used macro for routing the CLI command. Signed-off-by: Aravinda Vishwanathapura <[email protected]>
kadalu · Dec 27, 2020 · befbcff · befbcff
1 parent 6eb1292
commit befbcff
Show file tree

Hide file tree

Showing 8 changed files with 770 additions and 637 deletions.
diff --git a/cli/README.md b/cli/README.md
@@ -10,8 +10,8 @@ $ sudo apt-get install build-essential crystal
 Clone the repo
 
 ```
-$ git clone https://github.com/kadalu/moana.cr.git
-$ cd moana.cr
+$ git clone https://github.com/kadalu/moana.git
+$ cd moana
 ```
 
 Install the dependencies
@@ -30,7 +30,7 @@ $ shards build
 Export the Moana URL and use the CLI from `bin/moana`
 
 ```
-$ export MOANA_URL=http://localhost:3000
+$ export MOANA_URL=http://localhost:4000
 $ export PATH=$PATH:$(pwd)/bin
 $ moana cluster list
 ```
diff --git a/cli/shard.lock b/cli/shard.lock
@@ -1,5 +1,9 @@
 version: 2.0
 shards:
+  db:
+    git: https://github.com/crystal-lang/crystal-db.git
+    version: 0.10.0
+
   moana_client:
     path: ../client
     version: 0.1.0

diff --git a/cli/src/clusters.cr b/cli/src/clusters.cr
@@ -6,88 +6,155 @@ require "./helpers"
 require "moana_client"
 require "moana_types"
 
-include MoanaTypes
 
-def show_clusters(gflags, args)
-  cluster_data = save_and_get_clusters_list(gflags.moana_url)
-  default_cluster_id = default_cluster()
-  if cluster_data
-    printf(" %-36s  %-s\n", "ID", "Name")
+struct ClusterCreateCommand < Command
+  def pos_args(args : Array(String))
+    @args.cluster.name = cluster_name_from_pos_args(args)
   end
-  cluster_data.each do |cluster|
-    if args.name == "" || cluster.id == args.name || cluster.name == args.name
-      pfx = " "
-      pfx = "*" if cluster.id == default_cluster_id
-      printf("%s%-36s  %-s\n", pfx, cluster.id, cluster.name)
+
+  def handle
+    client = MoanaClient::Client.new(@gflags.moana_url)
+    begin
+      cluster = client.cluster_create(@args.cluster.name)
+      save_and_get_clusters_list(@gflags.moana_url)
+      default_cluster_id = default_cluster()
+      puts "Cluster created successfully."
+      puts "ID: #{cluster.id}"
+      if default_cluster_id == ""
+        save_default_cluster(cluster.id)
+        puts "\nSaved as default Cluster"
+      end
+    rescue ex : MoanaClient::MoanaClientException
+      STDERR.puts ex.status_code
     end
   end
 end
 
-def save_default_cluster(cluster_id)
-  filename = Path.home.join(".moana", "default_cluster")
-  File.write(filename, cluster_id)
-end
+struct ClusterUpdateCommand < Command
+  def pos_args(args : Array(String))
+    @args.cluster.newname = cluster_name_from_pos_args(args)
+
+    super
+  end
+
+  def handle
+    cluster_id = cluster_id_from_name(@args.cluster.name)
+    client = MoanaClient::Client.new(@gflags.moana_url)
+    cluster = client.cluster(cluster_id)
 
-def set_default_cluster(gflags, args)
-  cluster_id = cluster_id_from_name(args.name)
-  save_default_cluster(cluster_id)
-  puts "Default cluster set successfully.\n"
-  puts "Note: The default cluster details is stored locally in this node"
+    begin
+      cluster.update(@args.cluster.newname)
+      save_and_get_clusters_list(@gflags.moana_url)
+      puts "Cluster updated successfully"
+    rescue ex : MoanaClient::MoanaClientException
+      STDERR.puts ex.status_code
+    end
+  end
 end
 
-def create_cluster(gflags, args)
-  client = MoanaClient::Client.new(gflags.moana_url)
-  begin
-    cluster = client.cluster_create(args.name)
-    save_and_get_clusters_list(gflags.moana_url)
+struct ClusterListCommand < Command
+  # Override the default behaviour by defining empty function
+  def pos_args(args : Array(String))
+  end
+
+  def handle
+    cluster_data = save_and_get_clusters_list(@gflags.moana_url)
     default_cluster_id = default_cluster()
-    puts "Cluster created successfully."
-    puts "ID: #{cluster.id}"
-    if default_cluster_id == ""
-      save_default_cluster(cluster.id)
-      puts "\nSaved as default Cluster"
+    if cluster_data
+      printf(" %-36s  %-s\n", "ID", "Name")
+    end
+    cluster_data.each do |cluster|
+      if @args.cluster.name == "" || cluster.id == @args.cluster.name || cluster.name == @args.cluster.name
+        pfx = " "
+        pfx = "*" if cluster.id == default_cluster_id
+        printf("%s%-36s  %-s\n", pfx, cluster.id, cluster.name)
+      end
     end
-  rescue ex : MoanaClient::MoanaClientException
-    STDERR.puts ex.status_code
   end
 end
 
-def update_cluster(gflags, args)
-  cluster_id = cluster_id_from_name(args.name)
-  client = MoanaClient::Client.new(gflags.moana_url)
-  cluster = client.cluster(cluster_id)
-
-  begin
-    cluster.update(args.newname)
-    save_and_get_clusters_list(gflags.moana_url)
-    puts "Cluster updated successfully"
-  rescue ex : MoanaClient::MoanaClientException
-    STDERR.puts ex.status_code
+struct ClusterDeleteCommand < Command
+  def pos_args(args : Array(String))
+    @args.cluster.name = cluster_name_from_pos_args(args)
   end
-end
 
-def delete_cluster(gflags, args)
-  cluster_id = cluster_id_from_name(args.name)
-  client = MoanaClient::Client.new(gflags.moana_url)
-  cluster = client.cluster(cluster_id)
+
+  def handle
+    cluster_id = cluster_id_from_name(@args.cluster.name)
+    client = MoanaClient::Client.new(@gflags.moana_url)
+    cluster = client.cluster(cluster_id)
 
-  begin
-    cluster.delete
-    default_cluster_id = default_cluster()
-    save_and_get_clusters_list(gflags.moana_url)
-    # If the Cluster deleted is the default Cluster then
-    # reset default cluster.
-    if default_cluster_id == cluster_id
-      save_default_cluster("")
+    begin
+      cluster.delete
+      default_cluster_id = default_cluster()
+      save_and_get_clusters_list(@gflags.moana_url)
+      # If the Cluster deleted is the default Cluster then
+      # reset default cluster.
+      if default_cluster_id == cluster_id
+        save_default_cluster("")
+      end
+      puts "Cluster deleted successfully"
+    rescue ex : MoanaClient::MoanaClientException
+      if ex.status_code == 404
+        STDERR.puts "Invalid Cluster name"
+        exit
+      else
+        STDERR.puts ex.status_code
+        exit
+      end
     end
-    puts "Cluster deleted successfully"
-  rescue ex : MoanaClient::MoanaClientException
-    if ex.status_code == 404
-      STDERR.puts "Invalid Cluster name"
-      exit
-    else
-      STDERR.puts ex.status_code
-      exit
+  end
+end
+
+struct ClusterSetDefaultCommand < Command
+  def pos_args(args : Array(String))
+    @args.cluster.name = cluster_name_from_pos_args(args)
+  end
+
+  def handle
+    cluster_id = cluster_id_from_name(@args.cluster.name)
+    save_default_cluster(cluster_id)
+    puts "Default cluster set successfully.\n"
+    puts "Note: The default cluster details is stored locally in this node"
+  end
+
+end
+
+class MoanaCommands
+  def cluster_commands(parser)
+    parser.on("cluster", "Manage Moana Clusters") do
+      parser.banner = "Usage: moana cluster <subcommand> [arguments]"
+      parser.on("list", "List Moana Clusters") do
+        @command_type = CommandType::ClusterList
+        parser.banner = "Usage: moana cluster list [arguments]"
+        parser.on("-c NAME", "--cluster=NAME", "Cluster name") { |name| @args.cluster.name = name }
+      end
+
+      parser.on("default", "Set default Cluster") do
+        @command_type = CommandType::ClusterSetDefault
+        parser.banner = "Usage: moana cluster default NAME"
+      end
+
+      parser.on("create", "Create Moana Cluster") do
+        @command_type = CommandType::ClusterCreate
+        parser.banner = "Usage: moana cluster create NAME [arguments]"
+      end
+
+      parser.on("delete", "Delete Moana Cluster") do
+        @command_type = CommandType::ClusterDelete
+        parser.banner = "Usage: moana cluster delete NAME [arguments]"
+      end
+
+      parser.on("update", "Update Moana Cluster") do
+        @command_type = CommandType::ClusterUpdate
+        parser.banner = "Usage: moana cluster update NEWNAME [arguments]"
+        parser.on("-c NAME", "Cluster name") { |name| @args.cluster.name = name }
+      end
     end
   end
 end
+
+def save_default_cluster(cluster_id)
+  filename = Path.home.join(".moana", "default_cluster")
+  File.write(filename, cluster_id)
+end