kontena-cli 1.2.0.pre3 → 1.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbe93b31f3b0185a1f79d87967898a48dd6c3a8b
-  data.tar.gz: d94145ce8dbb0289a75785293802b25f8a29e48f
+  metadata.gz: d1303357caabb58711e52c64fef54b12a9afc989
+  data.tar.gz: 8ce9069dcf068450f990cb23fddac6792a7956c6
 SHA512:
-  metadata.gz: b6f6a68a4ef272bdc3f8ef941e155d7536eb3c429fd726dc00d98fe8ee6cd15a39f1f600ad218f7d1041a33db88d01a23f4d6d692ef0af1f2ad9b25de3a54725
-  data.tar.gz: 1e0552a145da0f8cebebe1ef1305052385f25077b7d903d58a4bc4f4fda7622e323e712af13b2bcce79319fc0950d55e59c01ae4cd63f97b8c5876d3ff2b0c2c
+  metadata.gz: 7df9880f68b96488d865427015884e99af34a56c9b4b0c52df1c4614e15e5e3686f386fa672ea1310c42801cb6e8b6d82a2387dca9439800f3b2e980e06ae01a
+  data.tar.gz: d1447a0ac64a834660c7b4857e50e533757247af83664d875644c812075b6622bdd53397e18c2fb1bb12cc4924319e17c9b9c788d46b6dbb6de1288d034e1399

data/VERSION

@@ -1 +1 @@
-1.2.0.pre3
+1.2.0.rc1

data/kontena-cli.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "excon", "~> 0.49.0"
-  spec.add_runtime_dependency "tty-prompt", "~> 0.11.0"
+  spec.add_runtime_dependency "tty-prompt", "0.12.0"
   spec.add_runtime_dependency "clamp", "~> 1.1.0"
   spec.add_runtime_dependency "ruby_dig", "~> 0.0.2"
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
-  spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
+  spec.add_runtime_dependency "hash_validator", "~> 0.7.1"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
-  spec.add_runtime_dependency "opto", "1.8.4"
+  spec.add_runtime_dependency "opto", "1.8.5"
   spec.add_runtime_dependency "semantic", "~> 1.5"
   spec.add_runtime_dependency "safe_yaml", "~> 1.0"
   spec.add_runtime_dependency "liquid", "~> 4.0.0"

data/lib/kontena/cli/common.rb

@@ -22,6 +22,19 @@ module Kontena
         @pastel ||= Pastel.new(enabled: $stdout.tty?)
       end
 
+      # Read from STDIN. If stdin is a console, use prompt to ask.
+      # @param [String] message
+      # @param [Symbol] mode (prompt method: :ask, :multiline, etc)
+      def stdin_input(message = nil, mode = :ask)
+        if $stdin.tty?
+          Array(prompt.send(mode, message)).join.chomp
+        elsif !$stdin.eof?
+          $stdin.read.chomp
+        else
+          exit_with_error 'Missing input'
+        end
+      end
+
       def running_silent?
         self.respond_to?(:silent?) && self.silent?
       end

data/lib/kontena/cli/grid_command.rb

@@ -6,6 +6,7 @@ class Kontena::Cli::GridCommand < Kontena::Command
   subcommand "use", "Switch to use specific grid", load_subcommand('grids/use_command')
   subcommand "show", "Show grid details", load_subcommand('grids/show_command')
   subcommand "logs", "Show logs from grid containers", load_subcommand('grids/logs_command')
+  subcommand "events", "Show events from grid", load_subcommand('grids/events_command')
   subcommand ["remove","rm"], "Remove a grid", load_subcommand('grids/remove_command')
   subcommand "current", "Show current grid details", load_subcommand('grids/current_command')
   subcommand "env", "Show the current grid environment details", load_subcommand('grids/env_command')

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

@@ -0,0 +1,50 @@
+require_relative '../helpers/log_helper'
+
+module Kontena::Cli::Grids
+  class EventsCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Helpers::LogHelper
+
+    SKIP_TYPES = ['grid']
+
+    option "--node", "NODE", "Filter by node name", multivalued: true
+    option "--service", "SERVICE", "Filter by service name", multivalued: true
+
+    def execute
+      require_api_url
+
+      query_params = {}
+      query_params[:nodes] = node_list.join(",") unless node_list.empty?
+      query_params[:services] = service_list.join(",") unless service_list.empty?
+
+      titles = ['TIME', 'TYPE', 'RELATIONSHIPS', 'MESSAGE']
+      puts "%-25s %-25s %-40s %s" % titles
+      show_logs("grids/#{current_grid}/event_logs", query_params) do |log|
+        show_log(log)
+      end
+    end
+
+    def show_log(log)
+      msg = log['message']
+      rels = log['relationships'].
+        delete_if { |r| SKIP_TYPES.include?(r['type']) }.
+        map { |r|
+          id = r['id'].split('/')[1..-1].delete_if{ |s| s == 'null'}.join('/')
+          unless id.empty?
+            "#{r['type']}=#{id}"
+          end
+        }.compact
+
+      time = log['created_at']
+      if log['severity'] == 2
+        time = time.colorize(:yellow)
+      elsif log['severity'] >= 3
+        time = time.colorize(:red)
+      end
+
+      puts '%-25s %-25s %-40s %s' % [
+        time, log['type'], rels.join(','), msg
+      ]
+    end
+  end
+end

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

@@ -52,7 +52,7 @@ module Kontena::Cli::Helpers
 
       begin
         query_params[:from] = last_seen if last_seen
-        result = client(token).get_stream(url, streamer, query_params)
+        client(token).get_stream(url, streamer, query_params)
       rescue => exc
         retry if exc.cause.is_a?(EOFError) # Excon wraps the EOFerror into SocketError
         raise
@@ -74,7 +74,7 @@ module Kontena::Cli::Helpers
         end
         @buffer = ''
         log
-      rescue => exc
+      rescue
         @buffer << orig_chunk
         nil
       end

data/lib/kontena/cli/master/config/import_command.rb

@@ -8,7 +8,7 @@ module Kontena::Cli::Master::Config
 
     banner "Updates configuration from a file into Master"
 
-    parameter '[PATH]', "Input from file in PATH, default: STDIN", required: false
+    parameter '[PATH]', "Input from file in PATH (default: STDIN)", required: false
 
     option ['--preset'], '[NAME]', 'Load preset', hidden: true
 
@@ -30,7 +30,7 @@ module Kontena::Cli::Master::Config
         path = File.join(Kontena.root, 'lib/kontena/presets', "#{self.preset}.yml")
         File.read(path)
       else
-        STDIN.read
+        stdin_input("Enter master configuration as #{format.upcase}", :multiline)
       end
     end
 

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

@@ -1,23 +1,25 @@
-class Kontena::Cli::Master::LogoutCommand < Kontena::Command
-  include Kontena::Cli::Common
+module Kontena::Cli::Master
+  class LogoutCommand < Kontena::Command
+    include Kontena::Cli::Common
 
-  option ['-A', '--all'], :flag, 'Log out from all masters. By default only log out from current master.'
+    option ['-A', '--all'], :flag, 'Log out from all masters. By default only log out from current master.'
 
-  def execute
-    if self.all?
-      config.servers.each do |server|
-        use_refresh_token(server)
-        server.token = nil
-        puts "Logged out of #{server.name.colorize(:green)}"
+    def execute
+      if self.all?
+        config.servers.each do |server|
+          use_refresh_token(server)
+          server.token = nil
+          puts "Logged out of #{server.name.colorize(:green)}"
+        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)}"
+      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...)
       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)}"
-    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...)
+      config.write
     end
-    config.write
   end
 end

data/lib/kontena/cli/service_command.rb

@@ -11,6 +11,7 @@ class Kontena::Cli::ServiceCommand < Kontena::Command
   subcommand ["remove", "rm"], "Remove service", load_subcommand('services/remove_command')
   subcommand "containers", "List service containers", load_subcommand('services/containers_command')
   subcommand "logs", "Show service logs", load_subcommand('services/logs_command')
+  subcommand "events", "Show service events", load_subcommand('services/events_command')
   subcommand "stats", "Show service statistics", load_subcommand('services/stats_command')
   subcommand "monitor", "Monitor", load_subcommand('services/monitor_command')
 

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

@@ -0,0 +1,36 @@
+require_relative 'services_helper'
+require_relative '../helpers/log_helper'
+
+module Kontena::Cli::Services
+  class EventsCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::LogHelper
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+
+      query_params = {}
+
+      titles = ['TIME', 'TYPE', 'MESSAGE']
+      puts "%-25s %-20s %s" % titles
+      show_logs("services/#{parse_service_id(name)}/event_logs", query_params) do |log|
+        show_log(log)
+      end
+    end
+
+    def show_log(log)
+      msg = log['message']
+      node = log['relationships'].find { |r| r['type'] == 'node' }
+      if node
+        msg = "#{msg} (#{node['id'].split('/')[-1]})"
+      end
+      puts '%-25s %-20s %s' % [
+        log['created_at'], log['type'].sub('service:'.freeze, ''.freeze), msg
+      ]
+    end
+  end
+end

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

@@ -6,20 +6,32 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
+    option "--instance", "INSTANCE", "Remove only given instance"
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
+    banner "Remove a service"
+
+    requires_current_master
+    requires_current_master_token
+
     def execute
-      require_api_url
-      token = require_token
+      if instance
+        remove_instance
+      else
+        remove
+      end
+    end
+
+    def remove
       confirm_command(name) unless forced?
 
       spinner "Removing service #{name.colorize(:cyan)} " do
-        client(token).delete("services/#{parse_service_id(name)}")
+        client.delete("services/#{parse_service_id(name)}")
         removed = false
         until removed == true
           sleep 1
           begin
-            client(token).get("services/#{parse_service_id(name)}")
+            client.get("services/#{parse_service_id(name)}")
           rescue Kontena::Errors::StandardError => exc
             if exc.status == 404
               removed = true
@@ -30,5 +42,17 @@ module Kontena::Cli::Services
         end
       end
     end
+
+    def remove_instance
+      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
+        client.delete("services/#{parse_service_id(name)}/instances/#{service_instance['id']}")
+      end
+    end
   end
 end

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

@@ -41,12 +41,11 @@ module Kontena
         # @param [String] service_id
         def show_service(token, service_id)
           service = get_service(token, service_id)
-          grid = service['id'].split('/')[0]
           puts "#{service['id']}:"
           puts "  created: #{service['created_at']}"
           puts "  updated: #{service['updated_at']}"
           puts "  stack: #{service['stack']['id'] }"
-          puts "  state: #{service['state'] }"
+          puts "  desired_state: #{service['state'] }"
           puts "  image: #{service['image']}"
           puts "  revision: #{service['revision']}"
           puts "  stack_revision: #{service['stack_revision']}" if service['stack_revision']
@@ -54,7 +53,9 @@ module Kontena
           puts "  scaling: #{service['instances'] }"
           puts "  strategy: #{service['strategy']}"
           puts "  deploy_opts:"
-          puts "    min_health: #{service['deploy_opts']['min_health']}"
+          if service['deploy_opts']['min_health']
+            puts "    min_health: #{service['deploy_opts']['min_health']}"
+          end
           if service['deploy_opts']['wait_for_port']
             puts "    wait_for_port: #{service['deploy_opts']['wait_for_port']}"
           end
@@ -104,7 +105,7 @@ module Kontena
             end
           end
 
-          unless service['net'].to_s.empty?
+          if service['net'].to_s != 'bridge'
             puts "  net: #{service['net']}"
           end
 
@@ -188,6 +189,40 @@ module Kontena
         end
 
         def show_service_instances(token, service_id)
+          puts "  instances:"
+          instances = client(token).get("services/#{parse_service_id(service_id)}/instances")['instances']
+          containers = client(token).get("services/#{parse_service_id(service_id)}/containers")['containers']
+          instances.each do |i|
+            puts "    #{name}/#{i['instance_number']}:"
+            puts "      scheduled_to: #{i.dig('node', 'name') || '-'}"
+            puts "      deploy_rev: #{i['deploy_rev']}"
+            puts "      rev: #{i['rev']}"
+            puts "      state: #{i['state']}"
+            puts "      error: #{i['error'] || '-'}" if i['error']
+            puts "      containers:"
+            containers.select { |c|
+              c['instance_number'] == i['instance_number']
+            }.each do |container|
+              puts "        #{container['name']} (on #{container.dig('node', 'name')}):"
+              puts "          dns: #{container['hostname']}.#{container['domainname']}"
+              puts "          ip: #{container['ip_address']}"
+              puts "          public ip: #{container['node']['public_ip'] rescue 'unknown'}"
+              if container['health_status']
+                health_time = Time.now - Time.parse(container.dig('health_status', 'updated_at'))
+                puts "          health: #{container.dig('health_status', 'status')} (#{health_time.to_i}s ago)"
+              end
+              puts "          status: #{container['status']}"
+              if container.dig('state', 'error') != ''
+                puts "          reason: #{container['state']['error']}"
+              end
+              if container.dig('state', 'exit_code').to_i != 0
+                puts "          exit code: #{container['state']['exit_code']}"
+              end
+            end
+          end
+        end
+
+        def show_service_containers(token, service_id)
           puts "  instances:"
           result = client(token).get("services/#{parse_service_id(service_id)}/containers")
           result['containers'].each do |container|

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

@@ -13,7 +13,14 @@ module Kontena::Cli::Services
       token = require_token
 
       show_service(token, name)
-      show_service_instances(token, name)
+      begin
+        show_service_instances(token, name)
+      rescue Kontena::Errors::StandardError => exc
+        if exc.status == 404
+          # fallback to old behaviour
+          show_service_containers(token, name)
+        end
+      end
     end
   end
 end

data/lib/kontena/cli/stack_command.rb

@@ -6,6 +6,7 @@ class Kontena::Cli::StackCommand < Kontena::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')
+  subcommand "events", "Show events from services in a stack", load_subcommand('stacks/events_command')
   subcommand "monitor", "Monitor services in a stack", load_subcommand('stacks/monitor_command')
   subcommand "build", "Build images listed in a stack file and push them to an image registry", load_subcommand('stacks/build_command')
   subcommand ["reg", "registry"], "Stack registry related commands", load_subcommand('stacks/registry_command')

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

@@ -0,0 +1,33 @@
+require_relative '../helpers/log_helper'
+
+module Kontena::Cli::Stacks
+  class EventsCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::LogHelper
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+
+      query_params = {}
+      titles = ['TIME', 'TYPE', 'MESSAGE']
+      puts "%-25s %-25s %s" % titles
+      show_logs("stacks/#{current_grid}/#{name}/event_logs", query_params) do |log|
+        show_log(log)
+      end
+    end
+
+    def show_log(log)
+      msg = log['message']
+      node = log['relationships'].find { |r| r['type'] == 'node' }
+      if node
+        msg = "#{msg} (#{node['id'].split('/')[-1]})"
+      end
+      puts '%-25s %-25s %s' % [
+        log['created_at'], log['type'], msg
+      ]
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require_relative '../helpers/log_helper'
+
 module Kontena::Cli::Stacks
   class LogsCommand < Kontena::Command
     include Kontena::Cli::Common

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

@@ -50,7 +50,7 @@ module Kontena::Cli::Stacks
       end
 
       def bool
-        prompt.yes?(question_text, default: option.default == false ? false : true)
+        prompt.yes?(question_text, default: option.default.nil? || option.default)
       end
 
       def echo?

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Vault
     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"
+    parameter '[PATH]', "Input from file in PATH (default: STDIN)"
 
     requires_current_master
 
@@ -23,7 +23,7 @@ module Kontena::Cli::Vault
     end
 
     def input
-      path ? File.read(path) : STDIN.read
+      path ? File.read(path) : stdin_input("Enter secrets YAML", :multiline)
     end
 
     def execute

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

@@ -1,26 +1,23 @@
 module Kontena::Cli::Vault
   class UpdateCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter 'NAME', 'Secret name'
-    parameter '[VALUE]', 'Secret value'
+    parameter '[VALUE]', 'Secret value (default: STDIN)'
 
     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
+    requires_current_master
+
+    def default_value
+      stdin_input("Enter value for secret '#{name}'", :mask)
+    end
 
-      token = require_token
-      value ||= STDIN.read.chomp
-      data = {
-        name: name,
-        value: value,
-        upsert: upsert?
-      }
+    def execute
       vspinner "Updating #{name.colorize(:cyan)} value in the vault " do
-        client(token).put("secrets/#{current_grid}/#{name}", data)
+        client.put("secrets/#{current_grid}/#{name}", {name: name, value: value, upsert: upsert? })
       end
     end
   end

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

@@ -4,26 +4,19 @@ module Kontena::Cli::Vault
     include Kontena::Cli::GridOptions
 
     parameter 'NAME', 'Secret name'
-    parameter '[VALUE]', 'Secret value'
+    parameter '[VALUE]', 'Secret value (default: STDIN)'
 
     option '--silent', :flag, "Reduce output verbosity"
 
-    def execute
-      require_api_url
-      require_current_grid
+    requires_current_master
 
-      token = require_token
-      secret = value
-      if secret.to_s == ''
-        secret = STDIN.read
-      end
-      exit_with_error('No value provided') if secret.to_s == ''
-      data = {
-          name: name,
-          value: secret
-      }
+    def default_value
+      stdin_input("Enter value for secret '#{name}'", :mask)
+    end
+
+    def execute
       vspinner "Writing #{name.colorize(:cyan)} to the vault " do
-        client(token).post("grids/#{current_grid}/secrets", data)
+        client.post("grids/#{current_grid}/secrets", { name: name, value: value })
       end
     end
   end

data/lib/kontena/cli/volume_command.rb

@@ -1,7 +1,10 @@
 
 class Kontena::Cli::VolumeCommand < Kontena::Command
 
+  warn Kontena.pastel.yellow("[EXPERIMENTAL] The `kontena volume` commands are still experimental in Kontena #{Kontena.minor_version}, and may change in future releases")
+
   subcommand "create", "Create a managed volume", load_subcommand('volumes/create_command')
+  subcommand "show", "Show details of a volume", load_subcommand('volumes/show_command')
   subcommand ["remove", "rm"], "Remove a managed volume", load_subcommand('volumes/remove_command')
   subcommand ["list", "ls"], "List managed volumes", load_subcommand('volumes/list_command')
 

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

@@ -0,0 +1,38 @@
+
+module Kontena::Cli::Volumes
+  class ShowCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    banner "Show details of a volume"
+
+    parameter 'VOLUME', 'Volume'
+
+    requires_current_master
+    requires_current_master_token
+
+    def execute
+      vol = client.get("volumes/#{current_grid}/#{volume}")
+      puts "#{vol['name']}:"
+      puts "  id: #{vol['id']}"
+      puts "  created: #{vol['created_at']}"
+      puts "  scope: #{vol['scope']}"
+      puts "  driver: #{vol['driver']}"
+      puts "  driver_opts:"
+      vol['driver_opts'].each do |k,v|
+        puts "    #{k}: #{v}"
+      end
+      puts "  instances:"
+      vol['instances'].each do |instance|
+        puts "    - name: #{instance['name']}"
+        puts "      node: #{instance['node']}"
+      end
+      puts "  services:"
+      vol['services'].each do |service|
+        puts "    - #{service['id']}"
+      end
+
+    end
+
+  end
+end

data/lib/kontena/main_command.rb

@@ -36,7 +36,7 @@ class Kontena::MainCommand < Kontena::Command
   subcommand "whoami", "Shows current logged in user", load_subcommand('whoami_command')
   subcommand "plugin", "Plugin related commands", load_subcommand('plugin_command')
   subcommand "version", "Show CLI and current master version", load_subcommand('version_command')
-  subcommand "volume", "Volume specific commands", load_subcommand('volume_command')
+  subcommand "volume", "Volume specific commands [EXPERIMENTAL]", load_subcommand('volume_command')
 
   def execute
   end

data/lib/kontena_cli.rb

@@ -28,6 +28,11 @@ module Kontena
   end
 
 
+  # @return [String] x.y
+  def self.minor_version
+    Kontena::Cli::VERSION.split('.')[0..1].join('.')
+  end
+
   def self.version
     "kontena-cli/#{Kontena::Cli::VERSION}"
   end
@@ -111,4 +116,3 @@ require_relative 'kontena/stacks_cache'
 require_relative 'kontena/plugin_manager'
 require_relative 'kontena/main_command'
 require_relative 'kontena/cli/spinner'
-

data/spec/kontena/cli/grids/events_command_spec.rb

@@ -0,0 +1,15 @@
+require 'kontena/cli/grids/events_command'
+
+describe Kontena::Cli::Grids::EventsCommand do
+  include ClientHelpers
+  include OutputHelpers
+
+  describe '#execute' do
+    it 'requests events from master' do
+      expect(client).to receive(:get).with(
+        'grids/test-grid/event_logs', {limit: 100}
+      ).and_return({'logs' => []})
+      subject.run([])
+    end
+  end
+end

data/spec/kontena/cli/services/events_command_spec.rb

@@ -0,0 +1,22 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/services/events_command"
+
+describe Kontena::Cli::Services::EventsCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    before(:each) do
+      allow(client).to receive(:get).and_return({
+        'logs' => []
+      })
+    end
+
+    it 'requests logs from master' do
+      expect(client).to receive(:get).with(
+        'services/test-grid/null/service-a/event_logs', {limit: 100}
+      )
+      subject.run(['service-a'])
+    end
+  end
+end

data/spec/kontena/cli/stacks/events_command_spec.rb

@@ -0,0 +1,22 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/stacks/events_command"
+
+describe Kontena::Cli::Stacks::EventsCommand do
+
+  include ClientHelpers
+
+  describe '#execute' do
+    before(:each) do
+      allow(client).to receive(:get).and_return({
+        'logs' => []
+      })
+    end
+
+    it 'requests logs from master' do
+      expect(client).to receive(:get).with(
+        'stacks/test-grid/redish/event_logs', {limit: 100}
+      )
+      subject.run(['redish'])
+    end
+  end
+end

data/spec/kontena/cli/stacks/logs_command_spec.rb

@@ -0,0 +1,32 @@
+require "kontena/cli/stacks/logs_command"
+
+describe Kontena::Cli::Stacks::LogsCommand do
+  include ClientHelpers
+  include OutputHelpers
+
+  let (:logs) do
+    [
+      {
+        'id' => '57cff2e8cfee65c8b6efc8bd',
+        'name' => 'test-stack.mysql-1',
+        'created_at' => '2016-09-07T15:19:04.362690',
+        'data' => "mysql log message 1",
+      },
+    ]
+  end
+  
+  before(:each) do
+    Kontena.pastel.resolver.color.disable!
+  end
+
+  it "shows stack logs" do
+    expect(client).to receive(:get).with('stacks/test-grid/test-stack/container_logs', {
+      limit: 100,
+    }) { { 'logs' => logs } }
+
+    expect{subject.run(['test-stack'])}.to output_lines [
+      "2016-09-07T15:19:04.362690 [test-stack.mysql-1]: mysql log message 1",
+    ]
+  end
+
+end

data/spec/kontena/cli/vault/update_command_spec.rb

@@ -0,0 +1,79 @@
+require_relative "../../../spec_helper"
+require 'kontena/cli/vault/update_command'
+
+describe Kontena::Cli::Vault::UpdateCommand do
+
+  include RequirementsHelper
+  include ClientHelpers
+
+  let(:subject) { described_class.new(File.basename($0)) }
+
+  describe '#execute' do
+
+    context 'without value parameter' do
+
+      let(:stdin) { double(:stdin) }
+
+      before(:each) do
+        @old_stdin = $stdin
+        $stdin = stdin
+      end
+
+      after(:each) { $stdin = @old_stdin }
+
+      context 'without tty' do
+        before(:each) { allow(stdin).to receive(:tty?).and_return(false) }
+        after(:each) { $stdin = @old_stdin }
+
+        context 'nothing in stdin' do
+          before(:each) do
+            allow(stdin).to receive(:eof?).and_return(true)
+          end
+
+          it 'returns error if value not provided' do
+            expect{subject.run(['mysql_password'])}.to exit_with_error.and output(/Missing/).to_stderr
+          end
+        end
+
+        context 'value in stdin' do
+          it 'sends update request' do
+            expect(stdin).to receive(:eof?).and_return(false)
+            expect(stdin).to receive(:read).and_return('secret')
+            expect(client).to receive(:put).with('secrets/test-grid/mysql_password', { name: 'mysql_password', value: 'secret', upsert: false})
+            expect{subject.run(['mysql_password'])}.not_to exit_with_error
+          end
+        end
+      end
+
+      context 'with tty' do
+        before(:each) do
+          allow(stdin).to receive(:tty?).and_return(true)
+        end
+
+        context 'when value not given' do
+          let(:prompt) { double(:prompt) }
+          it 'prompts for value' do
+            expect(subject).to receive(:prompt).and_return(prompt)
+            expect(prompt).to receive(:mask).once.and_return('very-secret')
+            expect(client).to receive(:put).with('secrets/test-grid/mysql_password', { name: 'mysql_password', value: 'very-secret', upsert: false})
+            expect{subject.run(['mysql_password'])}.not_to exit_with_error
+          end
+        end
+      end
+    end
+
+    context 'with value parameter' do
+      it 'sends update request' do
+        expect(client).to receive(:put).with('secrets/test-grid/mysql_password', { name: 'mysql_password', value: 'secret', upsert: false})
+        expect{subject.run(['mysql_password', 'secret'])}.not_to exit_with_error
+      end
+
+      context 'when giving --upsert flag' do
+        it 'sets upsert true' do
+          expect(client).to receive(:put).with('secrets/test-grid/mysql_password', { name: 'mysql_password', value: 'secret', upsert: true})
+          subject.run(['-u', 'mysql_password', 'secret'])
+        end
+      end
+    end
+  end
+end

data/spec/kontena/cli/vault/write_command_spec.rb

@@ -0,0 +1,60 @@
+require_relative "../../../spec_helper"
+require 'kontena/cli/vault/write_command'
+
+describe Kontena::Cli::Vault::WriteCommand do
+
+  include RequirementsHelper
+  include ClientHelpers
+
+  let(:subject) { described_class.new(File.basename($0)) }
+
+  describe '#execute' do
+    context 'without value parameter' do
+
+      let(:stdin) { double(:stdin) }
+
+      before(:each) do
+        @old_stdin = $stdin
+        $stdin = stdin
+      end
+
+      after(:each) { $stdin = @old_stdin }
+
+      context 'no tty' do
+        context 'stdin empty' do
+          it 'returns an error' do
+            expect(stdin).to receive(:tty?).and_return(false)
+            expect(stdin).to receive(:eof?).and_return(true)
+            expect{subject.run(['mysql_password'])}.to exit_with_error.and output(/Missing/).to_stderr
+          end
+        end
+
+        context 'stdin has a value' do
+          it 'sends create request' do
+            expect(stdin).to receive(:tty?).and_return(false)
+            expect(stdin).to receive(:eof?).and_return(false)
+            expect(stdin).to receive(:read).and_return('secret')
+            expect(client).to receive(:post).with('grids/test-grid/secrets', { name: 'mysql_password', value: 'secret'})
+            expect{subject.run(['mysql_password'])}.not_to exit_with_error
+          end
+        end
+      end
+
+      context 'with tty' do
+        let(:prompt) { double(:prompt) }
+        it 'prompts value from STDIN' do
+          expect(stdin).to receive(:tty?).and_return(true)
+          expect(subject).to receive(:prompt).and_return(prompt)
+          expect(prompt).to receive(:mask).and_return('secret')
+          expect(client).to receive(:post).with('grids/test-grid/secrets', { name: 'mysql_password', value: 'secret'})
+          expect{subject.run(['mysql_password'])}.not_to exit_with_error
+        end
+      end
+    end
+
+    it 'sends create request' do
+      expect(client).to receive(:post).with('grids/test-grid/secrets', { name: 'mysql_password', value: 'secret'})
+      subject.run(['mysql_password', 'secret'])
+    end
+  end
+end

data/spec/kontena/kontena_cli_spec.rb

@@ -18,6 +18,12 @@ describe Kontena do
     end
   end
 
+  describe '#minor_version' do
+    it "returns a version string" do
+      expect(Kontena.minor_version).to match /^\d+\.\d+$/
+    end
+  end
+
   describe '#run' do
     let(:whoami) { double(:whoami) }
 
@@ -39,6 +45,3 @@ describe Kontena do
     end
   end
 end
-
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre3
+  version: 1.2.0.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ files:
 - lib/kontena/cli/grids/create_command.rb
 - lib/kontena/cli/grids/current_command.rb
 - lib/kontena/cli/grids/env_command.rb
+- lib/kontena/cli/grids/events_command.rb
 - lib/kontena/cli/grids/health_command.rb
 - lib/kontena/cli/grids/list_command.rb
 - lib/kontena/cli/grids/logs_command.rb
@@ -390,6 +391,7 @@ files:
 - lib/kontena/cli/services/envs/add_command.rb
 - lib/kontena/cli/services/envs/list_command.rb
 - lib/kontena/cli/services/envs/remove_command.rb
+- lib/kontena/cli/services/events_command.rb
 - lib/kontena/cli/services/exec_command.rb
 - lib/kontena/cli/services/link_command.rb
 - lib/kontena/cli/services/list_command.rb
@@ -413,6 +415,7 @@ files:
 - lib/kontena/cli/stacks/build_command.rb
 - lib/kontena/cli/stacks/common.rb
 - lib/kontena/cli/stacks/deploy_command.rb
+- lib/kontena/cli/stacks/events_command.rb
 - lib/kontena/cli/stacks/install_command.rb
 - lib/kontena/cli/stacks/list_command.rb
 - lib/kontena/cli/stacks/logs_command.rb
@@ -461,6 +464,7 @@ files:
 - lib/kontena/cli/volumes/create_command.rb
 - lib/kontena/cli/volumes/list_command.rb
 - lib/kontena/cli/volumes/remove_command.rb
+- lib/kontena/cli/volumes/show_command.rb
 - lib/kontena/cli/vpn/config_command.rb
 - lib/kontena/cli/vpn/create_command.rb
 - lib/kontena/cli/vpn/remove_command.rb
@@ -561,6 +565,7 @@ files:
 - spec/kontena/cli/containers/list_command_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
 - spec/kontena/cli/etcd/health_command_spec.rb
+- spec/kontena/cli/grids/events_command_spec.rb
 - spec/kontena/cli/grids/health_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
@@ -581,6 +586,7 @@ files:
 - spec/kontena/cli/nodes/health_command_spec.rb
 - spec/kontena/cli/nodes/list_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
+- spec/kontena/cli/services/events_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
 - spec/kontena/cli/services/logs_command_spec.rb
@@ -592,8 +598,10 @@ files:
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/stacks/build_command_spec.rb
 - spec/kontena/cli/stacks/deploy_command_spec.rb
+- spec/kontena/cli/stacks/events_command_spec.rb
 - spec/kontena/cli/stacks/install_command_spec.rb
 - spec/kontena/cli/stacks/list_command_spec.rb
+- spec/kontena/cli/stacks/logs_command_spec.rb
 - spec/kontena/cli/stacks/remove_command_spec.rb
 - spec/kontena/cli/stacks/service_generator_spec.rb
 - spec/kontena/cli/stacks/service_generator_v2_spec.rb
@@ -607,6 +615,8 @@ files:
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
 - spec/kontena/cli/vault/export_spec.rb
 - spec/kontena/cli/vault/import_spec.rb
+- spec/kontena/cli/vault/update_command_spec.rb
+- spec/kontena/cli/vault/write_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
@@ -700,6 +710,7 @@ test_files:
 - spec/kontena/cli/containers/list_command_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
 - spec/kontena/cli/etcd/health_command_spec.rb
+- spec/kontena/cli/grids/events_command_spec.rb
 - spec/kontena/cli/grids/health_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
@@ -720,6 +731,7 @@ test_files:
 - spec/kontena/cli/nodes/health_command_spec.rb
 - spec/kontena/cli/nodes/list_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
+- spec/kontena/cli/services/events_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
 - spec/kontena/cli/services/logs_command_spec.rb
@@ -731,8 +743,10 @@ test_files:
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/stacks/build_command_spec.rb
 - spec/kontena/cli/stacks/deploy_command_spec.rb
+- spec/kontena/cli/stacks/events_command_spec.rb
 - spec/kontena/cli/stacks/install_command_spec.rb
 - spec/kontena/cli/stacks/list_command_spec.rb
+- spec/kontena/cli/stacks/logs_command_spec.rb
 - spec/kontena/cli/stacks/remove_command_spec.rb
 - spec/kontena/cli/stacks/service_generator_spec.rb
 - spec/kontena/cli/stacks/service_generator_v2_spec.rb
@@ -746,6 +760,8 @@ test_files:
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
 - spec/kontena/cli/vault/export_spec.rb
 - spec/kontena/cli/vault/import_spec.rb
+- spec/kontena/cli/vault/update_command_spec.rb
+- spec/kontena/cli/vault/write_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb