deis-interactive 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eaaad20980391f761d494697ebc109d4cf74c31
-  data.tar.gz: ac52c7695114c4a7a48b2191308ed1e5ec3733ea
+  metadata.gz: 1650e0c2a5a4cedc3f0b96b5295ddbca67abded1
+  data.tar.gz: ab4b1fcc90cba3860fe71d21e7f21d0bd494aec4
 SHA512:
-  metadata.gz: b8c13d3f7ecef910ee63e29a79339a49cfe04905fdedb8c2834ff26fcca65f485c9fc44f054d7de4ae5bd4196ce684d41f861c7c64d581ab686b7a56b003b80a
-  data.tar.gz: 122becac77d7867bd9b231644b37e0be87a691874274fdf36faca1e1708c5a714336a54f79a4d35d04771faab97c91dfa1a33d3d48b803c5324b81eb2daa4de2
+  metadata.gz: 315d3534f8b14bad83b5fdbb3c80cbcefe0d431de7e135859e7817810ec5ff3975f1358ebd273495d862577d79bf0fec1eb55dd83f9741a302bfbc0630cf7d31
+  data.tar.gz: d30d620da15a99839d869dcb95ae58f5a1f3aa3423d84e1d87e8fe99a8f2279555f6d9ba6debf813e3388f92fdef122ba7a4f64df6cf71cdefee73a36b5fba01

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 vendor/
 .idea/
 binstubs/
+.byebug_history

data/README.md

@@ -27,6 +27,16 @@ Runing console for your Rails app:
 
     $ bundle exec deis-rails console -a MY-APP
 
+Logs for your Rails app:
+
+    $ bundle exec deis-rails logs -a MY-APP -p MY-PROCESS -f
+
+
+Execute a bash:
+
+    $ bundle exec deis-rails exec -a MY-APP bash ARGS
+
+
 ## Contributing
 
 1. Fork it

data/bin/deis-rails

@@ -1,49 +1,37 @@
 #!/usr/bin/env ruby
 
 require "thor"
-require "shellwords"
 
 class DeisRails < Thor
   desc "console -a APP", "run console on an app"
   method_option :app, aliases: ["a"], type: :string, required: true, desc: "Name of the app"
   def console
+    require_relative "../lib/deis-interactive/rails/console"
     app = options[:app]
-    DeisRailsConsole.new(app).run
-  end
-end
-
-class DeisRailsConsole
-  attr_reader :app
-
-  def initialize(app)
-    @app = app
+    DeisInteractive::Rails::Console.new(app).perform
   end
 
-  def run
-    puts "Run rails console attaching to #{container_id}"
-    exec "kubectl exec -it --namespace #{app} #{container_id} -- bash -c #{Shellwords.escape(bash)}"
-  end
-
-  def process
-    ENV['DEIS_CONSOLE_PROCESS'] || "web"
-  end
-
-  def container_id
-    @container_id ||= (
-      sample_container_id = container_ids.sample
-      if (sample_container_id.nil?)
-        raise "Error. None container of #{process} is found. kubectl won't be able to attach to run a console session"
-      end
-      sample_container_id.split("/").last
-    )
+  desc "exec -a APP COMMAND PARAMS", "run console 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"
+    app = options[:app]
+    require 'byebug'
+    debugger
+    DeisInteractive::Rails::Exec.new(app, command, params).perform
   end
 
-  def container_ids
-    `kubectl get pods --namespace #{app} -o name | grep #{app}-#{process}`.split("\n").reject(&:empty?)
-  end
 
-  def bash
-    ". /app/.profile.d/ruby.sh && PATH=/app/.heroku/node/bin:$PATH /app/bin/rails c"
+  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"
+  method_option :follow, aliases: ["f"], type: :boolean, required: false, desc: "Tail the log"
+  def logs
+    require_relative "../lib/deis-interactive/rails/logs"
+    app = options[:app]
+    process = options[:process]
+    follow = options[:follow]
+    DeisInteractive::Rails::Logs.new(app, process, follow: follow).perform
   end
 end
 

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

@@ -0,0 +1,29 @@
+module DeisInteractive
+  module Rails
+    class Base
+      attr_reader :app, :process
+
+      def initialize(app, process)
+        @app = app
+        @process = process
+      end
+
+      def processes_pattern
+        patterns = [app]
+        patterns << process if process
+        patterns.join("-")
+      end
+
+      def pod_ids
+        @pod_ids ||= (
+          puts "Fetching pod ids..."
+          output= `kubectl get pods --namespace #{app} -o name | grep #{processes_pattern}`
+          output.split("\n").reject(&:empty?).map do |str|
+            str.split("/").last
+          end
+        )
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,31 @@
+require_relative 'base'
+require "shellwords"
+
+module DeisInteractive
+  module Rails
+    class Console < Base
+      def initialize(app)
+        super(app, ENV['DEIS_CONSOLE_PROCESS'] || "web")
+      end
+
+      def perform
+        puts "Run rails console attaching to #{pod_id}"
+        exec "kubectl exec -it --namespace #{app} #{pod_id} -- bash -c #{Shellwords.escape(bash)}"
+      end
+
+      def pod_id
+        @pod_id ||= (
+          sample_pod_id = pod_ids.sample
+          if (sample_pod_id.nil?)
+            raise "Error. No pod of #{process} is found. kubectl won't be able to attach to run a console session"
+          end
+          sample_pod_id
+        )
+      end
+
+      def bash
+        ". /app/.profile.d/ruby.sh && PATH=/app/.heroku/node/bin:$PATH /app/bin/rails c"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+require_relative 'base'
+require "shellwords"
+
+module DeisInteractive
+  module Rails
+    class Exec < Base
+      attr_reader :cmd
+      attr_reader :params
+
+      def initialize(app, cmd, params)
+        super(app, ENV['DEIS_CONSOLE_PROCESS'] || "web")
+        @cmd = cmd
+        @params = params
+      end
+
+      def args
+        result = [cmd]
+        if params
+          result += params
+        end
+        result
+      end
+
+      def escaped_args
+        args.map do |arg|
+          Shellwords.escape(arg)
+        end.join(" ")
+      end
+
+      def perform
+        puts "Execute #{args} on #{pod_id}"
+        exec "kubectl exec -it --namespace #{app} #{pod_id} -- bash -c #{escaped_args}"
+      end
+
+      def pod_id
+        @pod_id ||= (
+          sample_pod_id = pod_ids.sample
+          if (sample_pod_id.nil?)
+            raise "Error. No pod of #{process} is found. kubectl won't be able to attach to run a console session"
+          end
+          sample_pod_id
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require_relative 'base'
+require "shellwords"
+
+module DeisInteractive
+  module Rails
+    class Logs < Base
+      attr_reader :follow
+
+      def initialize(app, process, follow: false)
+        super(app, process)
+        @follow = follow
+      end
+
+      def perform
+        if process.nil?
+          puts "Logging on all pods"
+        else
+          puts "Logging on pod of process #{process}"
+        end
+
+        log_pods
+      end
+
+      def kube_options
+        if follow
+          "-f"
+        end
+      end
+
+      def log_pods
+        pod_ids.each do |pod_id|
+          log_pod(pod_id)
+        end
+      end
+
+      def log_pod(pod_id)
+        fork do
+          exec "kubectl logs #{kube_options} #{pod_id} --namespace #{app}"
+        end
+      end
+    end
+  end
+end

data/lib/deis-interactive/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deis-interactive
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Phuong Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,10 @@ files:
 - README.md
 - bin/deis-rails
 - deis-interactive.gemspec
+- lib/deis-interactive/rails/base.rb
+- lib/deis-interactive/rails/console.rb
+- lib/deis-interactive/rails/exec.rb
+- lib/deis-interactive/rails/logs.rb
 - lib/deis-interactive/version.rb
 homepage: https://github.com/phuongnd08/deis-interactive
 licenses:
@@ -73,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.3
 signing_key: 
 specification_version: 4
 summary: Wrapper for kubectl to quickly launch console to a deis app