sct 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb3124f71d7225fc1c88fb1385b1de8c308b3cb9dcd3621c57d82c681b90ea10
-  data.tar.gz: bdc089394ec064af60751b213a57f491752bb3184e6eacdc11d8367ed65d7658
+  metadata.gz: c9a10c8fd025fd2f32f82840295ef14bd7da4604ab7f90e4d0f0f107b902ab0c
+  data.tar.gz: a719ae52d73c95fdff15652350046e75e6fe1bf99f3f893d85a577ed2f78efa5
 SHA512:
-  metadata.gz: a8a45d11bc4c50a627a913a8a38cd602eadd4520c2064a14801b9c31bc5e3943f6cb0c2cf2487bc8e191096b81a9797f12790a73267e46758fb6403ea5c1cec3
-  data.tar.gz: 696c6ae0977971f48f9460113b11aca055a6687f884adb70606eab9d2d6822bfb37c33c8cc45bd66e8bc216b601b750fa24d45babef9a0e0c638bd32f8e17f31
+  metadata.gz: 3777d0a28ceab88ebc43d3442068d55c5e95c6a2eaef141be7e71a81851e22e5feaf676c282e58fa662f65875fe9333a62b64211bee00a0b87b5b2e4c35aceb3
+  data.tar.gz: 04a36128ed9daf630791e025877800337a21efb0ddd9c374535878cc74c734c5fc502ff676ddeae57bc12888bccaeb7ae3777dcf4b2bf79db8c4e69af3109629

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    sct (0.1.15)
+    sct (0.1.16)
       class_interface (~> 0.1.1)
       colored (~> 1.2)
       commander (~> 4.4.7)
       highline (>= 1.7.2)
+      terminal-table (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
@@ -30,6 +31,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby

data/lib/sct/commands/cluster.rb

@@ -6,11 +6,11 @@ module Sct
     class ClusterCommand
 
         IS_PUBLIC_COMMAND = true
-        SYNTAX = 'sct cluster up | sct cluster down | sct cluster setup | sct cluster reset | sct cluster update-config | sct cluster delete-stalled-pods'
+        SYNTAX = 'sct cluster up | sct cluster down | sct cluster setup | sct cluster reset | sct cluster update-config | sct cluster delete-stalled-pods | sct cluster status'
         SUMMARY = 'Perform actions on the minikube cluster.'
-        EXAMPLE = 'sct cluster up | sct cluster down | sct cluster setup | sct cluster reset | sct cluster update-config | sct cluster delete-stalled-pods'
+        EXAMPLE = 'sct cluster up | sct cluster down | sct cluster setup | sct cluster reset | sct cluster update-config | sct cluster delete-stalled-pods | sct cluster status'
         EXAMPLE_DESCRIPTION = 'Perform actions on the minikube cluster.'
-        DESCRIPTION = "sct cluster allows you to start, stop, setup/reset, update the config, or delete the stalled pods of the Spend Cloud minikube cluster."
+        DESCRIPTION = "sct cluster allows you to start, stop, setup/reset, update the config, delete the stalled pods, or status of the Spend Cloud minikube cluster."
 
         OPTIONS = []
 
@@ -31,7 +31,7 @@ module Sct
                 when "status"
                     status
                 else
-                    puts "Unknown or missing argument. Please run 'sct cluster up', 'sct cluster down', 'sct cluster setup', 'sct cluster reset', 'sct cluster update-config', or 'sct cluster delete-stalled-pods'.".red
+                    puts "Unknown or missing argument. Please run 'sct cluster --help'.".red
             end
         end
 
@@ -155,58 +155,60 @@ module Sct
         end
 
         def status
-            minikube_status
-            pods_status
-            system_pods
-            current_contexts
-        end
+            print_contexts
+            print_minikube_status
 
-        def pods_status
-          rows = []
-          pods.map do |pod|
-            status = pod[:status] == "Running" ? pod[:status].green : pod[:status].red
-            rows << [pod[:name], status]
-          end
-          puts Terminal::Table.new :title => "Pods Status".green, :headings => ['Name', 'Status'], :rows => rows
-        end
-
-        def system_pods
-          rows = []
-          pods("kube-system").map do |pod|
-            status = pod[:status] == "Running" ? pod[:status].green : pod[:status].red
-            rows << [pod[:name], status]
-          end
-          puts Terminal::Table.new :title => "System pods Status".green, :headings => ['Name', 'Status'], :rows => rows
+            if get_minikube_status.find_all { |status| status[1] == 'Stopped' }.count == 0
+              print_pods_status("kube-system")
+              print_pods_status
+            else
+              puts "Please check your minikube status. If all services are stopped you should start the minikube first.".yellow
+            end
         end
 
-        def current_contexts
+        def print_contexts
           output = `kubectl config get-contexts`
 
           lines = output.split "\n"
           lines = lines[1..-1]
 
-          rows = []
-          lines.map do |line|
-              columns = line.split(" ")
+          rows = lines.map do |line|
+            columns = line.split(" ")
+
+            current_context = columns[0] == "*" ? "Yes".green : "No".red
 
-              current_context = columns[0] == "*" ? "Yes".green : "No".red
-              rows << [columns[2], current_context]
+            [columns[2], current_context]
           end
-          puts Terminal::Table.new :title => "Contexts".green, :headings => ['Cluster', 'Using context'], :rows => rows
+
+          puts Terminal::Table.new title: "Contexts".green, headings: ['Cluster', 'Using context'], rows: rows
+        end
+
+        def print_minikube_status
+
+          puts Terminal::Table.new title: "Minikube status".green, headings: ['Name', 'Status'], rows: get_minikube_status
         end
 
-        def minikube_status
+        def get_minikube_status
           output = `#{minikube} status`
 
           lines = output.split "\n"
 
-          rows = []
-          lines.map do |line|
+          rows = lines.map do |line|
               columns = line.split(" ")
 
-              rows << [columns[0], columns[1]]
+              [columns[0][0..-2], columns[1]]
           end
-          puts Terminal::Table.new :title => "Minikube Status".green, :headings => ['Name', 'Status'], :rows => rows
+        end
+
+        def print_pods_status(namespace = nil)
+          rows = pods(namespace).map do |pod|
+            [
+                pod[:name],
+                pod[:status] == "Running" ? pod[:status].green : pod[:status].red
+            ]
+          end
+
+          puts Terminal::Table.new title: "Pods (namespace: #{namespace || "default"})".green, headings: ['Name', 'Status'], rows: rows
         end
 
         def pods(namespace = nil)

data/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Reshad Farid
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.