kontena-cli 0.16.0.rc1 → 0.16.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 074582c5f337898b55470514cd0241dda4fd7186
-  data.tar.gz: f12755e0088565b92c5c0a670926cf5316392a28
+  metadata.gz: 051696774831893f38af45c6790e320cf2a7da4e
+  data.tar.gz: 46e7cb09fdcb4b1c02706948d7f70591542904a5
 SHA512:
-  metadata.gz: 5c53cc63797bea13a5a3b5b500e66b673763ca9af9eb4f78cb348a8a9a8990be9a048494b8aa3ce0384c54ef59f2e50d1fd8a8768b16bca84d11bd6790e8b832
-  data.tar.gz: 88e71e8730ec8d03001d3afc8d978cd917e28a5cbc00c782637e70a16fe4a4a275656fa4c50e0b325bcf29776a36d5d215746e12146bb2b0cebe377b622703ac
+  metadata.gz: 87e2d9d32a07d852588178cf9044469c2651b88dc68e7611eeeb333e409b97717c0aa4cda9e80ba2bd36a64864dfc8518a346c57e3410894f7efd4d0ce94590b
+  data.tar.gz: 9e6974e85c570f104b444a0c6730d9bc471fdd41495b9d8254f1f769fa8a9057779c9c9b5289837ac6cad51dbcf07f7086f1966448dcb0d087eec2064795fdfe

data/VERSION

@@ -1 +1 @@
-0.16.0.rc1
+0.16.0.rc2

data/lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb

@@ -20,7 +20,7 @@ module Kontena
         return unless command.result.has_key?(:name)
         return unless config.current_master
         return unless config.current_master.name == command.result[:name]
-        if command.respond_to?(:skip_auth_provider) && command.skip_auth_provider?
+        if command.respond_to?(:skip_auth_provider?) && command.skip_auth_provider?
           return
         end
 

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

@@ -2,6 +2,7 @@ require 'open3'
 
 module Kontena::Cli::Plugins
   class UninstallCommand < Kontena::Command
+    include Kontena::Util
     include Kontena::Cli::Common
 
     parameter 'NAME', 'Plugin name'
@@ -14,11 +15,11 @@ module Kontena::Cli::Plugins
 
     def uninstall_plugin(name)
       plugin = "kontena-plugin-#{name}"
-      gem_bin = `which gem`.strip
-      install_command = "#{gem_bin} install -q #{plugin}"
+      gem_bin = which('gem')
+      uninstall_command = "#{gem_bin} uninstall -q #{plugin}"
       success = false
       spinner "Uninstalling plugin #{name.colorize(:cyan)}" do
-        stdout, stderr, status = Open3.capture3(install_command)
+        stdout, stderr, status = Open3.capture3(uninstall_command)
         unless stderr.empty?
           raise stderr
         end

data/lib/kontena/cli/spinner.rb

@@ -38,6 +38,11 @@ module Kontena
       CHARS_LENGTH = CHARS.length
 
       def self.spin_no_tty(msg, &block)
+        unless block_given?
+          Kernel.puts "\r [" + "done".colorize(:green) + "] #{msg}"
+          return
+        end
+
         Kernel.puts "* #{msg}.. "
         result = nil
         status = nil
@@ -68,6 +73,11 @@ module Kontena
       def self.spin(msg, &block)
         return spin_no_tty(msg, &block) unless $stdout.tty?
 
+        unless block_given?
+          Kernel.puts "\r [" + "done".colorize(:green) + "] #{msg}"
+          return
+        end
+
         Thread.main['spinners'] ||= []
         unless Thread.main['spinners'].empty?
           Thread.main['spinners'].each do |thread|

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Vpn
   class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
@@ -12,7 +13,7 @@ module Kontena::Cli::Vpn
       vpn = client(token).get("services/#{current_grid}/#{name}") rescue nil
       exit_with_error("#{name} service does not exist") if vpn.nil?
 
-      spinner "Removing #{vpn.colorize(:cyan)} service " do
+      spinner "Removing #{name.colorize(:cyan)} service " do
         client(token).delete("services/#{current_grid}/vpn")
       end
     end

data/lib/kontena/cli/vpn_command.rb

@@ -1,7 +1,6 @@
 require_relative 'vpn/create_command'
 require_relative 'vpn/config_command'
 require_relative 'vpn/remove_command'
-require_relative 'vpn/delete_command'
 
 class Kontena::Cli::VpnCommand < Kontena::Command
 

data/lib/kontena/client.rb

@@ -57,7 +57,7 @@ module Kontena
         api_url,
         omit_default_port: true,
         connect_timeout: ENV["EXCON_CONNECT_TIMEOUT"] || 5,
-        read_timeout:    ENV["EXCON_READ_TIMEOUT"]    || 5,
+        read_timeout:    ENV["EXCON_READ_TIMEOUT"]    || 30,
         write_timeout:   ENV["EXCON_WRITE_TIMEOUT"]   || 5
       )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0.rc1
+  version: 0.16.0.rc2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -364,7 +364,6 @@ files:
 - lib/kontena/cli/version_command.rb
 - lib/kontena/cli/vpn/config_command.rb
 - lib/kontena/cli/vpn/create_command.rb
-- lib/kontena/cli/vpn/delete_command.rb
 - lib/kontena/cli/vpn/remove_command.rb
 - lib/kontena/cli/vpn_command.rb
 - lib/kontena/cli/whoami_command.rb

data/lib/kontena/cli/vpn/delete_command.rb

@@ -1,17 +0,0 @@
-module Kontena::Cli::Vpn
-  class DeleteCommand < Kontena::Command
-    include Kontena::Cli::Common
-    include Kontena::Cli::GridOptions
-
-    def execute
-      warning "Support for 'kontena vpn delete' will be dropped. Use 'kontena vpn remove' instead."
-      require_api_url
-      token = require_token
-
-      vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
-      abort("VPN service does not exist") if vpn.nil?
-
-      client(token).delete("services/#{current_grid}/vpn")
-    end
-  end
-end