kontena-plugin-shell 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 224176b2e33d18439b83db9414b42880f81b3d2f
-  data.tar.gz: e17443d9aa7aad0903d601c396d88bee5e85a215
+  metadata.gz: 801cf73c70dd8538e82d12cadda2b3053a22c653
+  data.tar.gz: 09f9479d92170bdd9184280a08649201b2d667a8
 SHA512:
-  metadata.gz: 1135d9b05e7e24d873e4b89ceed8d2de6650ee807637bc0c803c0ad2bd51cc0d20069eb9aeb7bba32cab18abad7b7a1f8d4f93b5d8fff88462e89386aa79a233
-  data.tar.gz: 0de7bb93ea664c32e6182c5da20abf7120a6d27e22255c301ba5c648bb231af2fb6d5963c655428cc0fd5adde12f76a820cf58397521717ddd0f7c3b69c19d1e
+  metadata.gz: 144d82873724fd87cab4b4e6cf92b3e0d99aa78ab0a7cefbc486474b324492c5eca52eeb0429464c997fbe3a80d1e7ba3a126943c98558d22b2f21942bf2fee3
+  data.tar.gz: 3b6cddff8ec0b27a3a08982f937df571e558a919c4bdce1218e13dac2f1b9e99430d906642f92dd488c3f5bca68e6d0f539831eb08a81f19aec2b6144bd82c52

data/bin/kosh

@@ -16,7 +16,7 @@ end
 
 ARGV.unshift('shell')
 
-Kontena::PluginManager.instance.init
+Kontena::PluginManager.respond_to?(:instance) ? Kontena::PluginManager.instance.init : Kontena::PluginManager.init
 Kontena::MainCommand.run
 __END__
 Usage: kosh [options] [initial_context]

data/lib/kontena/plugin/shell/commands/help.rb

@@ -31,7 +31,8 @@ module Kontena::Plugin
         end
 
         if args.empty? || (args.size == 1 && args.first == 'help')
-          puts Kontena.pastel.green('KOSH commands:')
+          puts
+          puts 'Kontena Shell commands:'
           Shell.commands.each do |name, cmd|
             next if cmd == Kontena::Plugin::Shell::KontenaCommand
             puts sprintf('    %-29s %s', name, cmd.description)

data/lib/kontena/plugin/shell/commands/kontena.rb

@@ -27,13 +27,17 @@ module Kontena::Plugin
           cmd.run([])
         end
       rescue Clamp::HelpWanted => ex
-        unless args.include?('--help') || args.include?('-h')
+        if args.include?('--help') || args.include?('-h')
+          puts cmd.class.help('')
+        else
           context.concat(args)
         end
       rescue SystemExit => ex
         puts Kontena.pastel.red('[Command exited with error]') unless ex.status.zero?
       rescue => ex
         puts Kontena.pastel.red("ERROR: #{ex.message}")
+      ensure
+        Thread.main['spinners'] && Thread.main['spinners'].map(&:kill) && Thread.main['spinners'] = nil
       end
 
       def subcommand_class

data/lib/kontena/plugin/shell/session.rb

@@ -38,7 +38,7 @@ module Kontena::Plugin
       def run
         puts File.read(__FILE__)[/__END__$(.*)/m, 1]
         puts "Kontena Shell v#{Kontena::Plugin::Shell::VERSION} (c) 2017 Kontena"
-        puts pastel.blue("Enter 'help' to see a list of commands or 'help <command>' to get help on a specific command.")
+        puts pastel.green("Enter 'help' to see a list of commands or 'help <command>' to get help on a specific command.")
 
         stty_save = `stty -g`.chomp rescue nil
         at_exit do
@@ -100,11 +100,11 @@ module Kontena::Plugin
       end
 
       def master_name
-        config.current_master ? pastel.green(config.current_master.name) : pastel.red('<no master>')
+        config.current_master ? pastel.blue(config.current_master.name) : pastel.red('<no master>')
       end
 
       def grid_name
-        config.current_grid ? pastel.green(config.current_grid) : pastel.red('<no grid>')
+        config.current_grid ? pastel.blue(config.current_grid) : pastel.red('<no grid>')
       end
     end
   end

data/lib/kontena/plugin/shell/version.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Shell
-      VERSION = '0.1.2'
+      VERSION = '0.1.3'
     end
   end
 end

data/lib/kontena_cli_plugin.rb

@@ -5,6 +5,6 @@ $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
 require 'kontena_cli' unless Object.const_defined?(:Kontena) && Kontena.const_defined?(:Cli)
 
 require 'kontena/plugin/shell'
-require 'kontena/plugin/shell/shell_command'
+require 'kontena/cli/subcommand_loader'
 
-Kontena::MainCommand.register("shell", "Kontena shell", Kontena::Plugin::Shell::ShellCommand)
+Kontena::MainCommand.register("shell", "Kontena shell", Kontena::Cli::SubcommandLoader.new('kontena/plugin/shell/shell_command'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Kontena interactive shell plugin