kontena-cli 1.1.6 → 1.2.0.dev1

data/lib/kontena/scripts/completer.rb

@@ -0,0 +1,230 @@
+require 'kontena/client'
+require 'kontena/cli/common'
+require 'yaml'
+
+class Helper
+  include Kontena::Cli::Common
+
+  def client
+    token = require_token
+    super(token)
+  end
+
+  def grids
+    client.get("grids")['grids'].map{|grid| grid['id']}
+  rescue
+    []
+  end
+
+  def nodes
+    client.get("grids/#{current_grid}/nodes")['nodes'].map{|node| node['name']}
+  rescue
+    []
+  end
+
+  def stacks
+    stacks = client.get("grids/#{current_grid}/stacks")['stacks']
+    results = []
+    results.push stacks.map{|s| s['name']}
+    results.delete('null')
+    results
+  rescue
+    []
+  end
+
+  def services
+    services = client.get("grids/#{current_grid}/services")['services']
+    results = []
+    results.push services.map{ |s|
+      stack = s['stack']['id'].split('/').last
+      if stack != 'null'
+        "#{stack}/#{s['name']}"
+      else
+        s['name']
+      end
+    }
+    results
+  rescue
+    []
+  end
+
+  def containers
+    results = []
+    client.get("grids/#{current_grid}/services")['services'].each do |service|
+      containers = client.get("services/#{service['id']}/containers")['containers']
+      results.push(containers.map{|c| c['name'] })
+      results.push(containers.map{|c| c['id'] })
+    end
+    results
+  rescue
+    []
+  end
+
+  def yml_services
+    if File.exist?('kontena.yml')
+      yaml = YAML.safe_load(File.read('kontena.yml'))
+      services = yaml['services']
+      services.keys
+    end
+  rescue
+    []
+  end
+
+  def yml_files
+    Dir["./*.yml"].map{|file| file.sub('./', '')}
+  rescue
+    []
+  end
+
+  def master_names
+    config_file = File.expand_path('~/.kontena_client.json')
+    if(File.exist?(config_file))
+      config = JSON.parse(File.read(config_file))
+      return config['servers'].map{|s| s['name']}
+    end
+  rescue
+    []
+  end
+
+end
+
+helper = Helper.new
+
+words = ARGV
+words.delete_at(0)
+
+completion = []
+completion.push %w(cloud logout grid app service stack 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)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.grids
+      else
+        completion.push sub_commands
+      end
+    when 'node'
+      completion.clear
+      sub_commands = %w(list show remove)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.nodes
+      else
+        completion.push sub_commands
+      end
+    when 'master'
+      completion.clear
+      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])
+      else
+        completion.push sub_commands
+      end
+    when 'service'
+      completion.clear
+      sub_commands = %w(containers create delete deploy list logs restart
+                      scale show start stats stop update monitor env
+                      secret link unlink)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.services
+      else
+        completion.push sub_commands
+      end
+    when 'container'
+      completion.clear
+      sub_commands = %w(exec inspect logs)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.containers
+      else
+        completion.push sub_commands
+      end
+    when 'vpn'
+      completion.clear
+      completion.push %w(config create delete)
+    when 'external-registry'
+      completion.clear
+      completion.push %w(add list delete)
+    when 'app'
+      completion.clear
+      sub_commands = %w(init build config deploy start stop remove rm ps list
+                        logs monitor show)
+      if words[1]
+        completion.push(sub_commands) unless sub_commands.include?(words[1])
+        completion.push helper.yml_services
+      else
+        completion.push sub_commands
+      end
+    when 'stack'
+      completion.clear
+      sub_commands = %w(build install upgrade deploy start stop remove rm ls list
+                        logs monitor show registry)
+      if words[1]
+        if words[1] == 'registry'
+          registry_sub_commands = %(push pull search show rm)
+          completion.push registry_sub_commands
+        elsif %w(install).include?(words[1])
+            completion.push helper.yml_files
+        elsif words[1] == 'upgrade' && words[3]
+          completion.push helper.yml_files
+        else
+          completion.push(sub_commands) unless sub_commands.include?(words[1])
+          completion.push helper.stacks
+        end
+      else
+        completion.push sub_commands
+      end
+  end
+end
+
+puts completion

data/lib/kontena/scripts/init

@@ -1,15 +1,12 @@
 #!/usr/bin/env bash
 
+# This file exists mostly for backwards dependency to
+# allow the old "which kontena && . foofoo/init"
+# completion loading
 _kontena_complete() {
   COMPREPLY=()
-  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[*]})"
+  local completions="$(kontena complete ${COMP_WORDS[*]})"
   COMPREPLY=( $(compgen -W "$completions" -- "$word") )
 }
 
@@ -18,4 +15,4 @@ if [ "$ZSH_VERSION" != "" ]; then
   autoload -U +X bashcompinit && bashcompinit
 fi
 
-complete -F _kontena_complete kontena
+which kontena > /dev/null && complete -F _kontena_complete kontena

data/lib/kontena/scripts/kontena.bash

@@ -0,0 +1,8 @@
+_kontena_complete() {
+  COMPREPLY=()
+  local word="${COMP_WORDS[COMP_CWORD]}"
+  local completions="$(kontena complete ${COMP_WORDS[*]})"
+  COMPREPLY=( $(compgen -W "$completions" -- "$word") )
+}
+
+which kontena > /dev/null && complete -F _kontena_complete kontena

data/lib/kontena/scripts/kontena.zsh

@@ -0,0 +1,11 @@
+#compdef kontena
+#autoload
+
+_kontena() {
+  local -a compreply
+  compreply=($(kontena complete ${words[*]}))
+  _describe -t kontena 'kontena' compreply
+  return 0
+}
+
+_kontena

data/lib/kontena_cli.rb

@@ -41,7 +41,7 @@ module Kontena
   end
 
   def self.simple_terminal?
-    on_windows? || ENV['KONTENA_SIMPLE_TERM'] || !$stdout.tty?
+    ENV['KONTENA_SIMPLE_TERM'] || !$stdout.tty?
   end
 
   def self.pastel
@@ -74,6 +74,14 @@ module Kontena
   def self.root
     File.dirname(__dir__)
   end
+
+  def self.cli_root(*joinables)
+    if joinables.empty?
+      File.join(Kontena.root, 'lib/kontena/cli')
+    else
+      File.join(Kontena.root, 'lib/kontena/cli', *joinables)
+    end
+  end
 end
 
 # Monkeypatching string to mimick 'colorize' gem

data/omnibus/wrappers/sh/kontena

@@ -4,4 +4,4 @@ export PATH=/opt/kontena/embedded/bin:$PATH
 export GEM_HOME=/opt/kontena/embedded/lib/ruby/gems/2.1.0
 export GEM_PATH=$GEM_HOME
 
-exec /opt/kontena/embedded/bin/kontena "$@"
+exec /opt/kontena/embedded/bin/kontena $@

data/spec/fixtures/stack-with-liquid-optional.yml

@@ -0,0 +1,14 @@
+stack: user/stackname
+version: 0.1.1
+variables:
+  asdf:
+    type: string
+    required: false
+
+services:
+  test:
+    image: foo
+    environment:
+    # {% if asdf %}
+      - ASDF={{asdf}}
+    # {% endif %}

data/spec/fixtures/stack-with-liquid-undefined.yml

@@ -0,0 +1,12 @@
+stack: user/stackname
+version: 0.1.1
+variables:
+  asdf:
+    type: string
+    default: asdfasdf
+
+services:
+  test:
+    image: foo
+    environment:
+      - ASDF={{asdflol}}

data/spec/kontena/cli/app/build_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/apps/build_command"
 
 describe Kontena::Cli::Apps::BuildCommand do
@@ -62,7 +61,7 @@ describe Kontena::Cli::Apps::BuildCommand do
       expect(subject).not_to receive(:process_docker_images)
       expect {
         subject.run([])
-      }.to raise_error SystemExit
+      }.to exit_with_error
     end
   end
 end

data/spec/kontena/cli/app/common_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/apps/common"
 
 describe Kontena::Cli::Apps::Common do
@@ -86,7 +85,7 @@ describe Kontena::Cli::Apps::Common do
     it 'aborts on validation failure' do
       allow_any_instance_of(Kontena::Cli::Apps::YAML::Validator).to receive(:validate)
         .and_return({ :errors => [{ 'wordress' => [] }], :notifications => [] })
-      expect { subject.services_from_yaml('kontena.yml',[],'') }.to raise_error(SystemExit)
+      expect { subject.services_from_yaml('kontena.yml',[],'') }.to exit_with_error
     end
 
     it 'returns given service from given YAML file' do

data/spec/kontena/cli/app/config_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/apps/config_command"
 require 'ruby_dig'
 

data/spec/kontena/cli/app/deploy_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/grid_options'
 require "kontena/cli/apps/deploy_command"
 
@@ -59,7 +58,7 @@ describe Kontena::Cli::Apps::DeployCommand do
         allow(subject.config).to receive(:current_master).and_return(
           Kontena::Cli::Config::Server.new
         )
-        expect{subject.run([])}.to raise_error(ArgumentError)
+        expect{subject.run([])}.to exit_with_error
       end
     end
 
@@ -68,7 +67,7 @@ describe Kontena::Cli::Apps::DeployCommand do
         allow(subject.config).to receive(:current_master).and_return(
           Kontena::Cli::Config::Server.new(url: 'http://foo.com')
         )
-        expect{subject.run([])}.to raise_error(ArgumentError)
+        expect{subject.run([])}.to exit_with_error
       end
     end
 

data/spec/kontena/cli/app/docker_helper_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/apps/docker_helper"
 
 describe Kontena::Cli::Apps::DockerHelper do

data/spec/kontena/cli/app/init_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/apps/init_command'
 
 describe Kontena::Cli::Apps::InitCommand do

data/spec/kontena/cli/app/logs_command_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require 'kontena/cli/grid_options'
 require "kontena/cli/apps/logs_command"
 

data/spec/kontena/cli/app/scale_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/apps/scale_command"
 
 describe Kontena::Cli::Apps::ScaleCommand do
@@ -28,7 +27,7 @@ describe Kontena::Cli::Apps::ScaleCommand do
       it 'aborts execution' do
         expect{
           subject.run(['wordpress', 3])
-        }.to raise_error(SystemExit)
+        }.to exit_with_error
       end
     end
 
@@ -36,7 +35,7 @@ describe Kontena::Cli::Apps::ScaleCommand do
       it 'aborts execution' do
         expect{
           subject.run(['mysql', 3])
-        }.to raise_error(SystemExit)
+        }.to exit_with_error
       end
     end
 

data/spec/kontena/cli/app/service_generator_spec.rb

@@ -1,4 +1,3 @@
-require_relative "../../../spec_helper"
 require "kontena/cli/apps/service_generator"
 
 describe Kontena::Cli::Apps::ServiceGenerator do
@@ -381,5 +380,5 @@ describe Kontena::Cli::Apps::ServiceGenerator do
         expect(result['secrets']).to be_nil
       end
     end
-  end  
+  end
 end