kontena-plugin-shell 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 801cf73c70dd8538e82d12cadda2b3053a22c653
-  data.tar.gz: 09f9479d92170bdd9184280a08649201b2d667a8
+SHA256:
+  metadata.gz: 09358261da75699f6afc793984e370be07c06c5cdda3ceaf24d2a7bd93804007
+  data.tar.gz: ea48df5a69dcb362faa3d9cb47a2949d4aaea1c191ccc908ebd0bb57e9c803b1
 SHA512:
-  metadata.gz: 144d82873724fd87cab4b4e6cf92b3e0d99aa78ab0a7cefbc486474b324492c5eca52eeb0429464c997fbe3a80d1e7ba3a126943c98558d22b2f21942bf2fee3
-  data.tar.gz: 3b6cddff8ec0b27a3a08982f937df571e558a919c4bdce1218e13dac2f1b9e99430d906642f92dd488c3f5bca68e6d0f539831eb08a81f19aec2b6144bd82c52
+  metadata.gz: f0344b8bd9795dbd7288f17ed58618f393f3d7d00dc7e03036a7a266e223906063bd872173fa4bbdbf09c6f695790a849f7d916a3eecd2bee70244cd75cc8f7a
+  data.tar.gz: b35ea14e3b3d9d69022f0cee239bd467b8aadb06247ada4edc8dd335dbc54dd87d06662f5c6c3e0b45722b376392044d5ed87e9bd8669c207c1d909a4cd95bd8

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

@@ -28,7 +28,7 @@ module Kontena::Plugin
         end
       rescue Clamp::HelpWanted => ex
         if args.include?('--help') || args.include?('-h')
-          puts cmd.class.help('')
+          puts subcommand_class.help('')
         else
           context.concat(args)
         end

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

@@ -0,0 +1,27 @@
+require 'kontena/cli/stacks/yaml/stack_file_loader'
+
+module Kontena
+  module Plugin
+    module Shell
+      class PromptLoader < Kontena::Cli::Stacks::YAML::StackFileLoader
+        def self.match?(source, parent = nil)
+          source.end_with?('kontena.yml') && !Kontena::Cli::Stacks::YAML::FileLoader.match?(source, parent)
+        end
+
+        def read_content
+          content = Kontena.prompt.multiline("Enter or paste a stack YAML").join
+          raise "Invalid stack YAML" unless YAML.safe_load(content).kind_of?(Hash)
+          content
+        end
+
+        def origin
+          "prompt"
+        end
+
+        def registry
+          "prompt"
+        end
+      end
+    end
+  end
+end

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

@@ -27,6 +27,25 @@ module Kontena::Plugin
         tokens = buf.split(/\s(?=(?:[^"]|"[^"]*")*$)/).map(&:strip)
         runner = Shell.command(tokens.first) || Shell.command(context.first) || Kontena::Plugin::Shell::KontenaCommand
         command = runner.new(context, tokens, self)
+        if fork_supported? && forkable_command?(command)
+          execute_with_fork(command)
+        else
+          execute_with_thread(command)
+        end
+      end
+
+      def forkable_command?(command)
+        return false if !command.is_a?(Kontena::Plugin::Shell::KontenaCommand)
+        return false if command.subcommand_class.has_subcommands?
+
+        true
+      end
+
+      def fork_supported?
+        Process.respond_to?(:fork)
+      end
+
+      def execute_with_thread(command)
         old_trap = trap('INT', Proc.new { Thread.main[:command_thread] && Thread.main[:command_thread].kill })
         Thread.main[:command_thread] = Thread.new do
           command.run
@@ -35,6 +54,33 @@ module Kontena::Plugin
         trap('INT', old_trap)
       end
 
+      def execute_with_fork(command)
+        start = Time.now
+        pid = fork do
+          Process.setproctitle("kosh-runner")
+          command.run
+        end
+        trap('INT') {
+          begin
+            Process.kill('TERM', pid)
+          rescue Errno::ESRCH
+            raise SignalException, 'SIGINT'
+          end
+        }
+        Process.waitpid(pid)
+        if config_file_modified_since?(start)
+          puts ""
+          puts pastel.yellow("Config file has been modified, reloading configuration")
+          puts ""
+          config.reset_instance
+        end
+      end
+
+      def config_file_modified_since?(time)
+        return false unless config.config_file_available?
+        return true if File.mtime(config.config_filename) >= time
+      end
+
       def run
         puts File.read(__FILE__)[/__END__$(.*)/m, 1]
         puts "Kontena Shell v#{Kontena::Plugin::Shell::VERSION} (c) 2017 Kontena"
@@ -47,7 +93,17 @@ module Kontena::Plugin
         end
 
         # Hook stack command kontena.yml content prompting
-        require 'kontena/plugin/shell/callbacks/stack_file'
+        if Gem::Version.new(Kontena::Cli::VERSION) >= Gem::Version.new('1.4.0')
+          require 'kontena/plugin/shell/prompt_loader'
+        else
+          require 'kontena/cli/stacks/validate_command'
+          require 'kontena/cli/stacks/install_command'
+          require 'kontena/cli/stacks/upgrade_command'
+          require 'kontena/plugin/shell/stacks_common_ext'
+          Kontena::Cli::Stacks::ValidateCommand.send(:include, Kontena::Plugin::Shell::StacksCommonExt)
+          Kontena::Cli::Stacks::InstallCommand.send(:include, Kontena::Plugin::Shell::StacksCommonExt)
+          Kontena::Cli::Stacks::UpgradeCommand.send(:include, Kontena::Plugin::Shell::StacksCommonExt)
+        end
 
         Readline.completion_proc = Proc.new do |word|
           line = Readline.line_buffer
@@ -92,7 +148,20 @@ module Kontena::Plugin
       end
 
       def prompt
-        "#{master_name}/#{grid_name} #{pastel.yellow(context)} #{caret} "
+        if master_name && master_name.include?('/'.freeze)
+          org, name = master_name.split('/')
+          "#{pastel.bright_cyan(org)} / #{pastel.cyan(name)} #{pastel.yellow(context)} #{caret} "
+        elsif master_name && grid_name
+          "#{pastel.bright_cyan(master_name)} / #{pastel.cyan(grid_name)} #{pastel.yellow(context)} #{caret} "
+        elsif master_name
+          "#{pastel.bright_cyan(master_name)} / #{pastel.red('<no grid>')} #{pastel.yellow(context)} #{caret} "
+        else
+          if org = ENV['KONTENA_ORGANIZATION']
+            "#{pastel.bright_cyan(org)} #{pastel.yellow(context)} #{caret} "
+          else
+            "#{pastel.yellow(context)} #{caret} "
+          end
+        end
       end
 
       def caret
@@ -100,17 +169,17 @@ module Kontena::Plugin
       end
 
       def master_name
-        config.current_master ? pastel.blue(config.current_master.name) : pastel.red('<no master>')
+        config.current_master.name if config.current_master
       end
 
       def grid_name
-        config.current_grid ? pastel.blue(config.current_grid) : pastel.red('<no grid>')
+        config.current_grid
       end
     end
   end
 end
 __END__
- _               _
+_               _
 | | _____  _ __ | |_ ___ _ __   __ _
 | |/ / _ \| '_ \| __/ _ \ '_ \ / _` |
 |   < (_) | | | | ||  __/ | | | (_| |

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

@@ -0,0 +1,21 @@
+require 'tempfile'
+
+module Kontena
+  module Plugin
+    module Shell
+      module StacksCommonExt
+        def reader_from_yaml(*args)
+          if args.first == 'kontena.yml' && !File.exist?('kontena.yml')
+            tempfile = Tempfile.new('kontena.yml')
+            tempfile.write(Kontena.prompt.multiline("Enter or paste a stack YAML").join)
+            tempfile.close
+            args[0] = tempfile.path
+          end
+          reader = super(*args)
+          File.unlink(args[0]) if File.exist?(args[0])
+          reader
+        end
+      end
+    end
+  end
+end

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

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

data/spec/kontena/plugin/shell/session_spec.rb

@@ -8,6 +8,7 @@ describe Kontena::Plugin::Shell::Session do
   let(:subject) { described_class.new(context) }
 
   it 'runs commands' do
+    allow(subject).to receive(:fork_supported?).and_return(false)
     expect(Readline).to receive(:readline).and_return('exit')
     expect{subject.run}.to output(/Bye/).to_stdout.and raise_error(SystemExit)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -79,7 +79,6 @@ files:
 - README.md
 - bin/kosh
 - lib/kontena/plugin/shell.rb
-- lib/kontena/plugin/shell/callbacks/stack_file.rb
 - lib/kontena/plugin/shell/command.rb
 - lib/kontena/plugin/shell/commands/batch.rb
 - lib/kontena/plugin/shell/commands/batch_do.rb
@@ -92,8 +91,10 @@ files:
 - lib/kontena/plugin/shell/commands/kontena.rb
 - lib/kontena/plugin/shell/completer.rb
 - lib/kontena/plugin/shell/context.rb
+- lib/kontena/plugin/shell/prompt_loader.rb
 - lib/kontena/plugin/shell/session.rb
 - lib/kontena/plugin/shell/shell_command.rb
+- lib/kontena/plugin/shell/stacks_common_ext.rb
 - lib/kontena/plugin/shell/version.rb
 - lib/kontena_cli_plugin.rb
 - spec/helpers/cli_helper.rb
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Kontena interactive shell plugin

data/lib/kontena/plugin/shell/callbacks/stack_file.rb

@@ -1,31 +0,0 @@
-require 'tempfile'
-module Kontena
-  module Plugin
-    module Shell
-      module Callbacks
-        class StackFile < Kontena::Callback
-
-          matches_commands 'stacks install', 'stacks validate', 'stacks upgrade'
-
-          def before
-            Kontena::Cli::Stacks::YAML::Reader.class_eval do
-              def self.new(*args)
-                if args.first == 'kontena.yml' && !File.exist?('kontena.yml')
-                  @tempfile = Tempfile.new('kontena.yml')
-                  @tempfile.write(Kontena.prompt.multiline("Enter or paste a stack YAML").join)
-                  @tempfile.close
-                  args[0] = @tempfile.path
-                end
-                super *args
-              end
-            end
-          end
-
-          def after
-            @tempfile.unlink if @tempfile
-          end
-        end
-      end
-    end
-  end
-end