kontena-cli 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d82df3e1f060653421ebc2ba56833b28881e6d6e
-  data.tar.gz: 867c7924eb2a780599392f21fdbc5e6d8e30961d
+  metadata.gz: 0799760c154ff891c9e67c2a893b47f47d9012c6
+  data.tar.gz: 075dcb4a30e995da47f86153b02d54b66e6576b7
 SHA512:
-  metadata.gz: 788d94e130ecad93547fb194564039d70a8b4686f2c8029649beea8f5e0d52c8ce42eba53aab463de49e5f11647c92f0b9d33659cd0339f7338c9892043d6cba
-  data.tar.gz: 2ce7bd1b2bc78591a7405ba7d09d6c4f192a290a15ed6c2f79e4cfdecc12ae69f1b224cca96ae842a2265c7626b68f66842d9c4d908ff85080409a81db386e82
+  metadata.gz: 943320e9d2f861ec68da9b0f4796bd268ec302bde7094ef440af6b578bc0f9b997ddf5dd913289cbe4fb40b78b049e0babdc52ec42de10cb3c64bec6543c449d
+  data.tar.gz: 74450cc8ab63055a6bd109f967d7c730e16c437236fb1c7b43825b73ade44dcad10fcbfdc9048eaa32d4c00e8f22585ea70a0035bea79898b973b1c1c92db018

data/VERSION

@@ -1 +1 @@
-0.15.1
+0.15.2

data/kontena-cli.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["info@kontena.io"]
   spec.summary       = %q{Kontena command line tool}
   spec.description   = %q{Kontena command line tool}
-  spec.homepage      = "http://www.kontena.io"
+  spec.homepage      = "https://www.kontena.io"
   spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "excon", "~> 0.49.0"
-  spec.add_runtime_dependency "colorize"
-  spec.add_runtime_dependency "clamp"
-  spec.add_runtime_dependency "highline"
-  spec.add_runtime_dependency "shell-spinner"
-  spec.add_runtime_dependency "ruby_dig"
+  spec.add_runtime_dependency "colorize", "~> 0.8.1"
+  spec.add_runtime_dependency "clamp", "~> 1.0.0"
+  spec.add_runtime_dependency "highline", "~> 1.7.8"
+  spec.add_runtime_dependency "shell-spinner", "~> 1.0.4"
+  spec.add_runtime_dependency "ruby_dig", "~> 0.0.2"
   spec.add_runtime_dependency "dry-validation", "~> 0.8.0"
   spec.add_runtime_dependency "dry-configurable", "~> 0.1.6"
 end

data/lib/kontena/cli/apps/common.rb

@@ -33,7 +33,7 @@ module Kontena::Cli::Apps
     # @return [Hash]
     def generate_services(yaml_services, version)
       services = {}
-      if version == '2'
+      if version.to_i == 2
         generator_klass = ServiceGeneratorV2
       else
         generator_klass = ServiceGenerator
@@ -63,7 +63,7 @@ module Kontena::Cli::Apps
     def project_name_from_yaml(file)
       reader = YAML::Reader.new(file, true)
       outcome = reader.execute
-      if outcome[:version] == '2'
+      if outcome[:version].to_i == 2
         outcome[:name]
       else
         nil

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

@@ -1,9 +1,12 @@
 require_relative 'common'
+require_relative '../helpers/log_helper'
 
 module Kontena::Cli::Apps
   class LogsCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::LogHelper
+
     include Common
 
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
@@ -13,60 +16,48 @@ module Kontena::Cli::Apps
     option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
     parameter "[SERVICE] ...", "Show only specified service logs"
 
-    attr_reader :services
-
     def execute
       require_config_file(filename)
 
-      @services = services_from_yaml(filename, service_list, service_prefix)
-      if services.size > 0
-        show_logs(services)
-      elsif !service_list.empty?
-        puts "No such service: #{service_list.join(', ')}".colorize(:red)
-      end
+      services = services_from_yaml(filename, service_list, service_prefix)
 
-    end
+      if services.empty? && !service_list.empty?
+        signal_error "No such service: #{service_list.join(', ')}"
+      elsif services.empty?
+        signal_error "No services for application"
+      end
 
-    def show_logs(services)
-      last_id = nil
-      loop do
-        query_params = []
-        query_params << "from=#{last_id}" unless last_id.nil?
-        query_params << "limit=#{lines}"
-        query_params << "since=#{since}" if !since.nil? && last_id.nil?
-        logs = []
-        services.each do |service_name, opts|
-          service = get_service(token, prefixed_name(service_name)) rescue false
-          result = client(token).get("services/#{service['id']}/container_logs?#{query_params.join('&')}") if service
-          logs = logs + result['logs'] if result && result['logs']
-        end
-        logs.sort!{|x,y| DateTime.parse(x['created_at']) <=> DateTime.parse(y['created_at'])}
-        logs.each do |log|
-          color = color_for_container(log['name'])
-          prefix = "#{log['created_at']} #{log['name']}:".colorize(color)
-          puts "#{prefix} #{log['data']}"
-          last_id = log['id']
-        end
-        break unless tail?
-        sleep(2)
+      query_services = services.map{|service_name, opts| prefixed_name(service_name)}.join ','
+      query_params = {
+        services: query_services,
+        limit: lines,
+      }
+      query_params[:since] = since if since
+
+      if tail?
+        tail_logs(services, query_params)
+      else
+        show_logs(services, query_params)
       end
     end
 
-    def color_for_container(container_id)
-      color_maps[container_id] = colors.shift unless color_maps[container_id]
-      color_maps[container_id].to_sym
+    def tail_logs(services, query_params)
+      stream_logs("grids/#{current_grid}/container_logs", query_params) do |log|
+        show_log(log)
+      end
     end
 
-    def color_maps
-      @color_maps ||= {}
+    def show_logs(services, query_params)
+      result = client(token).get("grids/#{current_grid}/container_logs", query_params)
+      result['logs'].each do |log|
+        show_log(log)
+      end
     end
 
-    def colors
-      if(@colors.nil? || @colors.size == 0)
-        @colors = [:green, :magenta, :yellow, :cyan, :red,
-                   :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
-      end
-      @colors
+    def show_log(log)
+      color = color_for_container(log['name'])
+      prefix = "#{log['created_at']} #{log['name']}:".colorize(color)
+      puts "#{prefix} #{log['data']}"
     end
   end
 end

data/lib/kontena/cli/apps/yaml/reader.rb

@@ -126,15 +126,26 @@ module Kontena::Cli::Apps
       # @param [Hash] service_config
       # @return [Hash] updated service config
       def extend_config(service_config)
-        service_name = service_config['extends']['service']
+        extended_service = extended_service(service_config['extends'])
+        return unless extended_service
         filename = service_config['extends']['file']
         if filename
-          parent_service = from_external_file(filename, service_name)
+          parent_config = from_external_file(filename, extended_service)
         else
-          abort("Service '#{service_name}' not found in #{file}".colorize(:red)) unless services.key?(service_name)
-          parent_service = process_config(services[service_name])
+          abort("Service '#{extended_service}' not found in #{file}".colorize(:red)) unless services.key?(extended_service)
+          parent_config = process_config(services[extended_service])
+        end
+        ServiceExtender.new(service_config).extend(parent_config)
+      end
+
+      def extended_service(extend_config)
+        if extend_config.is_a?(Hash)
+          extend_config['service']
+        elsif extend_config.is_a?(String)
+          extend_config
+        else
+          nil
         end
-        ServiceExtender.new(service_config).extend(parent_service)
       end
 
       def from_external_file(filename, service_name)

data/lib/kontena/cli/apps/yaml/validations.rb

@@ -4,9 +4,12 @@ module Kontena::Cli::Apps::YAML
    def append_common_validations(base)
      base.optional('image').maybe(:str?)
 
-     base.optional('extends').schema do
-       required('service').filled(:str?)
-       optional('file').value(:str?)
+     base.optional('extends') { str? | type?(Hash) }
+     base.rule(when_extends_is_hash: ['extends']) do |extends|
+       extends.type?(Hash) > extends.schema do
+         required('service').filled(:str?)
+         optional('file').value(:str?)
+       end
      end
 
      base.optional('stateful') { bool? }

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

@@ -1,6 +1,9 @@
+require_relative '../helpers/log_helper'
+
 module Kontena::Cli::Grids
   class LogsCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::Helpers::LogHelper
 
     option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
     option "--lines", "LINES", "Number of lines to show from the end of the logs"
@@ -9,9 +12,13 @@ module Kontena::Cli::Grids
     option "--service", "SERVICE", "Filter by service name", multivalued: true
     option ["-c", "--container"], "CONTAINER", "Filter by container", multivalued: true
 
+    # @return [String]
+    def token
+      @token ||= require_token
+    end
+
     def execute
       require_api_url
-      token = require_token
 
       query_params = {}
       query_params[:nodes] = node_list.join(",") unless node_list.empty?
@@ -21,15 +28,13 @@ module Kontena::Cli::Grids
       query_params[:since] = since if since
 
       if tail?
-        @buffer = ''
-        query_params[:follow] = 1
-        stream_logs(token, query_params)
+        tail_logs(query_params)
       else
-        list_logs(token, query_params)
+        list_logs(query_params)
       end
     end
 
-    def list_logs(token, query_params)
+    def list_logs(query_params)
       result = client(token).get("grids/#{current_grid}/container_logs", query_params)
       result['logs'].each do |log|
         color = color_for_container(log['name'])
@@ -41,56 +46,13 @@ module Kontena::Cli::Grids
       end
     end
 
-    def stream_logs(token, query_params)
-      streamer = lambda do |chunk, remaining_bytes, total_bytes|
-        begin
-          unless @buffer.empty?
-            chunk = @buffer + chunk
-          end
-          unless chunk.empty?
-            log = JSON.parse(chunk)
-          end
-          @buffer = ''
-        rescue => exc
-          @buffer << chunk
-        end
-        if log
-          @last_seen = log['id']
-          color = color_for_container(log['name'])
-          puts "#{log['name'].colorize(color)} | #{log['data']}"
-        end
-      end
-
-      begin
-        if @last_seen
-          query_params[:from] = @last_seen
-        end
-        result = client(token).get_stream(
-          "grids/#{current_grid}/container_logs", streamer, query_params
-        )
-      rescue => exc
-        if exc.cause.is_a?(EOFError) # Excon wraps the EOFerror into SockerError
-          retry
-        end
-      end
-
-    end
-
-    def color_for_container(container_id)
-      color_maps[container_id] = colors.shift unless color_maps[container_id]
-      color_maps[container_id].to_sym
-    end
-
-    def color_maps
-      @color_maps ||= {}
-    end
-
-    def colors
-      if(@colors.nil? || @colors.size == 0)
-        @colors = [:green, :yellow, :magenta, :cyan, :red,
-          :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+    # @param [String] token
+    # @param [Hash] query_params
+    def tail_logs(query_params)
+      stream_logs("grids/#{current_grid}/container_logs", query_params) do |log|
+        color = color_for_container(log['name'])
+        puts "#{log['name'].colorize(color)} | #{log['data']}"
       end
-      @colors
     end
   end
 end

data/lib/kontena/cli/helpers/log_helper.rb

@@ -0,0 +1,68 @@
+module Kontena::Cli::Helpers
+  module LogHelper
+
+    # @param [String] url
+    # @param [Hash] query_params
+    def stream_logs(url, query_params)
+      last_seen = nil
+      streamer = lambda do |chunk, remaining_bytes, total_bytes|
+        log = buffered_log_json(chunk)
+        if log
+          yield log
+          last_seen = log['id']
+        end
+      end
+
+      begin
+        query_params[:follow] = 1
+        query_params[:from] = last_seen if last_seen
+        result = client(token).get_stream(url, streamer, query_params)
+      rescue => exc
+        retry if exc.cause.is_a?(EOFError) # Excon wraps the EOFerror into SocketError
+        raise
+      end
+    end
+
+    # @param [String] chunk
+    # @return [Hash,NilClass]
+    def buffered_log_json(chunk)
+      @buffer = '' if @buffer.nil?
+      return if @buffer.empty? && chunk.strip.empty?
+      begin
+        orig_chunk = chunk
+        unless @buffer.empty?
+          chunk = @buffer + chunk
+        end
+        unless chunk.empty?
+          log = JSON.parse(chunk)
+        end
+        @buffer = ''
+        log
+      rescue => exc
+        @buffer << orig_chunk
+        nil
+      end
+    end
+
+    # @param [String] container_id
+    # @return [Symbol]
+    def color_for_container(container_id)
+      color_maps[container_id] = colors.shift unless color_maps[container_id]
+      color_maps[container_id].to_sym
+    end
+
+    # @return [Hash]
+    def color_maps
+      @color_maps ||= {}
+    end
+
+    # @return [Array<Symbol>]
+    def colors
+      if(@colors.nil? || @colors.size == 0)
+        @colors = [:green, :yellow, :magenta, :cyan, :red,
+          :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+      end
+      @colors
+    end
+  end
+end

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

@@ -1,9 +1,11 @@
 require_relative 'services_helper'
+require_relative '../helpers/log_helper'
 
 module Kontena::Cli::Services
   class LogsCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::LogHelper
     include ServicesHelper
 
     parameter "NAME", "Service name"
@@ -15,7 +17,7 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-      
+
 
       query_params = {}
       query_params[:limit] = lines if lines
@@ -47,56 +49,30 @@ module Kontena::Cli::Services
       end
     end
 
+    # @param [String] token
+    # @param [Hash] query_params
     def stream_logs(token, query_params)
+      last_seen = nil
       streamer = lambda do |chunk, remaining_bytes, total_bytes|
-        begin
-          unless @buffer.empty?
-            chunk = @buffer + chunk
-          end
-          unless chunk.empty?
-            log = JSON.parse(chunk)
-          end
-          @buffer = ''
-        rescue => exc
-          @buffer << chunk
-        end
+        log = buffered_log_json(chunk)
         if log
-          @last_seen = log['id']
+          last_seen = log['id']
           render_log_line(log)
         end
       end
 
       begin
         query_params[:follow] = true
-        if @last_seen
-          query_params[:from] = @last_seen
+        if last_seen
+          query_params[:from] = last_seen
         end
         result = client(token).get_stream(
           "services/#{current_grid}/#{name}/container_logs", streamer, query_params
         )
       rescue => exc
-        if exc.cause.is_a?(EOFError) # Excon wraps the EOFerror into SockerError
-          retry
-        end
-      end
-
-    end
-
-    def color_for_container(container_id)
-      color_maps[container_id] = colors.shift unless color_maps[container_id]
-      color_maps[container_id].to_sym
-    end
-
-    def color_maps
-      @color_maps ||= {}
-    end
-
-    def colors
-      if(@colors.nil? || @colors.size == 0)
-        @colors = [:green, :yellow, :magenta, :cyan, :red,
-          :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+        retry if exc.cause.is_a?(EOFError) # Excon wraps the EOFerror into SocketError
+        raise
       end
-      @colors
     end
   end
 end

data/lib/kontena/scripts/completer

@@ -55,7 +55,7 @@ class Helper
   end
 
   def yml_services
-    if File.exist?('kontena.yml')      
+    if File.exist?('kontena.yml')
       yaml = YAML.load(File.read('kontena.yml'))
       if yaml['version'] == '2'
         services = yaml['services']
@@ -100,7 +100,7 @@ if words.size > 0
       end
     when 'node'
       completion.clear
-      sub_commands = %w(list show remove vagrant digitalocean azure aws)
+      sub_commands = %w(list show remove)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.nodes
@@ -109,7 +109,7 @@ if words.size > 0
       end
     when 'master'
       completion.clear
-      sub_commands = %w(list use vagrant digitalocean azure aws users)
+      sub_commands = %w(list use)
       if words[1] && words[1] == 'use'
         completion.push helper.master_names
       elsif words[1] && words[1] == 'users'

data/spec/fixtures/kontena-internal-extend.yml

@@ -0,0 +1,8 @@
+base:
+  stateful: true
+  instances: 2
+  deploy:
+    strategy: ha
+app:
+  extends: base
+  stateful: true  

data/spec/fixtures/kontena_numeric_version.yml

@@ -0,0 +1,9 @@
+version: 2
+name: foo
+
+services:
+  bar:
+    image: konttisample
+    build:
+      context: .
+      dockerfile: Dockerfile

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

@@ -13,6 +13,10 @@ describe Kontena::Cli::Apps::Common do
     fixture('kontena.yml')
   end
 
+  let(:kontena_numeric_version_yml) do
+    fixture('kontena_numeric_version.yml')
+  end
+
   let(:kontena_v2_yml) do
     fixture('kontena_v2.yml')
   end
@@ -61,7 +65,7 @@ describe Kontena::Cli::Apps::Common do
     end
   end
 
-  describe '#load_from_yaml' do
+  describe '#services_from_yaml' do
     before(:each) do
       allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
       allow(File).to receive(:read).with("#{Dir.getwd}/health.yml").and_return(health_yml)
@@ -96,5 +100,12 @@ describe Kontena::Cli::Apps::Common do
       expect(services['web']).not_to be_nil
       expect(services['web']['health_check']).not_to be_nil
     end
+
+    it 'allows version to be numeric' do
+      allow(File).to receive(:read).with("#{Dir.getwd}/kontena-numeric-version.yml").and_return(kontena_numeric_version_yml)
+      services = subject.services_from_yaml('kontena-numeric-version.yml', [], '')
+      expect(services.dig('bar', 'build', 'context')).to eq(Dir.pwd)
+      expect(services.dig('bar', 'build', 'dockerfile')).to eq('Dockerfile')
+    end
   end
 end

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

@@ -0,0 +1,133 @@
+require_relative "../../../spec_helper"
+require 'kontena/cli/grid_options'
+require "kontena/cli/apps/logs_command"
+
+describe Kontena::Cli::Apps::LogsCommand do
+  include FixturesHelpers
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:client) do
+    double("client")
+  end
+
+  let(:token) do
+    "testtoken"
+  end
+
+  let(:current_grid) do
+  'test-grid'
+end
+
+  let(:service_prefix) do
+    'test'
+  end
+
+  before (:each) do
+    allow(subject).to receive(:token) { token }
+    allow(subject).to receive(:client) { client }
+    allow(subject).to receive(:service_prefix) { service_prefix }
+    allow(subject).to receive(:current_grid) { current_grid }
+  end
+
+  context 'with multiple services' do
+    let(:kontena_yml) do
+      fixture('kontena.yml')
+    end
+
+    let(:docker_compose_yml) do
+      fixture('docker-compose.yml')
+    end
+
+    # globally ordered logs across multiple services
+    let (:logs) do
+      [
+        {
+          'id' => '57cff2e8cfee65c8b6efc8bd',
+          'name' => 'test-mysql-1',
+          'created_at' => '2016-09-07T15:19:04.362690',
+          'data' => "mysql log message 1",
+        },
+        {
+          'id' => '57cff2e8cfee65c8b6efc8be',
+          'name' => 'test-mysql-1',
+          'created_at' => '2016-09-07T15:19:04.500000',
+          'data' => "mysql log message 2",
+        },
+        {
+          'id' => '57cff2e8cfee65c8b6efc8bf',
+          'name' => 'test-wordpress-1',
+          'created_at' => '2016-09-07T15:19:05.362690',
+          'data' => "wordpress log message 1-1",
+        },
+        {
+          'id' => '57cff2e8cfee65c8b6efc8c1',
+          'name' => 'test-mysql-1',
+          'created_at' => '2016-09-07T15:19:06.100000',
+          'data' => "mysql log message 3",
+        },
+        {
+          'id' => '57cff2e8cfee65c8b6efc8c2',
+          'name' => 'test-wordpress-1',
+          'created_at' => '2016-09-07T15:19:07.100000',
+          'data' => "wordpress log message 1-2",
+        },
+      ]
+    end
+
+    before (:each) do
+      # mock kontena.yml services
+      expect(subject).to receive(:require_config_file).with("kontena.yml")
+      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
+      allow(File).to receive(:read).with("#{Dir.getwd}/docker-compose.yml").and_return(docker_compose_yml)
+
+      # collect show_log() output
+      @logs = []
+
+      allow(subject).to receive(:show_log) do |log|
+        @logs << log
+      end
+    end
+
+    it "shows all service logs" do
+      expect(client).to receive(:get).with('grids/test-grid/container_logs', {
+        services: 'test-wordpress,test-mysql',
+        limit: '100',
+      }) { { 'logs' => logs } }
+
+      subject.run([])
+
+      expect(@logs).to eq logs
+    end
+
+    it "shows logs for one service" do
+      mysql_logs = logs.select{|log| log['name'] =~ /test-mysql-/ }
+
+      expect(client).to receive(:get).with('grids/test-grid/container_logs', {
+        services: 'test-mysql',
+        limit: '100',
+      }) { { 'logs' => mysql_logs } }
+
+      subject.run(["mysql"])
+
+      expect(@logs).to eq mysql_logs
+    end
+
+    it "shows logs since time" do
+      since = '2016-09-07T15:19:05.362690'
+      since_logs = logs.select{|log| log['created_at'] > since }
+
+      expect(client).to receive(:get).with('grids/test-grid/container_logs', {
+        services: 'test-wordpress,test-mysql',
+        limit: '100',
+        since: since,
+      }) { { 'logs' => since_logs } }
+
+      subject.run(["--since=#{since}"])
+
+      expect(@logs).to eq since_logs
+    end
+  end
+end

data/spec/kontena/cli/app/yaml/reader_spec.rb

@@ -194,38 +194,53 @@ describe Kontena::Cli::Apps::YAML::Reader do
         .and_return(fixture('docker-compose.yml'))
     end
 
-    it 'extends services' do
-      docker_compose_yml = YAML.load(fixture('docker-compose.yml') % { project: 'test' })
-      wordpress_options = {
-        'extends' => {
-          'file' => 'docker-compose.yml',
-          'service' => 'wordpress'
-        },
-        'stateful' => true,
-        'environment' => ['WORDPRESS_DB_PASSWORD=test_secret'],
-        'instances' => 2,
-        'deploy' => { 'strategy' => 'ha' }
-      }
-      mysql_options = {
-        'extends' => {
-          'file' => 'docker-compose.yml',
-          'service' => 'mysql'
-        },
-        'stateful' => true,
-        'environment' => ['MYSQL_ROOT_PASSWORD=test_secret']
-      }
-      expect(Kontena::Cli::Apps::YAML::ServiceExtender).to receive(:new)
-        .with(wordpress_options)
-        .once
-        .and_return(service_extender)
-      expect(Kontena::Cli::Apps::YAML::ServiceExtender).to receive(:new)
-        .with(mysql_options)
-        .once
-        .and_return(service_extender)
-      expect(service_extender).to receive(:extend).with(docker_compose_yml['wordpress'])
-      expect(service_extender).to receive(:extend).with(docker_compose_yml['mysql'])
-
-      subject.execute
+    context 'when extending services' do
+      it 'extends services from external file' do
+        docker_compose_yml = YAML.load(fixture('docker-compose.yml') % { project: 'test' })
+        wordpress_options = {
+          'extends' => {
+            'file' => 'docker-compose.yml',
+            'service' => 'wordpress'
+          },
+          'stateful' => true,
+          'environment' => ['WORDPRESS_DB_PASSWORD=test_secret'],
+          'instances' => 2,
+          'deploy' => { 'strategy' => 'ha' }
+        }
+        mysql_options = {
+          'extends' => {
+            'file' => 'docker-compose.yml',
+            'service' => 'mysql'
+          },
+          'stateful' => true,
+          'environment' => ['MYSQL_ROOT_PASSWORD=test_secret']
+        }
+        expect(Kontena::Cli::Apps::YAML::ServiceExtender).to receive(:new)
+          .with(wordpress_options)
+          .once
+          .and_return(service_extender)
+        expect(Kontena::Cli::Apps::YAML::ServiceExtender).to receive(:new)
+          .with(mysql_options)
+          .once
+          .and_return(service_extender)
+        expect(service_extender).to receive(:extend).with(docker_compose_yml['wordpress'])
+        expect(service_extender).to receive(:extend).with(docker_compose_yml['mysql'])
+
+        subject.execute
+      end
+
+      it 'extends services from the same file' do
+        allow(File).to receive(:read)
+          .with(absolute_yaml_path('kontena.yml'))
+          .and_return(fixture('kontena-internal-extend.yml'))
+        kontena_yml = YAML.load(fixture('kontena-internal-extend.yml') % { project: 'test' })
+        expect(Kontena::Cli::Apps::YAML::ServiceExtender).to receive(:new)
+          .with(kontena_yml['app'])
+          .once
+          .and_return(service_extender)
+        expect(service_extender).to receive(:extend).with(kontena_yml['base'])
+        subject.execute
+      end
     end
 
     context 'environment variables' do

data/spec/kontena/cli/app/yaml/validator_spec.rb

@@ -206,6 +206,26 @@ describe Kontena::Cli::Apps::YAML::Validator do
       end
     end
 
+    context 'validates extends' do
+      it 'accepts string value' do
+        result = subject.validate_options('extends' => 'web')
+        expect(result.messages.key?('extends')).to be_falsey
+      end
+
+      context 'when value is hash' do
+        it 'must contain service' do
+          result = subject.validate_options('extends' => { 'file' => 'docker_compose.yml'})
+          expect(result.messages.key?('extends')).to be_truthy
+        end
+      end
+
+      context 'when value is not string or hash' do
+        it 'returns error' do
+          result = subject.validate_options('extends' => ['array is invalid'])
+          expect(result.messages.key?('extends')).to be_truthy
+        end
+      end
+    end
     context 'validates hooks' do
       context 'validates pre_build' do
         it 'must be array' do

data/spec/kontena/cli/helpers/log_helper_spec.rb

@@ -0,0 +1,58 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/helpers/log_helper"
+
+describe Kontena::Cli::Helpers::LogHelper do
+
+  let(:described_class) do
+    Class.new do
+      include Kontena::Cli::Helpers::LogHelper
+
+      def buffer
+        @buffer
+      end
+    end
+  end
+
+  describe '#buffered_log_json' do
+    it 'returns has on valid json' do
+      chunk = {"foo" => "bar"}
+      log = subject.buffered_log_json(chunk.to_json)
+      expect(log).to eq(chunk)
+    end
+
+    it 'combines multi part json chunks to valid json' do
+      chunk1 = '{"foo": "'
+      chunk2 = 'bar'
+      chunk3 = '"}'
+      log = subject.buffered_log_json(chunk1)
+      expect(log).to be_nil
+      log = subject.buffered_log_json(chunk2)
+      expect(log).to be_nil
+      log = subject.buffered_log_json(chunk3)
+      expect(log).to eq({"foo" => "bar"})
+    end
+
+    it 'handles big log messages' do
+      chunk1 = '{"foo": "' << "lol" * 10000
+      chunk2 = 'lol'
+      chunk3 = 'lol"}'
+      log = subject.buffered_log_json(chunk1)
+      expect(log).to be_nil
+      log = subject.buffered_log_json(chunk2)
+      expect(log).to be_nil
+      log = subject.buffered_log_json(chunk3)
+      expect(log).to eq(JSON.parse(chunk1 + chunk2 + chunk3))
+    end
+
+    it 'does not append to buffer if buffer is empty and chunk has just whitespace' do
+      log = subject.buffered_log_json(' ')
+      expect(log).to be_nil
+      expect(subject.buffer).to eq('')
+    end
+
+    it 'returns nil on invalid json' do
+      log = subject.buffered_log_json('{"foo": "')
+      expect(log).to be_nil
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,72 +56,72 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: shell-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: ruby_dig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ files:
 - lib/kontena/cli/grids/users/add_command.rb
 - lib/kontena/cli/grids/users/list_command.rb
 - lib/kontena/cli/grids/users/remove_command.rb
+- lib/kontena/cli/helpers/log_helper.rb
 - lib/kontena/cli/login_command.rb
 - lib/kontena/cli/logout_command.rb
 - lib/kontena/cli/master/current_command.rb
@@ -352,11 +353,13 @@ files:
 - spec/fixtures/docker-compose_v2.yml
 - spec/fixtures/health.yml
 - spec/fixtures/kontena-build.yml
+- spec/fixtures/kontena-internal-extend.yml
 - spec/fixtures/kontena-invalid.yml
 - spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
 - spec/fixtures/kontena_build_v2.yml
+- spec/fixtures/kontena_numeric_version.yml
 - spec/fixtures/kontena_v2.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/wordpress-scaled.yml
@@ -367,6 +370,7 @@ files:
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/init_command_spec.rb
+- spec/kontena/cli/app/logs_command_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/app/service_generator_spec.rb
 - spec/kontena/cli/app/service_generator_v2_spec.rb
@@ -379,6 +383,7 @@ files:
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
+- spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
@@ -403,7 +408,7 @@ files:
 - spec/support/client_helpers.rb
 - spec/support/fixtures_helpers.rb
 - tasks/rspec.rake
-homepage: http://www.kontena.io
+homepage: https://www.kontena.io
 licenses:
 - Apache-2.0
 metadata: {}
@@ -433,11 +438,13 @@ test_files:
 - spec/fixtures/docker-compose_v2.yml
 - spec/fixtures/health.yml
 - spec/fixtures/kontena-build.yml
+- spec/fixtures/kontena-internal-extend.yml
 - spec/fixtures/kontena-invalid.yml
 - spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
 - spec/fixtures/kontena_build_v2.yml
+- spec/fixtures/kontena_numeric_version.yml
 - spec/fixtures/kontena_v2.yml
 - spec/fixtures/mysql.yml
 - spec/fixtures/wordpress-scaled.yml
@@ -448,6 +455,7 @@ test_files:
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
 - spec/kontena/cli/app/init_command_spec.rb
+- spec/kontena/cli/app/logs_command_spec.rb
 - spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/app/service_generator_spec.rb
 - spec/kontena/cli/app/service_generator_v2_spec.rb
@@ -460,6 +468,7 @@ test_files:
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
+- spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb