kontena-cli 0.15.5 → 0.16.0.pre1

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

@@ -1,31 +1,20 @@
 module Kontena::Cli::Master
-  class UseCommand < Clamp::Command
+  class UseCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "NAME", "Master name to use"
 
     def execute
-      master = settings['servers'].find { |s| s['name'] == name }
-
-      if master
-        self.current_master = master['name']
-        puts "Using master: #{master['name'].cyan} (#{master['url']})"
-        puts "Using grid: #{current_grid.cyan}" if current_grid
-
-        grids = client(require_token).get('grids')['grids']
-        if grids.size > 1
-          puts ""
-          puts "You have access to following grids:"
-          puts ""
-          grids.each do |grid|
-            puts "  * #{grid['name']}"
-          end
-        end
+      master = config.find_server(name)
+      if master.nil?
+        abort pastel.red("Could not resolve master by name '#{name}'.") +
+              "\nFor a list of known masters please run: kontena master list"
       else
-        abort "Could not resolve master with name: #{name}".colorize(:red)
+        self.current_master = master['name']
+        puts "Using master: #{pastel.cyan(master['name'])} (#{master['url']})"
+        puts "Using grid: #{current_grid ? pastel.cyan(current_grid) : "<none>"}"
       end
     end
-
   end
 
 end

data/lib/kontena/cli/master/users/invite_command.rb

@@ -1,24 +1,51 @@
 require_relative '../../common'
+require_relative 'roles/add_command'
 
 module Kontena::Cli::Master::Users
-  class InviteCommand < Clamp::Command
+  class InviteCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "EMAIL ...", "List of emails"
 
+    banner <<-EOB.gsub(/^\s+/, "")
+      If the email address matches the one returned from authentication provider
+      then the user can authenticate using 'kontena master auth <url>'.
+      If it doesn't, the user must use the invitation code:
+      $ kontena master join <url> <invite_code>
+    EOB
+
+    option ['-r', '--roles'], '[ROLES]', 'Comma separated list of roles to assign to the invited users'
+    option ['-c', '--code'], :flag, 'Only output the invite code'
+
     def execute
       require_api_url
       token = require_token
+
+      if self.roles
+        roles = self.roles.split(',')
+      else
+        roles = []
+      end
+
       email_list.each do |email|
         begin
-          data = { email: email }
-          response = client(token).post('users', data)
-          puts "Invited #{email} (no email gets sent)"
+          data = { email: email, response_type: 'invite' }
+          response = client(token).post('/oauth2/authorize', data)
+          if self.code?
+            puts response['invite_code']
+          else
+            puts "Invitation created for #{response['email']}".colorize(:green)
+            puts "  * code:    #{response['invite_code']}"
+            puts "  * command: kontena master join #{current_master.url} #{response['invite_code']}"
+          end
+          roles.each do |role|
+            Kontena.run("master users role add #{role.shellescape} #{email.shellescape}")
+          end
         rescue
           puts "Failed to invite #{email}".colorize(:red)
-          puts exc.message
+          ENV["DEBUG"] && puts("#{$!} - #{$!.message} -- #{$!.backtrace}")
         end
       end
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 require_relative '../../common'
 
 module Kontena::Cli::Master::Users
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
 
     def execute
@@ -15,4 +15,4 @@ module Kontena::Cli::Master::Users
       end
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 require_relative '../../common'
 
 module Kontena::Cli::Master::Users
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "EMAIL ...", "List of emails"

data/lib/kontena/cli/master/users/role_command.rb

@@ -3,7 +3,7 @@ module Kontena::Cli::Master::Users
   require_relative 'roles/add_command'
   require_relative 'roles/remove_command'
 
-  class RoleCommand < Clamp::Command
+  class RoleCommand < Kontena::Command
     subcommand "add", "Add role to user", Roles::AddCommand
     subcommand ["remove", "rm"], "Remove role from user", Roles::RemoveCommand
   end

data/lib/kontena/cli/master/users/roles/add_command.rb

@@ -1,24 +1,26 @@
 require_relative '../../../common'
 
-module Kontena::Cli::Master::Users::Roles
-  class AddCommand < Clamp::Command
-    include Kontena::Cli::Common
+module Kontena::Cli::Master::Users
+  module Roles
+    class AddCommand < Kontena::Command
+      include Kontena::Cli::Common
 
-    parameter "ROLE", "Role name"
-    parameter "USER ...", "List of users"
+      parameter "ROLE", "Role name"
+      parameter "USER ...", "List of users"
 
-    def execute
-      require_api_url
-      token = require_token
-      data = { role: role }
+      def execute
+        require_api_url
+        token = require_token
+        data = { role: role }
 
-      user_list.each do |email|
-        begin
-          response = client(token).post("users/#{email}/roles", data)
-          puts "Added role #{role} to #{email}"
-        rescue => exc
-          puts "Failed to add role #{role} to #{email}".colorize(:red)
-          puts exc.message
+        user_list.each do |email|
+          begin
+            response = client(token).post("users/#{email}/roles", data)
+            puts "Added role #{role} to #{email}"
+          rescue => exc
+            puts "Failed to add role #{role} to #{email}".colorize(:red)
+            puts exc.message
+          end
         end
       end
     end

data/lib/kontena/cli/master/users/roles/remove_command.rb

@@ -1,7 +1,7 @@
 require_relative '../../../common'
 
 module Kontena::Cli::Master::Users::Roles
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "ROLE", "Role name"

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

@@ -5,7 +5,7 @@ module Kontena::Cli::Master
   require_relative 'users/list_command'
   require_relative 'users/role_command'
 
-  class UsersCommand < Clamp::Command
+  class UsersCommand < Kontena::Command
     subcommand "invite", "Invite user to Kontena Master", Users::InviteCommand
     subcommand ["remove", "rm"], "Remove user from Kontena Master", Users::RemoveCommand
     subcommand ["list", "ls"], "List users", Users::ListCommand

data/lib/kontena/cli/master_command.rb

@@ -1,14 +1,34 @@
+require_relative '../main_command'
 require_relative 'master/use_command'
 require_relative 'master/list_command'
 require_relative 'master/users_command'
 require_relative 'master/current_command'
+require_relative 'master/config_command'
+require_relative 'master/login_command'
+require_relative 'master/join_command'
+require_relative 'master/audit_log_command'
 
-class Kontena::Cli::MasterCommand < Clamp::Command
+if ENV["DEV"]
+  begin
+    require_relative 'master/create_command'
+  rescue LoadError
+  end
+end
+
+class Kontena::Cli::MasterCommand < Kontena::Command
 
   subcommand ["list", "ls"], "List masters where client has logged in", Kontena::Cli::Master::ListCommand
+  subcommand ["config", "cfg"], "Configure master settings", Kontena::Cli::Master::ConfigCommand
   subcommand "use", "Switch to use selected master", Kontena::Cli::Master::UseCommand
   subcommand "users", "Users specific commands", Kontena::Cli::Master::UsersCommand
   subcommand "current", "Show current master details", Kontena::Cli::Master::CurrentCommand
+  subcommand "login", "Authenticate to Kontena Master", Kontena::Cli::Master::LoginCommand
+  subcommand "join", "Join Kontena Master using an invitation code", Kontena::Cli::Master::JoinCommand
+  subcommand "audit-log", "Show master audit logs", Kontena::Cli::Master::AuditLogCommand
+
+  if ENV["DEV"]
+    subcommand "create", "Install a new Kontena Master", Kontena::Cli::Master::CreateCommand
+  end
 
   def execute
   end

data/lib/kontena/cli/node_command.rb

@@ -5,7 +5,7 @@ require_relative 'nodes/update_command'
 require_relative 'nodes/ssh_command'
 require_relative 'nodes/label_command'
 
-class Kontena::Cli::NodeCommand < Clamp::Command
+class Kontena::Cli::NodeCommand < Kontena::Command
 
   subcommand ["list","ls"], "List grid nodes", Kontena::Cli::Nodes::ListCommand
   subcommand "show", "Show node", Kontena::Cli::Nodes::ShowCommand

data/lib/kontena/cli/nodes/label_command.rb

@@ -3,7 +3,7 @@ module Kontena::Cli::Nodes
   require_relative 'labels/add_command'
   require_relative 'labels/remove_command'
 
-  class LabelCommand < Clamp::Command
+  class LabelCommand < Kontena::Command
 
     subcommand "add", "Add label to node", Labels::AddCommand
     subcommand ["remove", "rm"], "Remove label from node", Labels::RemoveCommand

data/lib/kontena/cli/nodes/labels/add_command.rb

@@ -1,5 +1,5 @@
 module Kontena::Cli::Nodes::Labels
-  class AddCommand < Clamp::Command
+  class AddCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "NODE_ID", "Node id"

data/lib/kontena/cli/nodes/labels/remove_command.rb

@@ -1,5 +1,5 @@
 module Kontena::Cli::Nodes::Labels
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter "NODE_ID", "Node id"

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

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

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

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

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

@@ -1,5 +1,5 @@
 module Kontena::Cli::Nodes
-  class ShowCommand < Clamp::Command
+  class ShowCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::BytesHelper

data/lib/kontena/cli/nodes/ssh_command.rb

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

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

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

data/lib/kontena/cli/plugin_command.rb

@@ -3,7 +3,7 @@ require_relative 'plugins/search_command'
 require_relative 'plugins/install_command'
 require_relative 'plugins/uninstall_command'
 
-class Kontena::Cli::PluginCommand < Clamp::Command
+class Kontena::Cli::PluginCommand < Kontena::Command
 
   subcommand ["list","ls"], "List plugins", Kontena::Cli::Plugins::ListCommand
   subcommand "search", "Search plugins", Kontena::Cli::Plugins::SearchCommand

data/lib/kontena/cli/plugins/install_command.rb

@@ -1,7 +1,7 @@
 require 'open3'
 
 module Kontena::Cli::Plugins
-  class InstallCommand < Clamp::Command
+  class InstallCommand < Kontena::Command
     include Kontena::Util
 
     parameter 'NAME', 'Plugin name'
@@ -15,7 +15,7 @@ module Kontena::Cli::Plugins
       gem_bin = which('gem')
       install_command = "#{gem_bin} install --no-ri --no-doc #{plugin}"
       success = false
-      ShellSpinner "Installing plugin #{name.colorize(:cyan)}" do
+      spinner "Installing plugin #{name.colorize(:cyan)}" do
         stdout, stderr, status = Open3.capture3(install_command)
         unless stderr.empty?
           raise stderr

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

@@ -1,6 +1,5 @@
-
 module Kontena::Cli::Plugins
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
 
     def execute
       titles = ['NAME', 'VERSION', 'DESCRIPTION']
@@ -9,5 +8,6 @@ module Kontena::Cli::Plugins
         puts "%-40s %-10s %-40s" % [plugin.name, plugin.version, plugin.description]
       end
     end
+
   end
 end

data/lib/kontena/cli/plugins/search_command.rb

@@ -1,5 +1,5 @@
 module Kontena::Cli::Plugins
-  class SearchCommand < Clamp::Command
+  class SearchCommand < Kontena::Command
 
     parameter '[NAME]', 'Search text'
 

data/lib/kontena/cli/plugins/uninstall_command.rb

@@ -1,7 +1,7 @@
 require 'open3'
 
 module Kontena::Cli::Plugins
-  class UninstallCommand < Clamp::Command
+  class UninstallCommand < Kontena::Command
     include Kontena::Cli::Common
 
     parameter 'NAME', 'Plugin name'
@@ -17,7 +17,7 @@ module Kontena::Cli::Plugins
       gem_bin = `which gem`.strip
       install_command = "#{gem_bin} install -q #{plugin}"
       success = false
-      ShellSpinner "Uninstalling plugin #{name.colorize(:cyan)}" do
+      spinner "Uninstalling plugin #{name.colorize(:cyan)}" do
         stdout, stderr, status = Open3.capture3(install_command)
         unless stderr.empty?
           raise stderr

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

@@ -1,7 +1,5 @@
-require 'shell-spinner'
-
 module Kontena::Cli::Registry
-  class CreateCommand < Clamp::Command
+  class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
@@ -98,7 +96,7 @@ module Kontena::Cli::Registry
       }
       client(token).post("grids/#{current_grid}/services", data)
       client(token).post("services/#{current_grid}/registry/deploy", {})
-      ShellSpinner "Deploying registry service " do
+      spinner "Deploying registry service " do
         sleep 1 until client(token).get("services/#{current_grid}/registry")['state'] != 'deploying'
       end
       puts "\n"

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

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

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

@@ -1,5 +1,5 @@
 module Kontena::Cli::Registry
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced

data/lib/kontena/cli/registry_command.rb

@@ -2,7 +2,7 @@ require_relative 'registry/create_command'
 require_relative 'registry/delete_command'
 require_relative 'registry/remove_command'
 
-class Kontena::Cli::RegistryCommand < Clamp::Command
+class Kontena::Cli::RegistryCommand < Kontena::Command
 
   subcommand "create", "Create Docker image registry service", Kontena::Cli::Registry::CreateCommand
   subcommand ["remove","rm"], "Remove Docker image registry service", Kontena::Cli::Registry::RemoveCommand

data/lib/kontena/cli/service_command.rb

@@ -20,7 +20,7 @@ require_relative 'services/secret_command'
 require_relative 'services/link_command'
 require_relative 'services/unlink_command'
 
-class Kontena::Cli::ServiceCommand < Clamp::Command
+class Kontena::Cli::ServiceCommand < Kontena::Command
 
   subcommand ["list","ls"], "List services", Kontena::Cli::Services::ListCommand
   subcommand "create", "Create a new service", Kontena::Cli::Services::CreateCommand

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

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

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

@@ -1,7 +1,7 @@
 require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class ContainersCommand < Clamp::Command
+  class ContainersCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include ServicesHelper