kontena-cli 1.3.0.rc1 → 1.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1aa18c17b13a8b1887ca08c0a4a97f01d99b6df
-  data.tar.gz: 396d0b859359808ee9bcc11b0f92c9a6f9c3119b
+  metadata.gz: '09472d142a0b905453dae67fd9a5f773d8cacb78'
+  data.tar.gz: 0fbe77649ccdb7fcb79a5d15b093235ea1dee186
 SHA512:
-  metadata.gz: 6c8e6b7eb2767919326db9290c952457303c7c390622fc6d762d9453df15d9d2e5deb9993e7731aff7d7b310cb325dd178da401051c8088d90472595c159d2e1
-  data.tar.gz: 02a1e6756340210bd7de9c552b9f67464165db55476c55defe14a907c9da0ca55a7d05921bf4417b752e1e4712f23aab8dfb5589c1afc724c7e7029831096cb6
+  metadata.gz: 909d89da90b3b8101329c00bb5971200e8404368457e475620ff1a8f742ed4dcce1b1899fb6859bff861e0d7416f1b691d313ff532eb9675f3e68d2d1faa2b54
+  data.tar.gz: 542ec9dce844b9aa9e4e420c3f6dfcf610e65140f144ee531a777f8cdc3aa418eb672894287b2ffd934a2bd8af4456ed01411d00bcb00f0cbf1dee899adad79a

data/VERSION

@@ -1 +1 @@
-1.3.0.rc1
+1.3.0.rc2

data/kontena-cli.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "safe_yaml", "~> 1.0"
   spec.add_runtime_dependency "liquid", "~> 4.0.0"
   spec.add_runtime_dependency "tty-table", "~> 0.8.0"
-  spec.add_runtime_dependency "websocket-client-simple", "~> 0.3.0"
+  spec.add_runtime_dependency "websocket-driver-kontena", "0.6.5"
 end

data/lib/kontena/cli/common.rb

@@ -1,22 +1,41 @@
 require 'forwardable'
+require 'kontena_cli'
 
 module Kontena
   module Cli
     module Common
       extend Forwardable
 
-      def_delegators :Kontena, :pastel, :prompt, :logger
       def_delegators :prompt, :ask, :yes?
       def_delegators :config,
         :current_grid=, :require_current_grid, :current_master,
         :current_master=, :require_current_master, :require_current_account,
         :current_account
-      def_delegator Kontena::Cli::Spinner, :spin, :spinner
-      def_delegator Kontena::Cli::Config, :instance, :config
-      def_delegator Kontena::Cli::Config, :instance, :settings
       def_delegator :config, :config_filename, :settings_filename
       def_delegator :client, :server_version, :api_url_version
 
+      def logger
+        Kontena.logger
+      end
+
+      def prompt
+        Kontena.prompt
+      end
+
+      def pastel
+        Kontena.pastel
+      end
+
+      def spinner(msg, &block)
+        require 'kontena/cli/spinner' unless Kontena::Cli.const_defined?(:Spinner)
+         Kontena::Cli::Spinner.spin(msg, &block)
+      end
+
+      def config
+        require 'kontena/cli/config' unless Kontena::Cli.const_defined?(:Config)
+        Kontena::Cli::Config.instance
+      end
+
       # Read from STDIN. If stdin is a console, use prompt to ask.
       # @param [String] message
       # @param [Symbol] mode (prompt method: :ask, :multiline, etc)

data/lib/kontena/cli/containers/exec_command.rb

@@ -13,23 +13,28 @@ module Kontena::Cli::Containers
     option ["--interactive"], :flag, "Keep stdin open"
 
     def execute
-      require 'websocket-client-simple'
-
       require_api_url
       token = require_token
       cmd = JSON.dump({cmd: cmd_list})
-      base = self
-      ws = connect(ws_url("#{current_grid}/#{container_id}"), token)
+      url = ws_url("#{current_grid}/#{container_id}")
+      url << 'interactive=true&' if interactive?
+      url << 'shell=true' if shell?
+      ws = connect(url, token)
+
       ws.on :message do |msg|
-        base.handle_message(msg)
+        self.handle_message(msg)
       end
       ws.on :open do
-        ws.send(cmd)
+        ws.text(cmd)
       end
       ws.on :close do |e|
-        exit 1
+        if e.reason.include?('code: 404')
+          exit_with_error('Not found')
+        else
+          exit 1
+        end
       end
-
+      ws.connect
       if interactive?
         stream_stdin_to_ws(ws).join
       else 

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

@@ -1,13 +1,16 @@
+require_relative '../../websocket/client'
+
 module Kontena::Cli::Helpers
   module ExecHelper
 
     # @param [WebSocket::Client::Simple] ws 
     # @return [Thread]
     def stream_stdin_to_ws(ws)
+      require 'io/console'
       Thread.new {
         STDIN.raw {
           while char = STDIN.readpartial(1024)
-            ws.send(JSON.dump({ stdin: char }))
+            ws.text(JSON.dump({ stdin: char }))
           end
         }
       }
@@ -43,19 +46,22 @@ module Kontena::Cli::Helpers
     def ws_url(container_id)
       url = require_current_master.url
       url << '/' unless url.end_with?('/')
-      "#{url.sub('http', 'ws')}v1/containers/#{container_id}/exec"
+      "#{url.sub('http', 'ws')}v1/containers/#{container_id}/exec?"
     end
 
     # @param [String] url
     # @param [String] token
     # @return [WebSocket::Client::Simple]
     def connect(url, token)
-      WebSocket::Client::Simple.connect(url, {
+      options = {
         headers: {
-          'Authorization' => "Bearer #{token.access_token}",
-          'Accept' => 'application/json'
+          'Authorization' => "Bearer #{token.access_token}"
         }
-      })
+      }
+      if ENV['SSL_IGNORE_ERRORS'].to_s == 'true'
+        options[:verify_mode] = ::OpenSSL::SSL::VERIFY_NONE
+      end
+      Kontena::Websocket::Client.new(url, options)
     end
   end
 end

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

@@ -9,9 +9,9 @@ module Kontena::Cli::Master
 
     def execute
       params = []
-      params << "--join #{self.invite_code.shellescape}"
+      params += ["--join", self.invite_code]
       params << "--remote" if self.remote?
-      params << "--name #{self.name.shellescape}" if self.name
+      params += ["--name", self.name] if self.name
       params << "--verbose" if self.verbose?
 
       cmd = ['master', 'login'] + params

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

@@ -2,9 +2,20 @@ module Kontena::Cli::Master
   class UseCommand < Kontena::Command
     include Kontena::Cli::Common
 
-    parameter "NAME", "Master name to use"
+    parameter "[NAME]", "Master name to use"
+
+    option '--clear', :flag, "Clear current master setting"
 
     def execute
+      if clear?
+        config.current_master = nil
+        config.write
+        exit 0
+      elsif name.nil?
+        signal_usage_error Clamp.message(:parameter_argument_error, :param => 'NAME', :message => "missing")
+        exit 1
+      end
+
       master = config.find_server(name)
       if master.nil?
         exit_with_error p"Could not resolve master by name '#{name}'." +

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

@@ -34,7 +34,6 @@ module Kontena::Cli::Nodes
     def fields
       return ['name'] if quiet?
       {
-        ' ' =>   'health_icon',
         name:    'name',
         version: 'agent_version',
         status:  'status',
@@ -67,7 +66,7 @@ module Kontena::Cli::Nodes
         unless quiet?
           grid_health = grid_health(grid, grid_nodes)
           grid_nodes.each do |node|
-            node['health_icon'] = health_icon(node_health(node, grid_health))
+            node['name'] = health_icon(node_health(node, grid_health)) + " " + node['name']
           end
         end
 

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

@@ -24,8 +24,6 @@ module Kontena::Cli::Services
     requires_current_grid
 
     def execute
-      require 'websocket-client-simple'
-
       exit_with_error "--interactive cannot be used with --all" if all? && interactive?
 
       service_containers = client.get("services/#{parse_service_id(name)}/containers")['containers']
@@ -92,7 +90,7 @@ module Kontena::Cli::Services
       exit_status = nil
       token = require_token
       url = ws_url(container['id'])
-      url << '?shell=true' if shell?
+      url << 'shell=true' if shell?
       ws = connect(url, token)
       ws.on :message do |msg|
         data = base.parse_message(msg)
@@ -107,11 +105,12 @@ module Kontena::Cli::Services
         end
       end
       ws.on :open do
-        ws.send(cmd)
+        ws.text(cmd)
       end
-      ws.on :close do |e|
-        exit_status = 1
+      ws.on :close do |e|s
+        exit_status = 1 if exit_status.nil? && e.code != 1000
       end
+      ws.connect
 
       sleep 0.01 until !exit_status.nil?
 
@@ -120,23 +119,22 @@ module Kontena::Cli::Services
 
     # @param [Hash] container
     def interactive_exec(container)
-      require 'io/console'
-
       token = require_token
       cmd = JSON.dump({ cmd: cmd_list })
       base = self
-      url = ws_url(container['id']) << '?interactive=true'
+      url = ws_url(container['id']) << 'interactive=true'
       url << '&shell=true' if shell?
       ws = connect(url, token)
       ws.on :message do |msg|
         base.handle_message(msg)        
       end
       ws.on :open do
-        ws.send(cmd)
+        ws.text(cmd)
       end
       ws.on :close do |e|
-        exit 1
+        exit 1 if e.code != 1000
       end
+      ws.connect
       
       stream_stdin_to_ws(ws).join
     end

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

@@ -17,7 +17,7 @@ module Kontena::Cli::Services
     end
 
     def fields
-      quiet? ? ['name'] : {'  ' => 'health_icon', name: 'name', instances: 'instances', stateful: 'stateful', state: 'state', "exposed ports" => 'ports' }
+      quiet? ? ['name'] : {name: 'name', instances: 'instances', stateful: 'stateful', state: 'state', "exposed ports" => 'ports' }
     end
 
     def service_port(port)
@@ -49,9 +49,8 @@ module Kontena::Cli::Services
 
     def execute
       print_table(services) do |row|
-        row['name'] = service_name(row)
+        row['name'] = quiet? ? service_name(row) :  health_status_icon(health_status(row)) + " " + service_name(row)
         next if quiet?
-        row['health_icon'] = health_status_icon(health_status(row))
         row['stateful'] = row['stateful'] ? pastel.green('yes') : 'no'
         row['ports'] = row['ports'].map(&method(:service_port)).join(',')
         row['state'] = pastel.send(state_color(row['state']), row['state'])

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

@@ -26,7 +26,6 @@ module Kontena::Cli::Stacks
     def fields
       return ['name'] if quiet?
       {
-        '  ' => 'health_icon',
         name: 'name',
         stack: 'stack',
         services: 'services_count',
@@ -38,7 +37,7 @@ module Kontena::Cli::Stacks
     def execute
       print_table(stacks) do |row|
         next if quiet?
-        row['health_icon'] = health_icon(stack_health(row))
+        row['name'] = health_icon(stack_health(row)) + " " + row['name']
         row['stack'] = "#{row['stack']}:#{row['version']}"
         row['services_count'] = row['services'].size
         row['ports'] = stack_ports(row).join(',')

data/lib/kontena/cli/table_generator.rb

@@ -11,6 +11,8 @@ module Kontena
 
       DEFAULT_HEADER_FORMAT_PROC = lambda { |header| header.to_s.capitalize }
 
+      DEFAULT_RENDER_OPTS = {padding: [0,2,0,0]}
+
       module Helper
         def self.included(base)
           if base.respond_to?(:option)
@@ -28,8 +30,8 @@ module Kontena
             array,
             fields,
             row_format_proc: block_given? ? block.to_proc : nil,
-            header_format_proc: lambda { |item| pastel.blue(item.to_s.capitalize) },
-            render_options: self.respond_to?(:render_options) ? self.render_options : nil
+            header_format_proc: lambda { |item| pastel.bold(item.to_s.upcase) },
+            render_options: self.respond_to?(:render_options) ? DEFAULT_RENDER_OPTS.merge(self.render_options) : DEFAULT_RENDER_OPTS
           ).render
         end
 
@@ -68,7 +70,7 @@ module Kontena
         if data.empty?
           fields.map(&method(:format_header_item)).join('  ')
         else
-          table.render(render_mode, render_options)
+          table.render(render_mode, render_options).gsub(/\s+$/, '')
         end
       end
 

data/lib/kontena/errors.rb

@@ -24,6 +24,7 @@ module Kontena
 
       # Render as indented YAML
       def errors_message(indent: "\t")
+        require 'yaml'
         @errors.to_yaml.lines[1..-1].map{|line| "#{indent}#{line}" }.join
       end
 

data/lib/kontena/scripts/completer.rb

@@ -1,18 +1,42 @@
-require 'kontena/client'
 require 'kontena/cli/common'
-require 'yaml'
 
 class Helper
   include Kontena::Cli::Common
 
+  def client_config
+    require 'json'
+    config_file = File.expand_path('~/.kontena_client.json')
+    if(File.exist?(config_file))
+      JSON.parse(File.read(config_file))
+    else
+      {}
+    end
+  rescue => ex
+    logger.debug ex
+    {}
+  end
+
+  def current_grid
+    client_config['servers'].find { |s| s['name'] == client_config['current_server']}['grid']
+  rescue => ex
+    logger.debug ex
+    nil
+  end
+
+  def current_master_name
+    client_config['current_server']
+  end
+
   def client
+    $VERSION_WARNING_ADDED=true
     token = require_token
     super(token)
   end
 
   def grids
     client.get("grids")['grids'].map{|grid| grid['id']}
-  rescue
+  rescue => ex
+    logger.debug ex
     []
   end
 
@@ -28,7 +52,8 @@ class Helper
     results.push stacks.map{|s| s['name']}
     results.delete('null')
     results
-  rescue
+  rescue => ex
+    logger.debug ex
     []
   end
 
@@ -44,7 +69,8 @@ class Helper
       end
     }
     results
-  rescue
+  rescue => ex
+    logger.debug ex
     []
   end
 
@@ -56,33 +82,34 @@ class Helper
       results.push(containers.map{|c| c['id'] })
     end
     results
-  rescue
+  rescue => ex
+    logger.debug ex
     []
   end
 
   def yml_services
+    require 'yaml'
     if File.exist?('kontena.yml')
       yaml = YAML.safe_load(File.read('kontena.yml'))
       services = yaml['services']
       services.keys
     end
-  rescue
+  rescue => ex
+    logger.debug ex
     []
   end
 
   def yml_files
     Dir["./*.yml"].map{|file| file.sub('./', '')}
-  rescue
+  rescue => ex
+    logger.debug ex
     []
   end
 
   def master_names
-    config_file = File.expand_path('~/.kontena_client.json')
-    if(File.exist?(config_file))
-      config = JSON.parse(File.read(config_file))
-      return config['servers'].map{|s| s['name']}
-    end
-  rescue
+    client_config['servers'].map{|s| s['name']}
+  rescue => ex
+    logger.debug ex
     []
   end
 
@@ -108,138 +135,152 @@ end
 
 words.delete_at(0)
 
-completion = []
-completion.push %w(cloud logout grid app service stack vault certificate node master vpn registry container etcd external-registry whoami plugin version) if words.size < 2
-if words.size > 0
-  case words[0]
-    when 'plugin'
-      completion.clear
-      sub_commands = %w(list ls search install uninstall)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'etcd'
-      completion.clear
-      sub_commands = %w(get set mkdir mk list ls rm)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'registry'
-      completion.clear
-      sub_commands = %w(create remove rm)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'grid'
-      completion.clear
-      sub_commands = %w(add-user audit-log create current list user remove show use)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.grids
-      else
-        completion.push sub_commands
-      end
-    when 'node'
-      completion.clear
-      sub_commands = %w(list show remove)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.nodes
-      else
-        completion.push sub_commands
-      end
-    when 'master'
-      completion.clear
-      sub_commands = %w(list use users current remove rm config cfg login logout token join audit-log init-cloud)
-      if words[1] && words[1] == 'use'
-        completion.push helper.master_names
-      elsif words[1] && words[1] == 'users'
-        users_sub_commands = %(invite list role)
-        completion.push users_sub_commands
-      elsif words[1] && ['config', 'cfg'].include?(words[1])
-        config_sub_commands = %(set get dump load import export unset)
-        completion.push config_sub_commands
-      elsif words[1] && words[1] == 'token'
-        token_sub_commands = %(list ls rm remove show current create)
-        completion.push token_sub_commands
-      elsif words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'cloud'
-      completion.clear
-      sub_commands = %w(login logout master)
-      if words[1] && words[1] == 'master'
-        cloud_master_sub_commands = %(list ls remove rm add show update)
-        completion.push cloud_master_sub_commands
-      elsif words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-      else
-        completion.push sub_commands
-      end
-    when 'service'
-      completion.clear
-      sub_commands = %w(containers create delete deploy list logs restart
-                      scale show start stats stop update monitor env
-                      secret link unlink)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.services
-      else
-        completion.push sub_commands
-      end
-    when 'container'
-      completion.clear
-      sub_commands = %w(exec inspect logs)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.containers
-      else
-        completion.push sub_commands
-      end
-    when 'vpn'
-      completion.clear
-      completion.push %w(config create delete)
-    when 'external-registry'
-      completion.clear
-      completion.push %w(add list delete)
-    when 'app'
-      completion.clear
-      sub_commands = %w(init build config deploy start stop remove rm ps list
-                        logs monitor show)
-      if words[1]
-        completion.push(sub_commands) unless sub_commands.include?(words[1])
-        completion.push helper.yml_services
-      else
-        completion.push sub_commands
-      end
-    when 'stack'
-      completion.clear
-      sub_commands = %w(build install upgrade deploy start stop remove rm ls list
-                        logs monitor show registry)
-      if words[1]
-        if words[1] == 'registry'
-          registry_sub_commands = %(push pull search show rm)
-          completion.push registry_sub_commands
-        elsif %w(install).include?(words[1])
-            completion.push helper.yml_files
-        elsif words[1] == 'upgrade' && words[3]
-          completion.push helper.yml_files
+helper.logger.debug { "Completing #{words.inspect}" }
+
+begin
+  completion = []
+  completion.push %w(cloud logout grid app service stack vault certificate node master vpn registry container etcd external-registry whoami plugin version) if words.size < 2
+  if words.size > 0
+    case words[0]
+      when 'plugin'
+        completion.clear
+        sub_commands = %w(list ls search install uninstall)
+        if words[1]
+          completion.push(sub_commands) unless sub_commands.include?(words[1])
         else
+          completion.push sub_commands
+        end
+      when 'etcd'
+        completion.clear
+        sub_commands = %w(get set mkdir mk list ls rm)
+        if words[1]
           completion.push(sub_commands) unless sub_commands.include?(words[1])
-          completion.push helper.stacks
+        else
+          completion.push sub_commands
         end
-      else
-        completion.push sub_commands
-      end
+      when 'registry'
+        completion.clear
+        sub_commands = %w(create remove rm)
+        if words[1]
+          completion.push(sub_commands) unless sub_commands.include?(words[1])
+        else
+          completion.push sub_commands
+        end
+      when 'grid'
+        completion.clear
+        sub_commands = %w(add-user audit-log create current list user remove show use)
+        if words[1] && words[1] == 'use'
+          completion.push helper.grids.reject { |g| g == helper.current_grid }
+        elsif words[1] && %w(update show rm remove env cloud-config health).include?(words[1])
+          completion.push helper.grids
+        else
+          completion.push sub_commands
+        end
+      when 'node'
+        completion.clear
+        sub_commands = %w(list show remove)
+        if words[1] && sub_commands.include?(words[1])
+          completion.push helper.nodes
+        else
+          completion.push sub_commands
+        end
+      when 'master'
+        completion.clear
+        sub_commands = %w(list use user current remove rm config cfg login logout token join audit-log init-cloud)
+        if words[1] && words[1] == 'use'
+          completion.push helper.master_names.reject { |n| n == helper.current_master_name }
+        elsif words[1] && %w(remove rm).include?(words[1])
+          completion.push helper.master_names
+        elsif words[1] && words[1] == 'user'
+          users_sub_commands = %w(invite list role)
+          if words[2] == 'role'
+            role_subcommands = %w(add remove rm)
+            if !words[3] || !role_subcommands.include?(words[3])
+              completion.push role_subcommands
+            end
+          else
+            completion.push users_sub_commands
+          end
+        elsif words[1] && ['config', 'cfg'].include?(words[1])
+          config_sub_commands = %(set get dump load import export unset)
+          completion.push config_sub_commands
+        elsif words[1] && words[1] == 'token'
+          token_sub_commands = %(list ls rm remove show current create)
+          completion.push token_sub_commands
+        elsif words[1]
+          completion.push(sub_commands) unless sub_commands.include?(words[1])
+        else
+          completion.push sub_commands
+        end
+      when 'cloud'
+        completion.clear
+        sub_commands = %w(login logout master)
+        if words[1] && words[1] == 'master'
+          cloud_master_sub_commands = %(list ls remove rm add show update)
+          completion.push cloud_master_sub_commands
+        elsif words[1]
+          completion.push(sub_commands) unless sub_commands.include?(words[1])
+        else
+          completion.push sub_commands
+        end
+      when 'service'
+        completion.clear
+        sub_commands = %w(containers create delete deploy list logs restart
+                        scale show start stats stop update monitor env
+                        secret link unlink)
+        if words[1] && sub_commands.include?(words[1])
+          completion.push helper.services
+        else
+          completion.push sub_commands
+        end
+      when 'container'
+        completion.clear
+        sub_commands = %w(exec inspect logs)
+        if words[1] && sub_commands.include?(words[1])
+          completion.push helper.containers
+        else
+          completion.push sub_commands
+        end
+      when 'vpn'
+        completion.clear
+        completion.push %w(config create delete)
+      when 'external-registry'
+        completion.clear
+        completion.push %w(add list delete)
+      when 'app'
+        completion.clear
+        sub_commands = %w(init build config deploy start stop remove rm ps list
+                          logs monitor show)
+        if words[1] && sub_commands.include?(words[1])
+          completion.push helper.yml_services
+        else
+          completion.push sub_commands
+        end
+      when 'stack'
+        completion.clear
+        sub_commands = %w(build install upgrade deploy start stop remove rm ls list
+                          logs monitor show registry)
+        if words[1]
+          if words[1] == 'registry'
+            registry_sub_commands = %(push pull search show rm)
+            completion.push registry_sub_commands
+          elsif %w(install).include?(words[1])
+              completion.push helper.yml_files
+          elsif words[1] == 'upgrade' && words[3]
+            completion.push helper.yml_files
+          elsif words[1] && sub_commands.include?(words[1])
+            completion.push helper.stacks
+          else
+            completion.push(sub_commands)
+          end
+        else
+          completion.push sub_commands
+        end
+    end
   end
+rescue => ex
+  helper.logger.debug ex
 end
+helper.logger.debug { "Returning completions: #{completion.inspect}" }
 
 puts completion

data/lib/kontena/websocket/client.rb

@@ -0,0 +1,12 @@
+require 'websocket/driver'
+module Kontena
+  module Websocket
+    module Client
+      def self.new(*args)
+        Connection.new(*args)
+      end
+    end
+  end
+end
+
+require_relative 'client/connection'

data/lib/kontena/websocket/client/connection.rb

@@ -0,0 +1,65 @@
+require 'forwardable'
+require 'socket'
+require 'openssl'
+
+module Kontena
+  module Websocket
+    module Client
+      class Connection
+        extend Forwardable
+
+        FRAME_SIZE = 1024
+
+        attr_reader :url
+
+        # @param [String] url
+        # @param [Hash] options
+        def initialize(url, options = {})
+          @options = options
+          @url = url
+          @client = ::WebSocket::Driver.client(self)
+          if headers = options[:headers]
+            headers.each do |k, v|
+              @client.set_header(k, v)
+            end
+          end
+        end
+
+        def connect
+          uri = URI.parse(@url)
+          port = uri.port || (uri.scheme == "ws" ? 80 : 443)
+          @socket = ::TCPSocket.new(uri.host, port)
+          if uri.scheme == "wss"
+            ctx = ::OpenSSL::SSL::SSLContext.new
+            ctx.ssl_version = @options[:ssl_version] if @options[:ssl_version]
+            ctx.verify_mode = @options[:verify_mode] if @options[:verify_mode]
+            cert_store = ::OpenSSL::X509::Store.new
+            cert_store.set_default_paths
+            ctx.cert_store = cert_store
+            @socket = ::OpenSSL::SSL::SSLSocket.new(@socket, ctx)
+            @socket.connect
+          end
+          @client.start
+          Thread.new { self.read_socket }
+        end
+
+        def_delegators :@client, :text, :binary, :ping, :close, :protocol, :on
+
+        def write(buffer)
+          @socket.write buffer
+        end
+
+        def read_socket
+          loop do
+            begin
+              @client.parse(@socket.readpartial(FRAME_SIZE))
+            rescue EOFError
+              break
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/kontena_cli.rb

@@ -173,8 +173,7 @@ end
 require 'retriable'
 Retriable.configure do |c|
   c.on_retry = Proc.new do |exception, try, elapsed_time, next_interval|
-    return true unless ENV["DEBUG"]
-    puts "Retriable retry: #{try} - Exception: #{exception.class.name} - #{exception.message}. Elapsed: #{elapsed_time} Next interval: #{next_interval}"
+    Kontena.logger.debug { "Retriable retry: #{try} - Exception: #{exception.class.name} - #{exception.message}. Elapsed: #{elapsed_time} Next interval: #{next_interval}" }
   end
 end
 

data/spec/kontena/cli/app/build_command_spec.rb

@@ -19,20 +19,8 @@ describe Kontena::Cli::Apps::BuildCommand do
     fixture('docker-compose.yml')
   end
 
-  let(:settings) do
-    {'current_server' => 'alias',
-     'servers' => [
-         {
-           'name' => 'some_master',
-           'url' => 'some_master'
-         }
-     ]
-    }
-  end
-
   describe '#execute' do
     before(:each) do
-      allow(subject).to receive(:settings).and_return(settings)
       allow(subject).to receive(:current_dir).and_return("kontena-test")
       allow(File).to receive(:exists?).and_return(true)
       allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)

data/spec/kontena/cli/master/join_command_spec.rb

@@ -0,0 +1,33 @@
+require 'kontena/cli/master/join_command'
+require 'kontena/cli/localhost_web_server'
+require 'launchy'
+require 'ostruct'
+
+describe Kontena::Cli::Master::JoinCommand do
+
+  include ClientHelpers
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  it 'calls master login with proper join options' do
+    expect(Kontena).to receive(:run!).with(%w(master login --join xyz someurl))
+    subject.run(%w(someurl xyz))
+  end
+
+  it 'calls master login with remote option' do
+    expect(Kontena).to receive(:run!).with(%w(master login --join xyz --remote someurl))
+    subject.run(%w(--remote someurl xyz))
+  end
+
+  it 'calls master login with name option' do
+    expect(Kontena).to receive(:run!).with(%w(master login --join xyz --name somename someurl))
+    subject.run(%w(--name somename someurl xyz))
+  end
+
+  it 'calls master login with verbose option' do
+    expect(Kontena).to receive(:run!).with(%w(master login --join xyz --verbose someurl))
+    subject.run(%w(--verbose someurl xyz))
+  end
+end

data/spec/kontena/cli/master/use_command_spec.rb

@@ -18,5 +18,15 @@ describe Kontena::Cli::Master::UseCommand do
     it 'should abort with error message if master is not configured' do
       expect { subject.run(['not_existing']) }.to output(/Could not resolve master with name: 'not_existing'/).to_stderr
     end
+
+    it 'should abort with error message if master is not given' do
+      expect { subject.run([]) }.to raise_error Clamp::UsageError
+    end
+
+    it 'should clear current master when --clear given' do
+      expect(subject.config).to receive(:write).and_return(true)
+      subject.run(['--clear'])
+      expect(subject.config.current_server).to be_nil
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'websocket-client-simple'
+require 'kontena/websocket/client'
 require 'kontena/cli/services/exec_command'
 
 describe Kontena::Cli::Services::ExecCommand do
@@ -24,6 +24,8 @@ describe Kontena::Cli::Services::ExecCommand do
         end
       end
 
+      def connect ; end
+
       def receive_message(msg)
         @callbacks[:message].call(Event.new(JSON.dump(msg)))
       rescue => exc 
@@ -67,8 +69,8 @@ describe Kontena::Cli::Services::ExecCommand do
     end
 
     it "Executes on the running container by default" do
-      expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec", anything).and_return(ws_client)
-      expect(ws_client).to receive(:send) do |foo|
+      expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec?", anything).and_return(ws_client)
+      expect(ws_client).to receive(:text) do |foo|
         ws_client.receive_message({'stream' => 'stdout', 'chunk' => "ok\n"})
         ws_client.receive_message({'exit' => 0})
       end
@@ -105,8 +107,8 @@ describe Kontena::Cli::Services::ExecCommand do
 
     it "Executes on the first running container by default" do
       expect(client).to receive(:get).with('services/test-grid/null/test-service/containers').and_return(service_containers)
-      expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec", anything).and_return(ws_client)
-      expect(ws_client).to receive(:send) do
+      expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec?", anything).and_return(ws_client)
+      expect(ws_client).to receive(:text) do
         respond_ok(ws_client)
       end
       expect {
@@ -116,8 +118,8 @@ describe Kontena::Cli::Services::ExecCommand do
 
     it "Executes on the first running container, even if they are ordered differently" do
       expect(client).to receive(:get).with('services/test-grid/null/test-service/containers').and_return({'containers' => service_containers['containers'].reverse })
-      expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec", anything).and_return(ws_client)
-      expect(ws_client).to receive(:send) do
+      expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec?", anything).and_return(ws_client)
+      expect(ws_client).to receive(:text) do
         respond_ok(ws_client)
       end
       expect {
@@ -127,8 +129,8 @@ describe Kontena::Cli::Services::ExecCommand do
 
     it "Executes on the first running container if given" do
       expect(client).to receive(:get).with('services/test-grid/null/test-service/containers').and_return(service_containers)
-      expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec", anything).and_return(ws_client)
-      expect(ws_client).to receive(:send) do
+      expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec?", anything).and_return(ws_client)
+      expect(ws_client).to receive(:text) do
         respond_ok(ws_client)
       end
       expect {
@@ -138,8 +140,8 @@ describe Kontena::Cli::Services::ExecCommand do
 
     it "Executes on the second running container if given" do
       expect(client).to receive(:get).with('services/test-grid/null/test-service/containers').and_return(service_containers)
-      expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-2/exec", anything).and_return(ws_client)
-      expect(ws_client).to receive(:send) do
+      expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-2/exec?", anything).and_return(ws_client)
+      expect(ws_client).to receive(:text) do
         respond_ok(ws_client)
       end
       expect {
@@ -158,8 +160,8 @@ describe Kontena::Cli::Services::ExecCommand do
 
       3.times do |i|
         ws_client = ws_client_class.new
-        expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-#{i + 1}/exec", anything).and_return(ws_client)
-        expect(ws_client).to receive(:send) do
+        expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-#{i + 1}/exec?", anything).and_return(ws_client)
+        expect(ws_client).to receive(:text) do
           ws_client.receive_message({'stream' => 'stdout', 'chunk' => "test#{i + 1}\n"})
           ws_client.receive_message({'exit' => 0})
         end
@@ -172,8 +174,8 @@ describe Kontena::Cli::Services::ExecCommand do
 
     it "Stops if the first container fails" do
       expect(client).to receive(:get).with('services/test-grid/null/test-service/containers').and_return(service_containers)
-      expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec", anything).and_return(ws_client)
-      expect(ws_client).to receive(:send) do
+      expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-1/exec?", anything).and_return(ws_client)
+      expect(ws_client).to receive(:text) do
         respond_error(ws_client)
       end
       expect {
@@ -186,8 +188,8 @@ describe Kontena::Cli::Services::ExecCommand do
       i = 1
       [:ok, :err].each do |status|
         ws_client = ws_client_class.new
-        expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-#{i}/exec", anything).and_return(ws_client)
-        expect(ws_client).to receive(:send) do
+        expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-#{i}/exec?", anything).and_return(ws_client)
+        expect(ws_client).to receive(:text) do
           if status == :ok
             respond_ok(ws_client)
           else 
@@ -207,8 +209,8 @@ describe Kontena::Cli::Services::ExecCommand do
       i = 1
       [:ok, :err, :ok].each do |status|
         ws_client = ws_client_class.new
-        expect(WebSocket::Client::Simple).to receive(:connect).with("#{master_url}v1/containers/test-grid/host/test-service.container-#{i}/exec", anything).and_return(ws_client)
-        expect(ws_client).to receive(:send) do
+        expect(Kontena::Websocket::Client).to receive(:new).with("#{master_url}v1/containers/test-grid/host/test-service.container-#{i}/exec?", anything).and_return(ws_client)
+        expect(ws_client).to receive(:text) do
           if status == :ok
             respond_ok(ws_client)
           else 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
+  version: 1.3.0.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,19 +207,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: websocket-client-simple
+  name: websocket-driver-kontena
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.5
 description: Command-line client for the Kontena container and microservices platform
 email:
 - info@kontena.io
@@ -526,6 +526,8 @@ files:
 - lib/kontena/stacks_cache.rb
 - lib/kontena/stacks_client.rb
 - lib/kontena/util.rb
+- lib/kontena/websocket/client.rb
+- lib/kontena/websocket/client/connection.rb
 - lib/kontena_cli.rb
 - omnibus/.gitignore
 - omnibus/.kitchen.yml
@@ -610,6 +612,7 @@ files:
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/init_cloud_command_spec.rb
+- spec/kontena/cli/master/join_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
@@ -762,6 +765,7 @@ test_files:
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/init_cloud_command_spec.rb
+- spec/kontena/cli/master/join_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb