kontena-cli 1.3.0.pre1 → 1.3.0.pre2

data/lib/kontena/cli/etcd/list_command.rb

@@ -6,18 +6,23 @@ module Kontena::Cli::Etcd
     include Kontena::Cli::GridOptions
     include Common
 
-    parameter "KEY", "Etcd key"
+    parameter "[KEY]", "Etcd key", default: '/'
 
-    option "--recursive", :flag, "List keys recursively", default: false
+    option ['-r', '--recursive'], :flag, "List keys recursively", default: false
+
+    # the command outputs id info only anyway, this is here strictly for ignoring purposes
+    option ['-q', '--quiet'], :flag, "Output the identifying column only", hidden: true
+
+    requires_current_master
+    requires_current_master_token
 
     def execute
-      require_api_url
-      token = require_token
       validate_key
 
-      opts = []
-      opts << 'recursive=true' if recursive?
-      response = client(token).get("etcd/#{current_grid}/#{key}?#{opts.join('&')}")
+      response = spin_if(!quiet?, "Retrieving keys from etcd") do
+        client.get("etcd/#{current_grid}/#{key}#{'?recursive=true' if recursive?}")
+      end
+
       if response['children']
         children = response['children'].map{|c| c['key'] }
         puts children.join("\n")

data/lib/kontena/cli/external_registries/list_command.rb

@@ -2,16 +2,22 @@ module Kontena::Cli::ExternalRegistries
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::TableGenerator::Helper
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    def fields
+      quiet? ? %(name) : %w(name username email)
+    end
+
+    def external_registries
+      client.get("grids/#{current_grid}/external_registries")['external_registries']
+    end
 
     def execute
-      require_api_url
-      require_current_grid
-      token = require_token
-      result = client(token).get("grids/#{current_grid}/external_registries")
-      puts "%-30s %-20s %-30s" % ['Name', 'Username', 'Email']
-      result['external_registries'].each { |r|
-        puts "%-30.30s %-20.20s %-30.30s" % [r['name'], r['username'], r['email']]
-      }
+      print_table(external_registries)
     end
   end
 end

data/lib/kontena/cli/grids/list_command.rb

@@ -3,14 +3,25 @@ require_relative 'common'
 module Kontena::Cli::Grids
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::TableGenerator::Helper
     include Common
 
     option ['-u', '--use'], :flag, 'Automatically use first available grid sorted by user count', hidden: true
     option ['-v', '--verbose'], :flag, 'Use a more verbose output', hidden: true
 
+    requires_current_master
+    requires_current_master_token
+
+    def fields
+      { name: 'name', nodes: 'node_count', services: 'service_count', users: 'user_count' }
+    end
+
     def execute
-      require_api_url
-      require_token
+      if quiet?
+        puts grids['grids'].map { |grid| grid['name'] }.join("\n")
+        exit 0
+      end
+
       vputs
 
       gridlist = []
@@ -28,16 +39,13 @@ module Kontena::Cli::Grids
         vputs "You have access to the following grids:"
         vputs
 
-        puts '%-30.30s %-8s %-12s %-10s' % ['Name', 'Nodes', 'Services', 'Users']
-        gridlist.each do |grid|
-          if grid['name'] == config.current_master.grid
-            name = "#{grid['name']} *"
-          else
-            name = grid['name']
-          end
-          puts '%-30.30s %-8s %-12s %-10s' % [name, grid['node_count'], grid['service_count'], grid['user_count']]
+        if current_grid
+          current_grid_entry = gridlist.find { |grid| grid['name'] == current_grid }
+          current_grid_entry['name'] += pastel.yellow(' *') if current_grid_entry
         end
 
+        print_table(gridlist)
+
         if self.use?
           vputs
           vspinner "* Selecting '#{gridlist.first['name']}' as the current grid" do

data/lib/kontena/cli/grids/trusted_subnets/list_command.rb

@@ -1,16 +1,18 @@
+require 'kontena/cli/grids/common'
+
 module Kontena::Cli::Grids::TrustedSubnets
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::Grids::Common
+
+    # the command outputs id info only anyway, this is here strictly for ignoring purposes
+    option ['-q', '--quiet'], :flag, "Output the identifying column only", hidden: true
 
     requires_current_master
 
     def execute
-      grid = client.get("grids/#{current_grid}")
-      trusted_subnets = grid['trusted_subnets'] || []
-      trusted_subnets.each do |subnet|
-        puts subnet
-      end
+      Array(get_grid['trusted_subnets']).map(&method(:puts))
     end
   end
 end

data/lib/kontena/cli/grids/users/list_command.rb

@@ -4,15 +4,17 @@ module Kontena::Cli::Grids::Users
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::Grids::Common
+    include Kontena::Cli::TableGenerator::Helper
+    include Kontena::Cli::GridOptions
+
+    requires_current_master
+
+    def fields
+      quiet? ? %w(email) : %w(email name)
+    end
 
     def execute
-      require_api_url
-      token = require_token
-      result = client(token).get("grids/#{current_grid}/users")
-      puts "%-40s %-40s" % ['Email', 'Name']
-      result['users'].each { |user|
-        puts "%-40.40s %-40.40s" % [user['email'], user['name']]
-      }
+      print_table(client.get("grids/#{current_grid}/users")['users'])
     end
   end
 end

data/lib/kontena/cli/localhost_web_server.rb

@@ -39,7 +39,7 @@ module Kontena
     #
     # @return [Hash] query_params
     def serve_one
-      ENV["DEBUG"] && $stderr.puts("Waiting for connection on port #{port}..")
+      Kontena.logger.debug("LHWS") { "Waiting for connection on port #{port}.." }
       socket = server.accept
 
       content = socket.recvfrom(2048).first.split(/(?:\r)?\n/)
@@ -56,7 +56,7 @@ module Kontena
 
       body = content.join("\n")
 
-      ENV["DEBUG"] && $stderr.puts("Got request: \"#{request.inspect}\n  Headers: #{headers.inspect}\n  Body: #{body}\"")
+      Kontena.logger.debug("LHWS") { "Got request: \"#{request.inspect}\n  Headers: #{headers.inspect}\n  Body: #{body}\"" }
 
       get_request = request[/GET (\/cb.+?) HTTP/, 1]
       if get_request
@@ -82,7 +82,7 @@ module Kontena
         socket.close
         server.close
         uri = URI.parse("http://localhost#{get_request}")
-        ENV["DEBUG"] && $stderr.puts("  * Parsing params: \"#{uri.query}\"")
+        Kontena.logger.debug("LHWS") { "  * Parsing params: \"#{uri.query}\"" }
         params = {}
         URI.decode_www_form(uri.query).each do |key, value|
           if value.to_s == ''

data/lib/kontena/cli/log_formatters/compact.rb

@@ -0,0 +1,65 @@
+require 'logger'
+
+module Kontena
+  module Cli
+    module LogFormatter
+      class Compact < Logger::Formatter
+        def self.ms_since_first
+          Time.now.to_f - @first_log
+        end
+
+        def self.ms_since_last
+          ((Time.now.to_f - @last_log) * 1000).to_i
+        ensure
+          @last_log = Time.now.to_f
+        end
+
+        def self.__init_timers__
+          @first_log = $KONTENA_START_TIME || Time.now.to_f
+          @last_log = @first_log
+        end
+
+        __init_timers__
+
+        DEBUG_INDICATOR = Kontena.pastel.inverse.bright_blue('DEBUG').freeze
+        WARN_INDICATOR  = Kontena.pastel.inverse.yellow('WARN ').freeze
+        INFO_INDICATOR  = Kontena.pastel.inverse.cyan('INFO ').freeze
+        ERROR_INDICATOR = Kontena.pastel.inverse.red('ERROR').freeze
+
+        def colorize_severity(severity)
+          case severity[0..0]
+          when 'D' then DEBUG_INDICATOR
+          when 'W' then WARN_INDICATOR
+          when 'I' then INFO_INDICATOR
+          when 'E', 'F' then ERROR_INDICATOR
+          else severity[0..0]
+          end
+        end
+
+        TS_FORMAT = '%4d'.freeze
+
+        def colorized_time
+          elapsed = self.class.ms_since_last
+          ts = TS_FORMAT % [elapsed]
+          if elapsed > 300
+            Kontena.pastel.red(ts)
+          elsif elapsed > 100
+            Kontena.pastel.yellow(ts)
+          else
+            ts
+          end
+        end
+
+        if ENV['DEBUG_PERF']
+          define_method :call do |severity, time, progname, msg|
+            "#{colorize_severity(severity)} #{colorized_time} #{msg2str(msg)}\n"
+          end
+        else
+          define_method :call do |severity, time, progname, msg|
+            "#{colorize_severity(severity)} #{msg2str(msg)}\n"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kontena/cli/log_formatters/strip_color.rb

@@ -0,0 +1,13 @@
+require 'logger'
+
+module Kontena
+  module Cli
+    module LogFormatter
+      class StripColor < Logger::Formatter
+        def msg2str(msg)
+          super(msg.kind_of?(String) ? msg.gsub(/\e+\[{1,2}[0-9;:?]+m/m, '') : msg)
+        end
+      end
+    end
+  end
+end

data/lib/kontena/cli/master/config/import_command.rb

@@ -40,7 +40,8 @@ module Kontena::Cli::Master::Config
         require 'json'
         JSON.parse(data)
       when 'yaml', 'yml'
-        require 'yaml'
+        require "safe_yaml"
+        SafeYAML::OPTIONS[:default_mode] = :safe
         YAML.safe_load(data)
       else
         exit_with_error "Unknown input format '#{self.format}'"

data/lib/kontena/cli/master/config/set_command.rb

@@ -11,7 +11,7 @@ module Kontena::Cli::Master::Config
     parameter "KEY_VALUE_PAIR ...", "Key/value pair, for example server.root_url=http://example.com", required: true
 
     def execute
-      data = Hash[*self.key_value_pair_list.flat_map{ |p| p.split('=') }]
+      data = self.key_value_pair_list.map{ |p| p.split('=') }.to_h
       client.patch('config', data)
     end
   end

data/lib/kontena/cli/master/list_command.rb

@@ -1,18 +1,24 @@
 module Kontena::Cli::Master
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::TableGenerator::Helper
 
-    def execute
-      puts '%-24s %-30s' % ['Name', 'Url']
-      current_master = config.current_master
-      config.servers.each do |server|
-        if current_master && server['name'] == current_master.name
-          name = "* #{server['name']}"
-        else
-          name = server['name']
-        end
-        puts '%-24s %-30s' % [name, server['url']]
+    def fields
+      @fields ||= quiet? ? %w(name) : %w(name url)
+    end
+
+    def current_master_name
+      @current_master_name ||= current_master.nil? ? nil : current_master.name
+    end
+
+    def mark_if_current(row)
+      unless quiet?
+        row.name.insert(0, pastel.yellow('* ')) if row.name == current_master_name
       end
     end
+
+    def execute
+      print_table(config.servers, fields, &method(:mark_if_current))
+    end
   end
 end

data/lib/kontena/cli/master/token/list_command.rb

@@ -2,25 +2,36 @@ require_relative 'common'
 
 module Kontena::Cli::Master::Token
   class ListCommand < Kontena::Command
-
+    include Kontena::Util
     include Kontena::Cli::Common
+    include Kontena::Cli::TableGenerator::Helper
     include Common
 
     requires_current_master
     requires_current_master_token
 
+    def fields
+      return ['id'] if quiet?
+      { id: 'id', token_type: 'token_type', token_last4: 'access_token_last_four', expires_in: 'expires_in', scopes: 'scopes' }
+    end
+
     def execute
-      rows = []
-      puts "%-26s %-18s %-11s %-10s %-20s" % ["ID", "TOKEN_TYPE", "TOKEN_LAST4", "EXPIRES_IN", "SCOPES"]
-      client.get("/oauth2/tokens")["tokens"].each do |row_data|
-        data = token_data_to_hash(row_data)
-        puts "%-26s %-18s %-11s %-10s %-20s" % [
-          data[:id],
-          data[:token_type],
-          data[:access_token_last_four],
-          data[:expires_in],
-          data[:scopes]
-        ]
+      data = Array(client.get("/oauth2/tokens")["tokens"])
+      print_table(data) do |row|
+        next if quiet?
+        row['expires_in'] = colorize(row['expires_in'].to_i)
+        row['token_type'] ||= row['grant_type']
+      end
+    end
+
+    def colorize(expires_in)
+      return expires_in.to_s unless $stdout.tty?
+      if expires_in.zero?
+        pastel.yellow('never')
+      elsif expires_in < 0
+        pastel.red(time_ago(Time.now.to_i + expires_in))
+      else
+        pastel.green(time_until(expires_in))
       end
     end
   end

data/lib/kontena/cli/master/user/invite_command.rb

@@ -42,7 +42,7 @@ module Kontena::Cli::Master::User
             raise "Failed to add role" unless Kontena.run(["master", "user", "role", "add", role, email])
           end
         rescue => ex
-          ENV["DEBUG"] && $stderr.puts("#{ex} : #{ex.message}\n#{ex.backtrace.join("\n  ")}")
+          logger.error(ex)
           exit_with_error "Failed to invite #{email} : #{ex.message}"
         end
       end

data/lib/kontena/cli/master/user/list_command.rb

@@ -3,15 +3,26 @@ require_relative '../../common'
 module Kontena::Cli::Master::User
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::TableGenerator::Helper
+
+    requires_current_master
+    requires_current_master_token
+
+    def fields
+      quiet? ? ['id'] : { email: 'email', roles: 'role_list' }
+    end
 
     def execute
-      require_api_url
-      token = require_token
-      response = client(token).get('users')
+      response = spin_if(!quiet? && $stdout.tty?, "Retrieving user list from Kontena Master") do
+        client.get('users')['users']
+      end
 
-      response['users'].each do |user|
-        roles = user['roles'].map{|r| r['name']}
-        puts "#{user['email']} - #{roles.join(', ')}"
+      print_table(response) do |row|
+        if row['roles'].empty?
+          row['role_list'] = ''
+        else
+          row['role_list'] = row['roles'].map { |r| r['name'] }.join(',')
+        end
       end
     end
   end

data/lib/kontena/cli/nodes/labels/list_command.rb

@@ -4,6 +4,9 @@ module Kontena::Cli::Nodes::Labels
 
     parameter "NODE_ID", "Node id"
 
+    # the command outputs id info only anyway, this is here strictly for ignoring purposes
+    option ['-q', '--quiet'], :flag, "Output the identifying column only", hidden: true
+
     requires_current_master
     requires_current_master_token
     requires_current_grid

data/lib/kontena/cli/nodes/list_command.rb

@@ -5,57 +5,78 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Helpers::HealthHelper
+    include Kontena::Cli::TableGenerator::Helper
 
-    option ["--all"], :flag, "List nodes for all grids", default: false
+    option ['-a', '--all'], :flag, 'List nodes for all grids', default: false
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    def node_name(node, grid)
+      return node['name'] unless all?
+      "#{grid['name']}/#{node['name']}"
+    end
+
+    def node_status(node)
+      node['connected'] ? pastel.green('online') : pastel.red('offline')
+    end
 
     def node_initial(node, grid)
-      if node['initial_member']
-        return "#{node['node_number']} / #{grid['initial_size']}"
-      else
-        return "-"
-      end
+      return '-' unless node['initial_member']
+      "#{node['node_number']} / #{grid['initial_size']}"
     end
 
     def node_labels(node)
-      (node['labels'] || ['-']).join(",")
-    end
-
-    def show_grid_nodes(grid, nodes, multi: false)
-      grid_health = grid_health(grid, nodes)
-
-      nodes = nodes.sort_by{|n| n['node_number'] }
-      nodes.each do |node|
-        puts [
-          "%s" % health_icon(node_health(node, grid_health)),
-          "%-70.70s" % [multi ? "#{grid['name']}/#{node['name']}" : node['name']],
-          "%-10s" % node['agent_version'],
-          "%-10s" % (node['connected'] ? "online" : "offline"),
-          "%-10s" % node_initial(node, grid),
-          "%s" % [node_labels(node)],
-        ].join ' '
-      end
+      (node['labels'] || ['-']).join(',')
     end
 
-    def execute
-      require_api_url
-      require_current_grid
-      token = require_token
+    def fields
+      return ['name'] if quiet?
+      {
+        ' ' =>   'health_icon',
+        name:    'name',
+        version: 'agent_version',
+        status:  'status',
+        initial: 'initial',
+        labels:  'labels'
+      }
+    end
 
-      puts "%s %-70s %-10s %-10s %-10s %-s" % [health_icon(nil), "Name", "Version", "Status", "Initial", "Labels"]
+    def grids
+      all? ? client.get("grids")['grids'] : [client.get("grids/#{current_grid}")]
+    end
+
+    def grid_nodes(grid_name)
+      client.get("grids/#{grid_name}/nodes")['nodes']
+    end
+
+    def node_data
+      grids.flat_map do |grid|
+        grid_nodes = []
 
-      if all?
-        grids = client(token).get("grids")
-        grids['grids'].each do |grid|
-          nodes = client(require_token).get("grids/#{grid['id']}/nodes")['nodes']
+        grid_nodes(grid['id']).each do |node|
+          node['name'] = node_name(node, grid)
+          grid_nodes << node
+          next if quiet?
+          node['initial'] = node_initial(node, grid)
+          node['status'] = node_status(node)
+          node['labels'] = node_labels(node)
+        end
 
-          show_grid_nodes(grid, nodes, multi: true)
+        unless quiet?
+          grid_health = grid_health(grid, grid_nodes)
+          grid_nodes.each do |node|
+            node['health_icon'] = health_icon(node_health(node, grid_health))
+          end
         end
-      else
-        grid = client(token).get("grids/#{current_grid}")
-        nodes = client(require_token).get("grids/#{current_grid}/nodes")['nodes']
 
-        show_grid_nodes(grid, nodes)
+        grid_nodes.sort { |n| n['node_number'] }
       end
     end
+
+    def execute
+      print_table(node_data)
+    end
   end
 end