kontena-cli 0.15.5 → 0.16.0.pre1

data/lib/kontena/cli/container_command.rb

@@ -1,7 +1,7 @@
 require_relative 'containers/exec_command'
 require_relative 'containers/inspect_command'
 
-class Kontena::Cli::ContainerCommand < Clamp::Command
+class Kontena::Cli::ContainerCommand < Kontena::Command
 
   subcommand "exec", "Execute command inside a container", Kontena::Cli::Containers::ExecCommand
   subcommand "inspect", "Inspect the container", Kontena::Cli::Containers::InspectCommand

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

@@ -2,7 +2,7 @@ require_relative '../grid_options'
 require_relative './containers_helper'
 
 module Kontena::Cli::Containers
-  class ExecCommand < Clamp::Command
+  class ExecCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ContainersHelper

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

@@ -1,5 +1,5 @@
 module Kontena::Cli::Containers
-  class InspectCommand < Clamp::Command
+  class InspectCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Etcd
-  class GetCommand < Clamp::Command
+  class GetCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Etcd
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Etcd
-  class MkdirCommand < Clamp::Command
+  class MkdirCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Etcd
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Etcd
-  class SetCommand < Clamp::Command
+  class SetCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

data/lib/kontena/cli/etcd_command.rb

@@ -4,7 +4,7 @@ require_relative 'etcd/mkdir_command'
 require_relative 'etcd/list_command'
 require_relative 'etcd/remove_command'
 
-class Kontena::Cli::EtcdCommand < Clamp::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

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

@@ -1,5 +1,5 @@
 module Kontena::Cli::ExternalRegistries
-  class AddCommand < Clamp::Command
+  class AddCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

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

@@ -1,5 +1,5 @@
 module Kontena::Cli::ExternalRegistries
-  class DeleteCommand < Clamp::Command
+  class DeleteCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

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

@@ -1,5 +1,5 @@
 module Kontena::Cli::ExternalRegistries
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

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

@@ -1,5 +1,5 @@
 module Kontena::Cli::ExternalRegistries
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "NAME", "External registry name to remove"

data/lib/kontena/cli/external_registry_command.rb

@@ -3,7 +3,7 @@ require_relative 'external_registries/list_command'
 require_relative 'external_registries/delete_command'
 require_relative 'external_registries/remove_command'
 
-class Kontena::Cli::ExternalRegistryCommand < Clamp::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

data/lib/kontena/cli/grid_command.rb

@@ -12,7 +12,7 @@ require_relative 'grids/user_command'
 require_relative 'grids/cloud_config_command'
 require_relative 'grids/trusted_subnet_command'
 
-class Kontena::Cli::GridCommand < Clamp::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

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

@@ -1,17 +1,18 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class AuditLogCommand < Clamp::Command
+  class AuditLogCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 
     option ["-l", "--lines"], "LINES", "Number of lines"
 
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
     def execute
-      require_api_url
-      require_current_grid
-      token = require_token
-      audit_logs = client(token).get("grids/#{current_grid}/audit_log", {limit: lines})
+      audit_logs = client.get("grids/#{current_grid}/audit_log", {limit: lines})
       puts '%-30.30s %-10s %-15s %-25s %-15s %-25s %-15s %-15s' % ['Time', 'Grid', 'Resource Type', 'Resource Name', 'Event Name', 'User', 'Source IP', 'User-Agent']
       audit_logs['logs'].each do |log|
         puts '%-30.30s %-10s %-15s %-25s %-15s %-25s %-15s %-15s' % [ log['time'], log['grid'], log['resource_type'], log['resource_name'], log['event_name'], log['user_identity']['email'], log['source_ip'], log['user_agent']]

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class CloudConfigCommand < Clamp::Command
+  class CloudConfigCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 

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

@@ -38,7 +38,7 @@ module Kontena::Cli::Grids
     end
 
     def grids
-      @grids ||= client(require_token).get('grids')
+      @grids ||= client.get('grids')
     end
 
     # @param [Array<Hash>] nodes

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

@@ -1,12 +1,15 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class CreateCommand < Clamp::Command
+  class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 
     parameter "NAME", "Grid name"
+
     option "--initial-size", "INITIAL_SIZE", "Initial grid size (number of nodes)", default: 1
+    option "--skip-use", :flag, "Do not switch to the created grid"
+    option "--silent", :flag, "Reduce output verbosity"
 
     def execute
       require_api_url
@@ -17,9 +20,10 @@ module Kontena::Cli::Grids
       }
       payload[:initial_size] = initial_size if initial_size
       grid = client(token).post('grids', payload)
-      if grid
-        self.current_grid = grid
-        puts "Using grid: #{grid['name'].cyan}"
+      if grid && !self.skip_use?
+        config.current_grid = grid['name']
+        config.write
+        puts "Using grid: #{pastel.cyan(grid['name'])}"
       end
     end
   end

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class CurrentCommand < Clamp::Command
+  class CurrentCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class EnvCommand < Clamp::Command
+  class EnvCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 

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

@@ -1,25 +1,50 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 
+    option ['-u', '--use'], :flag, 'Automatically use first available grid sorted by user count', hidden: true
+    option ['-v', '--verbose'], :flag, 'Use a more verbose output', hidden: true
+
     def execute
       require_api_url
 
-      if grids['grids'].size == 0
-        puts "You don't have any grids yet. Create first one with 'kontena grid create' command".colorize(:yellow)
+      vputs
+
+      gridlist = []
+
+      vspinner "Retrieving a list of available grids" do
+        gridlist = grids['grids'].sort_by{|grid| grid['user_count']}
       end
 
-      puts '%-30.30s %-8s %-12s %-10s' % ['Name', 'Nodes', 'Services', 'Users']
-      grids['grids'].each do |grid|
-        if grid['id'] == current_grid
-          name = "#{grid['name']} *"
-        else
-          name = grid['name']
+      if gridlist.size == 0
+        self.verbose? && puts
+        puts "Kontena Master #{config.current_master.name} doesn't have any grids yet. Create one now using 'kontena grid create' command".colorize(:yellow)
+        self.verbose? && puts
+      else
+        vputs
+        vputs "You have access to the following grids:"
+        vputs
+
+        puts '%-30.30s %-8s %-12s %-10s' % ['Name', 'Nodes', 'Services', 'Users']
+        gridlist.each do |grid|
+          if grid['name'] == config.current_master.grid
+            name = "#{grid['name']} *"
+          else
+            name = grid['name']
+          end
+          puts '%-30.30s %-8s %-12s %-10s' % [name, grid['node_count'], grid['service_count'], grid['user_count']]
+        end
+
+        if self.use?
+          vputs
+          vspinner "* Selecting '#{gridlist.first['name']}' as the current grid" do
+            config.current_master.grid = gridlist.first['name']
+            config.write
+          end
         end
-        puts '%-30.30s %-8s %-12s %-10s' % [name, grid['node_count'], grid['service_count'], grid['user_count']]
       end
     end
   end

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

@@ -1,7 +1,7 @@
 require_relative '../helpers/log_helper'
 
 module Kontena::Cli::Grids
-  class LogsCommand < Clamp::Command
+  class LogsCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::Helpers::LogHelper
 

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 
@@ -18,7 +18,7 @@ module Kontena::Cli::Grids
         response = client(token).delete("grids/#{grid['id']}")
         if response
           clear_current_grid if grid['id'] == current_grid
-          puts "removed #{grid['name'].cyan}"
+          puts "removed #{pastel.cyan(grid['name'])}"
         end
       else
         abort "Could not resolve grid by name [#{name}]. For a list of existing grids please run: kontena grid list".colorize(:red)

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class ShowCommand < Clamp::Command
+  class ShowCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 

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

@@ -4,7 +4,7 @@ module Kontena::Cli::Grids
   require_relative 'trusted_subnets/add_command'
   require_relative 'trusted_subnets/remove_command'
 
-  class TrustedSubnetCommand < Clamp::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

data/lib/kontena/cli/grids/trusted_subnets/add_command.rb

@@ -1,5 +1,5 @@
 module Kontena::Cli::Grids::TrustedSubnets
-  class AddCommand < Clamp::Command
+  class AddCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "NAME", "Grid name"

data/lib/kontena/cli/grids/trusted_subnets/list_command.rb

@@ -1,5 +1,5 @@
 module Kontena::Cli::Grids::TrustedSubnets
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "NAME", "Grid name"

data/lib/kontena/cli/grids/trusted_subnets/remove_command.rb

@@ -1,5 +1,5 @@
 module Kontena::Cli::Grids::TrustedSubnets
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "NAME", "Grid name"

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class UpdateCommand < Clamp::Command
+  class UpdateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 

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

@@ -1,21 +1,26 @@
 require_relative 'common'
 
 module Kontena::Cli::Grids
-  class UseCommand < Clamp::Command
+  class UseCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 
+    requires_current_master
+
     parameter "NAME", "Grid name to use"
 
+    option ['--silent'], :flag, 'Reduce output verbosity'
+
     def execute
-      require_api_url
       grid = find_grid_by_name(name)
-      if !grid.nil?
-        self.current_grid = grid
-        puts "Using grid: #{grid['name'].cyan}"
-      else
+      unless grid
         abort "Could not resolve grid by name [#{name}]. For a list of existing grids please run: kontena grid list".colorize(:red)
       end
+      config.current_master.grid = grid['name']
+      config.write
+      unless self.silent?
+        puts "Using grid: #{pastel.cyan(grid['name'])}"
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Kontena::Cli::Grids
   require_relative 'users/add_command'
   require_relative 'users/remove_command'
 
-  class UserCommand < Clamp::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

data/lib/kontena/cli/grids/users/add_command.rb

@@ -1,7 +1,7 @@
 require_relative '../common'
 
 module Kontena::Cli::Grids::Users
-  class AddCommand < Clamp::Command
+  class AddCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Grids::Common

data/lib/kontena/cli/grids/users/list_command.rb

@@ -1,7 +1,7 @@
 require_relative '../common'
 
 module Kontena::Cli::Grids::Users
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::Grids::Common
 

data/lib/kontena/cli/grids/users/remove_command.rb

@@ -1,7 +1,7 @@
 require_relative '../common'
 
 module Kontena::Cli::Grids::Users
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Grids::Common