kontena-cli 1.3.0.pre1 → 1.3.0.pre2

data/lib/kontena/cli/common.rb

@@ -1,26 +1,21 @@
-require 'tty-prompt'
-require 'pastel'
-require 'uri'
-require 'io/console'
-
-require 'kontena/cli/config'
-require 'kontena/cli/spinner'
+require 'forwardable'
 
 module Kontena
   module Cli
     module Common
-
-      def logger
-        return @logger if @logger
-        @logger = Logger.new(ENV["DEBUG"] ? $stderr : $stdout)
-        @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
-        @logger.progname = 'COMMON'
-        @logger
-      end
-
-      def pastel
-        @pastel ||= Pastel.new(enabled: $stdout.tty?)
-      end
+      extend Forwardable
+
+      def_delegators :Kontena, :pastel, :prompt, :logger
+      def_delegators :prompt, :ask, :yes?
+      def_delegators :config,
+        :current_grid=, :require_current_grid, :current_master,
+        :current_master=, :require_current_master, :require_current_account,
+        :current_account
+      def_delegator Kontena::Cli::Spinner, :spin, :spinner
+      def_delegator Kontena::Cli::Config, :instance, :config
+      def_delegator Kontena::Cli::Config, :instance, :settings
+      def_delegator :config, :config_filename, :settings_filename
+      def_delegator :client, :server_version, :api_url_version
 
       # Read from STDIN. If stdin is a console, use prompt to ask.
       # @param [String] message
@@ -43,6 +38,10 @@ module Kontena
         self.respond_to?(:verbose?) && self.verbose?
       end
 
+      def running_quiet?
+        self.respond_to?(:quiet?) && self.quiet?
+      end
+
       # Puts that puts even when self.silent?
       def sputs(*msgs)
         ::Kernel.puts(*msgs)
@@ -87,9 +86,19 @@ module Kontena
       def vspinner(msg, &block)
         return vfakespinner(msg) unless block_given?
 
-        if running_verbose?
+        if running_verbose? && $stdout.tty?
           spinner(msg, &block)
         else
+          logger.debug { msg }
+          yield
+        end
+      end
+
+      def spin_if(obj_or_proc, message, &block)
+        if (obj_or_proc.respond_to?(:call) && obj_or_proc.call) || obj_or_proc
+          spinner(message, &block)
+        else
+          logger.debug { message }
           yield
         end
       end
@@ -97,7 +106,7 @@ module Kontena
       # Like vspinner but without actually running any block
       def vfakespinner(msg, success: true)
         if !running_verbose?
-          logger.debug msg
+          logger.debug { msg }
           return
         end
         puts " [#{ success ? 'done'.colorize(:green) : 'fail'.colorize(:red)}] #{msg}"
@@ -113,10 +122,7 @@ module Kontena
         $stderr.puts " [#{error}] #{msg}"
         exit code
       end
-
-      def config
-        Kontena::Cli::Config.instance
-      end
+      module_function :exit_with_error
 
       def require_api_url
         config.require_current_master.url
@@ -148,20 +154,8 @@ module Kontena
         logger.debug "Refreshing failed: #{ex.class.name} : #{ex.message}"
       end
 
-      def require_current_master
-        config.require_current_master
-      end
-
-      def require_current_account
-        config.require_current_account
-      end
-
-      def current_account
-        config.current_account
-      end
-
       def kontena_account
-        @kontena_account ||= config.find_account(ENV['KONTENA_ACCOUNT'] || 'kontena')
+        @kontena_account ||= config.current_account
       end
 
       def cloud_auth?
@@ -171,10 +165,6 @@ module Kontena
         true
       end
 
-      def api_url_version
-        client.server_version
-      end
-
       def cloud_client
         @cloud_client ||= Kontena::Client.new(kontena_account.url, kontena_account.token, prefix: '/')
       end
@@ -184,11 +174,13 @@ module Kontena
       end
 
       def client(token = nil, api_url = nil)
+        return @client if @client
+
         if token.kind_of?(String)
           token = Kontena::Cli::Config::Token.new(access_token: token)
         end
 
-        @client ||= Kontena::Client.new(
+        @client = Kontena::Client.new(
           api_url || require_current_master.url,
           token || require_current_master.token
         )
@@ -198,26 +190,10 @@ module Kontena
         @client = nil
       end
 
-      def settings_filename
-        config.config_filename
-      end
-
-      def settings
-        config
-      end
-
       def api_url
         config.require_current_master.url
       end
 
-      def current_grid=(grid)
-        config.current_grid=(grid)
-      end
-
-      def require_current_grid
-        config.require_current_grid
-      end
-
       def clear_current_grid
         current_master.delete_field(:grid) if require_current_master.respond_to?(:grid)
         config.write
@@ -231,31 +207,11 @@ module Kontena
         config.find_server_index(require_current_master.name)
       end
 
-      def current_master
-        config.current_master
-      end
-
-      def current_master=(master_alias)
-        config.current_master = master_alias
-      end
-
       def error(message = "Error")
         prompt.error(message)
         exit(1)
       end
 
-      def ask(question = "")
-        prompt.ask(question)
-      end
-
-      def yes?(question = "")
-        prompt.yes?(question)
-      end
-
-      def prompt
-        ::Kontena.prompt
-      end
-
       def confirm_command(name, message = nil)
         if self.respond_to?(:force?) && self.force?
           return
@@ -289,10 +245,6 @@ module Kontena
         config.add_server(master_info.merge('name' => server_name))
       end
 
-      def spinner(msg, &block)
-        Kontena::Cli::Spinner.spin(msg, &block)
-      end
-
       def any_key_to_continue_with_timeout(timeout=9)
         return nil if running_silent?
         return nil unless $stdout.tty?
@@ -352,6 +304,7 @@ module Kontena
       def display_logo
         puts File.read(File.expand_path('../../../../LOGO', __FILE__))
       end
+      module_function :display_logo
     end
   end
 end

data/lib/kontena/cli/config.rb

@@ -1,8 +1,8 @@
 require 'ostruct'
 require 'singleton'
 require 'forwardable'
-require 'json'
 require 'logger'
+autoload :JSON, 'json'
 
 module Kontena
   module Cli
@@ -13,10 +13,23 @@ module Kontena
     class Config < OpenStruct
       include Singleton
 
+      module Fields
+        def keys
+          @table.keys
+        end
+
+        def values_at(*fields)
+          (fields.first.is_a?(Array) ? fields.first : fields).map { |field| self[field] }
+        end
+      end
+
+      include Fields
+
       attr_accessor :logger
       attr_accessor :current_server
       attr_reader :current_account
 
+
       def self.reset_instance
         Singleton.send :__init__, self
         self
@@ -26,20 +39,22 @@ module Kontena
 
       def initialize
         super
-        @logger = Logger.new(ENV["DEBUG"] ? $stderr : $stdout)
-        @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
-        @logger.progname = 'CONFIG'
+        @logger = Kontena.logger
         load_settings_from_env || load_settings_from_config_file
 
-        logger.debug "Configuration loaded with #{servers.count} servers."
-        logger.debug "Current master: #{current_server || '(not selected)'}"
-        logger.debug "Current grid: #{current_grid || '(not selected)'}"
+        debug { "Configuration loaded with #{servers.count} servers." }
+        debug { "Current master: #{current_server || '(not selected)'}" }
+        debug { "Current grid: #{current_grid || '(not selected)'}" }
+      end
+
+      def debug(&block)
+        Kontena.logger.add(Logger::DEBUG, nil, 'CONFIG', &block)
       end
 
       # Craft a regular looking configuration based on ENV variables
       def load_settings_from_env
         return nil unless ENV['KONTENA_URL']
-        logger.debug 'Loading configuration from ENV'
+        debug { 'Loading configuration from ENV' }
         servers << Server.new(
           url: ENV['KONTENA_URL'],
           name: 'default',
@@ -48,11 +63,9 @@ module Kontena
           parent_type: :master,
           parent_name: 'default'
         )
-        accounts << Account.new(
-          url: ENV['AUTH_API_URL'] || 'https://auth.kontena.io',
-          name: 'kontena',
-          token: Token.new(access_token: ENV['KONTENA_ACCOUNT_TOKEN'], parent_type: :account, parent_name: 'default')
-        )
+        accounts << Account.new(kontena_account_data.merge(
+          token: Token.new(access_token: ENV['KONTENA_CLOUD_TOKEN'], parent_type: :account, parent_name: 'default')
+        ))
 
         self.current_master  = 'default'
         self.current_account = 'kontena'
@@ -84,7 +97,7 @@ module Kontena
           if servers.find { |s| s['name'] == server.name}
             server.name = "#{server.name}-2"
             server.name.succ! until servers.find { |s| s['name'] == server.name }.nil?
-            logger.debug "Renamed server to #{server.name} because a duplicate was found in config"
+            debug { "Renamed server to #{server.name} because a duplicate was found in config" }
           end
           servers << server
         end
@@ -115,22 +128,23 @@ module Kontena
         accounts.delete_at(master_index) if master_index
         accounts << Account.new(master_account_data)
 
-        self.current_account = settings['current_account'] || 'kontena'
+        self.current_account = ENV['KONTENA_CLOUD'] || settings['current_account'] || 'kontena'
       end
 
       def kontena_account_data
         {
           name: 'kontena',
-          url: 'https://cloud-api.kontena.io',
-          stacks_url: 'https://stacks.kontena.io',
-          token_endpoint: 'https://cloud-api.kontena.io/oauth2/token',
-          authorization_endpoint: 'https://cloud.kontena.io/login/oauth/authorize',
-          userinfo_endpoint: 'https://cloud-api.kontena.io/user',
-          token_post_content_type: 'application/x-www-form-urlencoded',
-          code_requires_basic_auth: false,
-          token_method: 'post',
-          scope: 'user',
-          client_id: nil
+          url: ENV['KONTENA_CLOUD_URL'] || 'https://cloud-api.kontena.io',
+          stacks_url: ENV['KONTENA_STACK_REGISTRY_URL'] || 'https://stacks.kontena.io',
+          token_endpoint: ENV['AUTH_TOKEN_ENDPOINT'] || 'https://cloud-api.kontena.io/oauth2/token',
+          authorization_endpoint: ENV['AUTH_AUTHORIZE_ENDPOINT'] || 'https://cloud.kontena.io/login/oauth/authorize',
+          userinfo_endpoint: ENV['AUTH_USERINFO_ENDPOINT'] || 'https://cloud-api.kontena.io/user',
+          token_post_content_type: ENV['AUTH_TOKEN_POST_CONTENT_TYPE'] || 'application/x-www-form-urlencoded',
+          code_requires_basic_auth: ENV['AUTH_CODE_REQUIRES_BASIC_AUTH'].to_s == true,
+          token_method: ENV['AUTH_TOKEN_METHOD'] || 'post',
+          scope: ENV['AUTH_USERINFO_SCOPE'] || 'user',
+          client_id: nil,
+          stacks_read_authentication: ENV['KONTENA_STACK_REGISTRY_READ_AUTHENTICATION'].to_s == 'true'
         }
       end
 
@@ -157,7 +171,7 @@ module Kontena
       #
       # @return [Hash]
       def default_settings
-        logger.debug 'Configuration file not found, using default settings.'
+        debug { 'Configuration file not found, using default settings.' }
         {
           'current_server' => 'default',
           'servers' => []
@@ -169,7 +183,7 @@ module Kontena
       # @param [Hash] settings_hash
       # @return [Hash] migrated_settings_hash
       def migrate_legacy_settings(settings)
-        logger.debug "Migrating from legacy style configuration"
+        debug { "Migrating from legacy style configuration" }
         {
           'current_server' => 'default',
           'servers' => [
@@ -186,7 +200,7 @@ module Kontena
       #
       # @return [Hash] config_data
       def parse_config_file
-        logger.debug "Loading configuration from #{config_filename}"
+        debug { "Loading configuration from #{config_filename}" }
         settings = JSON.load(File.read(config_filename))
         if settings.has_key?('server')
           settings = migrate_legacy_settings(settings)
@@ -437,7 +451,7 @@ module Kontena
       # Does nothing if using settings from environment variables.
       def write
         return nil if ENV['KONTENA_URL']
-        logger.debug "Writing configuration to #{config_filename}"
+        debug { "Writing configuration to #{config_filename}" }
         File.write(config_filename, to_json)
       end
 
@@ -468,6 +482,7 @@ module Kontena
       end
 
       class Account < OpenStruct
+        include Fields
         include TokenSerializer
         include ConfigurationInstance
 
@@ -484,6 +499,7 @@ module Kontena
       end
 
       class Server < OpenStruct
+        include Fields
         include TokenSerializer
         include ConfigurationInstance
 
@@ -494,6 +510,7 @@ module Kontena
       end
 
       class Token < OpenStruct
+        include Fields
         include ConfigurationInstance
 
         # Hash representation of token data

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

@@ -3,56 +3,45 @@ module Kontena::Cli::Containers
     include Kontena::Util
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::TableGenerator::Helper
 
-    option ['--all', '-a'], :flag, 'Show all containers'
+    option ['-a', '--all'], :flag, 'Show all containers'
+
+    requires_current_master
+    requires_current_master_token
+
+    NON_STOP_STATES = ['paused', 'restarting', 'oom_killed', 'dead', 'running']
+
+    def fields
+      return ['id'] if quiet?
+      { container_id: 'id', image: 'image', command: 'cmd', created: 'created_at', status: 'state' }
+    end
 
     def execute
-      require_api_url
-      token = require_token
-
-      params = '?'
-      params << 'all=1' if all?
-      result = client(token).get("containers/#{current_grid}#{params}")
-      containers = result['containers']
-      id_column = longest_string_in_array(containers.map {|c| "#{c['node']['name']}/#{c['name']}"})
-      image_column = longest_string_in_array(containers.map {|c| c['image'] })
-      columns = "%-#{id_column + 2}s %-#{image_column + 2}s %-30s %-20s %-10s"
-      puts columns % [ 'CONTAINER ID', 'IMAGE', 'COMMAND', 'CREATED', 'STATUS']
-      result['containers'].reverse.each do |container|
-        puts columns % [
-          "#{container['node']['name']}/#{container['name']}",
-          container['image'],
-          "\"#{container['cmd'].to_a.join(' ')[0..26]}\"",
-          "#{time_ago(container['created_at'])} ago",
-          container_status(container)
-        ]
+      result = spin_if(!quiet?, "Retrieving container list") do
+        Array(client.get("containers/#{current_grid}#{'?all=1' if all?}")['containers'])
       end
-    end
 
-    def longest_string_in_array(array)
-      longest = 0
-      array.each do |item|
-        longest = item.length if item.length > longest
+      print_table(result.reverse) do |row|
+        row['id'] = container_id(row)
+        row['created_at'] = time_ago(row['created_at'])
+        row['cmd'] = truncate_cmd(row)
+        row['state'] = container_state(row)
       end
+    end
 
-      longest
+    def container_id(row)
+      "#{row['node']['name']}/#{row['name']}"
     end
 
-    def container_status(container)
-      s = container['state']
-      if s['paused']
-        'paused'.freeze
-      elsif s['restarting']
-        'restarting'.freeze
-      elsif s['oom_killed']
-        'oom_killed'.freeze
-      elsif s['dead']
-        'dead'.freeze
-      elsif s['running']
-        'running'.freeze
-      else
-        'stopped'.freeze
-      end
+    def truncate_cmd(row)
+      cmd = row['cmd'].nil? ? '' : row['cmd'].join(' ')
+      cmd = "#{cmd[0..24]}#{pastel.cyan('..')}" if cmd.length > 26
+      "\"#{cmd}\""
+    end
+
+    def container_state(row)
+      NON_STOP_STATES.find { |state| row.fetch('state', {})[state] == true } || pastel.cyan('stopped')
     end
   end
 end