kontena-cli 1.4.0.pre6 → 1.4.0.pre7

data/lib/kontena/cli/stacks/deploy_command.rb

@@ -10,6 +10,8 @@ module Kontena::Cli::Stacks
 
     parameter "NAME", "Stack name"
 
+    option '--[no-]wait', :flag, 'Do not wait service deployment', default: true
+
     requires_current_master
     requires_current_master_token
 
@@ -18,10 +20,12 @@ module Kontena::Cli::Stacks
       spinner "Triggering deployment of stack #{pastel.cyan(name)}" do
         deployment = deploy_stack(name)
       end
-      spinner "Waiting for deployment to start" do
-        wait_for_deployment_to_start(deployment)
+      if wait?
+        spinner "Waiting for deployment to start" do
+          wait_for_deployment_to_start(deployment)
+        end
+        wait_for_deploy_to_finish(deployment)
       end
-      wait_for_deploy_to_finish(deployment)
     end
 
     def deploy_stack(name)

data/lib/kontena/cli/stacks/install_command.rb

@@ -1,4 +1,5 @@
 require_relative 'common'
+require_relative 'yaml/stack_file_loader'
 
 module Kontena::Cli::Stacks
   class InstallCommand < Kontena::Command
@@ -16,21 +17,53 @@ module Kontena::Cli::Stacks
     include Common::StackValuesToOption
     include Common::StackValuesFromOption
 
+    option '--parent-name', '[PARENT_NAME]', "Set parent stack name", hidden: true
+    option '--skip-dependencies', :flag, "Do not install any stack dependencies"
+
     requires_current_master
     requires_current_master_token
 
     def execute
-      stack = stack_read_and_dump(filename, name: name, values: values)
+      set_env_variables(stack_name, current_grid)
+
+      install_dependencies unless skip_dependencies?
+
+      hint_on_validation_notifications(reader.notifications)
+      abort_on_validation_errors(reader.errors)
+
+      dump_variables if values_to
+
+      create_stack
+      deploy_stack if deploy?
+    end
+
+    def install_dependencies
+      dependencies = loader.dependencies
+      return if dependencies.nil?
+      dependencies.each do |dependency|
+        target_name = "#{stack_name}-#{dependency['name']}"
+        caret "Installing dependency #{pastel.cyan(dependency[:stack])} as #{pastel.cyan(target_name)}"
+        cmd = ['stack', 'install', '-n', target_name, '--parent-name', stack_name]
+
+        dependency['variables'].merge(dependency_values_from_options(dependency['name'])).each do |key, value|
+          cmd.concat ['-v', "#{key}=#{value}"]
+        end
+
+        cmd << '--no-deploy' unless deploy?
+
+        cmd << dependency['stack']
+        Kontena.run!(cmd)
+      end
+    end
 
-      stack['name'] = name if name
+    def create_stack
       spinner "Creating stack #{pastel.cyan(stack['name'])} " do
-        create_stack(stack)
+        client.post("grids/#{current_grid}/stacks", stack)
       end
-      Kontena.run!(['stack', 'deploy', stack['name']]) if deploy?
     end
 
-    def create_stack(stack)
-      client.post("grids/#{current_grid}/stacks", stack)
+    def deploy_stack
+      Kontena.run!(['stack', 'deploy', stack['name']])
     end
   end
 end

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

@@ -19,8 +19,22 @@ module Kontena::Cli::Stacks
       default:   Kontena.pastel.dim('⊝').freeze
     }
 
-    def stacks
-      client.get("grids/#{current_grid}/stacks")['stacks']
+    def stacks_by_names(stacks, name_list)
+      name_list.map { |name| stacks.find { |stack| stack['name'] == name } }.compact
+    end
+
+    def build_depths(stacks)
+      stacks.sort_by { |s| s['name'] }.each do |stack|
+        stack['depth'] += 1
+        stacks_by_names(stacks, stack['children'].map { |n| n['name'] }).each do |child_stack|
+          child_stack['depth'] += stack['depth']
+        end
+      end
+      stacks
+    end
+
+    def get_stacks
+      client.get("grids/#{current_grid}/stacks")['stacks'].tap { |stacks| stacks.map { |stack| stack['depth'] = 0 } }
     end
 
     def fields
@@ -35,9 +49,11 @@ module Kontena::Cli::Stacks
     end
 
     def execute
-      print_table(stacks) do |row|
+    stacks = build_depths(get_stacks)
+
+    print_table(stacks) do |row|
         next if quiet?
-        row['name'] = health_icon(stack_health(row)) + " " + row['name']
+        row['name'] = health_icon(stack_health(row)) + " " + tree_icon(row) + row['name']
         row['stack'] = "#{row['stack']}:#{row['version']}"
         row['services_count'] = row['services'].size
         row['ports'] = stack_ports(row).join(',')
@@ -59,6 +75,22 @@ module Kontena::Cli::Stacks
       HEALTH_ICONS.fetch(health) { HEALTH_ICONS[:default] }
     end
 
+    def tree_icon(row)
+      parent = row['parent']
+      children = row['children'] || []
+      if parent.nil? && children.empty?
+        # solo
+        char = ''
+      elsif parent.nil? && !children.empty?
+        char = ''
+      elsif !parent.nil?
+        char = '┗━'
+      end
+      left_pad = ' ' * (2 * (row['depth'] - 1))
+      right_pad = row['depth'] > 1 ? '━' : ''
+      left_pad + char + right_pad
+    end
+
     # @param [Hash] stack
     # @return [Array<String>]
     def stack_ports(stack)

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

@@ -9,13 +9,20 @@ module Kontena::Cli::Stacks
     banner "Shows logs from services in a stack"
 
     parameter "NAME", "Stack name"
+    parameter "[SERVICE] ...", "Service names"
 
     requires_current_master
     requires_current_master_token
 
     def execute
-      show_logs("stacks/#{current_grid}/#{name}/container_logs") do |log|
-        show_log(log)
+      if service_list.empty?
+        show_logs("stacks/#{current_grid}/#{name}/container_logs") do |log|
+          show_log(log)
+        end
+      else
+        show_logs("grids/#{current_grid}/container_logs", services: service_list.map {|s| [name, s].join('/')}.join(',')) do |log|
+          show_log(log)
+        end
       end
     end
 

data/lib/kontena/cli/stacks/registry/pull_command.rb

@@ -4,7 +4,7 @@ module Kontena::Cli::Stacks::Registry
   class PullCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::Stacks::Common
-    include Kontena::Cli::Stacks::Common::StackNameParam
+    include Kontena::Cli::Stacks::Common::RegistryNameParam
 
     banner "Pulls / downloads a stack from the stack registry"
 
@@ -14,7 +14,7 @@ module Kontena::Cli::Stacks::Registry
 
     def execute
       target = no_cache? ? stacks_client : Kontena::StacksCache
-      content = target.pull(stack_name, stack_version)
+      content = target.pull(stack_name.stack_name, stack_name.version)
       if return?
         return content
       elsif file

data/lib/kontena/cli/stacks/registry/push_command.rb

@@ -7,19 +7,30 @@ module Kontena::Cli::Stacks::Registry
 
     banner "Pushes (uploads) a stack to the stack registry"
 
-    parameter "FILENAME", "Stack file path"
+    include Kontena::Cli::Stacks::Common::StackFileOrNameParam
+    include Kontena::Cli::Stacks::Common::StackValuesFromOption
 
     requires_current_account_token
 
+    option '--dry-run', :flag, "Do not perform any uploading", hidden: true
+
+    def includes_local_dependencies?(dependencies = loader.dependencies)
+      return false if dependencies.nil?
+      dependencies.any? { |dep| Kontena::Cli::Stacks::YAML::StackFileLoader.for(dep['stack']).origin == 'file' || includes_local_dependencies(dep['depends']) }
+    end
+
+    def includes_local_extends?
+      stack.fetch(:services) { {} }.any? { |svc| svc['extends'] && svc[:extends]['file'] }
+    end
+
     def execute
-      file = Kontena::Cli::Stacks::YAML::Reader.new(
-        filename,
-        skip_variables: true,
-        skip_validation: true
-      )
-      name = "#{file.stack_name}:#{file.stack_version}"
-      spinner("Pushing #{pastel.cyan(name)} to stacks registry") do
-        stacks_client.push(file.stack_name, file.stack_version, file.raw_content)
+      set_env_variables(stack_name, 'validate', 'validate-platform')
+
+      exit_with_error "Stack file contains dependencies to local files" if includes_local_dependencies?
+      exit_with_error "Stack file has services that extend from local files" if includes_local_extends?
+
+      spinner("Pushing #{pastel.cyan(source)} to stacks registry as #{loader.stack_name}") do
+        stacks_client.push(stack_name, loader.stack_name.version, loader.content) unless dry_run?
       end
     end
   end

data/lib/kontena/cli/stacks/registry/remove_command.rb

@@ -4,7 +4,7 @@ module Kontena::Cli::Stacks::Registry
   class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::Stacks::Common
-    include Kontena::Cli::Stacks::Common::StackNameParam
+    include Kontena::Cli::Stacks::Common::RegistryNameParam
 
     banner "Removes a stack (or version) from the stack registry. Use user/stack_name or user/stack_name:version."
 
@@ -14,8 +14,8 @@ module Kontena::Cli::Stacks::Registry
 
     def execute
       unless force?
-        if stack_version
-          puts "About to delete #{pastel.cyan("#{stack_name}:#{stack_version}")} from the stacks registry"
+        if stack_name.version
+          puts "About to delete #{pastel.cyan("#{stack_name}")} from the stacks registry"
           confirm
         else
           puts "About to delete an entire stack and all of its versions from the stacks registry"
@@ -23,7 +23,7 @@ module Kontena::Cli::Stacks::Registry
         end
       end
       spinner "Removing #{pastel.cyan(stack_name)} from the registry" do
-        stacks_client.destroy(stack_name, stack_version)
+        stacks_client.destroy(stack_name.stack_name, stack_name.version)
       end
     end
   end

data/lib/kontena/cli/stacks/registry/show_command.rb

@@ -4,7 +4,7 @@ module Kontena::Cli::Stacks::Registry
   class ShowCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::Stacks::Common
-    include Kontena::Cli::Stacks::Common::StackNameParam
+    include Kontena::Cli::Stacks::Common::RegistryNameParam
 
     banner "Shows information about a stack on the stacks registry"
 
@@ -15,16 +15,16 @@ module Kontena::Cli::Stacks::Registry
     def execute
       require 'semantic'
       unless versions?
-        stack = ::YAML.safe_load(stacks_client.show(stack_name, stack_version))
+        stack = ::YAML.safe_load(stacks_client.show(stack_name.stack_name, stack_name.version))
         puts "#{stack['stack']}:"
-        puts "  #{"latest_" unless stack_version}version: #{stack['version']}"
+        puts "  #{"latest_" unless stack_name.version}version: #{stack['version']}"
         puts "  expose: #{stack['expose'] || '-'}"
         puts "  description: #{stack['description'] || '-'}"
 
         puts "  available_versions:"
       end
 
-      stacks_client.versions(stack_name).reject {|s| s['version'].nil? || s['version'].empty?}.map { |s| Semantic::Version.new(s['version'])}.sort.reverse_each do |version|
+      stacks_client.versions(stack_name.stack_name).reject {|s| s['version'].nil? || s['version'].empty?}.map { |s| Semantic::Version.new(s['version'])}.sort.reverse_each do |version|
         puts versions? ? version : "    - #{version}"
       end
     end

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

@@ -10,12 +10,38 @@ module Kontena::Cli::Stacks
 
     parameter "NAME", "Stack name"
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
+    option "--keep-dependencies", :flag, "Do not remove dependencies"
 
     requires_current_master
     requires_current_master_token
 
+    def fetch_stack
+      client.get("stacks/#{current_grid}/#{name}")
+    end
+
+    def confirm_remove(stack)
+      if stack['parent']
+        puts "#{pastel.yellow('Warning:')} The stack #{pastel.cyan(stack['parent']['name'])} depends on stack #{name}"
+      end
+      if stack['children'] && !stack['children'].empty?
+        puts "#{pastel.yellow('Warning:')} The stack #{pastel.cyan(name)} has dependencies that will be removed:"
+        stack['children'].each do |child|
+          puts "- #{pastel.yellow(child['name'])}"
+        end
+      end
+      confirm_command(name)
+    end
+
     def execute
-      confirm_command(name) unless forced?
+      stack = fetch_stack
+      confirm_remove(stack) unless forced?
+      unless keep_dependencies?
+        stack.fetch('children', Hash.new).each do |child_stack|
+          caret"Removing dependency #{pastel.cyan(child_stack['name'])}"
+          Kontena.run!(['stack', 'remove', '--force', child_stack['name']])
+        end
+      end
+
       spinner "Removing stack #{pastel.cyan(name)} " do
         remove_stack(name)
         wait_stack_removal(name)

data/lib/kontena/cli/stacks/service_generator.rb

@@ -27,12 +27,14 @@ module Kontena::Cli::Stacks
       data = {}
       data['instances'] = options['instances']
       data['image'] = parse_image(options['image'])
-      data['env'] = options['environment'] if options['environment']
+      data['env'] = options['environment'] || options['env']
       data['links'] = parse_links(options['links'] || [])
       data['external_links'] = parse_links(options['external_links'] || [])
       data['ports'] = parse_stringified_ports(options['ports'] || [])
       data['memory'] = parse_memory(options['mem_limit'].to_s) if options['mem_limit']
       data['memory_swap'] = parse_memory(options['memswap_limit'].to_s) if options['memswap_limit']
+      data['shm_size'] = parse_memory(options['shm_size'].to_s) if options['shm_size']
+      data['cpus'] = options['cpus'] if options['cpus']
       data['cpu_shares'] = options['cpu_shares'] if options['cpu_shares']
       data['volumes'] = options['volumes'] || []
       data['volumes_from'] = options['volumes_from'] || []
@@ -61,6 +63,7 @@ module Kontena::Cli::Stacks
       data['deploy_opts'] = deploy
       data['hooks'] = options['hooks'] || {}
       data['secrets'] = options['secrets'] if options['secrets']
+      data['certificates'] = options['certificates'] if options['certificates']
       data['build'] = parse_build_options(options) if options['build']
       data['health_check'] = parse_health_check(options)
       data['stop_grace_period'] = options['stop_grace_period'] if options['stop_grace_period']
@@ -85,7 +88,14 @@ module Kontena::Cli::Stacks
     # @return [Array<Hash>]
     def parse_links(link_options)
       link_options.map{|l|
-        service_name, alias_name = l.split(':')
+        if l.kind_of?(String)
+          service_name, alias_name = l.split(':')
+        elsif l.kind_of?(Hash)
+          service_name = l['name']
+          alias_name = l['alias']
+        else
+          raise TypeError, "Invalid link type #{l.class.name}, expecting String or Hash"
+        end
         if service_name.nil?
           raise ArgumentError.new("Invalid link value #{l}")
         end

data/lib/kontena/cli/stacks/show_command.rb

@@ -1,4 +1,5 @@
 require_relative 'common'
+require 'yaml'
 
 module Kontena::Cli::Stacks
   class ShowCommand < Kontena::Command
@@ -13,17 +14,35 @@ module Kontena::Cli::Stacks
     requires_current_master
     requires_current_master_token
 
+    option '--values', :flag, 'Output the variable-value pairs as YAML'
+    include Common::StackValuesToOption
+
     def execute
-      show_stack(name)
+      write_variables if values_to
+      values? ? show_variables : show_stack
+    end
+
+    def variables
+      @variables ||= stack['variables'] || {}
+    end
+
+    def stack
+      @stack ||= client.get("stacks/#{current_grid}/#{name}")
     end
 
-    def fetch_stack(name)
-      client.get("stacks/#{current_grid}/#{name}")
+    def show_variables
+      puts variable_yaml
     end
 
-    def show_stack(name)
-      stack = fetch_stack(name)
+    def variable_yaml
+      ::YAML.dump(variables)
+    end
 
+    def write_variables
+      File.write(values_to, variable_yaml)
+    end
+      
+    def show_stack
       puts "#{stack['name']}:"
       puts "  created: #{stack['created_at']}"
       puts "  updated: #{stack['updated_at']}"
@@ -32,6 +51,17 @@ module Kontena::Cli::Stacks
       puts "  version: #{stack['version']}"
       puts "  revision: #{stack['revision']}"
       puts "  expose: #{stack['expose'] || '-'}"
+      puts "  variables:#{' -' if variables.empty?}"
+      variables.each do |var, val|
+        puts "    #{var}: #{val}"
+      end
+      puts "  parent: #{stack['parent'] ? stack['parent']['name'] : '-'}"
+      if stack['children'] && !stack['children'].empty?
+        puts "  children:"
+        stack['children'].each do |child|
+          puts "    - #{child['name']}"
+        end
+      end
       puts "  services:"
       stack['services'].each do |service|
         show_service(service['id'])

data/lib/kontena/cli/stacks/stack_name.rb

@@ -0,0 +1,71 @@
+require 'semantic'
+
+module Kontena::Cli::Stacks
+  class StackName
+    # A class for parsing stack name strings, such as kontena/foo:1.0.0
+
+    attr_reader :user, :stack, :version
+
+    # @param definition [String] such as kontena/foo:1.0.0
+    # @param version [String] set version separately
+    # @return [StackName]
+    # @example
+    #   name = StackName.new('kontena/foo:0.1.0')
+    #   name.user => 'kontena'
+    #   name.stack => 'foo'
+    #   name.version => '0.1.0'
+    #   name.stack_name => 'kontena/foo'
+    #   name.to_s => 'kontena/foo:0.1.0
+    def initialize(definition = nil, version = nil)
+      if definition.kind_of?(Hash)
+        @user = definition[:user] || definition['user']
+        @stack = definition[:stack] || definition['stack']
+        @version = definition[:version] || definition['version'] || version
+      elsif definition.kind_of?(String)
+        parsed = parse(definition)
+        @user = parsed[:user]
+        @stack = parsed[:stack]
+        @version = parsed[:version] || version
+      end
+    end
+
+    # Stack name without version
+    # @return [String] example: kontena/foo
+    def stack_name
+      [user, stack].compact.join('/')
+    end
+
+    # Full stack name including version if present
+    # @return [String] example: kontena/foo:0.1.0
+    def to_s
+      version ? "#{stack_name}:#{version}" : stack_name
+    end
+    alias to_str to_s
+
+    # True when version is a prerelease
+    # @return [NilClass,TrueClass,FalseClass] nil when no version, true when prerelease, false when not.
+    def pre?
+      return nil if version.nil?
+      !Semantic::Version.new(version).pre.nil?
+    end
+
+    private
+
+    def parse(definition)
+      return {} if definition.empty?
+      name, version = definition.split(':', 2)
+      if name.include?('/')
+        user, stack = name.split('/', 2)
+      else
+        user = nil
+        stack = name
+      end
+      {
+        user: user,
+        stack: stack,
+        version: version
+      }
+    end
+
+  end
+end