kontena-cli 0.11.7 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05d019eab615b4a8cef10906bae09f8858ab486c
-  data.tar.gz: b2818cb57bc09a5fbfd6986b9a2f0816eeedf103
+  metadata.gz: 09a43f90d845f6046491b8b9636cae6201fc0602
+  data.tar.gz: 357fcf2a78efd43d5371056837a188b7225bd016
 SHA512:
-  metadata.gz: 5adefb5a60bd0444f254f6faf63faa2cfa5600e1e9694209e54f1549b039b648ecb72695d6707f472ce04de56c0658641a8fc82bfc173e1cdc50f661395bf029
-  data.tar.gz: b85ae888626bbc54797da140843d51d4e6709377ba46cd11c019fd297f7ddf6dc22dad8d72983ff35ce55a9b768f2ae7a7e9f6bb59e44f72f706961af11a9376
+  metadata.gz: 076aa681b8e39964cbe93b9ae29279ee443f36fa0e73e6a054aef32852f93e5bb1502a318c556da5505eb6aaa13ec1b80a0d6d617b00466c8529c8f3cbeb80ba
+  data.tar.gz: 40fe038531ef0e8cda9fa1af4c1a1df6f25a79088e7f8311b3d1c29b833762d145d26441e09f9ddc105419ae414866cd077a88dfd9a51fbc0b087c2cfad64e85

data/VERSION

@@ -1 +1 @@
-0.11.7
+0.12.0

data/bin/kontena

@@ -11,15 +11,16 @@ $:.unshift File.expand_path('../../lib', bin_file)
 STDOUT.sync = true
 
 require 'clamp'
+require 'ruby_dig'
 require 'kontena/client'
 require 'kontena/cli/common'
+require 'kontena/cli/grid_options'
 require 'kontena/cli/app_command'
 require 'kontena/cli/register_command'
 require 'kontena/cli/login_command'
 require 'kontena/cli/logout_command'
 require 'kontena/cli/whoami_command'
 require 'kontena/cli/verify_account_command'
-require 'kontena/cli/invite_command'
 require 'kontena/cli/forgot_password_command'
 require 'kontena/cli/reset_password_command'
 require 'kontena/cli/container_command'
@@ -30,7 +31,6 @@ require 'kontena/cli/service_command'
 require 'kontena/cli/vpn_command'
 require 'kontena/cli/registry_command'
 require 'kontena/cli/external_registry_command'
-require 'kontena/cli/deploy_command'
 require 'kontena/cli/app_command'
 require 'kontena/cli/etcd_command'
 require 'kontena/cli/vault_command'
@@ -42,7 +42,6 @@ class MainCommand < Clamp::Command
   subcommand "app", "App specific commands", Kontena::Cli::AppCommand
   subcommand "service", "Service specific commands", Kontena::Cli::ServiceCommand
   subcommand "vault", "Vault specific commands", Kontena::Cli::VaultCommand
-  subcommand "deploy", "Create and deploy multiple services from YAML file", Kontena::Cli::DeployCommand
   subcommand "node", "Node specific commands", Kontena::Cli::NodeCommand
   subcommand "master", "Master specific commands", Kontena::Cli::MasterCommand
   subcommand "vpn", "VPN specific commands", Kontena::Cli::VpnCommand
@@ -55,7 +54,6 @@ class MainCommand < Clamp::Command
   subcommand "logout", "Logout from Kontena Master", Kontena::Cli::LogoutCommand
   subcommand "whoami", "Shows current logged in user", Kontena::Cli::WhoamiCommand
   subcommand "verify-account", "Verify registered account", Kontena::Cli::VerifyAccountCommand
-  subcommand "invite", "Invite user to Kontena Master", Kontena::Cli::InviteCommand
   subcommand "forgot-password", "Request password reset for Kontena account", Kontena::Cli::ForgotPasswordCommand
   subcommand "reset-password", "Reset Kontena account password", Kontena::Cli::ResetPasswordCommand
   subcommand "version", "Show version", Kontena::Cli::VersionCommand

data/kontena-cli.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'clamp'
   spec.add_runtime_dependency 'highline'
   spec.add_runtime_dependency 'shell-spinner'
+  spec.add_runtime_dependency 'ruby_dig'
 end

data/lib/kontena/cli/app_command.rb

@@ -21,7 +21,7 @@ class Kontena::Cli::AppCommand < Clamp::Command
   subcommand "stop", "Stop services", Kontena::Cli::Apps::StopCommand
   subcommand "restart", "Restart services", Kontena::Cli::Apps::RestartCommand
   subcommand "show", "Show service details", Kontena::Cli::Apps::ShowCommand
-  subcommand ["ps", "list"], "List services", Kontena::Cli::Apps::ListCommand
+  subcommand ["ps", "list", "ls"], "List services", Kontena::Cli::Apps::ListCommand
   subcommand ["logs"], "Show service logs", Kontena::Cli::Apps::LogsCommand
   subcommand "monitor", "Monitor services", Kontena::Cli::Apps::MonitorCommand
   subcommand ["remove","rm"], "Remove services", Kontena::Cli::Apps::RemoveCommand

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

@@ -9,32 +9,46 @@ module Kontena::Cli::Apps
       abort("File #{filename} does not exist") unless File.exists?(filename)
     end
 
+    # @param [String] filename
+    # @param [Array<String>] service_list
+    # @param [String] prefix
+    # @return [Hash]
     def load_services(filename, service_list, prefix)
       services = parse_services(filename, nil, prefix)
       services.delete_if { |name, service| !service_list.include?(name)} unless service_list.empty?
       services
     end
 
+    # @return [String]
     def token
       @token ||= require_token
     end
 
+    # @param [String] name
+    # @return [String]
     def prefixed_name(name)
       return name if service_prefix.strip == ""
 
       "#{service_prefix}-#{name}"
     end
 
+    # @return [String]
     def current_dir
       File.basename(Dir.getwd)
     end
 
+    # @param [String] name
+    # @return [Boolean]
     def service_exists?(name)
       get_service(token, prefixed_name(name)) rescue false
     end
 
-    def parse_services(file, name = nil, prefix='')
-      services = YAML.load(File.read(File.expand_path(file)) % {project: prefix})
+    # @param [String] file
+    # @param [String,NilClass] name
+    # @param [String] prefix
+    # @return [Hash]
+    def parse_services(file, name = nil, prefix = '')
+      services = YAML.load(File.read(File.expand_path(file)) % {project: prefix, grid: current_grid})
       Dir.chdir(File.dirname(File.expand_path(file))) do
         services.each do |name, options|
           normalize_env_vars(options)
@@ -49,22 +63,32 @@ module Kontena::Cli::Apps
       if name.nil?
         services
       else
+        abort("Service #{name} not found in #{file}") unless services.has_key?(name)
         services[name]
       end
     end
 
+    # @param [Hash] options
+    # @param [String] file
+    # @param [String] service_name
+    # @param [String] prefix
+    # @return [Hash]
     def extend_options(options, file, service_name, prefix)
       parent_options = parse_services(file, service_name, prefix)
       options['environment'] = extend_env_vars(parent_options, options)
       parent_options.merge(options)
     end
 
+    # @param [Hash] options
     def normalize_env_vars(options)
       if options['environment'].is_a?(Hash)
         options['environment'] = options['environment'].map{|k, v| "#{k}=#{v}"}
       end
     end
 
+    # @param [Hash] from
+    # @param [Hash] to
+    # @return [Array]
     def extend_env_vars(from, to)
       env_vars = to['environment'] || []
       if from['environment']
@@ -75,12 +99,15 @@ module Kontena::Cli::Apps
       env_vars
     end
 
-    def create_yml(services, file='kontena.yml')
+    # @param [Hash] services
+    # @param [String] file
+    def create_yml(services, file = 'kontena.yml')
       yml = File.new(file, 'w')
       yml.puts services.to_yaml
       yml.close
     end
 
+    # @return [Hash]
     def app_json
       if !@app_json && File.exist?('app.json')
         @app_json = JSON.parse(File.read('app.json'))

data/lib/kontena/cli/apps/deploy_command.rb

@@ -5,6 +5,7 @@ require_relative 'docker_helper'
 module Kontena::Cli::Apps
   class DeployCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
     include DockerHelper
 

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class ListCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'

data/lib/kontena/cli/apps/logs_command.rb

@@ -3,12 +3,15 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class LogsCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
+    option ["-l", "--lines"], "LINES", "How many lines to show", default: '100'
+    option "--since", "SINCE", "Show logs since given timestamp"
     option ["-s", "--search"], "SEARCH", "Search from logs"
-    option ["-t", "--follow"], :flag, "Follow (tail) logs", default: false
+    option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
     parameter "[SERVICE] ...", "Show only specified service logs"
 
     attr_reader :services, :service_prefix
@@ -31,6 +34,8 @@ module Kontena::Cli::Apps
       loop do
         query_params = []
         query_params << "from=#{last_id}" unless last_id.nil?
+        query_params << "limit=#{lines}"
+        query_params << "since=#{since}" if !since.nil? && last_id.nil?
         query_params << "search=#{search}" if search
         logs = []
         services.each do |service_name, opts|
@@ -41,10 +46,11 @@ module Kontena::Cli::Apps
         logs.sort!{|x,y| DateTime.parse(x['created_at']) <=> DateTime.parse(y['created_at'])}
         logs.each do |log|
           color = color_for_container(log['name'])
-          puts "#{log['name'].colorize(color)} | #{log['data']}"
+          prefix = "#{log['created_at']} #{log['name']}:".colorize(color)
+          puts "#{prefix} #{log['data']}"
           last_id = log['id']
         end
-        break unless follow?
+        break unless tail?
         sleep(2)
       end
     end

data/lib/kontena/cli/apps/monitor_command.rb

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class MonitorCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'

data/lib/kontena/cli/apps/remove_command.rb

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
@@ -31,6 +32,7 @@ module Kontena::Cli::Apps
       services.find_all {|service_name, options| options['links'] && options['links'].size > 0 }.each do |service_name, options|
         delete(service_name, options)
         services.delete(service_name)
+        sleep 1
       end
       services.each do |service_name, options|
         delete(service_name, options)

data/lib/kontena/cli/apps/scale_command.rb

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class ScaleCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
@@ -29,4 +30,4 @@ module Kontena::Cli::Apps
 
 
   end
-end
+end

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class ShowCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'

data/lib/kontena/cli/apps/start_command.rb

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class StartCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'

data/lib/kontena/cli/apps/stop_command.rb

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Apps
   class StopCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'

data/lib/kontena/cli/common.rb

@@ -95,7 +95,11 @@ module Kontena
       end
 
       def current_grid
-        ENV['KONTENA_GRID'] || current_master['grid']
+        if self.respond_to?(:grid)
+          ENV['KONTENA_GRID'] || grid || current_master['grid']
+        else
+          ENV['KONTENA_GRID'] || current_master['grid']
+        end
       end
 
       def current_master_index

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Containers
   class ExecCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter "CONTAINER_ID", "Container id"
     parameter "CMD ...", "Command"

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Containers
   class InspectCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter "CONTAINER_ID", "Container id"
 

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Etcd
   class GetCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     parameter "KEY", "Etcd key"
@@ -11,7 +12,7 @@ module Kontena::Cli::Etcd
       require_api_url
       token = require_token
       validate_key
-      
+
       response = client(token).get("etcd/#{current_grid}/#{key}")
       if response['value']
         puts response['value']

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Etcd
   class ListCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     parameter "KEY", "Etcd key"

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Etcd
   class MkdirCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     parameter "KEY", "Etcd key"
@@ -11,7 +12,7 @@ module Kontena::Cli::Etcd
       require_api_url
       token = require_token
       validate_key
-      
+
       data = {}
       response = client(token).post("etcd/#{current_grid}/#{key}", data)
       if response['error']

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Etcd
   class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     parameter "KEY", "Etcd key"
@@ -13,7 +14,7 @@ module Kontena::Cli::Etcd
       require_api_url
       token = require_token
       validate_key
-      
+
       data = {}
       data[:recursive] = true if recursive?
       response = client(token).delete("etcd/#{current_grid}/#{key}", data)

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

@@ -3,6 +3,7 @@ require_relative 'common'
 module Kontena::Cli::Etcd
   class SetCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include Common
 
     parameter "KEY", "Etcd key"
@@ -12,7 +13,7 @@ module Kontena::Cli::Etcd
       require_api_url
       token = require_token
       validate_key
-      
+
       data = {value: value}
       response = client(token).post("etcd/#{current_grid}/#{key}", data)
       if response['error']

data/lib/kontena/cli/etcd_command.rb

@@ -8,8 +8,8 @@ class Kontena::Cli::EtcdCommand < Clamp::Command
 
   subcommand "get", "Get the current value for a single key", Kontena::Cli::Etcd::GetCommand
   subcommand "set", "Set a value on the specified key", Kontena::Cli::Etcd::SetCommand
-  subcommand "mk", "Create a directory", Kontena::Cli::Etcd::MkdirCommand
-  subcommand "ls", "List a directory", Kontena::Cli::Etcd::ListCommand
+  subcommand ["mkdir", "mk"], "Create a directory", Kontena::Cli::Etcd::MkdirCommand
+  subcommand ["list", "ls"], "List a directory", Kontena::Cli::Etcd::ListCommand
   subcommand "rm", "Remove a key or a directory", Kontena::Cli::Etcd::RemoveCommand
 
   def execute

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::ExternalRegistries
   class AddCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter '[URL]', 'Docker Registry url', default: 'https://index.docker.io/v2/'
 

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

@@ -1,10 +1,12 @@
 module Kontena::Cli::ExternalRegistries
   class DeleteCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter "NAME", "External registry name to delete"
 
     def execute
+       puts "DEPRECATION WARNING: Support for 'kontena external-registry delete' will be dropped. Use 'kontena external-registry remove' instead.".colorize(:red)
       require_api_url
       token = require_token
       client(token).delete("external_registries/#{current_grid}/#{name}")