kontena-cli 1.4.3 → 1.5.0.pre1

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

@@ -32,7 +32,7 @@ module Kontena::Cli::Grids
 
       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)
+        puts pastel.yellow("Kontena Master #{config.current_master.name} doesn't have any grids yet. Create one now using 'kontena grid create' command")
         self.verbose? && puts
       else
         vputs

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

@@ -29,7 +29,7 @@ module Kontena::Cli::Grids
         prefix = "#{log['created_at']} #{log['name']}:"
       end
 
-      puts "#{prefix.colorize(color)} #{log['data']}"
+      puts "#{pastel.send(color, prefix)} #{log['data']}"
     end
   end
 end

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

@@ -5,24 +5,26 @@ module Kontena::Cli::Grids
     include Kontena::Cli::Common
     include Common
 
-    parameter "NAME", "Grid name"
+    parameter "NAME ...", "Grid name", attribute_name: :grids
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       token = require_token
-      confirm_command(name) unless forced?
-      grid = find_grid_by_name(name)
+      grids.each do |name|
+        confirm_command(name) unless forced?
+        grid = find_grid_by_name(name)
 
-      if !grid.nil?
-        spinner "removing #{pastel.cyan(name)} grid " do
-          response = client(token).delete("grids/#{grid['id']}")
-          if response
-            clear_current_grid if grid['id'] == current_grid
+        if !grid.nil?
+          spinner "removing #{pastel.cyan(name)} grid " do
+            response = client(token).delete("grids/#{grid['id']}")
+            if response
+              clear_current_grid if grid['id'] == current_grid
+            end
           end
+        else
+          exit_with_error "Could not resolve grid by name [#{name}]. For a list of existing grids please run: kontena grid list"
         end
-      else
-        exit_with_error "Could not resolve grid by name [#{name}]. For a list of existing grids please run: kontena grid list"
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Grids::TrustedSubnets
     def execute
       grid = client.get("grids/#{current_grid}")
       data = {trusted_subnets: grid['trusted_subnets'] + [self.subnet]}
-      spinner "Adding #{subnet.colorize(:cyan)} as a trusted subnet in #{current_grid.colorize(:cyan)} grid " do
+      spinner "Adding #{pastel.cyan(subnet)} as a trusted subnet in #{pastel.cyan(current_grid)} grid " do
         client.put("grids/#{current_grid}", data)
       end
     end

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

@@ -3,21 +3,23 @@ module Kontena::Cli::Grids::TrustedSubnets
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "SUBNET", "Trusted subnet"
+    parameter "SUBNET ...", "Trusted subnet", attribute_name: :subnets
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     requires_current_master
 
     def execute
-      grid = client.get("grids/#{current_grid}")
-      confirm_command(subnet) unless forced?
-      trusted_subnets = grid['trusted_subnets'] || []
-      unless trusted_subnets.delete(self.subnet)
-        exit_with_error("Grid #{current_grid.colorize(:cyan)} does not have trusted subnet #{subnet.colorize(:cyan)}")
-      end
-      data = {trusted_subnets: trusted_subnets}
-      spinner "Removing trusted subnet #{subnet.colorize(:cyan)} from #{current_grid.colorize(:cyan)} grid " do
-        client.put("grids/#{current_grid}", data)
+      subnets.each do |subnet|
+        grid = client.get("grids/#{current_grid}")
+        confirm_command(subnet) unless forced?
+        trusted_subnets = grid['trusted_subnets'] || []
+        unless trusted_subnets.delete(subnet)
+          exit_with_error("Grid #{pastel.cyan(current_grid)} does not have trusted subnet #{pastel.cyan(subnet)}")
+        end
+        data = {trusted_subnets: trusted_subnets}
+        spinner "Removing trusted subnet #{pastel.cyan(subnet)} from #{pastel.cyan(current_grid)} grid " do
+          client.put("grids/#{current_grid}", data)
+        end
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Kontena::Cli::Grids
     def execute
       grid = find_grid_by_name(name)
       unless grid
-        exit_with_error "Could not resolve grid by name [#{name}]. For a list of existing grids please run: kontena grid list".colorize(:red)
+        exit_with_error pastel.red("Could not resolve grid by name [#{name}]. For a list of existing grids please run: kontena grid list")
       end
       config.current_master.grid = grid['name']
       config.write

data/lib/kontena/cli/helpers/log_helper.rb

@@ -84,7 +84,7 @@ module Kontena::Cli::Helpers
       color = color_for_container(log['name'])
       prefix = "#{log['created_at']} #{log['name']}:"
 
-      puts "#{prefix.colorize(color)} #{log['data']}"
+      puts "#{pastel.send(color, prefix)} #{log['data']}"
     end
 
     # @param [String] container_id

data/lib/kontena/cli/logout_command.rb

@@ -5,6 +5,6 @@ class Kontena::Cli::LogoutCommand < Kontena::Command
   banner "or 'kontena cloud logout' to log out of the Kontena Cloud", false
 
   def execute
-    exit_with_error("Command removed. Use #{"kontena master logout".colorize(:yellow)} to log out of the Kontena Master")
+    exit_with_error("Command removed. Use #{pastel.yellow("kontena master logout")} to log out of the Kontena Master")
   end
 end

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

@@ -176,7 +176,7 @@ module Kontena::Cli::Master
 
     def web_flow(server, auth_params)
       require_relative '../localhost_web_server'
-      require 'launchy'
+      require 'kontena/cli/browser_launcher'
 
 
       web_server = Kontena::LocalhostWebServer.new
@@ -202,12 +202,11 @@ module Kontena::Cli::Master
       puts
 
       server_thread  = Thread.new { Thread.main['response'] = web_server.serve_one }
-      browser_thread = Thread.new { Launchy.open(uri.to_s) }
+      Kontena::Cli::BrowserLauncher.open(uri.to_s)
 
       spinner "Waiting for browser authorization response" do
         server_thread.join
       end
-      browser_thread.join
 
       update_server(server, Thread.main['response'])
       update_server_to_config(server)

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

@@ -9,12 +9,12 @@ module Kontena::Cli::Master
         config.servers.each do |server|
           use_refresh_token(server)
           server.token = nil
-          puts "Logged out of #{server.name.colorize(:green)}"
+          puts "Logged out of #{pastel.green(server.name)}"
         end
       elsif config.current_master
         use_refresh_token(config.current_master)
         config.current_master.token = nil
-        puts "Logged out of #{config.current_master.name.colorize(:green)}"
+        puts "Logged out of #{pastel.green(config.current_master.name)}"
       else
         warn "Current master has not been selected"
         exit 0 # exiting with 0 not 1, it's not really an error situation (kontena logout && kontena master login...)

data/lib/kontena/cli/master/token/common.rb

@@ -9,7 +9,8 @@ module Kontena::Cli::Master::Token
         user_id: data["user"]["id"],
         user_email: data["user"]["email"],
         user_name: data["user"]["name"],
-        server_name: data["server"]["name"]
+        server_name: data["server"]["name"],
+        description: data['description']
       }
       if data["token_type"] == "bearer"
         output[:access_token_last_four] = data["access_token_last_four"]

data/lib/kontena/cli/master/token/create_command.rb

@@ -15,6 +15,7 @@ module Kontena::Cli::Master::Token
     option ['-u', '--user'], '[EMAIL]', 'Generate a token for another user'
     option ['--id'], :flag, "Only output the token ID"
     option ['--token'], :flag, "Only output the access_token (or authorization code)"
+    option ['-d', '--description'], '[DESCRIPTION]', 'Token description'
 
     option ['--return'], :flag, "Return the response hash", hidden: true
 
@@ -22,8 +23,9 @@ module Kontena::Cli::Master::Token
       params = {
         response_type: self.code? ? 'code' : 'token',
         scope: self.scopes,
-        expires_in: self.expires_in
+        expires_in: self.expires_in,
       }
+      params[:description] = self.description if self.description
       params[:user] = self.user if self.user
       data = token_data_to_hash(client.post("/oauth2/authorize", params))
 
@@ -39,8 +41,9 @@ module Kontena::Cli::Master::Token
         exit 0
       end
 
+      puts '%s:' % data.delete(:id)
       data.each do |key, value|
-        puts "%26.26s : %s" % [key, value]
+        puts "  %s: %s" % [key, value]
       end
     end
   end

data/lib/kontena/cli/master/token/current_command.rb

@@ -12,28 +12,33 @@ module Kontena::Cli::Master::Token
     option '--token', :flag, "Only output access token"
     option '--refresh-token', :flag, "Only output refresh token"
     option '--expires-in', :flag, "Only output expires in seconds"
+    option '--id', :flag, "Only output access token id"
 
     def execute
       if self.token?
         puts current_master.token.access_token
-        exit 0
+        return
       end
 
       if self.refresh_token?
         if current_master.token.refresh_token
           puts current_master.token.refresh_token
         end
-        exit 0
+        return
       end
 
       if self.expires_in?
         if current_master.token.expires_at.to_i > 0
           puts current_master.token.expires_at - Time.now.utc.to_i
         end
-        exit 0
+        return
       end
 
-      Kontena.run!(['master', 'token', 'show',  current_master.token.access_token])
+      if self.id?
+        Kontena.run!(['master', 'token', 'show',  '--id', current_master.token.access_token])
+      else
+        Kontena.run!(['master', 'token', 'show',  current_master.token.access_token])
+      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Kontena::Cli::Master::Token
 
     def fields
       return ['id'] if quiet?
-      { id: 'id', token_type: 'token_type', token_last4: 'access_token_last_four', expires_in: 'expires_in', scopes: 'scopes' }
+      { id: 'id', token_type: 'token_type', token_last4: 'access_token_last_four', expires_in: 'expires_in', scopes: 'scopes', description: 'description' }
     end
 
     def execute

data/lib/kontena/cli/master/token/show_command.rb

@@ -11,11 +11,21 @@ module Kontena::Cli::Master::Token
     requires_current_master
     requires_current_master_token
 
+    option '--id', :flag, "Only output access token id", hidden: true
+
     def execute
       data = client.get("/oauth2/tokens/#{token_or_id}")
       output = token_data_to_hash(data)
+
+      if id?
+        puts output[:id]
+        return
+      end
+
+      id = output.delete(:id)
+      puts '%s:' % id
       output.each do |key, value|
-        puts "%26.26s : %s" % [key, value]
+        puts "  %s: %s" % [key, value.nil? ? '-' : value]
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Kontena::Cli::Master::User
           elsif self.return?
             return response
           else
-            puts "Invitation created for #{response['email']}".colorize(:green)
+            puts pastel.green("Invitation created for #{response['email']}")
             puts "  * code:    #{response['invite_code']}"
             puts "  * command: kontena master join #{current_master.url} #{response['invite_code']}"
           end

data/lib/kontena/cli/master_command.rb

@@ -5,7 +5,6 @@ class Kontena::Cli::MasterCommand < Kontena::Command
   subcommand ["remove", "rm"], "Remove a master from configuration", load_subcommand('master/remove_command')
   subcommand ["config", "cfg"], "Configure master settings", load_subcommand('master/config_command')
   subcommand "use", "Switch to use selected master", load_subcommand('master/use_command')
-  subcommand "users", "Users specific commands [DEPRECATED]", load_subcommand('master/users_command')
   subcommand "user", "User specific commands", load_subcommand('master/user_command')
   subcommand "current", "Show current master details", load_subcommand('master/current_command')
   subcommand "login", "Authenticate to Kontena Master", load_subcommand('master/login_command')

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

@@ -17,7 +17,7 @@ module Kontena::Cli::Nodes
       data[:token] = token if token
       data[:labels] = label_list
 
-      spinner "Creating #{name.colorize(:cyan)} node " do
+      spinner "Creating #{pastel.cyan(name)} node " do
         client.post("grids/#{current_grid}/nodes", data)
       end
     end

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

@@ -5,14 +5,28 @@ module Kontena::Cli::Nodes::Labels
     parameter "NODE", "Node name"
     parameter "LABEL ...", "Labels"
 
+    option '--force', :flag, "Do not abort if items in label list are not found"
+
     requires_current_master
     requires_current_master_token
     requires_current_grid
 
     def execute
-      node = client.get("nodes/#{current_grid}/#{self.node}")
-      data = { labels: Array(node['labels']).reject {|label| label_list.include?(label) } }
-      client.put("nodes/#{node['id']}", data)
+      node_data = client.get("nodes/#{current_grid}/#{self.node}")
+
+      node_data['labels'] ||= []
+
+      found_labels = label_list.uniq & node_data['labels']
+
+      if !force? && found_labels.size != label_list.uniq.size
+        missing = label_list - found_labels
+        exit_with_error "Label#{'s' if missing.size > 1} #{pastel.cyan(missing.join(', '))} not found on node #{pastel.cyan(node)}"
+      end
+
+      return nil if found_labels.empty?
+
+      data = { labels: node_data['labels'] - found_labels }
+      client.put("nodes/#{node_data['id']}", data)
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "NODE", "Node name"
+    parameter "NODE ...", "Node name", attribute_name: :nodes
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
@@ -11,18 +11,20 @@ module Kontena::Cli::Nodes
       require_current_grid
       token = require_token
 
-      node = client(token).get("nodes/#{current_grid}/#{self.node}")
+      nodes.each do |node_name|
+        node = client(token).get("nodes/#{current_grid}/#{node_name}")
 
-      if node['has_token'] && node['connected']
-        warning "Node #{node['name']} is still connected using a node token, but will be force-disconnected"
-      elsif node['connected']
-        exit_with_error "Node #{node['name']} is still connected using a grid token. You must terminate the node before removing it."
-      end
+        if node['has_token'] && node['connected']
+          warning "Node #{node['name']} is still connected using a node token, but will be force-disconnected"
+        elsif node['connected']
+          exit_with_error "Node #{node['name']} is still connected using a grid token. You must terminate the node before removing it."
+        end
 
-      confirm_command(self.node) unless forced?
+        confirm_command(node_name) unless forced?
 
-      spinner "Removing #{self.node.colorize(:cyan)} node from #{current_grid.colorize(:cyan)} grid " do
-        client(token).delete("nodes/#{node['id']}")
+        spinner "Removing #{pastel.cyan(node_name)} node from #{pastel.cyan(current_grid)} grid " do
+          client(token).delete("nodes/#{node['id']}")
+        end
       end
     end
   end

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

@@ -17,7 +17,7 @@ module Kontena::Cli::Nodes
     def execute
       confirm("Resetting the node token will disconnect the agent (unless using --no-reset-connection), and require you to reconfigure the kontena-agent using the new `kontena node env` values before it will be able to reconnect. Are you sure?")
 
-      spinner "Resetting node #{self.node.colorize(:cyan)} websocket connection token" do
+      spinner "Resetting node #{pastel.cyan(self.node)} websocket connection token" do
         if self.clear_token?
           client.delete("nodes/#{current_grid}/#{self.node}/token",
             reset_connection: self.reset_connection?,

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

@@ -20,7 +20,7 @@ module Kontena::Cli::Nodes
       data[:labels] = [] if self.clear_labels?
 
       data[:availability] = availability if availability
-      spinner "Updating #{self.node.colorize(:cyan)} node " do
+      spinner "Updating #{pastel.cyan(self.node)} node " do
         client.put("nodes/#{current_grid}/#{self.node}", data)
       end
     end

data/lib/kontena/cli/plugin_command.rb

@@ -5,7 +5,8 @@ class Kontena::Cli::PluginCommand < Kontena::Command
   subcommand "search", "Search plugins", load_subcommand('plugins/search_command')
   subcommand "install", "Install a plugin", load_subcommand('plugins/install_command')
   subcommand "uninstall", "Uninstall a plugin", load_subcommand('plugins/uninstall_command')
+  subcommand "upgrade", "Upgrade plugins", load_subcommand('plugins/upgrade_command')
 
   def execute
   end
-end
+end

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

@@ -17,7 +17,7 @@ module Kontena::Cli::Plugins
 
     def execute
       if installed?(name)
-        installed = spinner "Upgrading plugin #{name.colorize(:cyan)}" do
+        installed = spinner "Upgrading plugin #{pastel.cyan(name)}" do
           installer.upgrade
         end
 
@@ -25,7 +25,7 @@ module Kontena::Cli::Plugins
           Kontena::PluginManager::Cleaner.new(name).cleanup
         end
       else
-        installed = spinner "Installing plugin #{name.colorize(:cyan)}" do
+        installed = spinner "Installing plugin #{pastel.cyan(name)}" do
           installer.install
         end
       end

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

@@ -4,19 +4,28 @@ module Kontena::Cli::Plugins
   class UninstallCommand < Kontena::Command
     include Kontena::Util
     include Kontena::Cli::Common
-    include Kontena::PluginManager::Common
 
-    parameter 'NAME', 'Plugin name'
-
-    def uninstaller
-      Kontena::PluginManager::Uninstaller.new(name)
-    end
+    parameter 'NAME ...', 'Plugin name'
 
     def execute
-      exit_with_error "Plugin #{name} has not been installed" unless installed?(name)
-      spinner "Uninstalling plugin #{pastel.cyan(name)}" do
-        uninstaller.uninstall
+      name_list.each do |name|
+        exit_with_error "Plugin #{name} has not been installed" unless plugin_installed?(name)
+        spinner "Uninstalling plugin #{pastel.cyan(name)}" do
+          plugin_uninstaller(name).uninstall
+        end
       end
     end
+
+    # @param name [String]
+    # @return [Boolean]
+    def plugin_installed?(name)
+      Kontena::PluginManager::Common.installed?(name)
+    end
+
+    # @param name [String]
+    # @return [Kontena::PluginManager::Uninstaller]
+    def plugin_uninstaller(name)
+      Kontena::PluginManager::Uninstaller.new(name)
+    end
   end
-end
+end