kontena-cli 1.1.6 → 1.2.0.dev1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ecda24ff9a2d6ed676a8c3f50081412288eb271
-  data.tar.gz: e7b334ee55e01ba10452dc3d26c964792966852e
+  metadata.gz: 1bb3a720a442f0537a388e074fc06d2deca0fe61
+  data.tar.gz: abb0c04c02d70ea872693f70f972d26c06519fb7
 SHA512:
-  metadata.gz: 6caea8765e6bd335b2366b565bf28de0e39ce200d44b82060bf5fa0eb1649b42c061bb8f3076689dd087c82cd50a6b21ccacade225400988f1d10e81f5420c34
-  data.tar.gz: be3d483b5e26f41ce6457df18a73a35e371489e3334bf3e6cc961709814bc5eac84def0de1789ee760b827a0a3b1b54967ea3cf06e6fc9f65f0a2f01b858caf8
+  metadata.gz: e6c457fe87e24961e71867cfdf13b03bbd0b342f51d78ecaf84a1d67d61aaa55bdba02d3005604dbf92bb55db4e1a64583a396bb232703af8d96b2877c961e62
+  data.tar.gz: 6d6502e6101bc887c366b4bdb49ac93480bf83ac23c8d411d9b294a95ce5835f9fa375b925a718653a4c06d76ca024e42a1bf2fea3042aa5fca3258757659670

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.2.0.dev1

data/bin/kontena

@@ -1,38 +1,18 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-# resolve bin path, ignoring symlinks
+# add lib to libpath (only needed when running from the sources)
 require 'pathname'
-bin_file = Pathname.new(__FILE__).realpath
+lib_path = File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
+$:.unshift lib_path unless $:.include?(lib_path)
 
-# add self to libpath
-$:.unshift File.expand_path('../../lib', bin_file)
-
-require 'kontena_cli'
 STDOUT.sync = true
 
-begin
+if ARGV[0] == 'complete'
+  ARGV.delete_at(0)
+  require 'kontena/scripts/completer'
+else
+  require 'kontena_cli'
   Kontena::PluginManager.instance.init
   Kontena::MainCommand.run
-rescue Excon::Errors::SocketError => exc
-  if exc.message.include?('Unable to verify certificate')
-    $stderr.puts " [#{Kontena.pastel.red('error')}] The server uses a certificate signed by an unknown authority."
-    $stderr.puts "         You can trust this server by copying server CA pem file to: #{Kontena.pastel.yellow("~/.kontena/certs/<hostname>.pem")}"
-    $stderr.puts "         Protip: you can bypass the certificate check by setting #{Kontena.pastel.yellow('SSL_IGNORE_ERRORS=true')} env variable, but any data you send to the server could be intercepted by others."
-    abort
-  else
-    abort(exc.message)
-  end
-rescue Kontena::Errors::StandardError => exc
-  raise exc if ENV['DEBUG']
-  $stderr.puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
-  abort
-rescue Errno::EPIPE
-  # If user is piping the command outputs to some other command that might exit before CLI has outputted everything
-  abort
-rescue => exc
-  raise exc if ENV['DEBUG']
-  $stderr.puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
-  $stderr.puts "         Rerun the command with environment DEBUG=true set to get the full exception"
-  abort
 end

data/kontena-cli.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kontena, Inc"]
   spec.email         = ["info@kontena.io"]
   spec.summary       = %q{Kontena command line tool}
-  spec.description   = %q{Kontena command line tool}
+  spec.description   = %q{Command-line client for the Kontena container and microservices platform}
   spec.homepage      = "https://www.kontena.io"
   spec.license       = "Apache-2.0"
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "excon", "~> 0.49.0"
-  spec.add_runtime_dependency "tty-prompt", "~> 0.10"
+  spec.add_runtime_dependency "tty-prompt", "~> 0.11.0"
   spec.add_runtime_dependency "clamp", "~> 1.1.0"
   spec.add_runtime_dependency "ruby_dig", "~> 0.0.2"
   spec.add_runtime_dependency "launchy", "~> 2.4.3"

data/lib/kontena/cli/app_command.rb

@@ -1,33 +1,20 @@
-require_relative 'apps/init_command'
-require_relative 'apps/build_command'
-require_relative 'apps/config_command'
-require_relative 'apps/deploy_command'
-require_relative 'apps/start_command'
-require_relative 'apps/stop_command'
-require_relative 'apps/restart_command'
-require_relative 'apps/remove_command'
-require_relative 'apps/list_command'
-require_relative 'apps/logs_command'
-require_relative 'apps/monitor_command'
-require_relative 'apps/show_command'
-require_relative 'apps/scale_command'
 
 class Kontena::Cli::AppCommand < Kontena::Command
 
-  subcommand "init", "Init Kontena application", Kontena::Cli::Apps::InitCommand
-  subcommand "build", "Build Kontena services", Kontena::Cli::Apps::BuildCommand
-  subcommand "config", "View service configurations", Kontena::Cli::Apps::ConfigCommand
-  subcommand "deploy", "Deploy Kontena services", Kontena::Cli::Apps::DeployCommand
-  subcommand "scale", "Scale services", Kontena::Cli::Apps::ScaleCommand
-  subcommand "start", "Start services", Kontena::Cli::Apps::StartCommand
-  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", "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
+  subcommand "init", "Init Kontena application", load_subcommand('apps/init_command')
+  subcommand "build", "Build Kontena services", load_subcommand('apps/build_command')
+  subcommand "config", "View service configurations", load_subcommand('apps/config_command')
+  subcommand "deploy", "Deploy Kontena services", load_subcommand('apps/deploy_command')
+  subcommand "scale", "Scale services", load_subcommand('apps/scale_command')
+  subcommand "start", "Start services", load_subcommand('apps/start_command')
+  subcommand "stop", "Stop services", load_subcommand('apps/stop_command')
+  subcommand "restart", "Restart services", load_subcommand('apps/restart_command')
+  subcommand "show", "Show service details", load_subcommand('apps/show_command')
+  subcommand ["ps", "list", "ls"], "List services", load_subcommand('apps/list_command')
+  subcommand ["logs"], "Show service logs", load_subcommand('apps/logs_command')
+  subcommand "monitor", "Monitor services", load_subcommand('apps/monitor_command')
+  subcommand ["remove","rm"], "Remove services", load_subcommand('apps/remove_command')
 
   def execute
   end
-end
+end

data/lib/kontena/cli/certificate_command.rb

@@ -1,14 +1,11 @@
-require_relative 'certificate/register_command'
-require_relative 'certificate/authorize_command'
-require_relative 'certificate/get_command'
 
 class Kontena::Cli::CertificateCommand < Kontena::Command
 
 
-  subcommand "register", "Register to LetsEncrypt", Kontena::Cli::Certificate::RegisterCommand
-  subcommand "authorize", "Create DNS authorization for domain", Kontena::Cli::Certificate::AuthorizeCommand
-  subcommand "get", "Get certificate for domain", Kontena::Cli::Certificate::GetCommand
+  subcommand "register", "Register to LetsEncrypt", load_subcommand('certificate/register_command')
+  subcommand "authorize", "Create DNS authorization for domain", load_subcommand('certificate/authorize_command')
+  subcommand "get", "Get certificate for domain", load_subcommand('certificate/get_command')
 
   def execute
   end
-end
+end

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

@@ -1,21 +1,14 @@
-require_relative 'master/add_command'
-require_relative 'master/list_command'
-require_relative 'master/remove_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 ['remove', 'rm'], "Remove a master registration from Kontena Cloud", Kontena::Cli::Cloud::Master::RemoveCommand
-    subcommand "add", "Register a master in Kontena Cloud", Kontena::Cli::Cloud::Master::AddCommand
-    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
+    subcommand ['list', 'ls'], "List masters in Kontena Cloud", load_subcommand('cloud/master/list_command')
+    subcommand "add", "Register a master in Kontena Cloud", load_subcommand('cloud/master/add_command')
+    subcommand ['remove', 'rm'], "Remove a master registration from Kontena Cloud", load_subcommand('cloud/master/remove_command')
+    subcommand "show", "Show master settings in Kontena Cloud", load_subcommand('cloud/master/show_command')
+    subcommand "update", "Update master settings in Kontena Cloud", load_subcommand('cloud/master/update_command')
 
     def execute
     end
   end
 end
-

data/lib/kontena/cli/cloud_command.rb

@@ -1,12 +1,9 @@
-require_relative 'cloud/login_command'
-require_relative 'cloud/logout_command'
-require_relative 'cloud/master_command'
 
 class Kontena::Cli::CloudCommand < Kontena::Command
-  subcommand "login", "Authenticate to Kontena Cloud", Kontena::Cli::Cloud::LoginCommand
-  subcommand "logout", "Logout from Kontena Cloud", Kontena::Cli::Cloud::LogoutCommand
-  subcommand "master", "Master specific commands", Kontena::Cli::Cloud::MasterCommand
+  subcommand "login", "Authenticate to Kontena Cloud", load_subcommand('cloud/login_command')
+  subcommand "logout", "Logout from Kontena Cloud", load_subcommand('cloud/logout_command')
+  subcommand "master", "Master specific commands", load_subcommand('cloud/master_command')
 
   def execute
   end
-end
+end

data/lib/kontena/cli/container_command.rb

@@ -1,14 +1,9 @@
-require_relative 'containers/list_command'
-require_relative 'containers/exec_command'
-require_relative 'containers/inspect_command'
-require_relative 'containers/logs_command'
-
 class Kontena::Cli::ContainerCommand < Kontena::Command
 
-  subcommand ["list", "ls"], "List grid containers", Kontena::Cli::Containers::ListCommand
-  subcommand "exec", "Execute command inside a container", Kontena::Cli::Containers::ExecCommand
-  subcommand "inspect", "Inspect the container", Kontena::Cli::Containers::InspectCommand
-  subcommand "logs", "Show container logs", Kontena::Cli::Containers::LogsCommand
+  subcommand ["list", "ls"], "List grid containers", load_subcommand('containers/list_command')
+  subcommand "exec", "Execute command inside a container", load_subcommand('containers/exec_command')
+  subcommand "inspect", "Inspect the container", load_subcommand('containers/inspect_command')
+  subcommand "logs", "Show container logs", load_subcommand('containers/logs_command')
 
   def execute
   end

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

@@ -1,4 +1,5 @@
 require_relative 'common'
+require 'kontena/cli/helpers/health_helper'
 
 module Kontena::Cli::Etcd
   class HealthCommand < Kontena::Command

data/lib/kontena/cli/etcd_command.rb

@@ -1,18 +1,11 @@
-require_relative 'etcd/get_command'
-require_relative 'etcd/set_command'
-require_relative 'etcd/mkdir_command'
-require_relative 'etcd/list_command'
-require_relative 'etcd/remove_command'
-require_relative 'etcd/health_command'
-
 class Kontena::Cli::EtcdCommand < Kontena::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 ["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
-  subcommand "health", "Check etcd health", Kontena::Cli::Etcd::HealthCommand
+  subcommand "get", "Get the current value for a single key", load_subcommand('etcd/get_command')
+  subcommand "set", "Set a value on the specified key", load_subcommand('etcd/set_command')
+  subcommand ["mkdir", "mk"], "Create a directory", load_subcommand('etcd/mkdir_command')
+  subcommand ["list", "ls"], "List a directory", load_subcommand('etcd/list_command')
+  subcommand "rm", "Remove a key or a directory", load_subcommand('etcd/remove_command')
+  subcommand "health", "Check etcd health", load_subcommand('etcd/health_command')
 
   def execute
   end

data/lib/kontena/cli/external_registry_command.rb

@@ -1,12 +1,8 @@
-require_relative 'external_registries/add_command'
-require_relative 'external_registries/list_command'
-require_relative 'external_registries/remove_command'
-
 class Kontena::Cli::ExternalRegistryCommand < Kontena::Command
 
-  subcommand "add", "Add external Docker image registry", Kontena::Cli::ExternalRegistries::AddCommand
-  subcommand ["list", "ls"], "List external Docker image registries", Kontena::Cli::ExternalRegistries::ListCommand
-  subcommand ["remove", "rm"], "Remove external Docker image registry", Kontena::Cli::ExternalRegistries::RemoveCommand
+  subcommand "add", "Add external Docker image registry", load_subcommand('external_registries/add_command')
+  subcommand ["list", "ls"], "List external Docker image registries", load_subcommand('external_registries/list_command')
+  subcommand ["remove", "rm"], "Remove external Docker image registry", load_subcommand('external_registries/remove_command')
 
   def execute
   end

data/lib/kontena/cli/grid_command.rb

@@ -1,34 +1,19 @@
-require_relative 'grids/list_command'
-require_relative 'grids/create_command'
-require_relative 'grids/update_command'
-require_relative 'grids/use_command'
-require_relative 'grids/show_command'
-require_relative 'grids/logs_command'
-require_relative 'grids/remove_command'
-require_relative 'grids/current_command'
-require_relative 'grids/env_command'
-require_relative 'grids/audit_log_command'
-require_relative 'grids/user_command'
-require_relative 'grids/cloud_config_command'
-require_relative 'grids/trusted_subnet_command'
-require_relative 'grids/health_command'
-
 class Kontena::Cli::GridCommand < Kontena::Command
 
-  subcommand ["list","ls"], "List all grids", Kontena::Cli::Grids::ListCommand
-  subcommand "create", "Create a new grid", Kontena::Cli::Grids::CreateCommand
-  subcommand "update", "Update grid", Kontena::Cli::Grids::UpdateCommand
-  subcommand "use", "Switch to use specific grid", Kontena::Cli::Grids::UseCommand
-  subcommand "show", "Show grid details", Kontena::Cli::Grids::ShowCommand
-  subcommand "logs", "Show logs from grid containers", Kontena::Cli::Grids::LogsCommand
-  subcommand ["remove","rm"], "Remove a grid", Kontena::Cli::Grids::RemoveCommand
-  subcommand "current", "Show current grid details", Kontena::Cli::Grids::CurrentCommand
-  subcommand "env", "Show the current grid environment details", Kontena::Cli::Grids::EnvCommand
-  subcommand "audit-log", "Show audit log of the current grid", Kontena::Cli::Grids::AuditLogCommand
-  subcommand "user", "User specific commands", Kontena::Cli::Grids::UserCommand
-  subcommand "cloud-config", "Generate cloud-config", Kontena::Cli::Grids::CloudConfigCommand
-  subcommand "trusted-subnet", "Trusted subnet related commands", Kontena::Cli::Grids::TrustedSubnetCommand
-  subcommand "health", "Check grid health", Kontena::Cli::Grids::HealthCommand
+  subcommand ["list","ls"], "List all grids", load_subcommand('grids/list_command')
+  subcommand "create", "Create a new grid", load_subcommand('grids/create_command')
+  subcommand "update", "Update grid", load_subcommand('grids/update_command')
+  subcommand "use", "Switch to use specific grid", load_subcommand('grids/use_command')
+  subcommand "show", "Show grid details", load_subcommand('grids/show_command')
+  subcommand "logs", "Show logs from grid containers", load_subcommand('grids/logs_command')
+  subcommand ["remove","rm"], "Remove a grid", load_subcommand('grids/remove_command')
+  subcommand "current", "Show current grid details", load_subcommand('grids/current_command')
+  subcommand "env", "Show the current grid environment details", load_subcommand('grids/env_command')
+  subcommand "audit-log", "Show audit log of the current grid", load_subcommand('grids/audit_log_command')
+  subcommand "user", "User specific commands", load_subcommand('grids/user_command')
+  subcommand "cloud-config", "Generate cloud-config", load_subcommand('grids/cloud_config_command')
+  subcommand "trusted-subnet", "Trusted subnet related commands", load_subcommand('grids/trusted_subnet_command')
+  subcommand "health", "Check grid health", load_subcommand('grids/health_command')
 
   def execute
   end

data/lib/kontena/cli/grids/cloud_config_command.rb

@@ -45,6 +45,7 @@ module Kontena::Cli::Grids
         docker_bip: docker_bip,
         version: version,
         match_default_network_name: default_interface_match,
+        grid_subnet: grid['subnet'],
       )
       puts config
     end

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

@@ -12,6 +12,8 @@ module Kontena::Cli::Grids
       grid['default_affinity'].to_a.each do |a|
         puts "    - #{a}"
       end
+      puts "  subnet: #{grid['subnet']}"
+      puts "  supernet: #{grid['supernet']}"
       root_dir = grid['engine_root_dir']
       nodes = client(require_token).get("grids/#{grid['name']}/nodes")
       nodes = nodes['nodes'].select{|n| n['connected'] == true }

data/lib/kontena/cli/grids/create_command.rb

@@ -11,6 +11,8 @@ module Kontena::Cli::Grids
     option "--silent", :flag, "Reduce output verbosity"
     option "--token", "[TOKEN]", "Set grid token"
     option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
+    option "--subnet", "[CIDR]", "Configure grid overlay subnet"
+    option "--supernet", "[CIDR]", "Configure grid IPAM supernet"
 
     requires_current_master_token
 
@@ -21,6 +23,9 @@ module Kontena::Cli::Grids
       payload[:token] = self.token if self.token
       payload[:initial_size] = self.initial_size if self.initial_size
       payload[:default_affinity] = self.default_affinity_list unless self.default_affinity_list.empty?
+      payload[:subnet] = subnet if subnet
+      payload[:supernet] = supernet if supernet
+      
       grid = nil
       if initial_size == 1
         warning "Option --initial-size=1 is only recommended for test/dev usage" unless running_silent?

data/lib/kontena/cli/grids/trusted_subnet_command.rb

@@ -1,12 +1,10 @@
 module Kontena::Cli::Grids
-
-  require_relative 'trusted_subnets/list_command'
-  require_relative 'trusted_subnets/add_command'
-  require_relative 'trusted_subnets/remove_command'
-
   class TrustedSubnetCommand < Kontena::Command
-    subcommand ["list", "ls"], "List trusted subnets", TrustedSubnets::ListCommand
-    subcommand "add", "Add trusted subnet", TrustedSubnets::AddCommand
-    subcommand ["remove", "rm"], "Remove trusted subnet", TrustedSubnets::RemoveCommand
+    subcommand ["list", "ls"], "List trusted subnets", load_subcommand('grids/trusted_subnets/list_command')
+    subcommand "add", "Add trusted subnet", load_subcommand('grids/trusted_subnets/add_command')
+    subcommand ["remove", "rm"], "Remove trusted subnet", load_subcommand('grids/trusted_subnets/remove_command')
+
+    def execute
+    end
   end
 end

data/lib/kontena/cli/grids/user_command.rb

@@ -1,12 +1,9 @@
 module Kontena::Cli::Grids
 
-  require_relative 'users/list_command'
-  require_relative 'users/add_command'
-  require_relative 'users/remove_command'
 
   class UserCommand < Kontena::Command
-    subcommand ["list", "ls"], "List grid users", Users::ListCommand
-    subcommand "add", "Add user to grid", Users::AddCommand
-    subcommand ["remove", "rm"], "Remove user from grid", Users::RemoveCommand
+    subcommand ["list", "ls"], "List grid users", load_subcommand('grids/users/list_command')
+    subcommand "add", "Add user to grid", load_subcommand('grids/users/add_command')
+    subcommand ["remove", "rm"], "Remove user from grid", load_subcommand('grids/users/remove_command')
   end
 end

data/lib/kontena/cli/master/config_command.rb

@@ -1,23 +1,17 @@
-require_relative 'config/set_command'
-require_relative 'config/get_command'
-require_relative 'config/unset_command'
-require_relative 'config/export_command'
-require_relative 'config/import_command'
 
 module Kontena
   module Cli
     module Master
       class ConfigCommand < Kontena::Command
-        subcommand "set", "Set a config value", Kontena::Cli::Master::Config::SetCommand
-        subcommand "get", "Get a config value", Kontena::Cli::Master::Config::GetCommand
-        subcommand "unset", "Clear a config value", Kontena::Cli::Master::Config::UnsetCommand
-        subcommand ["load", "import"], "Upload config to Master", Kontena::Cli::Master::Config::ImportCommand
-        subcommand ["dump", "export"], "Download config from Master", Kontena::Cli::Master::Config::ExportCommand
+        subcommand "set", "Set a config value", load_subcommand('master/config/set_command')
+        subcommand "get", "Get a config value", load_subcommand('master/config/get_command')
+        subcommand "unset", "Clear a config value", load_subcommand('master/config/unset_command')
+        subcommand ["load", "import"], "Upload config to Master", load_subcommand('master/config/import_command')
+        subcommand ["dump", "export"], "Download config from Master", load_subcommand('master/config/export_command')
 
         def execute
         end
       end
     end
   end
-end
-
+end

data/lib/kontena/cli/master/token_command.rb

@@ -1,18 +1,13 @@
-require_relative 'token/list_command'
-require_relative 'token/remove_command'
-require_relative 'token/create_command'
-require_relative 'token/current_command'
-require_relative 'token/show_command'
 
 module Kontena::Cli::Master
   class TokenCommand < Kontena::Command
-    subcommand ["list", "ls"], "List access tokens", Kontena::Cli::Master::Token::ListCommand
-    subcommand ["rm", "remove"], "Remove / revoke an access token", Kontena::Cli::Master::Token::RemoveCommand
-    subcommand "show", "Display access token", Kontena::Cli::Master::Token::ShowCommand
-    subcommand "current", "Display current access token", Kontena::Cli::Master::Token::CurrentCommand
-    subcommand "create", "Generate an access token", Kontena::Cli::Master::Token::CreateCommand
+    subcommand ["list", "ls"], "List access tokens", load_subcommand('master/token/list_command')
+    subcommand ["rm", "remove"], "Remove / revoke an access token", load_subcommand('master/token/remove_command')
+    subcommand "show", "Display access token", load_subcommand('master/token/show_command')
+    subcommand "current", "Display current access token", load_subcommand('master/token/current_command')
+    subcommand "create", "Generate an access token", load_subcommand('master/token/create_command')
 
     def execute
     end
   end
-end
+end