kuberun 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da5d548aede020fab4769a2a45582b3f414ce86245b3d50dc970703ca6ab4f24
-  data.tar.gz: 5f772f24c91a560370e6acd080da010a2bfc4c2212d5373378f2d1b9fc94dfde
+  metadata.gz: fca4d9708c1d5a9a9afa70d9983940d31f8dfebb6900c5f570c4add622dac72f
+  data.tar.gz: 836812210b8df17491153f82c7d3feba0ac2b6067fe2bea92bb8a8af83380f6a
 SHA512:
-  metadata.gz: a22538c40dbf5188836b1814f3a214e3ce3eb6e83ba75e999f35e91d4cc036e5892c2629bb92dfc8a2839e87fb44948a333a440db0f5cbefab4d9ab8ff1eaae5
-  data.tar.gz: 41cc9a3d8ad0f05208cfc841f7ddb07130e6e30d2c525945489c6246b3e79d7bbcf8d0bf6c6a613ec4a947405144bea7cc9ce9bf00fb6bcf4b4c8e20184511f9
+  metadata.gz: f77eda69cc9423990517a5810ec17a6fa7465e12a31d40a049c06a6c196273b3673df6ca87c715c5dae3dc5187ce8608e55084f319a0036ed149b2b95330780d
+  data.tar.gz: 2e553ff1da4812949e6ab878b5925a36aa34436784f4208194dec0279692e09ac333c8f1b4d0b726d80dbf3355d2692ed27f48e6c1b5af5a8a7e932ad1d4e21a

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.4.0
   - 2.5.1
 before_install: gem install bundler -N

data/Gemfile.lock

@@ -26,14 +26,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
     diff-lcs (1.3)
     equatable (0.5.0)
     hitimes (1.3.0)
     jaro_winkler (1.5.1)
     kramdown (1.16.2)
-    method_source (0.9.0)
     necromancer (0.4.0)
     parallel (1.12.1)
     parser (2.5.1.2)
@@ -42,12 +39,6 @@ GEM
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
     powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
     rainbow (3.0.0)
     rake (10.5.0)
     rouge (3.1.1)
@@ -139,8 +130,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   kuberun!
-  pry
-  pry-byebug
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.58.0)

data/README.md

@@ -6,13 +6,17 @@ This CLI tool aims to create completely separate pod for those commands without
 
 Uses `kubectl` inside.
 
+## Status
+
+This tool is in early alpha stage.
+
 ## Installation
 
 Dependencies:
 * Ruby >= 2.4
 * kubectl in `$PATH`
 
-Add this line to your application's Gemfile:
+Add this line to your application's Gemfile (preferably in `development` group):
 
 ```ruby
 gem 'kuberun'
@@ -28,7 +32,9 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```
+kuberun help
+```
 
 ## Development
 

data/lib/kuberun/cli.rb

@@ -8,7 +8,7 @@ module Kuberun
   #
   # @api public
   class CLI < Thor
-    DEFAULT_OPTIONS_FOR_KUBECTL_OPTIONS = { type: :string, default: '', desc: 'See kubectl options' }
+    DEFAULT_OPTIONS_FOR_KUBECTL_OPTIONS = { type: :string, default: '', desc: 'See kubectl options' }.freeze
     BASE_KUBECTL_OPTIONS = {
       'certificate-authority': {},
       'client-certificate': {},
@@ -19,11 +19,12 @@ module Kuberun
       'kubeconfig': {},
       'namespace': { aliases: :'-n' },
       'token': {},
-      'v': { type: :numeric, default: 0, desc: 'Log level, also passed to kubectl' },
-    }
+      'v': { type: :numeric, default: 0, desc: 'Log level passed to kubectl' }
+    }.freeze
     BASE_KUBECTL_OPTIONS.each do |option_name, hash|
       class_option option_name, DEFAULT_OPTIONS_FOR_KUBECTL_OPTIONS.merge(hash)
     end
+    class_option :debug, type: :boolean, default: false, desc: 'Debug logging'
 
     # Error raised by this runner
     Error = Class.new(StandardError)

data/lib/kuberun/commands/run_pod.rb

@@ -38,8 +38,9 @@ module Kuberun
 
         execute_command(input, output)
 
-        unless prompt.no?('Should I delete pod?')
+        unless prompt.no?(Kuberun::Pastel.yellow('Should I delete pod?'))
           Kuberun::Kubectl.delete(resource: 'pod', resource_name: generated_pod_name)
+          Kuberun::Pastel.green("Pod #{generated_pod_name} has been deleted!")
         end
 
         output.puts(Kuberun::Pastel.green('Done!'))

data/lib/kuberun/kubectl/exec.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+class Kubectl
+  ##
+  # Handles running kubectl exec
+  class Exec
+    extend Forwardable
+
+    def_delegators :@kubectl, :kubectl_base_command
+
+    def initialize(kubectl)
+      @kubectl = kubectl
+    end
+
+    def exec(pod:, command:)
+      old_state = `stty -g`
+
+      PTY.spawn("#{kubectl_base_command('exec', resource: pod)} #{command}") do |out, inp, pid|
+        pty_process(out, inp, pid, old_state)
+      end
+    end
+
+    private
+
+    attr_reader :stdin_thread, :stdout_thread
+
+    def prepare_stdin_thread(inp)
+      @stdin_thread = Thread.new do
+        until inp.closed?
+          input = $stdin.getch
+          inp.write(input)
+          inp.flush
+        end
+      end
+    end
+
+    def prepare_stdout_thread(out)
+      @stdout_thread = Thread.new do
+        until out.eof?
+          $stdout.print(out.readchar)
+          $stdout.flush
+        end
+      rescue Errno::EIO, EOFError
+        nil
+      end
+    end
+
+    def pty_process(out, inp, pid, old_state)
+      prepare_stdin_thread(inp)
+      prepare_stdout_thread(out)
+
+      stdin_thread.run
+
+      wait_for_process(pid)
+
+      stdout_thread.join
+      stdin_thread.kill
+
+      sleep 0.1
+    ensure
+      cleanup_pty(old_state)
+    end
+
+    def wait_for_process(pid)
+      Process.waitpid(pid)
+    rescue StandardError
+      nil # "rescue nil" is there in case process already ended.
+    end
+
+    def cleanup_pty(old_stty_state)
+      stdout_thread&.kill
+      stdin_thread&.kill
+      $stdout.puts
+      $stdout.flush
+
+      system("stty #{old_stty_state}")
+    end
+  end
+end

data/lib/kuberun/kubectl.rb

@@ -2,12 +2,16 @@
 
 require 'open3'
 require 'pty'
+require 'kuberun/kubectl/exec'
 
+##
+# Handles running kubectl
 class Kubectl
   CAT_MULTILINE = 'EOFCONFIG'
   KUBECTL_OPTIONS = Kuberun::CLI::BASE_KUBECTL_OPTIONS.keys.map(&:to_s)
 
   def load_options(options)
+    self.options = options
     self.kubectl_options = parsed_options(options)
   end
 
@@ -27,63 +31,28 @@ class Kubectl
   end
 
   def exec(pod:, command:)
-    old_state = `stty -g`
-
-    PTY.spawn("#{kubectl_base_command('exec', resource: pod)} #{command}") do |o, i, pid|
-      t_in = Thread.new do
-        until i.closed? do
-          input = $stdin.getch
-          i.write(input)
-          i.flush
-        end
-      end
-
-      t_out = Thread.new do
-        begin
-          until o.eof? do
-            $stdout.print(o.readchar)
-            $stdout.flush
-          end
-        rescue Errno::EIO, EOFError
-          nil
-        end
-      end
-
-      t_in.run
-
-      Process::waitpid(pid) rescue nil
-      # "rescue nil" is there in case process already ended.
-
-      t_out.join
-      t_in.kill
-      sleep 0.1
-    ensure
-      t_out&.kill
-      t_in&.kill
-      $stdout.puts
-      $stdout.flush
-      system "stty #{ old_state }"
-    end
+    Kubectl::Exec.new(self).exec(pod: pod, command: command)
   end
 
   def delete(resource:, resource_name:)
     cmd.run(kubectl_base_command('delete', resource: resource, resource_name: resource_name))
   end
 
+  def kubectl_base_command(verb, resource:, resource_name: nil, options: nil)
+    base = "#{kubectl} #{options} #{verb} #{resource}"
+    base = "#{base}/#{resource_name}" if resource_name
+    base
+  end
+
   private
 
-  attr_accessor :kubectl_options
+  attr_accessor :kubectl_options, :options
 
   def cmd(tty_options = {})
+    tty_options[:printer] = :progress unless options['debug']
     TTY::Command.new(tty_options)
   end
 
-  def kubectl_base_command(verb, resource:, resource_name: nil, options: nil)
-    base = "#{kubectl} #{options} #{verb} #{resource}"
-    base = "#{base}/#{resource_name}" if resource_name
-    base
-  end
-
   def kubectl_base_input_command(verb, configuration:, options:)
     "cat << '#{CAT_MULTILINE}' | #{kubectl} #{options} #{verb} -f - 2>&1\n#{configuration.to_json}\n#{CAT_MULTILINE}"
   end
@@ -101,6 +70,6 @@ class Kubectl
   end
 
   def parsed_json
-    JSON.load(yield)
+    JSON.parse(yield)
   end
 end

data/lib/kuberun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kuberun
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuberun
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kruczjak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -363,6 +363,7 @@ files:
 - lib/kuberun/commands/.gitkeep
 - lib/kuberun/commands/run_pod.rb
 - lib/kuberun/kubectl.rb
+- lib/kuberun/kubectl/exec.rb
 - lib/kuberun/templates/.gitkeep
 - lib/kuberun/templates/run_pod/.gitkeep
 - lib/kuberun/version.rb