kbe 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b9932bb5cf99190078cc9246a55236b0cf41b58b1a904688d2b5e644098f460
-  data.tar.gz: ffb627ff3b746edd9368958d54e9eec3f99b6936667e1c9bb249cdf8f73c4656
+  metadata.gz: 6305d833ab3cf7f17e9e62a7a60c9cb767e19220f01cca2e2c24e5bd08a60cab
+  data.tar.gz: 21132300f9c022d1db52d8432aec27898ac4fd452bbd53a4b857b7abf78efd75
 SHA512:
-  metadata.gz: d68c0f1fcf977575f9c013ec91f72f736818b9bca4af6dd0b4f74b3744b6094c2fb5ed724436b32791c566b37553552a1f5c039a889d19d05b2630fa324bc047
-  data.tar.gz: c46a5629630f7341f45fba5d3cd1825304cbd3941ce882ddfaa729b700f1dde3178471757137272e007eabb3822f9d43541a51966d70f94647d65ab5bbcb6507
+  metadata.gz: c0b9ac3700f873bec682f6d2d4111837b9242c55cb96b9dd505673673aaf45b0cc1de111ff783e90cdc8623977891f3e4e216a07d7dbd53aec701cf1dd645d19
+  data.tar.gz: 8db51d7e138940dfe30e75ff11d681621bddc25c02af7956e67c5905b36f3311ede3bd710284803c18a60d0cc32f27e87853e5049be4173848abc117e8ad4b6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kbe (0.1.4)
+    kbe (0.2.0)
       clamp
       colorize (~> 0.8, >= 0.8.1)
 

data/lib/kbe.rb

@@ -12,27 +12,48 @@ module KBE
     exec cmd_string
   end
 
-  def self.pod_by(selector)
-    ["app", "job-name"].each do |selector_prefix|
-      magic_selector = if selector.match? "="
-        selector
-      else
-        "#{selector_prefix}=#{selector}"
-      end
+  def self.pod_by(name_or_selector, only_running: true)
+    pods = if name_or_selector.match? "="
+      get_pods selector: name_or_selector, only_running: only_running
+    else
+      get_pods name: name_or_selector, only_running: only_running
+    end
 
-      pods = `kubectl get pods --no-headers -o custom-columns=":metadata.name" --field-selector=status.phase=Running --selector=#{magic_selector}`.split("\n")
-      return pods.first if pods.size == 1
+    if pods.empty?
+      ["app", "job-name"].each do |selector_prefix|
+        magic_selector = "#{selector_prefix}=#{name_or_selector}"
 
-      break if magic_selector == selector
-      next if pods.empty?
+        pods = get_pods selector: magic_selector, only_running: only_running
+        break if pods.any?
+      end
+    end
 
-      STDERR.puts "too many pods"
-      exit 1
+    if pods.size == 1
+      return pods.first
+    elsif pods.size > 1
+      STDERR.puts "too many pods found:"
+      STDERR.p pods
+    else
+      STDERR.puts "no pods found."
     end
 
-    STDERR.puts "no pod found"
     exit 1
   end
+
+  def self.get_pods(selector:nil, name:nil, only_running: true)
+    parts = []
+    parts << "kubectl get pods --no-headers -o custom-columns=':metadata.name'"
+    if selector
+      parts << "--field-selector=status.phase=Running" if only_running
+      parts << "--selector=#{selector}"
+    else
+      parts << name
+    end
+
+    cmd = parts.join " "
+    # dev/null supresses the "pod not found" by name
+    `#{cmd} 2>/dev/null`.split("\n")
+  end
 end
 
 require_relative 'kbe/version'

data/lib/kbe/cli/delete_command.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require "json"
+
+module KBE
+  module CLI
+    class DeleteCommand < Clamp::Command
+      option ['-h', '--help'], :flag, "help" do
+        puts "kbe delete selector"
+        exit 0
+      end
+
+      parameter "SELECTOR_OR_POD", "selector or pod name"
+
+      def execute
+        pod = KBE.pod_by(selector_or_pod, only_running: false)
+        KBE.kubectl "delete pod #{pod}"
+      end
+    end
+  end
+end
+

data/lib/kbe/cli/enter_command.rb

@@ -13,12 +13,12 @@ module KBE
 
       option ['-c', '--container'], 'CONTAINER', 'container', default: :first
 
-      parameter "SELECTOR", "k8s selector, like app=nginx"
+      parameter "SELECTOR_OR_POD", "selector or pod name"
       parameter "[CMD] ...", "cmd"
 
       def execute
         cmd_list = ["sh"] unless cmd_list
-        pod = KBE.pod_by selector
+        pod = KBE.pod_by selector_or_pod
 
         args = []
         args << "exec -it #{pod}"

data/lib/kbe/cli/list_command.rb

@@ -10,10 +10,11 @@ module KBE
         exit 0
       end
 
-      parameter "[POD]", "pod"
+      parameter "[POD]", "list containers from pod", attribute_name: :selector
 
       def execute
-        if pod
+        if selector
+          pod = KBE.pod_by(selector, only_running: false)
           json = JSON.parse(`kubectl get pod #{pod} -o json`)
           for container in json["spec"]["containers"]
             puts container["name"]
@@ -21,6 +22,7 @@ module KBE
         else
           KBE.kubectl ["get pod"]
         end
+      rescue JSON::ParserError
       end
     end
   end

data/lib/kbe/cli/root_command.rb

@@ -3,6 +3,7 @@ require_relative "version_command"
 require_relative "help_command"
 require_relative "enter_command"
 require_relative "list_command"
+require_relative "delete_command"
 
 module KBE
   module CLI
@@ -15,6 +16,8 @@ module KBE
       end
       subcommand ["list"], "List pods", ListCommand
       subcommand ["enter"], "Enter a container", EnterCommand
+      subcommand ["delete"], "Delete a pod", DeleteCommand
+
       subcommand ["version"], "Show version information", VersionCommand
       subcommand ["help"], "Show help", HelpCommand
 

data/lib/kbe/version.rb

@@ -1,3 +1,3 @@
 module KBE
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kbe
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Matti Paksula
@@ -110,6 +110,7 @@ files:
 - kbe.gemspec
 - lib/kbe.rb
 - lib/kbe/cli.rb
+- lib/kbe/cli/delete_command.rb
 - lib/kbe/cli/enter_command.rb
 - lib/kbe/cli/help_command.rb
 - lib/kbe/cli/list_command.rb