kontena-cli 1.0.6 → 1.1.0.pre1

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

@@ -48,6 +48,5 @@ module Kontena::Cli::Nodes
         end
       end
     end
-
   end
 end

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

@@ -11,38 +11,36 @@ module Kontena::Cli::Plugins
     option '--pre', :flag, 'Allow pre-release of a plugin to be installed', default: false
 
     def execute
-      require 'shellwords'
-      install_plugin(name)
-    end
-
-    def install_plugin(name)
-      plugin = "kontena-plugin-#{name}"
-      uninstall_previous(plugin) if plugin_exists?(plugin)
-      install_options = ['--no-ri', '--no-doc']
-      install_options << "--version #{version}" if version
-      install_options << "--pre" if pre?
-      install_options << plugin
-      install_command = "#{gem_bin} install #{install_options.shelljoin}"
-      ENV["DEBUG"] && STDERR.puts("Running #{install_command}")
-      spinner "Installing plugin #{name.colorize(:cyan)}" do
-        stdout, stderr, status = Open3.capture3(install_command)
-        raise(RuntimeError, stderr) unless status.success?
+      installed_version = Kontena::PluginManager.instance.installed(name)
+
+      if installed_version
+        installed = spinner "Upgrading plugin #{name.colorize(:cyan)}" do |spin|
+          begin
+            Kontena::PluginManager.instance.upgrade_plugin(name, pre: pre?)
+          rescue => ex
+            puts Kontena.pastel.red(ex.message)
+            ENV["DEBUG"] && puts(ex.backtrace.join("\n  "))
+            spin.fail!
+          end
+        end
+      else
+        installed = spinner "Installing plugin #{name.colorize(:cyan)}" do |spin|
+          begin
+            Kontena::PluginManager.instance.install_plugin(name, pre: pre?, version: version)
+          rescue => ex
+            puts Kontena.pastel.red(ex.message)
+            ENV["DEBUG"] && puts(ex.backtrace.join("\n  "))
+            spin.fail!
+          end
+        end
       end
-    end
-
-    def plugin_exists?(name)
-      Kontena::PluginManager.instance.plugins.any? { |p| p.name == name}
-    end
-
-    def gem_bin
-      @gem_bin ||= which('gem')
-    end
 
-    def uninstall_previous(name)
-      uninstall_command = "#{gem_bin} uninstall -q #{name.shellescape}"
-      spinner "Uninstalling previous version of plugin" do
-        stdout, stderr, status = Open3.capture3(uninstall_command)
-        raise(RuntimeError, stderr) unless status.success?
+      Array(installed).each do |gem|
+        if gem.name.start_with?('kontena-plugin-')
+          puts Kontena.pastel.green("Installed plugin #{gem.name.sub('kontena-plugin-', '')} version #{gem.version}")
+        else
+          puts Kontena.pastel.cyan("Installed dependency #{gem.name} version #{gem.version}")
+        end
       end
     end
   end

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

@@ -5,27 +5,19 @@ module Kontena::Cli::Plugins
     include Common
 
     parameter '[NAME]', 'Search text'
+    option '--pre', :flag, 'Include pre-release versions'
 
     def execute
-      results = fetch_plugins(name)
+      results = Kontena::PluginManager.instance.search_plugins(name)
       exit_with_error("Cannot access plugin server") unless results
       puts "%-50s %-10s %-60s" % ['NAME', 'VERSION', 'DESCRIPTION']
       results.each do |item|
+        if pre?
+          latest = Kontena::PluginManager.instance.latest_version(item['name'], pre: true)
+          item['version'] = latest.version.to_s
+        end
         puts "%-50s %-10s %-60s" % [short_name(item['name']), item['version'], item['info']]
       end
     end
-
-    def fetch_plugins(name)
-      client = Excon.new('https://rubygems.org')
-      response = client.get(
-        path: "/api/v1/search.json?query=kontena-plugin-#{name}",
-        headers: {
-          'Content-Type' => 'application/json',
-          'Accept' => 'application/json'
-        }
-      )
-
-      JSON.parse(response.body) rescue nil
-    end
   end
 end

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

@@ -9,18 +9,14 @@ module Kontena::Cli::Plugins
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
-      require 'shellwords'
       confirm unless forced?
-      uninstall_plugin(name)
-    end
-
-    def uninstall_plugin(name)
-      plugin = "kontena-plugin-#{name}"
-      gem_bin = which('gem')
-      uninstall_command = "#{gem_bin} uninstall -q #{plugin.shellescape}"
-      stderr = spinner "Uninstalling plugin #{name.colorize(:cyan)}" do |spin|
-        stdout, stderr, status = Open3.capture3(uninstall_command)
-        raise(RuntimeError, stderr) unless status.success?
+      spinner "Uninstalling plugin #{name.colorize(:cyan)}" do |spin|
+        begin
+          Kontena::PluginManager.instance.uninstall_plugin(name)
+        rescue => ex
+          puts Kontena.pastel.red(ex.message)
+          spin.fail
+        end
       end
     end
   end

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

@@ -39,7 +39,7 @@ module Kontena::Cli::Services
     end
 
     def render_header
-      puts '%-30.30s %-15s %-20s %-15s %-15s' % ['CONTAINER', 'CPU %', 'MEM USAGE/LIMIT', 'MEM %', 'NET I/O']
+      puts '%-30.30s %-15s %-20s %-15s %-15s' % ['INSTANCE', 'CPU %', 'MEM USAGE/LIMIT', 'MEM %', 'NET I/O']
     end
 
     def render_stat_row(stat)
@@ -55,7 +55,9 @@ module Kontena::Cli::Services
       cpu = stat['cpu'].nil? ? 'N/A' : stat['cpu']['usage']
       network_in = stat['network'].nil? ? 'N/A' : filesize_to_human(stat['network']['rx_bytes'])
       network_out = stat['network'].nil? ? 'N/A' : filesize_to_human(stat['network']['tx_bytes'])
-      puts '%-30.30s %-15s %-20s %-15s %-15s' % [ stat['container_id'], "#{cpu}%", "#{memory} / #{memory_limit}", "#{memory_pct}", "#{network_in}/#{network_out}"]
+      prefix = self.name.split('/')[0]
+      instance_name = stat['container_id'].gsub("#{prefix}-", "")
+      puts '%-30.30s %-15s %-20s %-15s %-15s' % [ instance_name, "#{cpu}%", "#{memory} / #{memory_limit}", "#{memory_pct}", "#{network_in}/#{network_out}"]
     end
 
     ##

data/lib/kontena/cli/spinner.rb

@@ -10,6 +10,14 @@ module Kontena
         @result = :done
       end
 
+      def set_title(message)
+        if $stdout.tty?
+          thread['update_msg'] = message
+        else
+          Kernel.puts "- #{message}"
+        end
+      end
+
       def warn?
         @result == :warn
       end
@@ -32,7 +40,7 @@ module Kontena
         @result = :warn
       end
     end
-    
+
     class Spinner
       CHARS = ['\\', '|', '/', '-']
       CHARS_LENGTH = CHARS.length
@@ -99,7 +107,15 @@ module Kontena
               end
               Kernel.print "\r#{message}#{CHARS[curr_index]}"
             end
-            
+
+            if Thread.current['update_msg']
+              msg = Thread.current['update_msg']
+              Thread.current['update_msg'] = nil
+              Thread.current['msg'] = msg
+              message = "    *   #{msg} .. "
+              Kernel.print "\r#{message}#{CHARS[curr_index]}"
+            end
+
             break if Thread.current['abort']
 
             if Thread.main['spinner_msgs']
@@ -143,13 +159,13 @@ module Kontena
           spin_thread.kill
           Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
           if ENV["DEBUG"]
-            puts "Spin aborted through fail!"
+            STDERR.puts "Spin aborted through fail!"
           end
         rescue Exception => ex
           spin_thread.kill
           Kernel.puts "\r [" + "fail".colorize(:red)   + "] #{msg}     "
           if ENV["DEBUG"]
-            puts "#{ex} #{ex.message}\n#{ex.backtrace.join("\n")}"
+            STDERR.puts "#{ex} #{ex.message}\n#{ex.backtrace.join("\n")}"
           end
           raise ex
         ensure

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

@@ -17,8 +17,12 @@ module Kontena::Cli::Stacks
       show_stack(name)
     end
 
+    def fetch_stack(name)
+      client.get("stacks/#{current_grid}/#{name}")
+    end
+
     def show_stack(name)
-      stack = client.get("stacks/#{current_grid}/#{name}")
+      stack = fetch_stack(name)
 
       puts "#{stack['name']}:"
       puts "  state: #{stack['state']}"

data/lib/kontena/cli/stacks/yaml/opto/service_instances_resolver.rb

@@ -0,0 +1,22 @@
+module Kontena::Cli::Stacks
+  module YAML
+    class Opto::Resolvers::ServiceInstances < Opto::Resolver
+      def resolve
+        read_command = Kontena::Cli::Stacks::ShowCommand.new([self.stack])
+        stack = read_command.fetch_stack(self.stack)
+        service = stack['services'].find { |s| s['name'] == hint }
+        if service
+          service['instances']
+        else
+          nil
+        end
+      rescue Kontena::Errors::StandardError
+        nil
+      end
+
+      def stack
+        ENV['STACK']
+      end
+    end
+  end
+end

data/lib/kontena/cli/stacks/yaml/opto/vault_setter.rb

@@ -3,7 +3,7 @@ module Kontena::Cli::Stacks
     class Opto::Setters::Vault < Opto::Setter
       def set(value)
         require 'shellwords'
-        ENV["DEBUG"] && puts("Setting to vault: #{hint}")
+        ENV["DEBUG"] && STDERR.puts("Setting to vault: #{hint}")
         Kontena.run("vault write --silent #{hint} #{value.to_s.shellescape}")
       end
     end

data/lib/kontena/cli/stacks/yaml/reader.rb

@@ -16,6 +16,7 @@ module Kontena::Cli::Stacks
         require_relative 'opto/vault_setter'
         require_relative 'opto/vault_resolver'
         require_relative 'opto/prompt_resolver'
+        require_relative 'opto/service_instances_resolver'
 
         @file = file
         @from_registry = from_registry

data/lib/kontena/cli/vault/export_command.rb

@@ -0,0 +1,22 @@
+module Kontena::Cli::Vault
+  class ExportCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    banner "Exports secrets from Vault to STDOUT as YAML or JSON."
+
+    requires_current_master
+
+    option '--json', :flag, "Output JSON"
+
+    def execute
+      require 'shellwords'
+      meth = json? ? :to_json : :to_yaml
+      puts Hash[
+        *Kontena.run('vault ls --return', returning: :result).sort.flat_map do |secret|
+          [secret, Kontena.run("vault read --return #{secret.shellescape}", returning: :result)]
+        end
+      ].send(meth)
+    end
+  end
+end

data/lib/kontena/cli/vault/import_command.rb

@@ -0,0 +1,80 @@
+module Kontena::Cli::Vault
+  class ImportCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    banner "Imports secrets to Vault from a YAML file. Secrets with a null value will be deleted from Vault."
+
+    option "--force", :flag, "Force import", default: false, attribute_name: :forced
+    option '--json', :flag, "Input JSON instead of YAML"
+    option '--skip-null', :flag, "Do not remove keys with null values"
+    option '--empty-is-null', :flag, "Treat empty values as null"
+
+    parameter '[PATH]', "Input from file in PATH, default: STDIN"
+
+    requires_current_master
+
+    UPDATE_CMD = 'vault update --upsert --silent %{key} %{value}'
+    DELETE_CMD = 'vault rm --silent --force %{key}'
+
+
+    def parsed_input
+      json? ? JSON.load(input) : YAML.safe_load(input)
+    end
+
+    def input
+      path ? File.read(path) : STDIN.read
+    end
+
+    def execute
+      require_current_grid
+
+      updates = []
+      deletes = []
+
+      parsed_input.map do |k,v|
+        case v
+        when String, Numeric, TrueClass, FalseClass
+          if empty_is_null? && v.to_s.empty?
+            deletes << k.to_s
+          else
+            updates << [k.to_s, v.to_s]
+          end
+        when NilClass
+          deletes << k.to_s
+        else
+          exit_with_error "Invalid value type #{v.class} for #{k}."
+        end
+      end
+
+      if updates.empty? && deletes.empty?
+        exit_with_error "No secrets loaded"
+      end
+
+      unless forced?
+        puts "About to.."
+        puts "  * #{Kontena.pastel.yellow("IMPORT")} #{updates.size} secret#{"s" if updates.size > 1}" unless updates.empty?
+        puts "  * #{Kontena.pastel.red("DELETE")} #{deletes.size} secret#{"s" if deletes.size > 1}" unless deletes.empty?
+        confirm
+      end
+
+      unless updates.empty?
+        spinner "Updating #{updates.size} secrets" do |spin|
+          updates.each do |pair|
+            result = Kontena.run(UPDATE_CMD % { key: pair.first.shellescape, value: pair.last.shellescape })
+            spin.fail! unless result.zero?
+          end
+        end
+      end
+
+      unless deletes.empty? || skip_null?
+        spinner "Deleting #{deletes.size} secrets" do |spin|
+          deletes.map(&:shellescape).each do |del|
+            result = Kontena.run(DELETE_CMD % { key: del })
+            spin.fail! unless result.zero?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,8 @@ module Kontena::Cli::Vault
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
+    option '--return', :flag, "Return the keys", hidden: true
+
     def execute
       require_api_url
       require_current_grid
@@ -10,6 +12,8 @@ module Kontena::Cli::Vault
       token = require_token
       result = client(token).get("grids/#{current_grid}/secrets")
 
+      return result['secrets'].map { |s| s['name'] } if return?
+
       column_width_paddings = '%-54s %-25.25s %-25.25s'
       puts column_width_paddings % ['NAME', 'CREATED AT', 'UPDATED AT']
       result['secrets'].sort_by { |s| s['name'] }.each do |secret|

data/lib/kontena/cli/vault/read_command.rb

@@ -5,6 +5,7 @@ module Kontena::Cli::Vault
 
     parameter "NAME", "Secret name"
 
+    option '--value', :flag, 'Just output the value'
     option '--return', :flag, 'Return the value', hidden: true
 
     def execute
@@ -14,9 +15,13 @@ module Kontena::Cli::Vault
       token = require_token
       result = client(token).get("secrets/#{current_grid}/#{name}")
       return result['value'] if self.return?
-      puts "#{result['name']}:"
-      puts "  created_at: #{result['created_at']}"
-      puts "  value: #{result['value']}"
+      if self.value?
+        puts result['value']
+      else
+        puts "#{result['name']}:"
+        puts "  created_at: #{result['created_at']}"
+        puts "  value: #{result['value']}"
+      end
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Kontena::Cli::Vault
 
     parameter "NAME", "Secret name"
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
+    option "--silent", :flag, "Reduce output verbosity"
 
     def execute
       require_api_url
@@ -12,7 +13,7 @@ module Kontena::Cli::Vault
       confirm_command(name) unless forced?
 
       token = require_token
-      spinner "Removing #{name.colorize(:cyan)} from the vault " do
+      vspinner "Removing #{name.colorize(:cyan)} from the vault " do
         client(token).delete("secrets/#{current_grid}/#{name}")
       end
     end

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

@@ -4,24 +4,22 @@ module Kontena::Cli::Vault
 
     parameter 'NAME', 'Secret name'
     parameter '[VALUE]', 'Secret value'
+
     option ['-u', '--upsert'], :flag, 'Create secret unless already exists', default: false
+    option '--silent', :flag, "Reduce output verbosity"
 
     def execute
       require_api_url
       require_current_grid
 
       token = require_token
-      secret = value
-      if secret.to_s == ''
-        secret = STDIN.read
-      end
-      exit_with_error('No value provided') if secret.to_s == ''
+      value ||= STDIN.read.chomp
       data = {
         name: name,
-        value: secret,
+        value: value,
         upsert: upsert?
       }
-      spinner "Updating #{name.colorize(:cyan)} value in the vault " do
+      vspinner "Updating #{name.colorize(:cyan)} value in the vault " do
         client(token).put("secrets/#{current_grid}/#{name}", data)
       end
     end