podjumper 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20feea954a12a81227f2ef8bff7f62697a159525
-  data.tar.gz: 8cc529ef8186915511690c17c0b205ef95131bf3
+  metadata.gz: 305b1f24dc6713ce147f47eda09fe946a3123212
+  data.tar.gz: 5022d3ae52bb2c67c15b556ab5b2f34352da948f
 SHA512:
-  metadata.gz: 4934b0b9d82315c32bfd67594f6c84caf1eda555c21f097dff57d1432576aac241fa8795d7df6b6868cf4e7c6b779bbeda6724dfc939b1bba2fc8e76a359e13d
-  data.tar.gz: ae7355ddff207b2c07a2192ea29ac3c0d72d90aadfc2be9682906f6ba8dca9031644bbc70f8fdf6606e4f894e21bfeeed3c262efe113a7f9b581c0d38fee4778
+  metadata.gz: dd31a2ca2f2f15b30445eec0d1b97e546968a7822c1f7ffd4c26d09eb3cf307fdf0b30951aadb30c04d92ec125247dfcf9c498883ee8c9e146e6229422183631
+  data.tar.gz: 795b80482e478e318cece638dd6fa004ec9a1d683239b402ca7c2a71519f0936d38de7415a95c2377abf2368b7275450b16f97358dd79f822ae935ad7bb8998b

data/bin/podj

@@ -9,6 +9,12 @@ include GLI::App
 
 using Refinements
 
+def handle_interrupts
+  yield
+rescue Interrupt
+  return
+end
+
 version Podjumper::VERSION
 
 desc 'Navigate to a container by picking through namespaces and subdomains.'
@@ -53,7 +59,7 @@ desc 'Shorthand command runs given command on nearest pod with subdomain label'
 command [:exec] do |j|
   j.action do |_, _, args|
     subdomain = args[0]
-    command = args[1...args.length].join(' ')
+    command = args[1...args.length]
     info = JumpInfo.load_rails_from_subdomain(subdomain)
     Command.new(info).exec(command)
   end
@@ -64,7 +70,9 @@ command [:logs] do |l|
   l.action do |_, _, args|
     subdomain = args[0]
     info = JumpInfo.load_rails_from_subdomain(subdomain)
-    Command.new(info).logs
+    handle_interrupts do
+      Command.new(info).logs
+    end
   end
 end
 

data/lib/podjumper/command.rb

@@ -7,29 +7,47 @@ module Podjumper
     end
 
     def exec(command)
-      tty = TTY::Command.new
-      tty.run(exec_command(command))
+      IO.popen(exec_command + command, in: :in) do |io|
+        io.each_char(&method(:print))
+      end
     end
 
     def logs
       tty = TTY::Command.new(printer: :null)
-      tty.run(logs_command) do |out, _|
-        puts out if !ping?(out)
+      tty.run(*logs_command) do |out, _|
+        puts out unless ping?(out)
       end
     end
 
     private
 
-    def exec_command(command)
-      "kubectl exec -ti #{@pod} -c #{@container} --namespace #{@namespace} -- #{command}"
+    attr_reader :namespace, :pod, :container
+
+    def exec_command
+      [
+        'kubectl',
+        'exec',
+        '-ti', pod,
+        '-c', container,
+        '--namespace', namespace,
+        '--'
+      ]
     end
 
     def logs_command
-      "kubectl logs #{@pod} #{@container} --namespace #{@namespace} -f --since=1s"
+      [
+        'kubectl',
+        'logs',
+        pod,
+        container,
+        '--namespace', namespace,
+        '-f',
+        '--since=1s'
+      ]
     end
 
     def ping?(log_line)
-      return ping_matchers.any? { |regex| log_line =~ regex }
+      ping_matchers.any? { |regex| log_line =~ regex }
     end
 
     def ping_matchers

data/lib/podjumper/jump_info.rb

@@ -37,7 +37,7 @@ module Podjumper
     end
 
     def load_rails_from_subdomain(subdomain)
-      pod = Pod.find_by_subdomain(subdomain)
+      pod = Pod.where(subdomain: subdomain).first
       new(pod.namespace, pod, pod.container('rails'))
     end
 

data/lib/podjumper/pod.rb

@@ -68,16 +68,20 @@ module Podjumper
   end
 
   class << Pod
-    def where(namespace: nil, subdomain: nil)
-      namespace_flag = namespace ? "-n '#{namespace}'" : '--all-namespaces'
-      subdomain_flag = subdomain ? "-l 'subdomain=#{subdomain}'" : ''
-      json = JSON.parse(`kubectl get pods --output=json #{namespace_flag} #{subdomain_flag}`)
+    def where(**opts)
+      output = TTY::Command.new(printer: :null).run(*_get_pods(opts)).out
 
-      json['items'].map(&Pod.method(:new))
+      JSON.parse(output)
+          .fetch('items', [])
+          .map { |h| Pod.new(h) }
     end
 
-    def find_by_subdomain(subdomain)
-      new(JSON.parse(`kubectl get pods --output=json --all-namespaces --selector='subdomain=#{subdomain}'`)['items'].first)
+    def _get_pods(namespace: nil, subdomain: nil)
+      ns_flag = namespace ? "--namespace=#{namespace}" : '--all-namespaces'
+      sd_flag = subdomain ? "--selector=subdomain=#{subdomain}" : nil
+      %w[kubectl get pods --output=json]
+        .push(ns_flag, sd_flag)
+        .compact
     end
   end
 end

data/lib/podjumper/version.rb

@@ -1,3 +1,3 @@
 module Podjumper
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podjumper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - johndavidmartinez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler