deis-interactive 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1650e0c2a5a4cedc3f0b96b5295ddbca67abded1
-  data.tar.gz: ab4b1fcc90cba3860fe71d21e7f21d0bd494aec4
+  metadata.gz: a5f83196b1200c69ff190f99918194896970ef25
+  data.tar.gz: c94a10bb6aec193ad8c570875910a37b67081044
 SHA512:
-  metadata.gz: 315d3534f8b14bad83b5fdbb3c80cbcefe0d431de7e135859e7817810ec5ff3975f1358ebd273495d862577d79bf0fec1eb55dd83f9741a302bfbc0630cf7d31
-  data.tar.gz: d30d620da15a99839d869dcb95ae58f5a1f3aa3423d84e1d87e8fe99a8f2279555f6d9ba6debf813e3388f92fdef122ba7a4f64df6cf71cdefee73a36b5fba01
+  metadata.gz: 1700bd2ce706c77a0d350950ffb3bbf7733cb6b45ce5054400a2ad841405b2bec8be19c1ce9ac55e19d645f811dbe4b96b961af5502443acf6fd4f6486071b3b
+  data.tar.gz: 4a93b6c21f8ebeb4011ac7210e0289e0dc57eef782b3e89799e611e7a75e912d7e59897887ba67e506286c8885337bf93ecdada21663a65f863c38aeb3eadfc3

data/bin/deis-rails

@@ -11,7 +11,7 @@ class DeisRails < Thor
     DeisInteractive::Rails::Console.new(app).perform
   end
 
-  desc "exec -a APP COMMAND PARAMS", "run console on an app"
+  desc "exec -a APP COMMAND PARAMS", "run any command on an app"
   method_option :app, aliases: ["a"], type: :string, required: true, desc: "Name of the app"
   def exec(command, *params)
     require_relative "../lib/deis-interactive/rails/exec"
@@ -21,7 +21,6 @@ class DeisRails < Thor
     DeisInteractive::Rails::Exec.new(app, command, params).perform
   end
 
-
   desc "logs [-f] -a APP [-d PROCESS]", "logs on an app"
   method_option :app, aliases: ["a"], type: :string, required: true, desc: "Name of the app"
   method_option :process, aliases: ["p"], type: :string, required: false, desc: "Processes to be logged on"

data/deis-interactive.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "thor"
+  spec.add_development_dependency "concurrent-ruby"
 end

data/lib/deis-interactive/rails/logs.rb

@@ -1,14 +1,26 @@
 require_relative 'base'
 require "shellwords"
+require 'concurrent'
+require 'open3'
 
 module DeisInteractive
   module Rails
     class Logs < Base
       attr_reader :follow
+      attr_reader :pids
+      attr_reader :outputs
 
       def initialize(app, process, follow: false)
         super(app, process)
         @follow = follow
+        @pids = Concurrent::Array.new
+        @outputs = Concurrent::Array.new
+
+        at_exit do
+          pids.each do |pid|
+            Process.kill("KILL", pid) if pid_alive?(pid)
+          end
+        end
       end
 
       def perform
@@ -21,6 +33,25 @@ module DeisInteractive
         log_pods
       end
 
+      def pid_alive?(pid)
+        begin
+          Process.getpgid( pid )
+          true
+        rescue Errno::ESRCH
+          false
+        end
+      end
+
+      def any_pid_alive?
+        20.times {
+          break if pids.count > 0
+          sleep 0.1
+        }
+
+        return false if pids.count == 0
+        pids.any? { |pid| pid_alive?(pid) }
+      end
+
       def kube_options
         if follow
           "-f"
@@ -31,11 +62,27 @@ module DeisInteractive
         pod_ids.each do |pod_id|
           log_pod(pod_id)
         end
+
+        loop do
+          while (outputs.count > 0)
+            puts outputs.shift
+          end
+          if any_pid_alive?
+            sleep 0.01
+          else
+            break
+          end
+        end
       end
 
       def log_pod(pod_id)
-        fork do
-          exec "kubectl logs #{kube_options} #{pod_id} --namespace #{app}"
+        Thread.new do
+          cmd = "kubectl logs #{kube_options} #{pod_id} --namespace #{app}"
+          Open3.popen2e(cmd) do |_, out_err, wait_thr|
+            puts "Tracking #{wait_thr.pid}"
+            pids << wait_thr.pid
+            out_err.each { |line| outputs << line }
+          end
         end
       end
     end

data/lib/deis-interactive/version.rb

@@ -1,3 +1,3 @@
 module DeisInteractive
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deis-interactive
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Phuong Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wrapper for kubectl to quickly launch console to a deis app
 email:
 - phuongnd08@gmail.com