kontena-cli 0.15.5 → 0.16.0.pre1

data/lib/kontena/cli/cloud/master/add_command.rb

@@ -0,0 +1,54 @@
+module Kontena::Cli::Cloud::Master
+  class AddCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    callback_matcher 'cloud-master', 'create'
+
+    requires_current_account_token
+
+    parameter "NAME", "Master name"
+
+    option ['--redirect-uri'], '[URL]',      'Se master redirect URL'
+    option ['--url'],          '[URL]',      'Se master URL'
+    option ['--provider'],     '[NAME]',     'Se master provider'
+    option ['--name'],         '[NAME]',     'Se master name',        hidden: true
+    option ['--version'],      '[VERSION]',  'Se master version',     hidden: true
+    option ['--owner'],        '[NAME]',     'Se master owner',       hidden: true
+
+    option ['--id'], :flag, 'Just output the ID'
+    option ['--arg'], :flag, 'Output as command line arguments'
+
+    option ['--return'], :flag, 'Return the ID', hidden: true
+
+    def execute
+      attributes = { 'name' => self.name }
+      attributes['url'] = self.url if self.url
+      attributes['provider'] = self.provider if self.provider
+      attributes['redirect-uri'] = self.redirect_uri if self.redirect_uri
+      attributes['version'] = self.version if self.version
+      attributes['owner'] = self.owner if self.owner
+
+      response = cloud_client.post('user/masters', { data: { attributes: attributes } })
+      if response.kind_of?(Hash)
+        if response['error']
+          puts "Failed: #{response['error']}"
+          exit 1
+        else
+          if self.return?
+            return response['data']['id']
+          elsif self.id?
+            puts response['data']['id']
+          elsif self.arg?
+            puts "--client-id #{response['data']['attributes']['client-id']} --client-secret #{response['data']['attributes']['client-secret']}"
+          else
+            puts "Created master.".colorize(:green)
+            puts "ID: #{response['data']['id']}"
+            puts "Client ID: #{response['data']['attributes']['client-id']}"
+            puts "Client Secret: #{response['data']['attributes']['client-secret']}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kontena/cli/cloud/master/delete_command.rb

@@ -0,0 +1,20 @@
+module Kontena::Cli::Cloud::Master
+  class DeleteCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    callback_matcher 'cloud-master', 'delete'
+
+    requires_current_account_token
+
+    parameter "MASTER_ID", "Master ID"
+
+    option ['-f', '--force'], :flag, "Don't ask for confirmation"
+
+    def execute
+      confirm unless self.force?
+      cloud_client.delete("user/masters/#{self.master_id}")
+    end
+  end
+end
+

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

@@ -0,0 +1,29 @@
+module Kontena::Cli::Cloud::Master
+  class ListCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    callback_matcher 'cloud-master', 'list'
+
+    requires_current_account_token
+
+    def execute
+      response = cloud_client.get('user/masters')
+      unless response && response.kind_of?(Hash) && response['data'].kind_of?(Array)
+        puts "Listing masters failed".colorize(:red)
+        exit 1
+      end
+
+      if response['data'].empty?
+        puts "No masters registered"
+      else
+        puts '%-26.26s %-24s %-12s %s' % ['ID', 'NAME', 'OWNER', 'URL']
+        response['data'].each do |data|
+          attr = data['attributes']
+          puts '%-26.26s %-24s %-12s %s' % [data['id'], attr['name'], attr['owner'], attr['url']]
+        end
+      end
+    end
+  end
+end
+

data/lib/kontena/cli/cloud/master/show_command.rb

@@ -0,0 +1,23 @@
+require 'pp'
+
+module Kontena::Cli::Cloud::Master
+  class ShowCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    callback_matcher 'cloud-master', 'show'
+
+    requires_current_account_token
+
+    parameter "MASTER_ID", "Master ID"
+
+    def execute
+      response = cloud_client.get("user/masters/#{master_id}")
+      response['data']['attributes']['id'] = response['data']['id']
+      response['data']['attributes'].each do |key, value|
+        puts "%20.20s : %s" % [key, value]
+      end
+    end
+  end
+end
+

data/lib/kontena/cli/cloud/master/update_command.rb

@@ -0,0 +1,58 @@
+module Kontena::Cli::Cloud::Master
+  class UpdateCommand < Kontena::Command
+
+    include Kontena::Cli::Common
+
+    callback_matcher 'cloud-master', 'update'
+
+    requires_current_account_token
+
+    parameter "MASTER_ID", "Master ID"
+
+    option ['--redirect-uri'], '[URL]',      'Set master redirect URL'
+    option ['--url'],          '[URL]',      'Set master URL'
+    option ['--provider'],     '[NAME]',     'Set master provider'
+    option ['--name'],         '[NAME]',     'Set master name',        hidden: true
+    option ['--version'],      '[VERSION]',  'Set master version',     hidden: true
+    option ['--owner'],        '[NAME]',     'Set master owner',       hidden: true
+
+    def get_attributes
+      cloud_client.get("user/masters/#{self.master_id}")["data"]["attributes"]
+    rescue
+      nil
+    end
+
+    def execute
+      attrs = get_attributes
+      unless attrs
+        puts "Failed to obtain master credentials".colorize(:red)
+        exit 1
+      end
+
+      attrs["name"]         = self.name         if self.name
+      attrs["redirect-uri"] = self.redirect_uri if self.redirect_uri
+      attrs["url"]          = self.url          if self.url
+      attrs["provider"]     = self.provider     if self.provider
+      attrs["version"]      = self.version      if self.version
+      attrs["owner"]        = self.owner        if self.owner
+
+      response = cloud_client.put(
+        "master",
+        { data: { attributes: attrs.reject{ |k, _| ['client-id', 'client-secret'].include?(k) } } },
+        {},
+        cloud_client.basic_auth_header(
+          attrs["client-id"],
+          attrs["client-secret"]
+        ),
+        false
+      )
+
+      if response
+        puts "Master settings updated"
+      else
+        puts "Request failed"
+        exit 1
+      end
+    end
+  end
+end

data/lib/kontena/cli/cloud/master_command.rb

@@ -0,0 +1,21 @@
+require_relative 'master/add_command'
+require_relative 'master/list_command'
+require_relative 'master/delete_command'
+require_relative 'master/update_command'
+require_relative 'master/show_command'
+
+module Kontena::Cli::Cloud
+  class MasterCommand < Kontena::Command
+    include Kontena::Cli::Common
+
+    subcommand ['list', 'ls'], "List masters in Kontena Cloud", Kontena::Cli::Cloud::Master::ListCommand
+    subcommand "add", "Register a master in Kontena Cloud", Kontena::Cli::Cloud::Master::AddCommand
+    subcommand "delete", "Delete a master in Kontena Cloud", Kontena::Cli::Cloud::Master::DeleteCommand
+    subcommand "show", "Show master settings in Kontena Cloud", Kontena::Cli::Cloud::Master::ShowCommand
+    subcommand "update", "Update master settings in Kontena Cloud", Kontena::Cli::Cloud::Master::UpdateCommand
+
+    def execute
+    end
+  end
+end
+

data/lib/kontena/cli/cloud_command.rb

@@ -0,0 +1,10 @@
+require_relative 'cloud/login_command'
+require_relative 'cloud/master_command'
+
+class Kontena::Cli::CloudCommand < Kontena::Command
+  subcommand "login", "Authenticate to Kontena Cloud", Kontena::Cli::Cloud::LoginCommand
+  subcommand "master", "Master specific commands", Kontena::Cli::Cloud::MasterCommand
+
+  def execute
+  end
+end

data/lib/kontena/cli/common.rb

@@ -1,31 +1,161 @@
-require 'colorize'
+require 'tty-prompt'
+require 'pastel'
 require 'uri'
+require 'io/console'
+
+require_relative 'config'
+require_relative 'spinner'
 
 module Kontena
   module Cli
     module Common
+
+      def pastel
+        ::Kontena.pastel
+      end
+
+      def logger
+        return @logger if @logger
+        @logger = Logger.new(STDOUT)
+        @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
+        @logger.progname = 'COMMON'
+        @logger
+      end
+
+      def pastel
+        @pastel ||= Pastel.new(enabled: $stdout.tty?)
+      end
+
+      def running_silent?
+        self.respond_to?(:silent?) && self.silent?
+      end
+
+      def running_verbose?
+        self.respond_to?(:verbose?) && self.verbose?
+      end
+
+      # Puts that puts even when self.silent?
+      def sputs(*msgs)
+        ::Kernel.puts(*msgs)
+      end
+
+      # Print that prints even when self.silent?
+      def sprint(*msgs)
+        ::Kernel.print(*msgs)
+      end
+
+      # Print that doesn't print if self.silent?
+      def print(*msgs)
+        if running_silent?
+          logger.debug(msgs.join)
+        else
+          super(*msgs)
+        end
+      end
+
+      # Puts that doesn't puts if self.silent?
+      def puts(*msgs)
+        if running_silent?
+          msgs.compact.each { |msg| logger.debug(msg) }
+        elsif Thread.main['spinners'] && !Thread.main['spinners'].empty?
+          Thread.main['spinner_msgs'] ||= []
+          msgs.each { |msg| Thread.main['spinner_msgs'] << msg }
+        else
+          super(*msgs)
+        end
+      end
+
+      # Only output message if in verbose mode
+      def vputs(msg = nil)
+        if running_verbose?
+          puts msg
+        elsif ENV["DEBUG"] && msg
+          logger.debug msg
+        end
+      end
+
+      # Only show spinner when in verbose mode
+      def vspinner(msg, &block)
+        unless block_given?
+          vfakespinner(msg)
+        end
+        if running_verbose?
+          spinner(msg, &block)
+        else
+          yield
+        end
+      end
+
+      # Like vspinner but without actually running any block
+      def vfakespinner(msg, success: true)
+        if !running_verbose?
+          logger.debug msg
+          return
+        end
+        puts " [#{ success ? 'done'.colorize(:green) : 'fail'.colorize(:red)}] #{msg}"
+      end
+
+      def config
+        Kontena::Cli::Config.instance
+      end
+
       def require_api_url
-        api_url
+        config.require_current_master.url
       end
 
       def require_token
-        token = ENV['KONTENA_TOKEN'] || current_master['token']
-        unless token
-          raise ArgumentError.new("Please login first using: kontena login")
+        retried ||= false
+        config.require_current_master_token
+      rescue Kontena::Cli::Config::TokenExpiredError
+        if retried
+          raise ArgumentError, "Current master access token has expired and refresh failed."
+        else
+          logger.debug "Access token expired, trying to refresh"
+          retried = true
+          client.refresh_token && retry
         end
-        token
       end
 
-      def client(token = nil)
-        if @client.nil?
-          headers = {}
-          unless token.nil?
-            headers['Authorization'] = "Bearer #{token}"
-          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')
+      end
+
+      def kontena_auth?
+        return false unless kontena_account
+        return false unless kontena_account.token
+        return false unless kontena_account.token.access_token
+        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
 
-          @client = Kontena::Client.new(api_url, headers)
+      def client(token = nil, api_url = nil)
+        if token.kind_of?(String)
+          token = Kontena::Cli::Config::Token.new(access_token: token)
         end
-        @client
+
+        @client ||= Kontena::Client.new(
+          api_url || require_current_master.url,
+          token || require_current_master.token
+        )
       end
 
       def reset_client
@@ -33,39 +163,15 @@ module Kontena
       end
 
       def settings_filename
-        File.join(Dir.home, '/.kontena_client.json')
+        config.config_filename
       end
 
       def settings
-        if @settings.nil?
-          if File.exists?(settings_filename)
-            @settings = JSON.parse(File.read(settings_filename))
-            unless @settings['current_server']
-              # Let's migrate the old settings model to new
-              @settings['server']['name'] = 'default'
-              @settings = {
-                  'current_server' => 'default',
-                  'servers' => [ @settings['server']]
-              }
-              save_settings
-            end
-          else
-            @settings = {
-                'current_server' => 'default',
-                'servers' => [{}]
-            }
-          end
-        end
-        @settings
+        config
       end
 
       def api_url
-        url = ENV['KONTENA_URL'] || current_master['url']
-        unless url
-          raise ArgumentError.new("It seem's that you are not logged into Kontena master, please login with: kontena login")
-        end
-        ensure_custom_ssl_ca(url)
-        url
+        config.require_current_master.url
       end
 
       def ensure_custom_ssl_ca(url)
@@ -79,96 +185,132 @@ module Kontena
       end
 
       def current_grid=(grid)
-        settings['servers'][current_master_index]['grid'] = grid['id']
-        save_settings
+        config.current_grid=(grid)
       end
 
       def require_current_grid
-        if current_grid.nil?
-          raise ArgumentError.new("Please select grid first using: kontena grid use <grid name>")
-        end
+        config.require_current_grid
       end
 
       def clear_current_grid
-        settings['servers'][current_master_index].delete('grid')
-        save_settings
+        current_master.delete_field(:grid) if require_current_master.respond_to?(:grid)
+        config.write
       end
 
       def current_grid
-        if self.respond_to?(:grid)
-          ENV['KONTENA_GRID'] || grid || current_master['grid']
-        else
-          ENV['KONTENA_GRID'] || current_master['grid']
-        end
-      rescue ArgumentError => e
-        nil      
+        config.current_grid || (self.respond_to?(:grid) ? self.grid : nil)
       end
 
       def current_master_index
-        current_server = settings['current_server'] || 'default'
-        settings['servers'].find_index{|m| m['name'] == current_server}
+        config.find_server_index(require_current_master.name)
       end
 
       def current_master
-        index = current_master_index
-        unless index
-          raise ArgumentError.new("It seem's that you are not logged into ANY Kontena master, please login with: kontena login")
-        end
-        settings['servers'][index]
+        config.current_master
       end
 
       def current_master=(master_alias)
-        settings['current_server'] = master_alias
-        save_settings
+        config.current_master = master_alias
       end
 
-      def error(message = nil)
-        $stderr.puts(message) if message
+      def error(message = "Error")
+        prompt.error(message)
         exit(1)
       end
 
-      def prompt(prefix = '> ')
-        require 'highline/import'
-        ask(prefix)
+      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
+        end
         puts message if message
         puts "Destructive command. To proceed, type \"#{name}\" or re-run this command with --force option."
 
-        prompt == name || error("Confirmation did not match #{name}. Aborted command.")
+        ask("Enter '#{name}' to confirm: ") == name || error("Confirmation did not match #{name}. Aborted command.")
       end
 
-      def confirm(message = 'Destructive command. Are you sure? (y/n) or re-run this command with --force option.')
-        puts message
-
-        ['y', 'yes'].include?(prompt) || error("Aborted command.")
+      def confirm(message = 'Destructive command. You can skip this prompt by running this command with --force option. Are you sure?')
+        if self.respond_to?(:force?) && self.force?
+          return
+        end
+        prompt.yes?(message) || error('Aborted command.')
       end
 
       def api_url=(api_url)
-        settings['servers'][current_master_index]['url'] = api_url
-        save_settings
+        config.current_master.url = api_url
+        config.write
       end
 
       def access_token=(token)
-        settings['servers'][current_master_index]['token'] = token
-        save_settings
+        require_current_master.token.access_token = token
+        config.write
       end
 
       def add_master(server_name, master_info)
-        server_name = server_name || 'default'
-        index = settings['servers'].find_index{|m| m['name'] == server_name}
-        if index
-          settings['servers'][index] = master_info
-        else
-          settings['servers'] << master_info
+        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
+        return nil if running_silent?
+        msg = "Press any key to continue or ctrl-c to cancel.. "
+        print pastel.bright_white("#{msg}")
+        char = STDIN.getch
+        print "\r#{' ' * msg.length}\r"
+        if char == "\u0003"
+          error "Canceled"
+        end
+      end
+
+      def display_login_info(only: nil)
+        unless only == :account
+          server = config.current_master
+          if server
+            puts [
+              pastel.green('Authenticated to Kontena Master'),
+              pastel.yellow(server.name),
+              pastel.green('at'),
+              pastel.yellow(server.url),
+              pastel.green('as'),
+              pastel.yellow(server.username)
+            ].join(' ')
+          else
+            puts pastel.red("master not selected")
+          end
+        end
+        unless only == :master
+          if kontena_account
+            if kontena_account.token && kontena_account.token.access_token
+              begin
+                puts [
+                  pastel.green("Authenticated to Kontena Cloud at"),
+                  pastel.yellow(kontena_account.url),
+                  pastel.green("as"),
+                  pastel.yellow(kontena_account.username)
+                ].join(' ')
+              rescue
+              end
+            end
+          end
         end
-        settings['current_server'] = server_name
-        save_settings
       end
 
-      def save_settings
-        File.write(settings_filename, JSON.pretty_generate(settings))
+      def display_logo
+        puts File.read(File.expand_path('../../../../LOGO', __FILE__))
       end
     end
   end