kontena-cli 0.16.0.pre8 → 0.16.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549a20ff35d02d49d04d5589b5f5186b72de7ed6
-  data.tar.gz: e18b7450099a72993f8569ce271aaa72c5a3bf84
+  metadata.gz: fa76bec3b6a5ed5df0158f25414e20867de2a4a9
+  data.tar.gz: 37751c168d7c698026f87cc6399bc8a2d7a81f65
 SHA512:
-  metadata.gz: ffe9ff495c0eab3b8e7076b429a24916a6c2f8fd459f2bb6142b50f97e4f52b54fa52342c1b80d117975653c6d39e3ec5f4e7a60c0f9479019fd6cd613a06410
-  data.tar.gz: aeb28936bece1fe439c6d57d1293cf94a922f8d9bf741e982872f5db44b14a3bcc1e532fc463c8ed9c200100cf32fdfa7fb4fcf737e81c6cf93f177bdb43318c
+  metadata.gz: e58a8e4e643e9ca4abad3630d3f0bb68d6006504f27338e7cca4374c85dc8227a9c66a2606da26fc04092e5a076812ab02121f209126f4d3af71fe4e3e166dfe
+  data.tar.gz: 834031757d11996be1724deffdd172fbc1dd2ef431b17792276a66000bdfcc35e434dbfe5002ca40aa66d38b239c03d5fc074b5d448f3df7b5bdee6da92a1cbc

data/Gemfile

@@ -8,4 +8,5 @@ group :development, :test do
   gem "kontena-plugin-hello", path: "./examples/kontena-plugin-hello"
   gem 'pry', require: false
   gem 'pry-byebug', require: false
+  gem 'webmock', require: false
 end

data/README.md

@@ -10,7 +10,7 @@ Install it yourself as:
 
     $ gem install kontena-cli
 
-To enable tab-completion for bash, add this to your `.bashrc` scripts:
+To enable tab-completion for bash, add this to your `.bashrc` scripts (or `.zshrc` for zsh):
 
 ```
 which kontena > /dev/null && . "$( kontena whoami --bash-completion-path )"

data/VERSION

@@ -1 +1 @@
-0.16.0.pre8
+0.16.0.pre9

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

@@ -66,4 +66,3 @@ module Kontena::Cli::Cloud::Master
     end
   end
 end
-

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

@@ -192,6 +192,10 @@ module Kontena
             puts "      dns: #{container['name']}.#{grid}.kontena.local"
             puts "      ip: #{container['overlay_cidr'].to_s.split('/')[0]}"
             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
             if container['status'] == 'unknown'
               puts "      status: #{container['status'].colorize(:yellow)}"
             else

data/lib/kontena/client.rb

@@ -5,6 +5,7 @@ require 'base64'
 require 'socket'
 require 'openssl'
 require 'uri'
+require 'time'
 require_relative 'errors'
 require_relative 'cli/version'
 begin
@@ -276,7 +277,7 @@ module Kontena
     # @param expects [Array] raises unless response status code matches this list.
     # @param auth [Boolean] use token authentication default = true
     # @return [Hash, String] response parsed response object
-    def request(http_method: :get, path:'/', body: nil, query: {}, headers: {}, response_block: nil, expects: [200, 201], host: nil, port: nil, auth: true)
+    def request(http_method: :get, path:'/', body: nil, query: {}, headers: {}, response_block: nil, expects: [200, 201, 204], host: nil, port: nil, auth: true)
 
       retried ||= false
 
@@ -286,11 +287,13 @@ module Kontena
 
       request_headers = request_headers(headers, auth)
 
-      body_content = body.nil? ? '' : encode_body(body, request_headers[CONTENT_TYPE])
-      if http_method == :get
-        request_headers.delete('Content-Type')
+      if body.nil?
+        body_content = ''
+        request_headers.delete(CONTENT_TYPE)
+      else
+        body_content =  encode_body(body, request_headers[CONTENT_TYPE])
+        request_headers.merge!('Content-Length' => body_content.bytesize)
       end
-      request_headers.merge!('Content-Length' => body_content.bytesize)
 
       uri = URI.parse(path)
       host_options = {}
@@ -319,7 +322,7 @@ module Kontena
       # Store the response into client.last_response
       @last_response = http_client.request(request_options)
 
-      parse_response
+      parse_response(@last_response)
     rescue Excon::Errors::Unauthorized
       if token
         logger.debug 'Server reports access token expired'
@@ -332,13 +335,10 @@ module Kontena
         retry if refresh_token
       end
       raise Kontena::Errors::StandardError.new(401, 'Unauthorized')
-    rescue Excon::Errors::NotFound
-      raise Kontena::Errors::StandardError.new(404, 'Not found')
-    rescue Excon::Errors::Forbidden
-      raise Kontena::Errors::StandardError.new(403, 'Access denied')
-    rescue
-      logger.debug "Request exception: #{$!} - #{$!.message}\n#{$!.backtrace.join("\n")}"
-      handle_error_response
+    rescue Excon::Errors::HTTPStatusError => error
+      logger.debug "Request #{error.request[:method].upcase} #{error.request[:path]}: #{error.response.status} #{error.response.reason_phrase}: #{error.response.body}"
+
+      handle_error_response(error.response)
     end
 
     # Build a token refresh request param hash
@@ -469,13 +469,13 @@ module Kontena
     # Parse response. If the respons is JSON, returns a Hash representation.
     # Otherwise returns the raw body.
     #
-    # @param [HTTP::Message]
+    # @param [Excon::Response]
     # @return [Hash,String]
-    def parse_response
-      if last_response.headers[CONTENT_TYPE] =~ JSON_REGEX
-        parse_json(last_response.body)
+    def parse_response(response)
+      if response.headers[CONTENT_TYPE] =~ JSON_REGEX
+        parse_json(response.body)
       else
-        last_response.body
+        response.body
       end
     end
 
@@ -504,9 +504,16 @@ module Kontena
     end
 
     # @param [Excon::Response] response
-    def handle_error_response
-      raise $!, $!.message unless last_response
-      raise Kontena::Errors::StandardError.new(last_response.status, last_response.body)
+    def handle_error_response(response)
+      data = parse_response(response)
+
+      if data.is_a?(Hash) && data.has_key?('error')
+        raise Kontena::Errors::StandardError.new(response.status, data['error'])
+      elsif data.is_a?(String) && !data.empty?
+        raise Kontena::Errors::StandardError.new(response.status, data)
+      else
+        raise Kontena::Errors::StandardError.new(response.status, response.reason_phrase)
+      end
     end
 
     # Convert expires_in into expires_at

data/lib/kontena/scripts/completer

@@ -86,9 +86,33 @@ words = ARGV
 words.delete_at(0)
 
 completion = []
-completion.push %w(app deploy forgot-password master node grid service container vpn external-registry registry login logout whoami) if words.size < 2
+completion.push %w(cloud logout grid app service 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)
@@ -109,15 +133,31 @@ if words.size > 0
       end
     when 'master'
       completion.clear
-      sub_commands = %w(list use)
+      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])
-        completion.push %w(create)
       else
         completion.push sub_commands
       end
@@ -134,7 +174,7 @@ if words.size > 0
       end
     when 'container'
       completion.clear
-      sub_commands = %w(exec)
+      sub_commands = %w(exec inspect logs)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.containers

data/lib/kontena/scripts/init

@@ -2,10 +2,20 @@
 
 _kontena_complete() {
   COMPREPLY=()
-  DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+  if [ "$ZSH_VERSION" == "" ]; then
+    local src="${BASH_SOURCE[0]}"
+  else
+    local src="${(%):-%x}"
+  fi
+  DIR=$( cd "$( dirname "$src" )" && pwd )
   local word="${COMP_WORDS[COMP_CWORD]}"
   local completions="$(${DIR}/completer ${COMP_WORDS[*]})"
   COMPREPLY=( $(compgen -W "$completions" -- "$word") )
 }
 
+if [ "$ZSH_VERSION" != "" ]; then
+  autoload -U +X compinit && compinit
+  autoload -U +X bashcompinit && bashcompinit
+fi
+
 complete -F _kontena_complete kontena

data/spec/kontena/client_spec.rb

@@ -38,7 +38,7 @@ describe Kontena::Client do
       client = Kontena::Client.new('https://localhost/v1/', token)
       expect(client.token).to eq token
     end
-    
+
     it 'uses the access token as a bearer token' do
       client = Kontena::Client.new('https://localhost/v1/', token)
       expect(client.http_client).to receive(:request) do |opts|
@@ -210,4 +210,89 @@ describe Kontena::Client do
       subject.delete('foo', nil, nil, {'Some-Header' => 'value'})
     end
   end
+
+  describe '#request' do
+    subject do
+      Kontena::Client.new('http://localhost', master.token)
+    end
+
+    context "for an expected response" do
+      before :each do
+        allow(subject).to receive(:http_client).and_call_original
+
+        WebMock.stub_request(:any, 'http://localhost/v1/test').to_return(
+        status: 200,
+        headers: {
+          'Content-Type' => 'application/json',
+        },
+        body: {'test' => [ "This was a triumph.", "I’m making a note here: HUGE SUCCESS." ]}.to_json,
+      )
+      end
+
+      it "returns the JSON object" do
+        expect(subject.get('test')['test'].join(" / ")).to eq "This was a triumph. / I’m making a note here: HUGE SUCCESS."
+      end
+    end
+
+    context "with an empty error response" do
+      before :each do
+        # workaround https://github.com/bblimke/webmock/issues/653
+        expect(http_client).to receive(:request).with(
+          hash_including(path: '/v1/coffee', method: :brew)
+        ) {
+          raise Excon::Errors::HTTPStatusError.new("I'm a teapot",
+            {
+              method: 'brew',
+              path: '/v1/coffee',
+            },
+            double(:response,
+              status: 418,
+              reason_phrase: "I'm a teapot",
+              headers: {
+                'Content-Type' => 'short/stout',
+              },
+              body: "",
+            )
+          )
+        }
+      end
+
+      it "raises StandardError with the status phrase" do
+        expect{subject.request(http_method: :brew, path: 'coffee')}.to raise_error(Kontena::Errors::StandardError, "I'm a teapot")
+      end
+    end
+
+    context "with an 500 response with text error" do
+      before :each do
+        allow(subject).to receive(:http_client).and_call_original
+
+        WebMock.stub_request(:any, 'http://localhost/v1/print').to_return(
+          status: 500,
+          body: "lp0 (printer) on fire",
+        )
+      end
+
+      it "raises StandardError with the server error message" do
+        expect{subject.post('print', { 'code' => "8A/HyA==" })}.to raise_error(Kontena::Errors::StandardError, "lp0 (printer) on fire")
+      end
+    end
+
+    context "with a 422 response with JSON error" do
+      before :each do
+        allow(subject).to receive(:http_client).and_call_original
+
+        WebMock.stub_request(:any, 'http://localhost/v1/test').to_return(
+          status: 422,
+          headers: {
+            'Content-Type' => 'application/json',
+          },
+          body: {'error' => "You are wrong"}.to_json,
+        )
+      end
+
+      it "raises StandardError with the server error message" do
+        expect{subject.get('test')}.to raise_error(Kontena::Errors::StandardError, "You are wrong")
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ require 'stringio'
 require 'clamp'
 require 'ruby_dig'
 require 'kontena_cli'
+require 'webmock/rspec'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre8
+  version: 0.16.0.pre9
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler