kontena-cli 0.6.1 → 0.7.0

data/lib/kontena/cli/server/user.rb

@@ -5,23 +5,24 @@ module Kontena::Cli::Server
   class User
     include Kontena::Cli::Common
 
-    def login
-      require_api_url
-      username = ask("Email: ")
-      password = password("Password: ")
-      params = {
-          username: username,
-          password: password,
-          grant_type: 'password',
-          scope: 'user'
-      }
+    def login(api_url = nil)
+      until !api_url.nil? && !api_url.empty?
+        api_url = ask('Kontena Master Node URL: ')
+      end
+      update_api_url(api_url)
 
-      response = client.post('auth', params)
+      unless request_server_info
+        print color('Could not connect to server', :red)
+        return false
+      end
+
+      email = ask("Email: ")
+      password = password("Password: ")
+      response = do_login(email, password)
 
       if response
-        settings['server']['token'] = response['access_token']
-        save_settings
-        puts ''
+        update_access_token(response['access_token'])
+        display_logo
         puts "Welcome #{response['user']['name'].green}"
         puts ''
         reset_client
@@ -44,9 +45,14 @@ module Kontena::Cli::Server
       save_settings
     end
 
-    def whoami
+    def whoami(options)
+      if options.bash_completion_path
+        puts File.realpath(File.join(__dir__, '../../scripts/init'))
+        exit 0
+      end
+
       require_api_url
-      puts "Server: #{settings['server']['url']}"
+      puts "Master: #{settings['server']['url']}"
       token = require_token
       response = client(token).get('user')
       puts "User: #{response['email']}"
@@ -60,8 +66,11 @@ module Kontena::Cli::Server
       puts 'User invited' if response
     end
 
-    def register
-      require_api_url
+    def register(api_url = nil, options)
+      auth_api_url = api_url || 'https://auth.kontena.io'
+      if !auth_api_url.start_with?('http://') && !auth_api_url.start_with?('https://')
+        auth_api_url = "https://#{auth_api_url}"
+      end
       email = ask("Email: ")
       password = password("Password: ")
       password2 = password("Password again: ")
@@ -69,7 +78,8 @@ module Kontena::Cli::Server
         raise ArgumentError.new("Passwords don't match")
       end
       params = {email: email, password: password}
-      client.post('users/register', params)
+      auth_client = Kontena::Client.new(auth_api_url)
+      auth_client.post('users', params)
     end
 
     def verify_account(token)
@@ -100,22 +110,65 @@ module Kontena::Cli::Server
       puts 'Password is now changed. To login with the new password, please run: kontena login'
     end
 
-    def add_registry
-      default_url = 'https://index.docker.io/v1/'
-      require_api_url
-      username = ask("Username: ")
-      password = password("Password: ")
-      email = ask("Email: ")
-      url = ask("URL [#{default_url}]: ")
-      url = default_url if url.strip == ''
-      data = { username: username, password: password, email: email, url: url }
-      client(token).post("user/registries", data)
-    end
-
     private
 
     def token
       @token ||= require_token
     end
+
+    def do_login(email, password)
+      params = {
+          username: email,
+          password: password,
+          grant_type: 'password',
+          scope: 'user'
+      }
+      client.post('auth', params)
+    end
+
+    def request_server_info
+      valid = true
+      begin
+        client.get('ping') # test server connection
+      rescue OpenSSL::SSL::SSLError => _
+        raise 'Could not connect to server because of SSL problem. If you want to ignore SSL errors, set SSL_IGNORE_ERRORS=true environment variable'
+      rescue => exc
+        valid = false
+      end
+      valid
+    end
+
+    ##
+    # Store access token to config file
+    #
+    # @param [String] access_token
+    def update_access_token(access_token)
+      settings['server']['token'] = access_token
+      save_settings
+    end
+
+    ##
+    # Store api_url to config file
+    #
+    # @param [String] api_url
+    def update_api_url(api_url)
+      settings['server']['url'] = api_url
+      save_settings
+    end
+
+    def display_logo
+      logo = <<LOGO
+ _               _
+| | _____  _ __ | |_ ___ _ __   __ _
+| |/ / _ \\| '_ \\| __/ _ \\ '_ \\ / _` |
+|   < (_) | | | | ||  __/ | | | (_| |
+|_|\\_\\___/|_| |_|\\__\\___|_| |_|\\__,_|
+-------------------------------------
+   Copyright (c)2015 Kontena, Inc.
+
+LOGO
+      puts logo
+    end
+
   end
 end

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

@@ -83,7 +83,7 @@ command 'service update' do |c|
   c.syntax = 'kontena service update <service_id>'
   c.description = 'Update service'
   c.option '-p', '--ports Array', Array, 'Exposed ports'
-  c.option '-e', '--env Array', Array, 'Environment variables'
+  c.option '-e', '--env Array', Array, 'Environment variables separated with commas'
   c.option '--image STRING', String, 'Service image'
   c.option '--instances INTEGER', Integer, 'How many instances should be deployed'
   c.option '--cmd STRING', String, 'Command to execute'

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

@@ -11,7 +11,7 @@ module Kontena::Cli::Services
       require_api_url
       token = require_token
 
-      result = client(token).get("services/#{service_id}/containers")
+      result = client(token).get("services/#{current_grid}/#{service_id}/containers")
       result['containers'].each do |container|
         puts "#{container['id']}:"
         puts "  node: #{container['node']['name']}"
@@ -21,4 +21,4 @@ module Kontena::Cli::Services
       end
     end
   end
-end
+end

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

@@ -13,10 +13,10 @@ module Kontena::Cli::Services
       last_id = nil
       loop do
         query_params = last_id.nil? ? '' : "from=#{last_id}"
-        result = client(token).get("services/#{service_id}/container_logs?#{query_params}")
+        result = client(token).get("services/#{current_grid}/#{service_id}/container_logs?#{query_params}")
         result['logs'].each do |log|
-          color = color_for_container(log['container_id'])
-          puts "#{log['container_id'][0..12].colorize(color)} | #{log['data']}"
+          color = color_for_container(log['name'])
+          puts "#{log['name'][0..12].colorize(color)} | #{log['data']}"
           last_id = log['id']
         end
         break unless options.follow

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

@@ -50,12 +50,12 @@ module Kontena::Cli::Services
         end
       end
       puts "  containers:"
-      result = client(token).get("services/#{service_id}/containers")
+      result = client(token).get("services/#{current_grid}/#{service_id}/containers")
       result['containers'].each do |container|
-        puts "    #{container['id']}:"
+        puts "    #{container['name']}:"
         puts "      rev: #{container['deploy_rev']}"
         puts "      node: #{container['node']['name']}"
-        puts "      dns: #{container['id']}.kontena.local"
+        puts "      dns: #{container['name']}.kontena.local"
         puts "      ip: #{container['network_settings']['ip_address']}"
         puts "      public ip: #{container['node']['public_ip']}"
         if container['status'] == 'unknown'
@@ -67,7 +67,7 @@ module Kontena::Cli::Services
     end
 
     def scale(service_id, count, options)
-      client(require_token).put("services/#{service_id}", {container_count: count})
+      client(require_token).put("services/#{current_grid}/#{service_id}", {container_count: count})
       self.deploy(service_id, options)
     end
 
@@ -85,20 +85,20 @@ module Kontena::Cli::Services
     def restart(service_id)
       require_api_url
       token = require_token
-      result = client(token).post("services/#{service_id}/restart", {})
+      result = client(token).post("services/#{current_grid}/#{service_id}/restart", {})
     end
 
     def stop(service_id)
       require_api_url
       token = require_token
-      result = client(token).post("services/#{service_id}/stop", {})
+      result = client(token).post("services/#{current_grid}/#{service_id}/stop", {})
     end
 
     def start(service_id)
       require_api_url
       token = require_token
 
-      result = client(token).post("services/#{service_id}/start", {})
+      result = client(token).post("services/#{current_grid}/#{service_id}/start", {})
     end
 
     def create(name, image, options)
@@ -126,7 +126,7 @@ module Kontena::Cli::Services
       require_api_url
       token = require_token
 
-      result = client(token).delete("services/#{service_id}")
+      result = client(token).delete("services/#{current_grid}/#{service_id}")
     end
 
     private
@@ -144,7 +144,7 @@ module Kontena::Cli::Services
       data[:memory_swap] = parse_memory(options.memory_swap) if options.memory_swap
       data[:cpu_shares] = options.cpu_shares if options.cpu_shares
       data[:affinity] = options.affinity if options.affinity
-      data[:env] = options.env if options.env
+      data[:env] = parse_env_options(options.env) if options.env
       data[:container_count] = options.instances if options.instances
       data[:cmd] = options.cmd.split(" ") if options.cmd
       data[:user] = options.user if options.user
@@ -153,5 +153,23 @@ module Kontena::Cli::Services
       data[:cap_drop] = options.cap_drop if options.cap_drop
       data
     end
+
+    ##
+    # @param [Array<String>] values
+    # @return [Array<String>]
+    def parse_env_options(values)
+      copy = values.dup
+      copy.each_index do |i|
+        key, value = copy[i].split("=", 2)
+        if value.nil?
+          copy[i] = "#{values[i - 1]},#{values[i]}"
+        elsif key != key.upcase
+          copy[i - 1] = "#{values[i - 1]},#{values[i]}"
+          copy.delete_at(i)
+        end
+      end
+
+      copy
+    end
   end
 end

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

@@ -12,17 +12,17 @@ module Kontena
         end
 
         def update_service(token, service_id, data)
-          client(token).put("services/#{service_id}", data)
+          client(token).put("services/#{current_grid}/#{service_id}", data)
         end
 
         def get_service(token, service_id)
-          client(token).get("services/#{service_id}")
+          client(token).get("services/#{current_grid}/#{service_id}")
         end
 
         def deploy_service(token, service_id, data)
-          client(token).post("services/#{service_id}/deploy", data)
+          client(token).post("services/#{current_grid}/#{service_id}/deploy", data)
           print 'deploying '
-          until client(token).get("services/#{service_id}")['state'] != 'deploying' do
+          until client(token).get("services/#{current_grid}/#{service_id}")['state'] != 'deploying' do
             print '.'
             sleep 1
           end
@@ -69,9 +69,7 @@ module Kontena
             memory.to_i
           end
         end
-
-
       end
     end
   end
-end
+end

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

@@ -24,7 +24,7 @@ module Kontena::Cli::Services
     private
 
     def fetch_stats(token, service_id, follow)
-      result = client(token).get("services/#{service_id}/stats")
+      result = client(token).get("services/#{current_grid}/#{service_id}/stats")
       system('clear') if follow
       render_header
       result['stats'].each do |stat|
@@ -57,9 +57,11 @@ module Kontena::Cli::Services
     # @return [String]
     def filesize_to_human(size)
       units = %w{B K M G T}
-      e = (Math.log(size)/Math.log(1000)).floor
+      e = (Math.log(size) / Math.log(1000)).floor
       s = '%.2f' % (size.to_f / 1000**e)
       s.sub(/\.?0*$/, units[e])
+    rescue FloatDomainError
+      'N/A'
     end
   end
-end
+end

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

@@ -6,6 +6,7 @@ command 'deploy' do |c|
   c.description = 'Create and deploy multiple services from YAML file'
   c.option '-f', '--file String', 'path to kontena.yml file, default: current directory'
   c.option '-p', '--prefix String', 'prefix of service names, default: name of the current directory'
+  c.option '-s', '--service Array', Array, 'Services to deploy'
   c.action do |args, options|
     Kontena::Cli::Stacks::Stacks.new.deploy(options)
   end

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

@@ -18,9 +18,11 @@ module Kontena::Cli::Stacks
       require_token
 
       filename = options.file || './kontena.yml'
-      @services = YAML.load(File.read(filename))
       @service_prefix = options.prefix || current_dir
 
+      @services = YAML.load(File.read(filename) % {prefix: service_prefix})
+      @services = @services.delete_if { |name, service| !options.service.include?(name)} if options.service
+
       Dir.chdir(File.dirname(filename))
       init_services(services)
       deploy_services(deploy_queue)
@@ -30,7 +32,7 @@ module Kontena::Cli::Stacks
 
     def init_services(services)
       services.each do |name, config|
-        create_or_update_service(prefixed_name(name), config)
+        create_or_update_service(name, config)
       end
     end
 
@@ -47,8 +49,9 @@ module Kontena::Cli::Stacks
     end
 
     def create_or_update_service(name, options)
-      # skip if service is already created or updated
-      return nil if in_deploy_queue?(name)
+
+      # skip if service is already created or updated or it's not present
+      return nil if in_deploy_queue?(name) || !services.keys.include?(name)
 
       # create/update linked services recursively before continuing
       unless options['links'].nil?
@@ -56,7 +59,7 @@ module Kontena::Cli::Stacks
           # change prefixed service name also to links options
           options['links'][index] = "#{prefixed_name(linked_service[:name])}:#{linked_service[:alias]}"
 
-          create_or_update_service(prefixed_name(linked_service[:name]), services[linked_service[:name]]) unless in_deploy_queue?(prefixed_name(linked_service[:name]))
+          create_or_update_service(linked_service[:name], services[linked_service[:name]]) unless in_deploy_queue?(linked_service[:name])
         end
       end
 
@@ -75,10 +78,11 @@ module Kontena::Cli::Stacks
     end
 
     def find_service_by_name(name)
-      get_service(token, name) rescue nil
+      get_service(token, prefixed_name(name)) rescue nil
     end
 
     def create(name, options)
+      name = prefixed_name(name)
       puts "creating #{name}"
       data = {name: name}
       data.merge!(parse_data(options))
@@ -86,13 +90,14 @@ module Kontena::Cli::Stacks
     end
 
     def update(id, options)
+      id = prefixed_name(id)
       data = parse_data(options)
       puts "updating #{id}"
       update_service(token, id, data)
     end
 
     def in_deploy_queue?(name)
-      deploy_queue.find {|service| service['id'] == name} != nil
+      deploy_queue.find {|service| service['id'] == prefixed_name(name)} != nil
     end
 
     def prefixed_name(name)
@@ -120,6 +125,8 @@ module Kontena::Cli::Stacks
       File.readlines(path).delete_if { |line| line.start_with?('#') || line.empty? }
     end
 
+    ##
+    # @param [Hash] options
     def parse_data(options)
       data = {}
       data[:image] = options['image']

data/lib/kontena/cli/version.rb

@@ -1,5 +1,5 @@
 module Kontena
   module Cli
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

data/lib/kontena/scripts/completer

@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# resolve bin path, ignoring symlinks
+require 'pathname'
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+$:.unshift File.expand_path('../../lib', bin_file)
+
+require_relative '../client'
+require_relative '../cli/common'
+
+class Helper
+  include Kontena::Cli::Common
+
+  def client
+    token = require_token
+    super(token)
+  end
+
+  def grids
+    client.get("grids")['grids'].map{|grid| grid['id']}
+  rescue
+    []
+  end
+
+  def nodes
+    client.get("grids/#{current_grid}/nodes")['nodes'].map{|node| node['name']}
+  rescue
+    []
+  end
+
+  def services
+    services = client.get("grids/#{current_grid}/services")['services']
+    results = []
+    results.push services.map{|s| s['name']}
+    results.push services.map{|s| s['id']}
+
+    results
+  rescue
+    []
+  end
+
+  def containers
+    results = []
+    client.get("grids/#{current_grid}/services")['services'].each do |service|
+      containers = client.get("services/#{service['id']}/containers")['containers']
+      results.push(containers.map{|c| c['name'] })
+      results.push(containers.map{|c| c['id'] })
+    end
+    results
+  rescue
+    []
+  end
+end
+
+helper = Helper.new
+
+words = ARGV
+words.delete_at(0)
+
+completion = []
+completion.push %w(deploy forgot node grid invite service container vpn external-registry registry login logout whoami) if words.size < 2
+if words.size > 0
+  case words[0]
+    when 'forgot'
+      completion.clear
+      sub_commands = %w(password)
+    when 'grid'
+      completion.clear
+      sub_commands = %w(add-user audit-log create current list list-users remove remove-user show use)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.grids
+      else
+        completion.push sub_commands
+      end
+    when 'node'
+      completion.clear
+      sub_commands = %w(list show remove)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.nodes
+      else
+        completion.push sub_commands
+      end
+    when 'service'
+      completion.clear
+      sub_commands = %w(containers create delete deploy list logs restart scale show start stats stop update)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.services
+      else
+        completion.push sub_commands
+      end
+    when 'container'
+      completion.clear
+      sub_commands = %w(exec)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.containers
+      else
+        completion.push sub_commands
+      end
+    when 'vpn'
+      completion.clear
+      completion.push %w(config create delete)
+    when 'external-registry'
+      completion.clear
+      completion.push %w(add list delete)
+  end
+end
+
+puts completion