kontena-cli 1.3.0.rc2 → 1.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09472d142a0b905453dae67fd9a5f773d8cacb78'
-  data.tar.gz: 0fbe77649ccdb7fcb79a5d15b093235ea1dee186
+  metadata.gz: 56f2fe0867115aff48b183538824e13eb77810f8
+  data.tar.gz: 67d15d8bcf84c128a38b7c70ea65d65f8444d696
 SHA512:
-  metadata.gz: 909d89da90b3b8101329c00bb5971200e8404368457e475620ff1a8f742ed4dcce1b1899fb6859bff861e0d7416f1b691d313ff532eb9675f3e68d2d1faa2b54
-  data.tar.gz: 542ec9dce844b9aa9e4e420c3f6dfcf610e65140f144ee531a777f8cdc3aa418eb672894287b2ffd934a2bd8af4456ed01411d00bcb00f0cbf1dee899adad79a
+  metadata.gz: dcb08e8ae2a117aee8c7e7e47b332d8fc5cd493bafd1e12c02e70e14d2a47295c10e71f33772d5806a13fc01bf807d42c4314d160e8e54f97bdfb2b0bdda8980
+  data.tar.gz: bec4e80d3179561182a5d59bd09f5d5d8c8f7ba47812b57fca560a80cb9e33980d76f2c3c098776a2042fdde114e3a17c94c2c29492ad63f210c9aadc4623f1e

data/VERSION

@@ -1 +1 @@
-1.3.0.rc2
+1.3.0.rc3

data/lib/kontena/autoload_core.rb

@@ -0,0 +1,18 @@
+# stdlib
+autoload :JSON, 'json'
+autoload :YAML, 'safe_yaml'
+autoload :URI, 'uri'
+autoload :Logger, 'logger'
+autoload :FileUtils, 'fileutils'
+autoload :Forwardable, 'forwardable'
+autoload :Singleton, 'singleton'
+autoload :Observable, 'observer'
+autoload :Pathname, 'pathname'
+autoload :DateTime, 'date'
+autoload :Date, 'date'
+autoload :Base64, 'base64'
+autoload :SecureRandom, 'securerandom'
+
+# dependencies
+autoload :Excon, 'excon'
+autoload :Opto, 'opto'

data/lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb

@@ -50,6 +50,7 @@ module Kontena
       end
 
       def before
+        extend Kontena::Cli::Common
         unless_param(:name) do
           if command.cloud_master_id
             response = spinner "Receiving Master information from Kontena Cloud" do

data/lib/kontena/cli/cloud/master/update_command.rb

@@ -37,7 +37,7 @@ module Kontena::Cli::Cloud::Master
       attrs["owner"]        = self.owner        if self.owner
 
       response = cloud_client.put(
-        "master",
+        "user/masters/#{master_id}",
         { data: { attributes: attrs.reject{ |k, _| ['client-id', 'client-secret'].include?(k) } } }
       )
 

data/lib/kontena/cli/common.rb

@@ -2,7 +2,13 @@ require 'forwardable'
 require 'kontena_cli'
 
 module Kontena
+  autoload :Client, 'kontena/client'
+
   module Cli
+    autoload :ShellSpinner, 'kontena/cli/spinner'
+    autoload :Spinner, 'kontena/cli/spinner'
+    autoload :Config, 'kontena/cli/config'
+
     module Common
       extend Forwardable
 
@@ -27,12 +33,10 @@ module Kontena
       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
 

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

@@ -10,36 +10,41 @@ module Kontena::Cli::Containers
     parameter "CMD ...", "Command"
 
     option ["--shell"], :flag, "Execute as a shell command"
-    option ["--interactive"], :flag, "Keep stdin open"
+    option ["-i", "--interactive"], :flag, "Keep stdin open"
+    option ["-t", "--tty"], :flag, "Allocate a pseudo-TTY"
 
     def execute
+      exit_with_error "the input device is not a TTY" if tty? && !STDIN.tty?
+
       require_api_url
       token = require_token
       cmd = JSON.dump({cmd: cmd_list})
-      url = ws_url("#{current_grid}/#{container_id}")
-      url << 'interactive=true&' if interactive?
-      url << 'shell=true' if shell?
+      queue = Queue.new
+      stdin_reader = nil
+      url = ws_url("#{current_grid}/#{container_id}", interactive: interactive?, shell: shell?, tty: tty?)
       ws = connect(url, token)
-
       ws.on :message do |msg|
-        self.handle_message(msg)
+        data = parse_message(msg)
+        queue << data if data.is_a?(Hash)
       end
       ws.on :open do
         ws.text(cmd)
+        stdin_reader = self.stream_stdin_to_ws(ws) if self.interactive?
       end
       ws.on :close do |e|
         if e.reason.include?('code: 404')
-          exit_with_error('Not found')
+          queue << {'exit' => 1, 'message' => 'Not found'}
         else
-          exit 1
+          queue << {'exit' => 1}
         end
       end
       ws.connect
-      if interactive?
-        stream_stdin_to_ws(ws).join
-      else 
-        sleep
+      while msg = queue.pop
+        self.handle_message(msg)
       end
+    rescue SystemExit
+      stdin_reader.kill if stdin_reader
+      raise
     end
   end
 end

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

@@ -3,35 +3,41 @@ require_relative '../../websocket/client'
 module Kontena::Cli::Helpers
   module ExecHelper
 
-    # @param [WebSocket::Client::Simple] ws 
+    # @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)
+        if STDIN.tty?
+          STDIN.raw {
+            while char = STDIN.readpartial(1024)
+              ws.text(JSON.dump({ stdin: char }))
+            end
+          }
+        else
+          while char = STDIN.gets
             ws.text(JSON.dump({ stdin: char }))
           end
-        }
+          ws.text(JSON.dump({ stdin: nil }))
+        end
       }
     end
 
-    # @param [Websocket::Frame::Incoming] msg
+    # @param [Hash] msg
     def handle_message(msg)
-      data = parse_message(msg)
-      if data.is_a?(Hash)
-        if data.has_key?('exit')
-          exit data['exit'].to_i
-        elsif data.has_key?('stream')
-          if data['stream'] == 'stdout'
-            $stdout << data['chunk'] 
-          else 
-            $stderr << data['chunk']
-          end
+      if msg.has_key?('exit')
+        if msg['message']
+          exit_with_error(msg['message'])
+        else
+          exit msg['exit'].to_i
+        end
+      elsif msg.has_key?('stream')
+        if msg['stream'] == 'stdout'
+          $stdout << msg['chunk']
+        else
+          $stderr << msg['chunk']
         end
       end
-    rescue => exc
-      $stderr << "#{exc.class.name}: #{exc.message}"
     end
 
     # @param [Websocket::Frame::Incoming] msg
@@ -41,12 +47,26 @@ module Kontena::Cli::Helpers
       nil
     end
 
-    # @param [String] container_id
+    # @param container_id [String] The container id
+    # @param interactive [Boolean] Interactive TTY on/off
+    # @param shell [Boolean] Shell on/of
+    # @param tty [Boolean] TTY on/of
     # @return [String]
-    def ws_url(container_id)
-      url = require_current_master.url
-      url << '/' unless url.end_with?('/')
-      "#{url.sub('http', 'ws')}v1/containers/#{container_id}/exec?"
+    def ws_url(container_id, interactive: false, shell: false, tty: false)
+      require 'uri' unless Object.const_defined?(:URI)
+      extend Kontena::Cli::Common unless self.respond_to?(:require_current_master)
+
+      url = URI.parse(require_current_master.url)
+      url.scheme = url.scheme.sub('http', 'ws')
+      url.path = "/v1/containers/#{container_id}/exec"
+      if shell || interactive || tty
+        query = {}
+        query.merge!(interactive: true) if interactive
+        query.merge!(shell: true) if shell
+        query.merge!(tty: true) if tty
+        url.query = URI.encode_www_form(query)
+      end
+      url.to_s
     end
 
     # @param [String] url
@@ -64,4 +84,4 @@ module Kontena::Cli::Helpers
       Kontena::Websocket::Client.new(url, options)
     end
   end
-end
+end

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

@@ -1,4 +1,5 @@
 require 'shellwords'
+require 'json'
 require_relative 'services_helper'
 require_relative '../helpers/exec_helper'
 
@@ -12,10 +13,11 @@ module Kontena::Cli::Services
     parameter "NAME", "Service name"
     parameter "CMD ...", "Command"
 
-    option ["-i", "--instance"], "INSTANCE", "Exec on given numbered instance, default first running" do |value| Integer(value) end
+    option ["--instance"], "INSTANCE", "Exec on given numbered instance, default first running" do |value| Integer(value) end
     option ["-a", "--all"], :flag, "Exec on all running instances"
     option ["--shell"], :flag, "Execute as a shell command"
-    option ["--interactive"], :flag, "Keep stdin open"
+    option ["-i", "--interactive"], :flag, "Keep stdin open"
+    option ["-t", "--tty"], :flag, "Allocate a pseudo-TTY"
     option ["--skip"], :flag, "Skip failed instances when executing --all"
     option ["--silent"], :flag, "Do not show exec status"
     option ["--verbose"], :flag, "Show exec status"
@@ -24,12 +26,13 @@ module Kontena::Cli::Services
     requires_current_grid
 
     def execute
+      exit_with_error "the input device is not a TTY" if tty? && !STDIN.tty?
       exit_with_error "--interactive cannot be used with --all" if all? && interactive?
 
       service_containers = client.get("services/#{parse_service_id(name)}/containers")['containers']
       service_containers.sort_by! { |container| container['instance_number'] }
       running_containers = service_containers.select{|container| container['status'] == 'running' }
-      
+
       exit_with_error "Service #{name} does not have any running containers" if running_containers.empty?
 
       if all?
@@ -51,13 +54,13 @@ module Kontena::Cli::Services
           exit_with_error "Service #{name} container #{container['name']} is not running, it is #{container['status']}"
         elsif interactive?
           interactive_exec(container)
-        else 
+        else
           exec_container(container)
         end
       else
         if interactive?
           interactive_exec(running_containers.first)
-        else 
+        else
           exec_container(running_containers.first)
         end
       end
@@ -89,17 +92,15 @@ module Kontena::Cli::Services
       cmd = JSON.dump({ cmd: cmd_list })
       exit_status = nil
       token = require_token
-      url = ws_url(container['id'])
-      url << 'shell=true' if shell?
-      ws = connect(url, token)
+      ws = connect(url(container['id']), token)
       ws.on :message do |msg|
         data = base.parse_message(msg)
-        if data 
+        if data
           if data['exit']
             exit_status = data['exit'].to_i
           elsif data['stream'] == 'stdout'
             $stdout << data['chunk']
-          else 
+          else
             $stderr << data['chunk']
           end
         end
@@ -107,7 +108,7 @@ module Kontena::Cli::Services
       ws.on :open do
         ws.text(cmd)
       end
-      ws.on :close do |e|s
+      ws.on :close do |e|
         exit_status = 1 if exit_status.nil? && e.code != 1000
       end
       ws.connect
@@ -121,22 +122,35 @@ module Kontena::Cli::Services
     def interactive_exec(container)
       token = require_token
       cmd = JSON.dump({ cmd: cmd_list })
-      base = self
-      url = ws_url(container['id']) << 'interactive=true'
-      url << '&shell=true' if shell?
-      ws = connect(url, token)
+      queue = Queue.new
+      stdin_stream = nil
+      ws = connect(url(container['id']), token)
       ws.on :message do |msg|
-        base.handle_message(msg)        
+        data = self.parse_message(msg)
+        queue << data if data.is_a?(Hash)
       end
       ws.on :open do
         ws.text(cmd)
+        stdin_stream = self.stream_stdin_to_ws(ws)
       end
       ws.on :close do |e|
-        exit 1 if e.code != 1000
+        if e.code != 1000
+          queue << {'exit' => 1}
+        else
+          queue << {'exit' => 0}
+        end
       end
       ws.connect
-      
-      stream_stdin_to_ws(ws).join
+      while msg = queue.pop
+        self.handle_message(msg)
+      end
+    rescue SystemExit
+      stdin_stream.kill if stdin_stream
+      raise
+    end
+
+    def url(container_id)
+      ws_url(container_id, shell: shell?, interactive: interactive?, tty: tty?)
     end
   end
-end
+end

data/lib/kontena/plugin_manager.rb

@@ -2,6 +2,14 @@ require 'singleton'
 
 module Kontena
   class PluginManager
+    autoload :RubygemsClient, 'kontena/plugin_manager/rubygems_client'
+    Gem.autoload :DependencyInstaller, 'rubygems/dependency_installer'
+    Gem.autoload :Requirement, 'rubygems/requirement'
+    Gem.autoload :Uninstaller, 'rubygems/uninstaller'
+    Gem.autoload :Commands, 'rubygems/command'
+    Gem.autoload :DefaultUserInteraction, 'rubygems/user_interaction'
+    Gem.autoload :StreamUI, 'rubygems/user_interaction'
+    Gem::Commands.autoload :CleanupCommand, 'rubygems/commands/cleanup_command'
 
     include Singleton
 
@@ -22,9 +30,6 @@ module Kontena
     # @param pre [Boolean] install a prerelease version if available
     # @param version [String] install a specific version
     def install_plugin(plugin_name, pre: false, version: nil)
-      require 'rubygems/dependency_installer'
-      require 'rubygems/requirement'
-
       cmd = Gem::DependencyInstaller.new(
         document: false,
         force: true,
@@ -42,7 +47,6 @@ module Kontena
       installed = installed(plugin_name)
       raise "Plugin #{plugin_name} not installed" unless installed
 
-      require 'rubygems/uninstaller'
       cmd = Gem::Uninstaller.new(
         installed.name,
         all: true,
@@ -56,31 +60,13 @@ module Kontena
     # Search rubygems for kontena plugins
     # @param pattern [String] optional search pattern
     def search_plugins(pattern = nil)
-      client = Excon.new('https://rubygems.org')
-      response = client.get(
-        path: "/api/v1/search.json?query=#{prefix(pattern)}",
-        headers: {
-          'Content-Type' => 'application/json',
-          'Accept' => 'application/json'
-        }
-      )
-
-      JSON.parse(response.body) rescue nil
+      RubygemsClient.new.search(prefix(pattern))
     end
 
     # Retrieve plugin versions from rubygems
     # @param plugin_name [String]
     def gem_versions(plugin_name)
-      client = Excon.new('https://rubygems.org')
-      response = client.get(
-        path: "/api/v1/versions/#{prefix(plugin_name)}.json",
-        headers: {
-          'Content-Type' => 'application/json',
-          'Accept' => 'application/json'
-        }
-      )
-      versions = JSON.parse(response.body)
-      versions.map { |version| Gem::Version.new(version["number"]) }.sort.reverse
+      RubygemsClient.new.versions(prefix(plugin_name))
     end
 
     # Get the latest version number from rubygems
@@ -120,7 +106,6 @@ module Kontena
     # Runs gem cleanup, removes remains from previous versions
     # @param plugin_name [String]
     def cleanup_plugin(plugin_name)
-      require 'rubygems/commands/cleanup_command'
       cmd = Gem::Commands::CleanupCommand.new
       options = []
       options += ['-q', '--no-verbose'] unless ENV["DEBUG"]
@@ -199,7 +184,7 @@ module Kontena
                 $stderr.puts "         To update the plugin, run 'kontena plugin install #{plugin_name}'"
               end
             rescue ScriptError, StandardError => ex
-              warn " [#{Kontena.pastel.red('error')}] Failed to load plugin: #{spec.name}\n\tRerun the command with environment DEBUG=true set to get the full exception."
+              warn " [#{Kontena.pastel.red('error')}] Failed to load plugin: #{spec.name} from #{spec.gem_dir}\n\tRerun the command with environment DEBUG=true set to get the full exception."
               Kontena.logger.error(ex)
             end
           end
@@ -221,7 +206,6 @@ module Kontena
     end
 
     def use_dummy_ui
-      require 'rubygems/user_interaction'
       Gem::DefaultUserInteraction.ui = dummy_ui
     end
 

data/lib/kontena/plugin_manager/rubygems_client.rb

@@ -0,0 +1,40 @@
+require 'excon'
+require 'json'
+
+module Kontena
+  class PluginManager
+    class RubygemsClient
+
+      RUBYGEMS_URL = 'https://rubygems.org'
+      HEADERS = {
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json'
+      }
+
+      attr_reader :client
+
+      def initialize
+        @client = Excon.new(RUBYGEMS_URL)
+      end
+
+      def search(pattern = nil)
+        response = client.get(
+          path: "/api/v1/search.json?query=#{pattern}",
+          headers: HEADERS
+        )
+
+        JSON.parse(response.body)
+      end
+
+      def versions(gem_name)
+        response = client.get(
+          path: "/api/v1/versions/#{gem_name}.json",
+          headers: HEADERS
+        )
+        versions = JSON.parse(response.body)
+        versions.map { |version| Gem::Version.new(version["number"]) }.sort.reverse
+      end
+
+    end
+  end
+end

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

@@ -46,7 +46,7 @@ module Kontena
         def_delegators :@client, :text, :binary, :ping, :close, :protocol, :on
 
         def write(buffer)
-          @socket.write buffer
+          @socket.write(buffer)
         end
 
         def read_socket

data/lib/kontena_cli.rb

@@ -1,4 +1,4 @@
-require 'logger'
+require 'kontena/autoload_core'
 
 $KONTENA_START_TIME = Time.now.to_f
 at_exit do
@@ -9,6 +9,7 @@ end
 module Kontena
   module Cli
     autoload :Config, 'kontena/cli/config'
+    autoload :ShellSpinner, 'kontena/cli/spinner'
     autoload :Spinner, 'kontena/cli/spinner'
     autoload :Common, 'kontena/cli/common'
     autoload :TableGenerator, 'kontena/cli/table_generator'

data/spec/kontena/cli/helpers/exec_helper_spec.rb

@@ -0,0 +1,44 @@
+require "kontena/cli/helpers/exec_helper"
+
+describe Kontena::Cli::Helpers::ExecHelper do
+
+  include ClientHelpers
+
+  let(:described_class) do
+    Class.new do
+      include Kontena::Cli::Helpers::ExecHelper
+      def initialize(*args)
+      end
+    end
+  end
+
+  describe '#ws_url' do
+    it 'returns an exec url for a container id' do
+      expect(subject).to receive(:require_current_master).and_return(double(url: 'http://someurl/'))
+      expect(subject.ws_url('abcd1234')).to eq 'ws://someurl/v1/containers/abcd1234/exec'
+    end
+
+    it 'also works when the url does not have a trailing slash' do
+      expect(subject).to receive(:require_current_master).and_return(double(url: 'http://someurl'))
+      expect(subject.ws_url('abcd1234')).to eq 'ws://someurl/v1/containers/abcd1234/exec'
+    end
+
+    context 'query params' do
+      before(:each) do
+        allow(subject).to receive(:require_current_master).and_return(double(url: 'http://someurl'))
+      end
+
+      it 'can add the interactive query param' do
+        expect(subject.ws_url('abcd1234', interactive: true)).to eq 'ws://someurl/v1/containers/abcd1234/exec?interactive=true'
+      end
+
+      it 'can add the shell query param' do
+        expect(subject.ws_url('abcd1234', shell: true)).to eq 'ws://someurl/v1/containers/abcd1234/exec?shell=true'
+      end
+
+      it 'can add both query params' do
+        expect(subject.ws_url('abcd1234', shell: true, interactive: true)).to eq 'ws://someurl/v1/containers/abcd1234/exec?interactive=true&shell=true'
+      end
+    end
+  end
+end

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

@@ -17,9 +17,9 @@ describe Kontena::Cli::Services::ExecCommand do
       def on(callback, &block)
         @callbacks[callback] = block
         if callback == :open
-          Thread.new { 
-            sleep 0.01 
-            @callbacks[:open].call 
+          Thread.new {
+            sleep 0.01
+            @callbacks[:open].call
           }
         end
       end
@@ -28,7 +28,7 @@ describe Kontena::Cli::Services::ExecCommand do
 
       def receive_message(msg)
         @callbacks[:message].call(Event.new(JSON.dump(msg)))
-      rescue => exc 
+      rescue => exc
         STDERR.puts exc.message
       end
     end
@@ -69,12 +69,12 @@ describe Kontena::Cli::Services::ExecCommand do
     end
 
     it "Executes on the running container by default" 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(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
-      
+
       expect {
         subject.run(['test-service', 'test'])
       }.to output("ok\n").to_stdout
@@ -107,7 +107,7 @@ 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(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(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
@@ -118,7 +118,7 @@ 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(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(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
@@ -129,7 +129,7 @@ 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(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(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
@@ -140,7 +140,7 @@ 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(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(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
@@ -160,13 +160,13 @@ describe Kontena::Cli::Services::ExecCommand do
 
       3.times do |i|
         ws_client = ws_client_class.new
-        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(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
       end
-      
+
       expect {
         subject.run(['--silent', '--all', 'test-service', 'test'])
       }.to output("test1\ntest2\ntest3\n").to_stdout
@@ -174,7 +174,7 @@ 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(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(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
@@ -188,11 +188,11 @@ describe Kontena::Cli::Services::ExecCommand do
       i = 1
       [:ok, :err].each do |status|
         ws_client = ws_client_class.new
-        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(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 
+          else
             respond_error(ws_client)
           end
         end
@@ -209,11 +209,11 @@ describe Kontena::Cli::Services::ExecCommand do
       i = 1
       [:ok, :err, :ok].each do |status|
         ws_client = ws_client_class.new
-        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(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 
+          else
             respond_error(ws_client)
           end
         end

data/spec/kontena/plugin_manager/rubygems_client_spec.rb

@@ -0,0 +1,50 @@
+require 'kontena/plugin_manager/rubygems_client'
+require 'json'
+
+describe Kontena::PluginManager::RubygemsClient do
+  let(:subject) { described_class.new }
+  let(:client) { double }
+
+  before(:each) do
+    allow(subject).to receive(:client).and_return(client)
+  end
+
+  context '#search' do
+    it 'searches rubygems and returns a hash' do
+      expect(client)
+        .to receive(:get)
+        .with(
+          hash_including(
+            path: "/api/v1/search.json?query=foofoo",
+            headers: hash_including(
+              'Content-Type' => 'application/json',
+              'Accept' => 'application/json'
+            )
+          )
+        )
+        .and_return(double(body: JSON.dump(foo: 'bar')))
+      expect(subject.search('foofoo')['foo']).to eq 'bar'
+    end
+  end
+
+  context '#versions' do
+    it 'fetches version list from rubygems and returns an array of Gem::Versions' do
+      expect(client)
+        .to receive(:get)
+        .with(
+          hash_including(
+            path: "/api/v1/versions/foofoo.json",
+            headers: hash_including(
+              'Content-Type' => 'application/json',
+              'Accept' => 'application/json'
+            )
+          )
+        )
+        .and_return(double(body: JSON.dump([{'number' => '0.1.0'}, {'number' => '0.2.0'}])))
+      versions = subject.versions('foofoo')
+      expect(versions.first).to be_kind_of Gem::Version
+      expect(versions.first.to_s).to eq '0.2.0'
+      expect(versions.last.to_s).to eq '0.1.0'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc2
+  version: 1.3.0.rc3
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,6 +251,7 @@ files:
 - examples/kontena-plugin-hello/lib/kontena_cli_plugin.rb
 - kontena-cli.gemspec
 - kontena-docker.sh
+- lib/kontena/autoload_core.rb
 - lib/kontena/callback.rb
 - lib/kontena/callbacks/.gitkeep
 - lib/kontena/callbacks/auth/01_list_and_select_grid_after_master_auth.rb
@@ -516,6 +517,7 @@ files:
 - lib/kontena/machine/random_name.rb
 - lib/kontena/main_command.rb
 - lib/kontena/plugin_manager.rb
+- lib/kontena/plugin_manager/rubygems_client.rb
 - lib/kontena/presets/github_auth_provider.yml
 - lib/kontena/presets/kontena_auth_provider.yml
 - lib/kontena/scripts/completer
@@ -608,6 +610,7 @@ files:
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
 - spec/kontena/cli/grids/update_command_spec.rb
 - spec/kontena/cli/grids/use_command_spec.rb
+- spec/kontena/cli/helpers/exec_helper_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
@@ -667,6 +670,7 @@ files:
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
 - spec/kontena/main_command_spec.rb
+- spec/kontena/plugin_manager/rubygems_client_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
@@ -761,6 +765,7 @@ test_files:
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
 - spec/kontena/cli/grids/update_command_spec.rb
 - spec/kontena/cli/grids/use_command_spec.rb
+- spec/kontena/cli/helpers/exec_helper_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
@@ -820,6 +825,7 @@ test_files:
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
 - spec/kontena/main_command_spec.rb
+- spec/kontena/plugin_manager/rubygems_client_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb