kontena-cli 0.17.0.pre1 → 0.17.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad6422b172a48accf054239e4dab6b61fa03f55
-  data.tar.gz: 536fafed2231e6fcece9120b06402aa88cab080b
+  metadata.gz: cc49a645052d88c4af58c2588b91c8579d56948b
+  data.tar.gz: 7cf02e974c1fdd082b7ee3895fe29e658680a89d
 SHA512:
-  metadata.gz: 889ecc5b3aef9a47aab715c3bfc4cb1a5200589b2c8fab55ceb00c7ac5d95f2d2fb8ceb06638c5f3de870920de2102c3722f9c120d20b3c494c1c875a57942db
-  data.tar.gz: 2140338ef86e138a7fdf5de202b7d8246e4402ade84327a493aea66307552daeca81c38a27b7b866804ef81cc219d95236713c65ff4736b83452c9fd624f034a
+  metadata.gz: 1f36d29da645638bf7ee06ad4c1f108d9c58dac907d3dd445b126c8cf6bee7e5edcace485fec66664d52c9deb03915097d1e55ad0806b22e7ba5ffb8435d48a9
+  data.tar.gz: 6874cbb4cac691b9f3477d3fc31f1e4004b7afafaab10dc34793b0cad756df653e8efd56116db4a237f7439ca023116c1f137bc64de35a2d14ea525185639574

data/VERSION

@@ -1 +1 @@
-0.17.0.pre1
+0.17.0.pre2

data/lib/kontena/cli/container_command.rb

@@ -1,9 +1,11 @@
+require_relative 'containers/list_command'
 require_relative 'containers/exec_command'
 require_relative 'containers/inspect_command'
 require_relative 'containers/logs_command'
 
 class Kontena::Cli::ContainerCommand < Kontena::Command
 
+  subcommand ["list", "ls"], "List grid containers", Kontena::Cli::Containers::ListCommand
   subcommand "exec", "Execute command inside a container", Kontena::Cli::Containers::ExecCommand
   subcommand "inspect", "Inspect the container", Kontena::Cli::Containers::InspectCommand
   subcommand "logs", "Show container logs", Kontena::Cli::Containers::LogsCommand

data/lib/kontena/cli/containers/exec_command.rb

@@ -1,11 +1,9 @@
 require_relative '../grid_options'
-require_relative './containers_helper'
 
 module Kontena::Cli::Containers
   class ExecCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include ContainersHelper
 
     parameter "CONTAINER_ID", "Container id"
     parameter "CMD ...", "Command"
@@ -14,11 +12,8 @@ module Kontena::Cli::Containers
       require_api_url
       token = require_token
 
-      cmd = build_command(cmd_list)
-      payload = {cmd: ["sh", "-c", cmd]}
-
-      service_name = container_id.match(/(.+)-(\d+)/)[1] rescue nil
-      result = client(token).post("containers/#{current_grid}/#{service_name}/#{container_id}/exec", payload)
+      payload = {cmd: ["sh", "-c", Shellwords.join(cmd_list)]}
+      result = client(token).post("containers/#{current_grid}/#{container_id}/exec", payload)
 
       puts result[0].join(" ") unless result[0].size == 0
       STDERR.puts result[1].join(" ") unless result[1].size == 0

data/lib/kontena/cli/containers/inspect_command.rb

@@ -9,14 +9,8 @@ module Kontena::Cli::Containers
       require_api_url
       token = require_token
 
-      match = container_id.match(/(.+)-(\d+)/)
-      if match
-        service_name = match[1]
-        result = client(token).get("containers/#{current_grid}/#{service_name}/#{container_id}/inspect")
-        puts JSON.pretty_generate(result)
-      else
-        exit_with_error("Cannot resolve container service")
-      end
+      result = client(token).get("containers/#{current_grid}/#{container_id}/inspect")
+      puts JSON.pretty_generate(result)
     end
   end
 end

data/lib/kontena/cli/containers/list_command.rb

@@ -0,0 +1,60 @@
+require_relative '../grid_options'
+
+module Kontena::Cli::Containers
+  class ListCommand < Kontena::Command
+    include Kontena::Util
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    option ['--all', '-a'], :flag, 'Show all containers'
+
+    def execute
+      require_api_url
+      token = require_token
+
+      params = '?'
+      params << 'all=1' if all?
+      result = client(token).get("containers/#{current_grid}#{params}")
+      containers = result['containers']
+      id_column = longest_string_in_array(containers.map {|c| "#{c['node']['name']}/#{c['name']}"})
+      image_column = longest_string_in_array(containers.map {|c| c['image'] })
+      columns = "%-#{id_column + 2}s %-#{image_column + 2}s %-30s %-20s %-10s"
+      puts columns % [ 'CONTAINER ID', 'IMAGE', 'COMMAND', 'CREATED', 'STATUS']
+      result['containers'].reverse.each do |container|
+        puts columns % [
+          "#{container['node']['name']}/#{container['name']}",
+          container['image'],
+          "\"#{container['cmd'].to_a.join(' ')[0..26]}\"",
+          "#{time_ago(container['created_at'])} ago",
+          container_status(container)
+        ]
+      end
+    end
+
+    def longest_string_in_array(array)
+      longest = 0
+      array.each do |item|
+        longest = item.length if item.length > longest
+      end
+
+      longest
+    end
+
+    def container_status(container)
+      s = container['state']
+      if s['paused']
+        'paused'.freeze
+      elsif s['restarting']
+        'restarting'.freeze
+      elsif s['oom_killed']
+        'oom_killed'.freeze
+      elsif s['dead']
+        'dead'.freeze
+      elsif s['running']
+        'running'.freeze
+      else
+        'stopped'.freeze
+      end
+    end
+  end
+end

data/lib/kontena/cli/containers/logs_command.rb

@@ -12,9 +12,7 @@ module Kontena::Cli::Containers
     def execute
       require_api_url
 
-      service_name = container_id.match(/(.+)-(\d+)/)[1] rescue nil
-
-      show_logs("containers/#{current_grid}/#{service_name}/#{container_id}/logs") do |log|
+      show_logs("containers/#{current_grid}/#{container_id}/logs") do |log|
         show_log(log)
       end
     end

data/lib/kontena/cli/registry/create_command.rb

@@ -87,6 +87,11 @@ module Kontena::Cli::Registry
 
       data = {
         name: 'registry',
+        stack: 'kontena/registry',
+        version: Kontena::Cli::VERSION,
+        source: '---',
+        registry: 'file://',
+        expose: 'api',
         services: [
           {
             name: 'api',
@@ -102,10 +107,11 @@ module Kontena::Cli::Registry
       }
 
       client(token).post("grids/#{current_grid}/stacks", data)
-      client(token).post("stacks/#{current_grid}/registry/deploy", {})
+      deployment = client(token).post("stacks/#{current_grid}/registry/deploy", {})
       spinner "Deploying #{data[:name].colorize(:cyan)} stack " do
-        sleep 1 until client(token).get("stacks/#{current_grid}/registry")['state'] == 'deploying'
-        sleep 1 until client(token).get("stacks/#{current_grid}/registry")['state'] == 'running'
+        deployment['service_deploys'].each do |service_deploy|
+          wait_for_deploy_to_finish(token, service_deploy)
+        end
       end
       puts "\n"
       puts "Docker Registry #{REGISTRY_VERSION} is now running at registry.#{current_grid}.kontena.local."

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

@@ -7,7 +7,7 @@ module Kontena::Cli::Vpn
       require 'rbconfig'
       require_api_url
       payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
-      stdout, stderr = client(require_token).post("containers/#{current_grid}/vpn/vpn-1/exec", payload)
+      stdout, stderr = client(require_token).post("services/#{current_grid}/vpn/server/containers/1/exec", payload)
       if linux?
         stdout << "\n"
         stdout << "script-security 2 system\n"

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

@@ -12,14 +12,20 @@ module Kontena::Cli::Vpn
       token = require_token
       preferred_node = node
 
-      vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
-      exit_with_error('Vpn already exists') if vpn
+      name = 'vpn'
+      vpn = client(token).get("stacks/#{current_grid}/#{name}") rescue nil
+      exit_with_error('Vpn stack already exists') if vpn
 
       node = find_node(token, preferred_node)
 
       vpn_ip = node_vpn_ip(node)
       data = {
-        name: 'vpn',
+        name: name,
+        stack: 'kontena/vpn',
+        version: Kontena::Cli::VERSION,
+        registry: 'file://',
+        source: '---',
+        expose: 'server',
         services: [
           name: 'server',
           stateful: true,
@@ -36,13 +42,15 @@ module Kontena::Cli::Vpn
           affinity: ["node==#{node['name']}"]
         ]
       }
+
       client(token).post("grids/#{current_grid}/stacks", data)
-      client(token).post("stacks/#{current_grid}/vpn/deploy", {})
-      spinner "Deploying vpn service " do
-        sleep 1 while client(token).get("stacks/#{current_grid}/vpn")['state'] == 'deploying'
-        sleep 1 while client(token).get("stacks/#{current_grid}/vpn")['state'] == 'running'
+      deployment = client(token).post("stacks/#{current_grid}/#{name}/deploy", {})
+      spinner "Deploying #{pastel.cyan(name)} service " do
+        deployment['service_deploys'].each do |service_deploy|
+          wait_for_deploy_to_finish(token, service_deploy)
+        end
       end
-      spinner "generating #{name.colorize(:cyan)} keys (this will take a while) " do
+      spinner "Generating #{pastel.cyan(name)} keys (this will take a while) " do
         wait_for_configuration_to_finish(token)
       end
       puts "#{name.colorize(:cyan)} service is now started (udp://#{vpn_ip}:1194)."
@@ -53,8 +61,8 @@ module Kontena::Cli::Vpn
       finished = false
       payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
       until finished
-        sleep 30
-        stdout, stderr = client(require_token).post("containers/#{current_grid}/vpn/vpn-1/exec", payload)
+        sleep 3
+        stdout, stderr = client(require_token).post("services/#{current_grid}/vpn/server/containers/1/exec", payload)
         finished = true if stdout.join('').include?('BEGIN PRIVATE KEY'.freeze)
       end
 

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

@@ -11,11 +11,11 @@ module Kontena::Cli::Vpn
       confirm unless forced?
       name = 'vpn'
 
-      vpn = client(token).get("stacks/#{current_grid}/vpn") rescue nil
+      vpn = client(token).get("stacks/#{current_grid}/#{name}") rescue nil
       exit_with_error("VPN stack does not exist") if vpn.nil?
 
       spinner "Removing #{name.colorize(:cyan)} service " do
-        client(token).delete("stacks/#{current_grid}/vpn")
+        client(token).delete("stacks/#{current_grid}/#{name}")
       end
     end
   end

data/lib/kontena/util.rb

@@ -28,6 +28,30 @@ module Kontena
       nil
     end
 
+    def time_ago(time)
+      now = Time.now.to_i
+      time = DateTime.parse(time).to_time.to_i
+      diff = now - time
+      if diff > 60 * 60 * 24
+        "#{diff / 60 / 60 / 24} days"
+      elsif diff > 60 * 60
+        "#{diff / 60 / 60} hours"
+      elsif diff > 60
+        "#{diff / 60} minutes"
+      else
+        "#{diff} seconds"
+      end
+    end
+
+    def longest_string_in_array(array)
+      longest = 0
+      array.each do |item|
+        longest = item.length if item.length > longest
+      end
+
+      longest
+    end
+
     module_function(:which)
 
     module ClassMethods

data/spec/kontena/cli/containers/list_command_spec.rb

@@ -0,0 +1,16 @@
+require_relative "../../../spec_helper"
+require 'kontena/cli/grid_options'
+require "kontena/cli/containers/list_command"
+
+describe Kontena::Cli::Containers::ListCommand do
+  include ClientHelpers
+
+  context "for a single container with logs" do
+
+    it "fetches containers" do
+      expect(client).to receive(:get).with('containers/test-grid?').and_return({'containers' => []})
+
+      subject.run([])
+    end
+  end
+end

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

@@ -34,11 +34,11 @@ describe Kontena::Cli::Containers::LogsCommand do
     end
 
     it "shows all logs" do
-      allow(client).to receive(:get).with('containers/test-grid/test-mysql/test-mysql-1/logs', {
+      allow(client).to receive(:get).with('containers/test-grid/node-1/test-mysql-1/logs', {
         limit: 100,
       }) { { 'logs' => logs } }
 
-      expect { subject.run(['test-mysql-1']) }.to output(<<LOGS
+      expect { subject.run(['node-1/test-mysql-1']) }.to output(<<LOGS
 2016-09-07T15:19:04.362690 test-mysql-1: mysql log message 1
 2016-09-07T15:19:04.500000 test-mysql-1: mysql log message 2
 2016-09-07T15:19:06.100000 test-mysql-1: mysql log message 3
@@ -47,7 +47,7 @@ LOGS
     end
 
     it "errors for an invalid --lines" do
-      expect { subject.run(["--lines=invalid", "test-mysql-1"]) }.to raise_error(Clamp::UsageError, "option '--lines': invalid value for Integer(): \"invalid\"")
+      expect { subject.run(["--lines=invalid", "node-1/test-mysql-1"]) }.to raise_error(Clamp::UsageError, "option '--lines': invalid value for Integer(): \"invalid\"")
     end
   end
 end

data/spec/kontena/cli/vpn/create_command_spec.rb

@@ -2,30 +2,27 @@ require_relative "../../../spec_helper"
 require "kontena/cli/vpn/create_command"
 
 describe Kontena::Cli::Vpn::CreateCommand do
-  
+
   include ClientHelpers
 
   let(:subject) { described_class.new(File.basename($0)) }
 
   describe '#execute' do
     it 'should abort if vpn already exists' do
-      expect(client).to receive(:get).with("services/test-grid/vpn").and_return({vpn: true})
+      expect(client).to receive(:get).with("stacks/test-grid/vpn").and_return({})
 
       expect {
         subject.execute
       }.to raise_error SystemExit
     end
-
-    
   end
 
   describe '#find_node' do
-
     it 'should abort if no online nodes exists' do
       expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
-        { 
+        {
           'nodes' => [
-            {'connected' => false}, 
+            {'connected' => false},
             {'connected' => false, 'public_ip' => '1.2.3.4'}
           ]
         })
@@ -37,9 +34,9 @@ describe Kontena::Cli::Vpn::CreateCommand do
 
     it 'should return first online node with public ip' do
       expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
-        { 
+        {
           'nodes' => [
-            {'connected' => true}, 
+            {'connected' => true},
             {'connected' => true, 'public_ip' => '1.2.3.4'}
           ]
         })
@@ -50,9 +47,9 @@ describe Kontena::Cli::Vpn::CreateCommand do
 
     it 'should return preferred node' do
       expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
-        { 
+        {
           'nodes' => [
-            {'connected' => true}, 
+            {'connected' => true},
             {'name' => 'preferred', 'connected' => true, 'public_ip' => '1.2.3.4'}
           ]
         })
@@ -63,9 +60,9 @@ describe Kontena::Cli::Vpn::CreateCommand do
 
     it 'should abort if no online nodes exists' do
       expect(client).to receive(:get).with("grids/test-grid/nodes").and_return(
-        { 
+        {
           'nodes' => [
-            {'connected' => true}, 
+            {'connected' => true},
             {'name' => 'preferred', 'connected' => true, 'public_ip' => '1.2.3.4'}
           ]
         })
@@ -78,7 +75,6 @@ describe Kontena::Cli::Vpn::CreateCommand do
   end
 
   describe '#node_vpn_ip' do
-
     it 'return ip when set' do
       allow(subject).to receive(:ip).and_return('1.2.3.4')
 
@@ -111,6 +107,5 @@ describe Kontena::Cli::Vpn::CreateCommand do
       }
       expect(subject.node_vpn_ip(node)).to eq('10.1.1.2')
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.17.0.pre1
+  version: 0.17.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,9 +227,9 @@ files:
 - lib/kontena/cli/common.rb
 - lib/kontena/cli/config.rb
 - lib/kontena/cli/container_command.rb
-- lib/kontena/cli/containers/containers_helper.rb
 - lib/kontena/cli/containers/exec_command.rb
 - lib/kontena/cli/containers/inspect_command.rb
+- lib/kontena/cli/containers/list_command.rb
 - lib/kontena/cli/containers/logs_command.rb
 - lib/kontena/cli/etcd/common.rb
 - lib/kontena/cli/etcd/get_command.rb
@@ -440,7 +440,7 @@ files:
 - spec/kontena/cli/cloud/logout_command_spec.rb
 - spec/kontena/cli/cloud/master/add_command_spec.rb
 - spec/kontena/cli/common_spec.rb
-- spec/kontena/cli/containers/containers_helper_spec.rb
+- spec/kontena/cli/containers/list_command_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
@@ -552,7 +552,7 @@ test_files:
 - spec/kontena/cli/cloud/logout_command_spec.rb
 - spec/kontena/cli/cloud/master/add_command_spec.rb
 - spec/kontena/cli/common_spec.rb
-- spec/kontena/cli/containers/containers_helper_spec.rb
+- spec/kontena/cli/containers/list_command_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb

data/lib/kontena/cli/containers/containers_helper.rb

@@ -1,22 +0,0 @@
-module Kontena
-  module Cli
-    module Containers
-      module ContainersHelper
-
-        # @param [Array<String>] args
-        # @return [String]
-        def build_command(args)
-          return args.first if args.size == 1
-
-          args.reduce('') do |cmd, arg|
-            if arg.include?(' ') || arg.include?('"')
-              arg = '"' + arg.gsub('"', '\\"') + '"'
-            end
-            cmd + ' ' + arg
-          end.strip
-        end
-
-      end
-    end
-  end
-end

data/spec/kontena/cli/containers/containers_helper_spec.rb

@@ -1,16 +0,0 @@
-require "kontena/cli/containers/containers_helper"
-
-describe Kontena::Cli::Containers::ContainersHelper do
-  let(:subject) do
-    Class.new { include Kontena::Cli::Containers::ContainersHelper }.new
-  end
-
-  describe '#build_command' do
-    it 'parses commands correctly' do
-      expect(subject.build_command(['echo $ID'])).to eq('echo $ID')
-      expect(subject.build_command(['echo', 'ID', '$ID'])).to eq('echo ID $ID')
-      expect(subject.build_command(['echo', 'ID: $ID'])).to eq('echo "ID: $ID"')
-      expect(subject.build_command(['echo', '{"ID": "123"}'])).to eq('echo "{\\"ID\\": \\"123\\"}"')
-    end
-  end
-end