kontena-cli 1.4.3 → 1.5.0.pre1

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

@@ -0,0 +1,60 @@
+require 'kontena/plugin_manager'
+require_relative 'common'
+
+module Kontena::Cli::Plugins
+  class UpgradeCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Common
+    include Kontena::PluginManager::Common
+
+    option '--pre', :flag, 'Include pre-release versions'
+    option '--silent', :flag, 'Less verbose output'
+
+    def running_verbose?
+      !silent?
+    end
+
+    def cleanup(*plugins)
+      return if plugins.empty?
+      vspinner "Running cleanup" do
+        plugins.each do |name|
+          Kontena::PluginManager::Cleaner.new(name).cleanup
+        end
+      end
+    end
+
+    def installer(name, version: nil)
+      Kontena::PluginManager::Installer.new(name, pre: pre?, version: version)
+    end
+
+    def upgrade(name, from, to)
+      vspinner "Upgrading #{pastel.cyan(name)} from #{pastel.cyan(from)} to #{pastel.cyan(to)}" do
+        installer(name, version: to).install
+      end
+      sputs "Upgraded #{name} from #{from} to #{to}" if silent?
+    end
+
+    def execute
+      upgradable = {}
+
+      vspinner "Checking for upgrades" do
+        plugins.each do |plugin|
+          short = short_name(plugin.name)
+          available_upgrade = installer(short).available_upgrade
+          unless available_upgrade.nil?
+            upgradable[short] = { from: plugin.version.to_s, to: available_upgrade }
+          end
+        end
+      end
+
+      if upgradable.empty?
+        vputs "Nothing upgraded"
+      else
+        upgradable.each do |name, data|
+          upgrade(name, data[:from], data[:to])
+        end
+        cleanup(upgradable.keys)
+      end
+    end
+  end
+end

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

@@ -111,7 +111,7 @@ module Kontena::Cli::Registry
 
       client(token).post("grids/#{current_grid}/stacks", data)
       deployment = client(token).post("stacks/#{current_grid}/registry/deploy", {})
-      spinner "Deploying #{data[:name].colorize(:cyan)} stack " do
+      spinner "Deploying #{pastel.cyan(data[:name])} stack " do
         wait_for_deploy_to_finish(deployment)
       end
       puts "\n"

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

@@ -11,9 +11,9 @@ module Kontena::Cli::Registry
       name = 'registry'
 
       registry = client(token).get("stacks/#{current_grid}/#{name}") rescue nil
-      exit_with_error("Stack #{name.colorize(:cyan)} does not exist") if registry.nil?
+      exit_with_error("Stack #{pastel.cyan(name)} does not exist") if registry.nil?
 
-      spinner "Removing #{name.colorize(:cyan)} stack " do
+      spinner "Removing #{pastel.cyan(name)} stack " do
         client(token).delete("stacks/#{current_grid}/#{name}")
       end
     end

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

@@ -28,7 +28,7 @@ module Kontena::Cli::Services
         puts "  ip: #{container['ip_address']}"
         puts "  public ip: #{container['node']['public_ip']}"
         if container['status'] == 'unknown'
-          puts "  status: #{container['status'].colorize(:yellow)}"
+          puts "  status: #{pastel.yellow(container['status'])}"
         else
           puts "  status: #{container['status']}"
         end

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

@@ -58,7 +58,7 @@ module Kontena::Cli::Services
         stateful: stateful?
       }
       data.merge!(parse_service_data_from_options)
-      spinner "Creating #{name.colorize(:cyan)} service " do
+      spinner "Creating #{pastel.cyan(name)} service " do
         create_service(token, current_grid, data)
       end
     end

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

@@ -16,7 +16,7 @@ module Kontena::Cli::Services
       service_id = name
       data = {}
       data[:force] = true if force?
-      spinner "Deploying service #{name.colorize(:cyan)} " do
+      spinner "Deploying service #{pastel.cyan(name)} " do
         deployment = deploy_service(token, name, data)
         wait_for_deploy_to_finish(token, deployment) if wait?
       end

data/lib/kontena/cli/services/envs/add_command.rb

@@ -13,7 +13,7 @@ module Kontena::Cli::Services::Envs
       require_api_url
       token = require_token
       data = {env: env}
-      spinner "Adding env variable to #{name.colorize(:cyan)} service " do
+      spinner "Adding env variable to #{pastel.cyan(name)} service " do
         client(token).post("services/#{parse_service_id(name)}/envs", data)
       end
     end

data/lib/kontena/cli/services/envs/remove_command.rb

@@ -7,13 +7,15 @@ module Kontena::Cli::Services::Envs
     include Kontena::Cli::Services::ServicesHelper
 
     parameter "NAME", "Service name"
-    parameter "ENV", "Environment variable name"
+    parameter "ENV ...", "Environment variable name", attribute_name: :envs
 
     def execute
       require_api_url
       token = require_token
-      spinner "Removing env variable #{env.colorize(:cyan)} from #{name.colorize(:cyan)} service " do
-        client(token).delete("services/#{parse_service_id(name)}/envs/#{env}")
+      envs.each do |env|
+        spinner "Removing env variable #{pastel.cyan(env)} from #{pastel.cyan(name)} service " do
+          client(token).delete("services/#{parse_service_id(name)}/envs/#{env}")
+        end
       end
     end
   end

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

@@ -27,7 +27,7 @@ module Kontena::Cli::Services
       links << {name: target_service.to_s, alias: target.to_s}
       links.compact!
       data = {links: links}
-      spinner "Linking #{name.colorize(:cyan)} to #{target.colorize(:cyan)} " do
+      spinner "Linking #{pastel.cyan(name)} to #{pastel.cyan(target)} " do
         update_service(token, name, data)
       end
     end

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

@@ -26,7 +26,7 @@ module Kontena::Cli::Services
       color = color_for_container(log['name'])
       instance_number = log['name'].match(/^.+-(\d+)$/)[1]
       name = instance_number.nil? ? log['name'] : instance_number
-      prefix = "#{log['created_at']} [#{name}]:".colorize(color)
+      prefix = pastel.send(color, "#{log['created_at']} [#{name}]:")
       puts "#{prefix} #{log['data']}"
     end
   end

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

@@ -43,7 +43,7 @@ module Kontena::Cli::Services
             else
               color = :yellow
             end
-            print "■".colorize(color)
+            print pastel.send(color, "■")
           end
           puts ''
         end

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

@@ -5,7 +5,7 @@ module Kontena::Cli::Services
     include Kontena::Cli::Common
     include ServicesHelper
 
-    parameter "NAME", "Service name"
+    parameter "NAME ...", "Service name", attribute_name: :names
     option "--instance", "INSTANCE", "Remove only given instance"
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
@@ -15,17 +15,19 @@ module Kontena::Cli::Services
     requires_current_master_token
 
     def execute
-      if instance
-        remove_instance
-      else
-        remove
+      names.each do |name|
+        if instance
+          remove_instance(name)
+        else
+          remove(name)
+        end
       end
     end
 
-    def remove
+    def remove(name)
       confirm_command(name) unless forced?
 
-      spinner "Removing service #{name.colorize(:cyan)} " do
+      spinner "Removing service #{pastel.cyan(name)} " do
         client.delete("services/#{parse_service_id(name)}")
         removed = false
         until removed == true
@@ -43,14 +45,14 @@ module Kontena::Cli::Services
       end
     end
 
-    def remove_instance
+    def remove_instance(name)
       instance_name = "#{name}/#{instance}"
       confirm_command("#{name}/#{instance}") unless forced?
       service_instance = client.get("services/#{parse_service_id(name)}/instances")['instances'].find{ |i|
         i['instance_number'] == instance.to_i
       }
       exit_with_error("Instance not found") unless service_instance
-      spinner "Removing service instance #{instance_name.colorize(:cyan)} " do
+      spinner "Removing service instance #{pastel.cyan(instance_name)} " do
         client.delete("services/#{parse_service_id(name)}/instances/#{service_instance['id']}")
       end
     end

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

@@ -11,7 +11,7 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-      spinner "Sending restart signal to service #{name.colorize(:cyan)} " do
+      spinner "Sending restart signal to service #{pastel.cyan(name)} " do
         restart_service(token, name)
       end
     end

data/lib/kontena/cli/services/secrets/link_command.rb

@@ -12,7 +12,7 @@ module Kontena::Cli::Services::Secrets
     def execute
       require_api_url
       token = require_token
-      spinner "Linking #{secret.colorize(:cyan)} from Vault to #{name.colorize(:cyan)} " do
+      spinner "Linking #{pastel.cyan(secret)} from Vault to #{pastel.cyan(name)} " do
         result = client(token).get("services/#{parse_service_id(name)}")
         secrets = result['secrets']
         secrets << parse_secrets([secret])[0]

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

@@ -264,7 +264,7 @@ module Kontena
               puts "      health: #{container.dig('health_status', 'status')} (#{health_time.to_i}s ago)"
             end
             if container['status'] == 'unknown'
-              puts "      status: #{container['status'].colorize(:yellow)}"
+              puts "      status: #{pastel.yellow(container['status'])}"
             else
               puts "      status: #{container['status']}"
             end
@@ -547,18 +547,12 @@ module Kontena
         # @param [Symbol] health
         # @return [String]
         def health_status_icon(health)
-          if health == :unhealthy
-            icon = '⊗'.freeze
-            icon.colorize(:red)
-          elsif health == :partial
-            icon = '⊙'.freeze
-            icon.colorize(:yellow)
-          elsif health == :healthy
-            icon = '⊛'.freeze
-            icon.colorize(:green)
+          case health
+          when :unhealthy then pastel.red('⊗')
+          when :partial   then pastel.yellow('⊙')
+          when :healthy   then pastel.green('⊛')
           else
-            icon = '⊝'.freeze
-            icon.colorize(:dim)
+            pastel.dim('⊝')
           end
         end
 

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

@@ -6,13 +6,15 @@ module Kontena::Cli::Services
     include Kontena::Cli::GridOptions
     include ServicesHelper
 
-    parameter "NAME", "Service name"
+    parameter "NAME ...", "Service name", attribute_name: :names
 
     def execute
       require_api_url
       token = require_token
-      spinner "Sending start signal to #{name.colorize(:cyan)} service " do
-        start_service(token, name)
+      names.each do |name|
+        spinner "Sending start signal to #{pastel.cyan(name)} service " do
+          start_service(token, name)
+        end
       end
     end
   end

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

@@ -6,13 +6,15 @@ module Kontena::Cli::Services
     include Kontena::Cli::GridOptions
     include ServicesHelper
 
-    parameter "NAME", "Service name"
+    parameter "NAME ...", "Service name", attribute_name: :names
 
     def execute
       require_api_url
       token = require_token
-      spinner "Sending stop signal to #{name.colorize(:cyan)} service " do
-        stop_service(token, name)
+      names.each do |name|
+        spinner "Sending stop signal to #{pastel.cyan(name)} service " do
+          stop_service(token, name)
+        end
       end
     end
   end

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

@@ -22,7 +22,7 @@ module Kontena::Cli::Services
       end
       links.delete_if { |l| l['id'] == target_id }
       data = {links: links}
-      spinner "Unlinking #{name.colorize(:cyan)} from #{target.colorize(:cyan)} " do
+      spinner "Unlinking #{pastel.cyan(name)} from #{pastel.cyan(target)} " do
         update_service(token, name, data)
       end
     end

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

@@ -50,7 +50,7 @@ module Kontena::Cli::Services
       token = require_token
 
       data = parse_service_data_from_options
-      spinner "Updating #{name.colorize(:cyan)} service " do
+      spinner "Updating #{pastel.cyan(name)} service " do
         update_service(token, name, data)
       end
     end

data/lib/kontena/cli/spinner.rb

@@ -47,7 +47,7 @@ module Kontena
 
       def self.spin_no_tty(msg, &block)
         unless block_given?
-          Kernel.puts "\r [" + "done".colorize(:green) + "] #{msg}"
+          Kernel.puts "\r [" + Kontena.pastel.green("done") + "] #{msg}"
           return
         end
 
@@ -80,7 +80,7 @@ module Kontena
         return spin_no_tty(msg, &block) unless $stdout.tty?
 
         unless block_given?
-          Kernel.puts "\r [" + "done".colorize(:green) + "] #{msg}"
+          Kernel.puts "\r [" + Kontena.pastel.green("done") + "] #{msg}"
           return
         end
 
@@ -89,7 +89,7 @@ module Kontena
           Thread.main['spinners'].each do |thread|
             thread['pause'] = true
           end
-          Kernel.puts "\r [#{'....'.colorize(:yellow)}] #{Thread.main['spinners'].last['msg']}"
+          Kernel.puts "\r [#{Kontena.pastel.yellow('....')}] #{Thread.main['spinners'].last['msg']}"
         end
 
         Thread.main['spinner_msgs'] = []
@@ -139,27 +139,27 @@ module Kontena
           spin_thread.kill
           case spin_status.result
           when :warn
-            Kernel.puts "\r [" + "warn".colorize(:yellow) + "] #{msg}     "
+            Kernel.puts "\r [" + Kontena.pastel.yellow("warn") + "] #{msg}     "
           when :fail
-            Kernel.puts "\r [" + "fail".colorize(:red) + "] #{msg}     "
+            Kernel.puts "\r [" + Kontena.pastel.red("fail") + "] #{msg}     "
           else
-            Kernel.puts "\r [" + "done".colorize(:green) + "] #{msg}     "
+            Kernel.puts "\r [" + Kontena.pastel.green("done") + "] #{msg}     "
           end
         rescue SystemExit => ex
           spin_thread.kill
           if ex.status == 0
-            Kernel.puts "\r [" + "done".colorize(:green)   + "] #{msg}     "
+            Kernel.puts "\r [" + Kontena.pastel.green("done")   + "] #{msg}     "
           else
-            Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
+            Kernel.puts "\r [" + Kontena.pastel.red("fail")   + "] #{msg}     "
           end
           status = ex.status
         rescue SpinAbort
           spin_thread.kill
-          Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
+          Kernel.puts "\r [" + Kontena.pastel.red("fail")   + "] #{msg}     "
           Kontena.logger.debug { "Spin aborted through fail!" }
         rescue Exception => ex
           spin_thread.kill
-          Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
+          Kernel.puts "\r [" + Kontena.pastel.red("fail")   + "] #{msg}     "
           Kontena.logger.error(ex)
           raise ex
         ensure

data/lib/kontena/cli/stack_command.rb

@@ -3,6 +3,7 @@ class Kontena::Cli::StackCommand < Kontena::Command
   subcommand ["ls", "list"], "List installed stacks in a grid", load_subcommand('stacks/list_command')
   subcommand ["remove","rm"], "Remove a deployed stack from a grid", load_subcommand('stacks/remove_command')
   subcommand "show", "Show details about a stack in a grid", load_subcommand('stacks/show_command')
+  subcommand "inspect", "Inspect a stack in a grid", load_subcommand('stacks/inspect_command')
   subcommand "upgrade", "Upgrade a stack in a grid", load_subcommand('stacks/upgrade_command')
   subcommand ["start", "deploy"], "Deploy an installed stack in a grid", load_subcommand('stacks/deploy_command')
   subcommand "logs", "Show logs from services in a stack", load_subcommand('stacks/logs_command')

data/lib/kontena/cli/stacks/build_command.rb

@@ -35,7 +35,7 @@ module Kontena::Cli::Stacks
       end
 
       if services.none?{ |service| service['build'] }
-        abort 'Not found any service with a build option'.colorize(:red)
+        abort pastel.red('Not found any service with a build option')
       end
       build_docker_images(services)
       push_docker_images(services) unless no_push?
@@ -49,10 +49,10 @@ module Kontena::Cli::Stacks
           abort("'#{service['image']}' is not valid Docker image name") unless valid_image_name?(service['image'])
           abort("'#{service['build']['context']}' does not have #{dockerfile}") unless dockerfile_exist?(service['build']['context'], dockerfile)
           if service['hooks'] && service['hooks']['pre_build']
-            puts "Running pre_build hook".colorize(:cyan)
+            puts pastel.cyan("Running pre_build hook")
             run_pre_build_hook(service['hooks']['pre_build'])
           end
-          puts "Building image #{service['image'].colorize(:cyan)}"
+          puts "Building image #{pastel.cyan(service['image'])}"
           build_docker_image(service)
         end
       end
@@ -62,7 +62,7 @@ module Kontena::Cli::Stacks
     def push_docker_images(services)
       services.each do |service|
         if service['build']
-          puts "Pushing image #{service['image'].colorize(:cyan)}"
+          puts "Pushing image #{pastel.cyan(service['image'])}"
           push_docker_image(service['image'])
         end
       end
@@ -85,7 +85,7 @@ module Kontena::Cli::Stacks
       end
       cmd << build_context
       ret = system(*cmd.flatten)
-      raise ("Failed to build image #{service['image'].colorize(:cyan)}") unless ret
+      raise ("Failed to build image #{pastel.cyan(service['image'])}") unless ret
       ret
     end
 
@@ -95,7 +95,7 @@ module Kontena::Cli::Stacks
       cmd = ['docker', 'push', image]
       cmd.unshift('sudo') if sudo?
       ret = system(*cmd)
-      raise ("Failed to push image #{image.colorize(:cyan)}") unless ret
+      raise ("Failed to push image #{pastel.cyan(image)}") unless ret
       ret
     end