kontena-cli 1.3.0.pre1 → 1.3.0.pre2

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

@@ -17,7 +17,7 @@ module Kontena::Cli::Nodes
       puts "  agent version: #{node['agent_version']}"
       puts "  docker version: #{node['docker_version']}"
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"
-      puts "  last connect: #{node['updated_at']}"
+      puts "  last connect: #{node['connected_at']}"
       puts "  last seen: #{node['last_seen_at']}"
       puts "  public ip: #{node['public_ip']}"
       puts "  private ip: #{node['private_ip']}"

data/lib/kontena/cli/plugins/install_command.rb

@@ -19,7 +19,7 @@ module Kontena::Cli::Plugins
             Kontena::PluginManager.instance.upgrade_plugin(name, pre: pre?)
           rescue => ex
             $stderr.puts pastel.red("#{ex.class.name} : #{ex.message}")
-            ENV["DEBUG"] && $stderr.puts(ex.backtrace.join("\n  "))
+            logger.error(ex)
             spin.fail!
           end
         end
@@ -33,7 +33,7 @@ module Kontena::Cli::Plugins
             Kontena::PluginManager.instance.install_plugin(name, pre: pre?, version: version)
           rescue => ex
             $stderr.puts pastel.red("#{ex.class.name} : #{ex.message}")
-            ENV["DEBUG"] && $stderr.puts(ex.backtrace.join("\n  "))
+            logger.error(ex)
             spin.fail!
           end
         end

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

@@ -2,14 +2,28 @@ require_relative 'common'
 
 module Kontena::Cli::Plugins
   class ListCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::TableGenerator::Helper
     include Common
 
-    def execute
-      titles = ['NAME', 'VERSION', 'DESCRIPTION']
-      puts "%-40s %-10s %-40s" % titles
-      Kontena::PluginManager.instance.plugins.each do |plugin|
-        puts "%-40s %-10s %-40s" % [short_name(plugin.name), plugin.version, plugin.description]
+    banner "List installed plugins"
+
+    def fields
+      quiet? ? [:name] : %i(name version description)
+    end
+
+    def plugins
+      Kontena::PluginManager.instance.plugins.map do |plugin|
+        {
+          name: short_name(plugin.name),
+          version: plugin.version,
+          description: plugin.description
+        }
       end
     end
+
+    def execute
+      print_table(plugins)
+    end
   end
 end

data/lib/kontena/cli/plugins/uninstall_command.rb

@@ -15,7 +15,7 @@ module Kontena::Cli::Plugins
           Kontena::PluginManager.instance.uninstall_plugin(name)
         rescue => ex
           $stderr.puts pastel.red("#{ex.class.name} : #{ex.message}")
-          ENV["DEBUG"] && $stderr.puts(ex.backtrace.join("\n  "))
+          logger.error(ex)
           spin.fail
         end
       end

data/lib/kontena/cli/services/containers_command.rb

@@ -7,12 +7,19 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
+    option ['-q', '--quiet'], :flag, "Output the identifying column only"
 
     def execute
       require_api_url
       token = require_token
 
       result = client(token).get("services/#{parse_service_id(name)}/containers")
+
+      if quiet?
+        puts result['containers'].map { |c| "#{c['node']['name']}/#{c['name']}" }.join("\n")
+        exit 0
+      end
+
       result['containers'].each do |container|
         puts "#{container['name']}:"
         puts "  rev: #{container['deploy_rev']}"

data/lib/kontena/cli/services/envs/list_command.rb

@@ -5,15 +5,17 @@ module Kontena::Cli::Services::Envs
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Services::ServicesHelper
+    include Kontena::Cli::TableGenerator::Helper
 
     parameter "NAME", "Service name"
 
+    requires_current_master
+    requires_current_master_token
+
     def execute
-      require_api_url
-      token = require_token
-      service = client(token).get("services/#{parse_service_id(name)}")
+      service = client.get("services/#{parse_service_id(name)}")
       service["env"].sort.each do |env|
-        puts env
+        puts quiet? ? env.split('=', 2).first : env
       end
     end
   end

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

@@ -4,53 +4,64 @@ module Kontena::Cli::Services
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::TableGenerator::Helper
     include ServicesHelper
 
-    option ["-q", "--quiet"], :flag, "Show only service names"
     option '--stack', 'STACK', 'Stack name'
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
+    requires_current_master_token
+
+    def services
+      client.get("grids/#{current_grid}/services#{"?stack=#{stack}" if stack}")['services'].sort_by{|s| s['updated_at'] }.reverse
+    end
+
+    def fields
+      quiet? ? ['name'] : {'  ' => 'health_icon', name: 'name', instances: 'instances', stateful: 'stateful', state: 'state', "exposed ports" => 'ports' }
+    end
 
-      grids = client(token).get("grids/#{current_grid}/services?stack=#{stack}")
-      services = grids['services'].sort_by{|s| s['updated_at'] }.reverse
+    def service_port(port)
+      "#{port['ip']}:#{port['node_port']}->#{port['container_port']}/#{port['protocol']}"
+    end
+
+    def stack_id(service)
       if quiet?
-        services.each do |service|
-          puts "#{service.dig('stack', 'id')}/#{service['name']}"
-        end
+        service.fetch('stack', {}).fetch('id', 'null')
       else
-        titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'EXPOSED PORTS']
-        puts "%-60s %-10s %-8s %-10s %-50s" % titles
-        services.each do |service|
-          print_service_row(service)
-        end
+        service.fetch('stack', {}).fetch('name', nil)
       end
     end
 
-    def print_service_row(service)
-      stateful = service['stateful'] ? 'yes' : 'no'
-      running = service['instance_counts']['running']
-      desired = service['instances']
-      instances = "#{running} / #{desired}"
-      ports = service['ports'].map{|p|
-        "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
-      }.join(", ")
-      health = health_status(service)
-      if service.dig('stack', 'name').to_s == 'null'.freeze
-        name = service['name']
-      else
-        name = "#{service.dig('stack', 'name')}/#{service['name']}"
+    def service_name(service)
+      stack_id = stack_id(service)
+      return service['name'] if stack_id == 'null'
+      [ stack_id(service), service['name'] ].compact.join('/')
+    end
+
+    def state_color(state)
+      case state
+      when 'running' then :green
+      when 'initialized' then :cyan
+      when 'stopped' then :red
+      else :blue
+      end
+    end
+
+    def execute
+      print_table(services) do |row|
+        row['name'] = service_name(row)
+        next if quiet?
+        row['health_icon'] = health_status_icon(health_status(row))
+        row['stateful'] = row['stateful'] ? pastel.green('yes') : 'no'
+        row['ports'] = row['ports'].map(&method(:service_port)).join(',')
+        row['state'] = pastel.send(state_color(row['state']), row['state'])
+
+        instances = [row['instance_counts']['running'], row['instances']]
+        if instances.first < instances.last
+          instances[0] = pastel.cyan(instances[0].to_s)
+        end
+        row['instances'] = instances.join(' / ')
       end
-      vars = [
-        health_status_icon(health),
-        name,
-        instances,
-        stateful,
-        service['state'],
-        ports
-      ]
-      puts "%s %-58s %-10.10s %-8s %-10s %-50s" % vars
     end
   end
 end

data/lib/kontena/cli/services/services_helper.rb

@@ -357,23 +357,16 @@ module Kontena
         # @param [Array<String>] port_options
         # @return [Array<Hash>]
         def parse_ports(port_options)
-          port_options.map{|p|
-            port, protocol = p.split('/')
-            protocol ||= 'tcp'
-            port_elements = port.split(':')
-            container_port = port_elements[-1]
-            node_port = port_elements[-2]
-            ip = port_elements[-3] || '0.0.0.0'
-            if node_port.nil? || container_port.nil?
-              raise ArgumentError.new("Invalid port value #{p}")
-            end
+          port_regex = Regexp.new(/\A(?<ip>\d+\.\d+\.\d+\.\d+)?:?(?<node_port>\d+)\:(?<container_port>\d+)\/?(?<protocol>\w+)?\z/)
+          port_options.map do |p|
+            match_data = port_regex.match(p.to_s)
+            raise ArgumentError, "Invalid port value #{p}" unless match_data
+
             {
-              ip: ip,
-              container_port: container_port,
-              node_port: node_port,
-              protocol: protocol
-            }
-          }
+              ip: '0.0.0.0',
+              protocol: 'tcp'
+            }.merge(match_data.names.map { |name| [name.to_sym, match_data[name]] }.to_h.reject { |_,v| v.nil? })
+          end
         end
 
         # @param [Array<String>] link_options

data/lib/kontena/cli/services/stats_command.rb

@@ -7,7 +7,8 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     MEM_MAX_LIMITS = [
-      1.8446744073709552e+19, 9.223372036854772e+18
+      2**64,
+      2**63 - 4096
     ]
 
     parameter "NAME", "Service name"

data/lib/kontena/cli/spinner.rb

@@ -69,7 +69,7 @@ module Kontena
           end
         rescue Exception => ex
           Kernel.puts "* #{msg}.. fail"
-          ENV["DEBUG"] && $stderr.puts("#{ex.class.name} : #{ex.message}\n#{ex.backtrace.join("\n  ")}")
+          Kontena.logger.error(ex)
           raise ex
         end
         exit(status) if status
@@ -156,13 +156,11 @@ module Kontena
         rescue SpinAbort
           spin_thread.kill
           Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
-          if ENV["DEBUG"]
-            $stderr.puts "Spin aborted through fail!"
-          end
+          Kontena.logger.debug { "Spin aborted through fail!" }
         rescue Exception => ex
           spin_thread.kill
           Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
-          ENV["DEBUG"] && $stderr.puts("#{ex.class.name} : #{ex.message}\n#{ex.backtrace.join("\n  ")}")
+          Kontena.logger.error(ex)
           raise ex
         ensure
           unless Thread.main['spinner_msgs'].empty?

data/lib/kontena/cli/stacks/common.rb

@@ -3,6 +3,9 @@ require_relative '../services/services_helper'
 require_relative 'service_generator_v2'
 require_relative '../../stacks_client'
 
+require "safe_yaml"
+SafeYAML::OPTIONS[:default_mode] = :safe
+
 module Kontena::Cli::Stacks
   module Common
     include Kontena::Cli::Services::ServicesHelper
@@ -153,10 +156,7 @@ module Kontena::Cli::Stacks
     end
 
     def stacks_client
-      return @stacks_client if @stacks_client
-      Kontena.run!(%w(cloud login)) unless cloud_auth?
-      config.reset_instance
-      @stacks_client = Kontena::StacksClient.new(kontena_account.stacks_url, kontena_account.token)
+      @stacks_client ||= Kontena::StacksClient.new(current_account.stacks_url, current_account.token, read_requires_token: current_account.stacks_read_authentication)
     end
   end
 end

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

@@ -4,6 +4,7 @@ module Kontena::Cli::Stacks
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::TableGenerator::Helper
     include Common
 
     banner "Lists all installed stacks on a grid in Kontena Master"
@@ -11,46 +12,54 @@ module Kontena::Cli::Stacks
     requires_current_master
     requires_current_master_token
 
-    def execute
-      list_stacks
-    end
+    HEALTH_ICONS = {
+      unhealthy: Kontena.pastel.red('⊗').freeze,
+      partial:   Kontena.pastel.yellow('⊙').freeze,
+      healthy:   Kontena.pastel.green('⊛').freeze,
+      default:   Kontena.pastel.dim('⊝').freeze
+    }
 
-    def list_stacks
-      response = client.get("grids/#{current_grid}/stacks")
-
-      titles = ['NAME', 'STACK', 'SERVICES', 'STATE', 'EXPOSED PORTS']
-      puts "%-30s %-40s %-10s %-10s %-50s" % titles
+    def stacks
+      client.get("grids/#{current_grid}/stacks")['stacks']
+    end
 
-      response['stacks'].each do |stack|
-        ports = stack_ports(stack)
-        health = stack_health(stack)
-        if health == :unhealthy
-          icon = '⊗'.freeze
-          color = :red
-        elsif health == :partial
-          icon = '⊙'.freeze
-          color = :yellow
-        elsif health == :healthy
-          icon = '⊛'.freeze
-          color = :green
-        else
-          icon = '⊝'.freeze
-          color = :dim
-        end
+    def fields
+      return ['name'] if quiet?
+      {
+        '  ' => 'health_icon',
+        name: 'name',
+        stack: 'stack',
+        services: 'services_count',
+        state: 'state',
+        'exposed ports' => 'ports'
+      }
+    end
 
-        vars = [
-          icon.colorize(color),
-          "#{stack['name']}",
-          "#{stack['stack']}:#{stack['version']}",
-          stack['services'].size,
-          stack['state'],
-          ports.join(",")
-        ]
+    def execute
+      print_table(stacks) do |row|
+        next if quiet?
+        row['health_icon'] = health_icon(stack_health(row))
+        row['stack'] = "#{row['stack']}:#{row['version']}"
+        row['services_count'] = row['services'].size
+        row['ports'] = stack_ports(row).join(',')
+        row['state'] = pastel.send(state_color(row['state']), row['state'])
+      end
+    end
 
-        puts "%s %-28s %-40s %-10s %-10s %-50s" % vars
+    def state_color(state)
+      case state
+      when 'running' then :green
+      when 'deploying', 'initialized' then :blue
+      when 'stopped' then :red
+      when 'partially_running' then :yellow
+      else :clear
       end
     end
 
+    def health_icon(health)
+      HEALTH_ICONS.fetch(health) { HEALTH_ICONS[:default] }
+    end
+
     # @param [Hash] stack
     # @return [Array<String>]
     def stack_ports(stack)

data/lib/kontena/cli/stacks/registry/search_command.rb

@@ -9,8 +9,14 @@ module Kontena::Cli::Stacks::Registry
 
     parameter "[QUERY]", "Query string"
 
+    option ['-q', '--quiet'], :flag, "Output the identifying column only"
+
     def execute
       results = stacks_client.search(query.to_s)
+      if quiet?
+        puts results.map { |s| s['stack'] }.join("\n")
+        exit 0
+      end
       exit_with_error 'Nothing found' if results.empty?
       titles = ['NAME', 'VERSION', 'DESCRIPTION']
       columns = "%-40s %-10s %-40s"

data/lib/kontena/cli/stacks/registry/show_command.rb

@@ -14,6 +14,8 @@ module Kontena::Cli::Stacks::Registry
 
     def execute
       require 'semantic'
+      require "safe_yaml"
+      SafeYAML::OPTIONS[:default_mode] = :safe
       unless versions?
         stack = ::YAML.safe_load(stacks_client.show(stack_name, stack_version))
         puts "#{stack['stack']}:"

data/lib/kontena/cli/stacks/registry_command.rb

@@ -1,9 +1,8 @@
 module Kontena::Cli::Stacks
   class RegistryCommand < Kontena::Command
-
     subcommand "push", "Push a stack into the stacks registry", load_subcommand('stacks/registry/push_command')
     subcommand "pull", "Pull a stack from the stacks registry", load_subcommand('stacks/registry/pull_command')
-    subcommand "search", "Search for stacks in the stacks registry", load_subcommand('stacks/registry/search_command')
+    subcommand ["search"], "Search for stacks in the stacks registry", load_subcommand('stacks/registry/search_command')
     subcommand "show", "Show info about a stack in the stacks registry", load_subcommand('stacks/registry/show_command')
     subcommand ["remove", "rm"], "Remove a stack (or version) from the stacks registry", load_subcommand('stacks/registry/remove_command')
   end

data/lib/kontena/cli/stacks/validate_command.rb

@@ -1,4 +1,5 @@
 require_relative 'common'
+require 'yaml'
 
 module Kontena::Cli::Stacks
   class ValidateCommand < Kontena::Command