kontena-cli 1.4.3 → 1.5.0.pre1

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

@@ -6,9 +6,9 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include StacksHelper
 
-    banner "Deploys all services of a stack that has been installed in a grid on Kontena Master"
+    banner "Deploys all services of a stack"
 
-    parameter "NAME", "Stack name"
+    parameter "NAME ...", "Stack name", attribute_name: :names
 
     option '--[no-]wait', :flag, 'Do not wait for service deployment', default: true
 
@@ -16,15 +16,17 @@ module Kontena::Cli::Stacks
     requires_current_master_token
 
     def execute
-      deployment = nil
-      spinner "Triggering deployment of stack #{pastel.cyan(name)}" do
-        deployment = deploy_stack(name)
-      end
-      if wait?
-        spinner "Waiting for deployment to start" do
-          wait_for_deployment_to_start(deployment)
+      names.each do |name|
+        deployment = nil
+        spinner "Triggering deployment of stack #{pastel.cyan(name)}" do
+          deployment = deploy_stack(name)
+        end
+        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
     end
 

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

@@ -0,0 +1,17 @@
+module Kontena::Cli::Stacks
+  class InspectCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    banner "Inspect a stack"
+
+    parameter "NAME", "Stack name"
+
+    requires_current_master
+    requires_current_master_token
+
+    def execute
+      puts client.get("stacks/#{current_grid}/#{name}")['source']
+    end
+  end
+end

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

@@ -36,7 +36,11 @@ module Kontena::Cli::Stacks
       dump_variables if values_to
 
       create_stack
-      deploy_stack if deploy?
+
+      if deploy?
+        deploy_dependencies
+        deploy_stack
+      end
     end
 
     def install_dependencies
@@ -46,18 +50,25 @@ module Kontena::Cli::Stacks
       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]
+        cmd = ['stack', 'install', '-n', target_name, '--parent-name', stack_name, '--no-deploy']
 
         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
+
+    def deploy_dependencies
+      dependencies = loader.dependencies
+      return if dependencies.nil?
 
+      dependencies.each do |dependency|
+        target_name = "#{stack_name}-#{dependency['name']}"
+        Kontena.run!(['stack', 'deploy', target_name])
+      end
     end
 
     def create_stack

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

@@ -53,7 +53,7 @@ module Kontena::Cli::Stacks
 
     print_table(stacks) do |row|
         next if quiet?
-        row['name'] = health_icon(stack_health(row)) + " " + tree_icon(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(',')
@@ -88,8 +88,7 @@ module Kontena::Cli::Stacks
         char = '┗━'
       end
       left_pad = ' ' * (2 * (row['depth'] - 1))
-      right_pad = row['depth'] > 1 ? '━' : ''
-      left_pad + char + right_pad
+      left_pad + char
     end
 
     # @param [Hash] stack

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

@@ -28,7 +28,7 @@ module Kontena::Cli::Stacks
 
     def show_log(log)
       color = color_for_container(log['name'])
-      prefix = "#{log['created_at']} [#{log['name']}]:".colorize(color)
+      prefix = pastel.send(color, "#{log['created_at']} [#{log['name']}]:")
       puts "#{prefix} #{log['data']}"
     end
   end

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

@@ -45,7 +45,7 @@ module Kontena::Cli::Stacks
         puts "services:"
         services.each do |service|
           color = color_for_service(service['name'])
-          puts "  #{"■".colorize(color)} #{service['name']} (#{service['instances']} instances)"
+          puts "  #{pastel.send(color, "■")} #{service['name']} (#{service['instances']} instances)"
         end
         puts "nodes:"
         node_names = nodes.keys.sort
@@ -59,7 +59,7 @@ module Kontena::Cli::Stacks
               icon = "□"
             end
             color = color_for_service(container['service'])
-            print icon.colorize(color)
+            print pastel.send(color, icon)
           end
           puts ''
         end

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

@@ -8,22 +8,38 @@ module Kontena::Cli::Stacks
 
     banner "Removes a stack in a grid on Kontena Master"
 
-    parameter "NAME", "Stack name"
+    parameter "NAME ...", "Stack name", attribute_name: :names
     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}")
+    def execute
+      names.each do |name|
+        stack = fetch_stack(name)
+        confirm_remove(stack, name) 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)
+        end
+      end
     end
 
-    def confirm_remove(stack)
+    # @param stack [Hash]
+    # @param name [String]
+    def confirm_remove(stack, name)
       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?
+      if !keep_dependencies? && 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'])}"
@@ -32,26 +48,19 @@ module Kontena::Cli::Stacks
       confirm_command(name)
     end
 
-    def execute
-      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)
-      end
+    # @param name [String]
+    # @return [Hash]
+    def fetch_stack(name)
+      client.get("stacks/#{current_grid}/#{name}")
     end
 
+    # @param name [String]
+    # @return [Hash]
     def remove_stack(name)
       client.delete("stacks/#{current_grid}/#{name}")
     end
 
+    # @param name [String]
     def wait_stack_removal(name)
       removed = false
       until removed == true

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

@@ -8,16 +8,17 @@ module Kontena::Cli::Stacks
 
     banner "Restarts all services of a stack that has been installed in a grid on Kontena Master"
 
-    parameter "NAME", "Stack name"
+    parameter "NAME ...", "Stack name", attribute_name: :names
 
     requires_current_master
     requires_current_master_token
 
     def execute
-      spinner "Sending restart signal for stack services" do
-        client.post("stacks/#{current_grid}/#{name}/restart", {})
+      names.each do |name|
+        spinner "Sending restart signal for stack #{name} services" do
+          client.post("stacks/#{current_grid}/#{name}/restart", {})
+        end
       end
     end
-
   end
 end

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

@@ -6,18 +6,19 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
-    banner "Stops all services of a stack that has been installed in a grid on Kontena Master"
+    banner "Stops all services of a stack"
 
-    parameter "NAME", "Stack name"
+    parameter "NAME ...", "Stack name", attribute_name: :names
 
     requires_current_master
     requires_current_master_token
 
     def execute
-      spinner "Sending stop signal for stack services" do
-        client.post("stacks/#{current_grid}/#{name}/stop", {})
+      names.each do |name|
+        spinner "Sending stop signal for stack #{name} services" do
+          client.post("stacks/#{current_grid}/#{name}/stop", {})
+        end
       end
     end
-
   end
 end

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

@@ -1,7 +1,6 @@
-require_relative 'common'
-require_relative 'change_resolver'
-
 require 'json'
+require 'kontena/stacks/change_resolver'
+require_relative 'common'
 
 module Kontena::Cli::Stacks
   class UpgradeCommand < Kontena::Command
@@ -21,13 +20,14 @@ module Kontena::Cli::Stacks
     option '--[no-]deploy', :flag, 'Trigger deploy after upgrade', default: true
 
     option '--force', :flag, 'Force upgrade'
-    option '--skip-dependencies', :flag, "Do not install any stack dependencies"
+    option '--skip-dependencies', :flag, "Do not upgrade any stack dependencies", default: false
+    option '--reuse-values', :flag, "Reuse existing values"
     option '--dry-run', :flag, "Simulate upgrade"
 
     requires_current_master
     requires_current_master_token
 
-    # @return [Kontena::Cli::Stacks::ChangeResolver]
+    # @return [Kontena::Stacks::ChangeResolver]
     def execute
       old_data = spinner "Reading stack #{pastel.cyan(stack_name)} from master" do
         gather_master_data(stack_name)
@@ -81,66 +81,72 @@ module Kontena::Cli::Stacks
       logger.debug { "Master stacks: #{old_data.keys.join(",")} YAML stacks: #{new_data.keys.join(",")}" }
 
       new_data.reverse_each do |stackname, data|
-        reader = data[:loader].reader
-        set_env_variables(stackname, current_grid) # set envs for execution time
-        data[:stack_data] = reader.execute(
-          values: data[:variables],
-          defaults: old_data[stackname].nil? ? nil : old_data[stackname][:stack_data]['variables'],
-          parent_name: data[:parent_name],
-          name: data[:name]
-        )
+        spinner "Processing stack #{pastel.cyan(stackname)}"
+        process_stack_data(stackname, data, old_data)
         hint_on_validation_notifications(reader.notifications, reader.loader.source)
         abort_on_validation_errors(reader.errors, reader.loader.source)
       end
 
-      set_env_variables(stack_name, current_grid) # restore envs
-
+      old_set = Kontena::Stacks::StackDataSet.new(old_data)
+      new_set = Kontena::Stacks::StackDataSet.new(new_data)
+      if skip_dependencies?
+        [old_set, new_set].each(&:remove_dependencies)
+      end
       spinner "Analyzing upgrade" do
-        Kontena::Cli::Stacks::ChangeResolver.new(old_data, new_data)
+        Kontena::Stacks::ChangeResolver.new(old_set, new_set)
       end
     end
 
-    def display_report(changes)
-      if !dry_run? && changes.removed_stacks.empty? && changes.replaced_stacks.empty? && changes.upgraded_stacks.size == 1 && changes.removed_services.empty?
-        return
-      end
-
-      will = dry_run? ? "would" : "will"
-
-      puts "SERVICES:"
-      puts "-" * 40
-
-      unless changes.removed_services.empty?
-        puts pastel.yellow("These services #{will} be removed from master:")
-        changes.removed_services.each { |svc| puts pastel.yellow(" - #{svc}") }
-        puts
-      end
-
-      unless changes.added_services.empty?
-        puts pastel.green("These new services #{will} be created to master:")
-        changes.added_services.each { |svc| puts pastel.green(" - #{svc}") }
-        puts
-      end
-
-      unless changes.upgraded_services.empty?
-        puts pastel.cyan("These services #{will} be upgraded:")
-        changes.upgraded_services.each do |svc|
-          puts pastel.cyan("- #{svc}")
-        end
-        puts
-      end
+    # @param stackname [String]
+    # @param data [Hash]
+    # @param old_data [Hash]
+    def process_stack_data(stackname, data, old_data)
+      prev_env = ENV.clone
+      reader = data[:loader].reader
+      values = data[:variables]
+      if reuse_values? && old_data[stackname]
+        old_vars = old_data[stackname][:stack_data]['variables']
+        values = old_vars.merge(values)
+      end
+      set_env_variables(stackname, current_grid) # set envs for execution time
+      parsed_stack = reader.execute(
+        values: values,
+        defaults: old_data[stackname].nil? ? nil : old_data[stackname][:stack_data]['variables'],
+        parent_name: data[:parent_name],
+        name: data[:name]
+      )
+      data[:stack_data] = parsed_stack
+    ensure
+      prev_env.each { |k, v| ENV[k] = v }
+    end
 
-      puts "STACKS:"
-      puts "-" * 40
+    # @param changes [Kontena::Stacks::ChangeResolver]
+    def display_report(changes)
+      puts
+      caret "Calculated changes:", dots: false
 
       unless changes.removed_stacks.empty?
-        puts pastel.red("These stacks #{will} be removed because they are no longer depended on:")
-        changes.removed_stacks.each { |stack| puts pastel.red("- #{stack}") }
-        puts
+        changes.removed_stacks.each { |stack|
+          puts "  #{pastel.red('-')} #{stack}"
+          changes.removed_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.red('-')} #{s}"
+          end
+        }
       end
 
       unless changes.replaced_stacks.empty?
-        puts pastel.yellow("These stacks #{will} be replaced by other stacks:")
+        changes.replaced_stacks.each { |stack|
+          puts "  #{pastel.yellow('-/+')} #{stack}"
+          changes.upgraded_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.cyan('~')} #{s}"
+          end
+          changes.added_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.green('+')} #{s}"
+          end
+          changes.removed_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.red('-')} #{s}"
+          end
+        }
         changes.replaced_stacks.each do |installed_name, data|
           puts "- #{pastel.yellow(installed_name)} from #{pastel.cyan(data[:from])} to #{pastel.cyan(data[:to])}"
         end
@@ -148,24 +154,35 @@ module Kontena::Cli::Stacks
       end
 
       unless changes.added_stacks.empty?
-        puts pastel.green("These new stack dependencies #{will} be installed:")
-        changes.added_stacks.each { |stack| puts pastel.green("- #{stack}") }
-        puts
+        changes.added_stacks.each { |stack|
+          puts "  #{pastel.green('+')} #{stack}"
+          changes.added_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.green('+')} #{s}"
+          end
+        }
       end
 
       unless changes.upgraded_stacks.empty?
-        puts pastel.cyan("These stacks #{will} be upgraded#{' and deployed' if deploy?}:")
-        changes.upgraded_stacks.each { |stack| puts pastel.cyan("- #{stack}") }
-        puts
+        changes.upgraded_stacks.each { |stack|
+          puts "  #{pastel.cyan('~')} #{stack}"
+          changes.upgraded_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.cyan('~')} #{s}"
+          end
+          changes.added_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.green('+')} #{s}"
+          end
+          changes.removed_services.select { |s| s.split('/')[0] == stack }.each do |s|
+            puts "    #{pastel.red('-')} #{s}"
+          end
+        }
       end
-
       puts
     end
 
     # requires heavier confirmation when something very dangerous is going to happen
     def get_confirmation(changes)
       unless force?
-        unless changes.removed_services.empty? && changes.removed_stacks.empty? && changes.replaced_stacks.empty?
+        unless changes.safe?
           puts "#{pastel.red('Warning:')} This can not be undone, data will be lost."
           confirm
         end
@@ -176,23 +193,25 @@ module Kontena::Cli::Stacks
       @deployable_stacks ||= []
     end
 
+    # @param removed_stacks [Array<String>]
     def run_removes(removed_stacks)
       removed_stacks.reverse_each do |removed_stack|
         Kontena.run!('stack', 'remove', '--force', '--keep-dependencies', removed_stack)
       end
     end
 
+    # @param changes [Kontena::Stacks::ChangeResolver]
     # @return [Array] an array of stack names that have been installed, but not yet deployed
     def run_installs(changes)
       deployable_stacks = []
       changes.added_stacks.reverse_each do |added_stack|
         data = changes.new_data[added_stack]
         cmd = ['stack', 'install', '--name', added_stack, '--no-deploy']
-        cmd.concat ['--parent-name', data[:parent_name]] if data[:parent_name]
-        data[:variables].each do |k,v|
+        cmd.concat ['--parent-name', data.parent] unless data.root?
+        data.variables.each do |k,v|
           cmd.concat ['-v', "#{k}=#{v}"]
         end
-        cmd << data[:loader].source
+        cmd << data.loader.source
         caret "Installing new dependency #{cmd.last} as #{added_stack}"
         deployable_stacks << added_stack
         Kontena.run!(cmd)
@@ -200,14 +219,15 @@ module Kontena::Cli::Stacks
       deployable_stacks
     end
 
+    # @param changes [Kontena::Stacks::ChangeResolver]
     # @return [Array] an array of stack names that have been upgraded, but not yet deployed
     def run_upgrades(changes)
       deployable_stacks = []
       changes.upgraded_stacks.reverse_each do |upgraded_stack|
         data = changes.new_data[upgraded_stack]
-        spinner "Upgrading #{stack_name == upgraded_stack ? 'stack' : 'dependency'} #{pastel.cyan(upgraded_stack)}" do |spin|
+        spinner "Upgrading #{data.root? ? 'stack' : 'dependency'} #{pastel.cyan(upgraded_stack)}" do |spin|
           deployable_stacks << upgraded_stack
-          update_stack(upgraded_stack, data[:stack_data]) || spin.fail!
+          update_stack(upgraded_stack, data.data) || spin.fail!
         end
       end
       deployable_stacks