kontena-cli 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb909be3c98e6f195a842ad6291f01a061f5a99e
-  data.tar.gz: e19fbfaeb34ae9b1f980bdcd9daf1f5a946a4339
+  metadata.gz: 4ba22a3516366cf0d4cb3d9b44e4460984a0cabf
+  data.tar.gz: 9e220dd6c8231906600723523ca8e59badc537ab
 SHA512:
-  metadata.gz: 35adfcc4263f86a37f5d87c2ccc487c1db64e831092f1eeb9538575d7f01f11053001c52925d89f401806a8e7767cd5907893809bd497efa798a6acaa30b4705
-  data.tar.gz: b32a33ee26a54ba74db995a020a95ca7f310f43da9bc144ab6147fdeafeec3d927765f82df3defb98e27854a8b240c6864eae1979608dd5160b0aab1aff47292
+  metadata.gz: 4088c0e1841b305ff61091f29adcae757045ecdf629840dd0988c83efc91e4b63d22e993c6766c3c36642c5e0fcdca3a48ef4a3e8c4ce405d73c0f1d6a9e9d9a
+  data.tar.gz: c15c7cee466cd4510f09616651d1ade116ba0b62e2c7dc8c6d415b630d88efbd88a665058dc2e474176dfbc1d846c454411cca16a80d0827c486d66bb10aa86d

data/VERSION

@@ -1 +1 @@
-1.0.0.pre2
+1.0.0.pre3

data/lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb

@@ -17,6 +17,7 @@ module Kontena
         if response && response.kind_of?(Hash) && response.has_key?('data') && response['data'].has_key?('attributes')
           user_data[:email] = response['data']['attributes']['email']
           user_data[:username] = response['data']['attributes']['username']
+          user_data[:id] = response['data']['id']
           user_data[:verified] = response['data']['attributes']['verified']
           @cloud_user_data = user_data
         end
@@ -32,7 +33,7 @@ module Kontena
 
         invite_response = nil
         spinner "Creating user #{cloud_user_data[:email]} into Kontena Master" do |spin|
-          invite_response = Kontena.run("master users invite --return #{cloud_user_data[:email].shellescape}", returning: :result)
+          invite_response = Kontena.run("master users invite --external-id #{cloud_user_data[:id]} --return #{cloud_user_data[:email].shellescape}", returning: :result)
           unless invite_response.kind_of?(Hash) && invite_response.has_key?('invite_code')
             spin.fail
           end

data/lib/kontena/cli/master/users/invite_command.rb

@@ -9,6 +9,7 @@ module Kontena::Cli::Master::Users
 
     option ['-r', '--roles'], '[ROLES]', 'Comma separated list of roles to assign to the invited users'
     option ['-c', '--code'], :flag, 'Only output the invite code'
+    option '--external-id', '[EXTERNAL ID]', 'Assign external id to user', hidden: true
     option '--return', :flag, 'Return the code', hidden: true
 
     requires_current_master
@@ -20,10 +21,13 @@ module Kontena::Cli::Master::Users
       else
         roles = []
       end
-
+      external_id = nil
+      if email_list.size == 1 && self.external_id
+        external_id = self.external_id
+      end
       email_list.each do |email|
         begin
-          data = { email: email, response_type: 'invite' }
+          data = { email: email, external_id: external_id, response_type: 'invite' }
           response = client.post('/oauth2/authorize', data)
           if self.code?
             puts response['invite_code']

data/lib/kontena/cli/stack_command.rb

@@ -7,27 +7,21 @@ require_relative 'stacks/show_command'
 require_relative 'stacks/build_command'
 require_relative 'stacks/monitor_command'
 require_relative 'stacks/logs_command'
-require_relative 'stacks/push_command'
-require_relative 'stacks/pull_command'
-require_relative 'stacks/search_command'
-require_relative 'stacks/install_command'
+require_relative 'stacks/registry_command'
 
 class Kontena::Cli::StackCommand < Kontena::Command
 
-  subcommand "install", "Install a stack", Kontena::Cli::Stacks::InstallCommand
-  subcommand "build", "Build stack file images", Kontena::Cli::Stacks::BuildCommand
-  subcommand ["ls", "list"], "List stacks", Kontena::Cli::Stacks::ListCommand
-  subcommand "show", "Show stack details", Kontena::Cli::Stacks::ShowCommand
-  subcommand "upgrade", "Upgrade installed stack", Kontena::Cli::Stacks::UpgradeCommand
-  subcommand "deploy", "Deploy stack", Kontena::Cli::Stacks::DeployCommand
-  subcommand "logs", "Show logs from stack services", Kontena::Cli::Stacks::LogsCommand
-  subcommand "monitor", "Monitor stack services", Kontena::Cli::Stacks::MonitorCommand
-  subcommand ["remove","rm"], "Remove a deployed stack", Kontena::Cli::Stacks::RemoveCommand
-  subcommand "push", "Push a stack to stacks registry", Kontena::Cli::Stacks::PushCommand
-  subcommand ["pull", "get"], "Pull a stack from stacks registry", Kontena::Cli::Stacks::PullCommand
-  subcommand "install", "Deploy a stack to Kontena Master", Kontena::Cli::Stacks::InstallCommand
-  subcommand "search", "Search for stacks in stacks repository", Kontena::Cli::Stacks::SearchCommand
-  
+  subcommand "install", "Install a stack to a grid", Kontena::Cli::Stacks::InstallCommand
+  subcommand ["ls", "list"], "List installed stacks in a grid", Kontena::Cli::Stacks::ListCommand
+  subcommand ["remove","rm"], "Remove a deployed stack from a grid", Kontena::Cli::Stacks::RemoveCommand
+  subcommand "show", "Show details about a stack in a grid", Kontena::Cli::Stacks::ShowCommand
+  subcommand "upgrade", "Upgrade a stack in a grid", Kontena::Cli::Stacks::UpgradeCommand
+  subcommand ["start", "deploy"], "Deploy an installed stack in a grid", Kontena::Cli::Stacks::DeployCommand
+  subcommand "logs", "Show logs from services in a stack", Kontena::Cli::Stacks::LogsCommand
+  subcommand "monitor", "Monitor services in a stack", Kontena::Cli::Stacks::MonitorCommand
+  subcommand "build", "Build images listed in a stack file and push them to an image registry", Kontena::Cli::Stacks::BuildCommand
+  subcommand "registry", "Stack registry related commands", Kontena::Cli::Stacks::RegistryCommand
+
   def execute
   end
 end

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

@@ -1,10 +1,12 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class BuildCommand < Clamp::Command
+  class BuildCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 
+    banner "Build images listed in a stack file and push them to your image registry"
+
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
     option ['--no-cache'], :flag, 'Do not use cache when building the image', default: false
     option ['--no-push'], :flag, 'Do not push images to registry', default: false

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

@@ -7,6 +7,23 @@ module Kontena::Cli::Stacks
   module Common
     include Kontena::Cli::Services::ServicesHelper
 
+    module StackNameParam
+      attr_accessor :stack_version
+
+      def self.included(where)
+        where.parameter "STACK_NAME", "Stack name, for example user/stackname or user/stackname:version" do |name|
+          if name.include?(':')
+            name, @stack_version = name.split(':',2 )
+          end
+          name
+        end
+      end
+    end
+
+    def stack_name
+      @stack_name ||= self.name || stack_name_from_yaml(filename)
+    end
+
     def stack_from_yaml(filename)
       reader = Kontena::Cli::Stacks::YAML::Reader.new(filename)
       if reader.stack_name.nil?

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

@@ -6,33 +6,34 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
+    banner "Deploys all services of a stack that has been installed in a grid on Kontena Master"
+
     parameter "NAME", "Stack name"
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
+    requires_current_master_token
 
+    def execute
       deployment = nil
       spinner "Deploying stack #{pastel.cyan(name)}" do
-        deployment = deploy_stack(token, name)
+        deployment = deploy_stack(name)
         deployment['service_deploys'].each do |service_deploy|
-          wait_for_deploy_to_finish(token, service_deploy)
+          wait_for_deploy_to_finish(service_deploy)
         end
       end
     end
 
-    def deploy_stack(token, name)
-      client(token).post("stacks/#{current_grid}/#{name}/deploy", {})
+    def deploy_stack(name)
+      client.post("stacks/#{current_grid}/#{name}/deploy", {})
     end
 
-    # @param [String] token
     # @param [Hash] deployment
     # @return [Boolean]
-    def wait_for_deploy_to_finish(token, deployment, timeout = 600)
+    def wait_for_deploy_to_finish(deployment, timeout = 600)
       deployed = false
       Timeout::timeout(timeout) do
         until deployed
-          deployment = client(token).get("services/#{deployment['service_id']}/deploys/#{deployment['id']}")
+          deployment = client.get("services/#{deployment['service_id']}/deploys/#{deployment['id']}")
           deployed = true if deployment['finished_at']
           sleep 1
         end

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

@@ -6,25 +6,28 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
+    banner "Installs a stack to a grid on Kontena Master"
+
     parameter "[FILE]", "Kontena stack file", default: "kontena.yml", attribute_name: :filename
 
     option ['-n', '--name'], 'NAME', 'Define stack name (by default comes from stack file)'
     option '--deploy', :flag, 'Deploy after installation'
 
+    requires_current_master
+    requires_current_master_token
+
     def execute
-      require_api_url
-      token = require_token
       require_config_file(filename)
       stack = stack_from_yaml(filename)
       stack['name'] = name if name
       spinner "Creating stack #{pastel.cyan(stack['name'])} " do
-        create_stack(token, stack)
+        create_stack(stack)
       end
       Kontena.run("stack deploy #{stack['name']}") if deploy?
     end
 
-    def create_stack(token, stack)
-      client(token).post("grids/#{current_grid}/stacks", stack)
+    def create_stack(stack)
+      client.post("grids/#{current_grid}/stacks", stack)
     end
   end
 end

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

@@ -6,7 +6,10 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
+    banner "Lists all installed stacks on a grid in Kontena Master"
+
     requires_current_master
+    requires_current_master_token
 
     def execute
       list_stacks

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

@@ -1,18 +1,20 @@
 module Kontena::Cli::Stacks
-  class LogsCommand < Clamp::Command
+  class LogsCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Helpers::LogHelper
 
+    banner "Shows logs from services in a stack"
+
     parameter "NAME", "Stack name"
     option ["-t", "--tail"], :flag, "Tail (follow) logs", default: false
     option ["-l", "--lines"], "LINES", "How many lines to show", default: '100'
     option "--since", "SINCE", "Show logs since given timestamp"
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
+    requires_current_master_token
 
+    def execute
       query_params = {}
       query_params[:limit] = lines if lines
       query_params[:since] = since if since

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

@@ -1,33 +1,34 @@
 require_relative 'common'
 
 module Kontena::Cli::Stacks
-  class MonitorCommand < Clamp::Command
+  class MonitorCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common
 
+    banner "Monitor services in a stack"
+
     parameter "NAME", "Stack name"
     parameter "[SERVICES] ...", "Stack services to monitor", attribute_name: 'selected_services'
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
+    requires_current_master_token
 
-      response = client(token).get("grids/#{current_grid}/services?stack=#{name}")
+    def execute
+      response = client.get("grids/#{current_grid}/services?stack=#{name}")
       services = response['services']
       if selected_services.size > 0
         services.delete_if{ |s| !selected_services.include?(s['name'])}
       end
-      show_monitor(token, services)
+      show_monitor(services)
     end
 
-    # @param [String] token
     # @param [Array<Hash>]
-    def show_monitor(token, services)
+    def show_monitor(services)
       loop do
         nodes = {}
         services.each do |service|
-          result = client(token).get("services/#{service['id']}/containers") rescue nil
+          result = client.get("services/#{service['id']}/containers") rescue nil
           service['instances'] = 0
           if result
             service['instances'] = result['containers'].size

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

@@ -0,0 +1,28 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class PullCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+    include Kontena::Cli::Stacks::Common::StackNameParam
+
+    banner "Pulls / downloads a stack from the stack registry"
+
+    option ['-F', '--file'], '[FILENAME]', "Write to file (default STDOUT)"
+    option '--no-cache', :flag, "Don't use local cache"
+    option '--return', :flag, 'Return the result', hidden: true
+
+    def execute
+      target = no_cache? ? stacks_client : Kontena::StacksCache
+      content = target.pull(stack_name, stack_version)
+      if return?
+        return content
+      elsif file
+        File.write(file, content)
+        puts pastel.green("Wrote #{content.bytesize} bytes to #{file}")
+      else
+        puts content
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class PushCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+
+    banner "Pushes (uploads) a stack to the stack registry"
+
+    parameter "FILENAME", "Stack file path"
+
+    requires_current_account_token
+
+    def execute
+      file = Kontena::Cli::Stacks::YAML::Reader.new(filename, skip_variables: true, replace_missing: "filler")
+      name = "#{file.yaml['stack']}:#{file.yaml['version']}"
+      spinner("Pushing #{pastel.cyan(name)} to stacks registry") do
+        stacks_client.push(file.yaml['stack'], file.yaml['version'], file.raw_content)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class RemoveCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+    include Kontena::Cli::Stacks::Common::StackNameParam
+
+    banner "Removes a stack (or version) from the stack registry. Use user/stack_name or user/stack_name:version."
+
+    option ['-f', '--force'], :flag, "Force delete"
+
+    requires_current_account_token
+
+    def execute
+      unless force?
+        if stack_version
+          puts "About to delete #{pastel.cyan("#{stack_name}:#{stack_version}")} from the stacks registry"
+          confirm
+        else
+          puts "About to delete an entire stack and all of its versions from the stacks registry"
+          confirm_command(stack_name)
+        end
+      end
+      spinner "Removing #{pastel.cyan(stack_name)} from the registry" do
+        stacks_client.destroy(stack_name, stack_version)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class SearchCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+
+    banner "Search for stacks on the stack registry"
+
+    parameter "[QUERY]", "Query string"
+
+    def execute
+      results = stacks_client.search(query.to_s)
+      exit_with_error 'Nothing found' if results.empty?
+      titles = ['NAME', 'VERSION', 'DESCRIPTION']
+      columns = "%-40s %-10s %-40s"
+      puts columns % titles
+      results.each do |stack|
+        stack = ::YAML.load(stacks_client.show(stack['name'])) rescue nil
+        puts columns % [stack['stack'], stack['version'], stack['description'] || '-'] if stack
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require_relative '../common'
+
+module Kontena::Cli::Stacks::Registry
+  class ShowCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::Stacks::Common
+    include Kontena::Cli::Stacks::Common::StackNameParam
+
+    banner "Shows information about a stack on the stacks registry"
+
+    option ['-v', '--versions'], :flag, "Only list available versions"
+
+    requires_current_account_token
+
+    def execute
+      stack = ::YAML.load(stacks_client.show(stack_name))
+      puts "#{stack['stack']}:"
+      puts "  latest_version: #{stack['version']}"
+      puts "  expose: #{stack['expose'] || '-'}"
+      puts "  description: #{stack['description'] || '-'}"
+
+      puts "  available_versions:"
+      stacks_client.versions(stack_name).map { |s| s['version']}.sort.reverse_each do |version|
+        puts "    - #{version}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Kontena::Cli::Stacks
+
+  require_relative 'registry/push_command'
+  require_relative 'registry/pull_command'
+  require_relative 'registry/search_command'
+  require_relative 'registry/show_command'
+  require_relative 'registry/remove_command'
+
+  class RegistryCommand < Kontena::Command
+
+    subcommand "push", "Push a stack into the stacks registry", Registry::PushCommand
+    subcommand "pull", "Pull a stack from the stacks registry", Registry::PullCommand
+    subcommand "search", "Search for stacks in the stacks registry", Registry::SearchCommand
+    subcommand "show", "Show info about a stack in the stacks registry", Registry::ShowCommand
+    subcommand ["remove", "rm"], "Remove a stack (or version) from the stacks registry", Registry::RemoveCommand
+  end
+end

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

@@ -6,29 +6,31 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
+    banner "Removes a stack in a grid on Kontena Master"
+
     parameter "NAME", "Stack name"
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
+    requires_current_master_token
 
+    def execute
       confirm_command(name) unless forced?
       spinner "Removing stack #{pastel.cyan(name)} " do
-        remove_stack(token, name)
-        wait_stack_removal(token, name)
+        remove_stack(name)
+        wait_stack_removal(name)
       end
     end
 
-    def remove_stack(token, name)
-      client(token).delete("stacks/#{current_grid}/#{name}")
+    def remove_stack(name)
+      client.delete("stacks/#{current_grid}/#{name}")
     end
 
-    def wait_stack_removal(token, name)
+    def wait_stack_removal(name)
       removed = false
       until removed == true
         begin
-          client(token).get("stacks/#{current_grid}/#{name}")
+          client.get("stacks/#{current_grid}/#{name}")
           sleep 1
         rescue Kontena::Errors::StandardError => exc
           if exc.status == 404

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

@@ -6,17 +6,19 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
+    banner "Show information and status of a stack in a grid on Kontena Master"
+
     parameter "NAME", "Stack name"
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
+    requires_current_master_token
 
-      show_stack(token, name)
+    def execute
+      show_stack(name)
     end
 
-    def show_stack(token, name)
-      stack = client(token).get("stacks/#{current_grid}/#{name}")
+    def show_stack(name)
+      stack = client.get("stacks/#{current_grid}/#{name}")
 
       puts "#{stack['name']}:"
       puts "  state: #{stack['state']}"
@@ -26,14 +28,13 @@ module Kontena::Cli::Stacks
       puts "  expose: #{stack['expose'] || '-'}"
       puts "  services:"
       stack['services'].each do |service|
-        show_service(token, service['id'])
+        show_service(service['id'])
       end
     end
 
-    # @param [String] token
     # @param [String] service_id
-    def show_service(token, service_id)
-      service = get_service(token, service_id)
+    def show_service(service_id)
+      service = get_service(service_id)
       pad = '    '.freeze
       puts "#{pad}#{service['name']}:"
       puts "#{pad}  image: #{service['image']}"

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

@@ -6,23 +6,26 @@ module Kontena::Cli::Stacks
     include Kontena::Cli::GridOptions
     include Common
 
+    banner "Upgrades a stack in a grid on Kontena Master"
+
     parameter "NAME", "Stack name"
     parameter "[FILE]", "Kontena stack file", default: "kontena.yml"
     option '--deploy', :flag, 'Deploy after upgrade'
 
+    requires_current_master
+    requires_current_master_token
+
     def execute
-      require_api_url
-      token = require_token
       require_config_file(file)
       stack = stack_from_yaml(file)
       spinner "Upgrading stack #{pastel.cyan(name)} " do
-        update_stack(token, stack)
+        update_stack(stack)
       end
       Kontena.run("stack deploy #{name}") if deploy?
     end
 
-    def update_stack(token, stack)
-      client(token).put("stacks/#{current_grid}/#{name}", stack)
+    def update_stack(stack)
+      client.put("stacks/#{current_grid}/#{name}", stack)
     end
   end
 end

data/lib/kontena/cli/stacks/yaml/custom_validators/extends_validator.rb

@@ -12,7 +12,8 @@ module Kontena::Cli::Stacks::YAML::Validations::CustomValidators
       if value.is_a?(Hash)
         extends_validation = {
           'service' => 'string',
-          'file' => HashValidator.optional('string')
+          'file' => HashValidator.optional('string'),
+          'stack' => HashValidator.optional('string')
         }
         HashValidator.validator_for(extends_validation).validate(key, value, extends_validation, errors)
       end

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

@@ -4,10 +4,11 @@ module Kontena::Cli::Stacks
   module YAML
     class Reader
       include Kontena::Util
+      include Kontena::Cli::Common
 
       attr_reader :file, :raw_content, :result, :errors, :notifications, :variables, :yaml
 
-      def initialize(file, skip_validation: false, skip_variables: false, replace_missing: nil)
+      def initialize(file, skip_validation: false, skip_variables: false, replace_missing: nil, from_registry: false)
         require 'yaml'
         require_relative 'service_extender'
         require_relative 'validator_v3'
@@ -17,7 +18,16 @@ module Kontena::Cli::Stacks
         require_relative 'opto/prompt_resolver'
 
         @file = file
-        @raw_content = File.read(File.expand_path(file))
+        @from_registry = from_registry
+
+        if from_registry?
+          require 'shellwords'
+          @raw_content = Kontena::StacksCache.pull(file)
+          @registry    = Kontena::StacksCache::RegistryClientFactory.new.stacks_client.api_url
+        else
+          @raw_content = File.read(File.expand_path(file))
+        end
+
         @errors = []
         @notifications = []
         @skip_validation  = skip_validation
@@ -27,6 +37,10 @@ module Kontena::Cli::Stacks
         parse_yaml
       end
 
+      def from_registry?
+        @from_registry == true
+      end
+
       # @return [Opto::Group]
       def variables
         return @variables if @variables
@@ -49,10 +63,11 @@ module Kontena::Cli::Stacks
       # @return [Hash]
       def execute(service_name = nil)
         result = {}
-        Dir.chdir(File.dirname(File.expand_path(file))) do
+        Dir.chdir(from_registry? ? Dir.pwd : File.dirname(File.expand_path(file))) do
           result[:stack]         = yaml['stack']
           result[:version]       = self.stack_version
           result[:name]          = self.stack_name
+          result[:registry]      = @registry if from_registry?
           result[:expose]        = yaml['expose']
           result[:errors]        = errors unless skip_validation?
           result[:notifications] = notifications
@@ -239,9 +254,12 @@ module Kontena::Cli::Stacks
       def extend_config(service_config)
         extended_service = extended_service(service_config['extends'])
         return unless extended_service
-        filename = service_config['extends']['file']
+        filename  = service_config['extends']['file']
+        stackname = service_config['extends']['stack']
         if filename
           parent_config = from_external_file(filename, extended_service)
+        elsif stackname
+          parent_config = from_external_file(stackname, extended_service, from_registry: true)
         else
           raise ("Service '#{extended_service}' not found in #{file}") unless services.has_key?(extended_service)
           parent_config = process_config(services[extended_service])
@@ -259,8 +277,8 @@ module Kontena::Cli::Stacks
         end
       end
 
-      def from_external_file(filename, service_name)
-        outcome = Reader.new(filename, skip_validation: @skip_validation, skip_variables: true, replace_missing: @replace_missing).execute(service_name)
+      def from_external_file(filename, service_name, from_registry: false)
+        outcome = Reader.new(filename, skip_validation: @skip_validation, skip_variables: true, replace_missing: @replace_missing, from_registry: from_registry).execute(service_name)
         errors.concat outcome[:errors] unless errors.any? { |item| item.has_key?(filename) }
         notifications.concat outcome[:notifications] unless notifications.any? { |item| item.has_key?(filename) }
         outcome[:services]

data/lib/kontena/command.rb

@@ -91,17 +91,23 @@ class Kontena::Command < Clamp::Command
   end
 
   def self.requires_current_master
-    banner "#{Kontena.pastel.green("Requires current master")}: This command requires that you have selected a current master using 'kontena master login' or 'kontena master use'. You can also use the environment variable KONTENA_URL to specify the master address or KONTENA_MASTER=master_name to override the current_master setting."
+    unless Kontena::Cli::Config.current_master
+      banner "#{Kontena.pastel.green("Requires current master")}: This command requires that you have selected a current master using 'kontena master login' or 'kontena master use'. You can also use the environment variable KONTENA_URL to specify the master address or KONTENA_MASTER=master_name to override the current_master setting."
+    end
     @requires_current_master = true
   end
 
   def self.requires_current_grid
-    banner "#{Kontena.pastel.green("Requires current grid")}: This command requires that you have selected a grid as the current grid using 'kontena grid use' or by setting KONTENA_GRID environment variable."
+    unless Kontena::Cli::Config.current_grid
+      banner "#{Kontena.pastel.green("Requires current grid")}: This command requires that you have selected a grid as the current grid using 'kontena grid use' or by setting KONTENA_GRID environment variable."
+    end
     @requires_current_grid = true
   end
 
   def self.requires_current_account_token
-    banner "#{Kontena.pastel.green("Requires account authentication")}: This command requires that you have authenticated to Kontena Cloud using 'kontena cloud auth'"
+    unless Kontena::Cli::Config.current_account && Kontena::Cli::Config.current_account.token && Kontena::Cli::Config.current_account.token.access_token
+      banner "#{Kontena.pastel.green("Requires account authentication")}: This command requires that you have authenticated to Kontena Cloud using 'kontena cloud auth'"
+    end
     @requires_current_account_token = true
   end
 

data/lib/kontena/stacks_cache.rb

@@ -1,13 +1,14 @@
 require_relative 'stacks_client'
 require_relative 'cli/common'
 require_relative 'cli/stacks/common'
+require 'yaml'
 
 module Kontena
   class StacksCache
     class CachedStack
 
-      attr_reader :stack
-      attr_reader :version
+      attr_accessor :stack
+      attr_accessor :version
 
       def initialize(stack, version = nil)
         unless version
@@ -15,7 +16,6 @@ module Kontena
         end
         @stack = stack
         @version = version
-        raise ArgumentError, "Stack name and version required" unless @stack && @version
       end
 
       def read
@@ -27,6 +27,11 @@ module Kontena
       end
 
       def write(content)
+        raise ArgumentError, "Stack name and version required" unless @stack && @version
+        unless File.directory?(File.dirname(path))
+          require 'fileutils'
+          FileUtils.mkdir_p(File.dirname(path))
+        end
         File.write(path, content)
       end
 
@@ -35,14 +40,14 @@ module Kontena
       end
 
       def cached?
+        return false unless version
         File.exist?(path)
       end
 
       def path
-        return @path if @path
-        @path = File.expand_path(File.join(base_path, stack, version))
-        raise "Path traversal attempted" unless @path.start_with?(base_path)
-        @path
+        path = File.expand_path(File.join(base_path, "#{stack}-#{version}.yml"))
+        raise "Path traversal attempted" unless path.start_with?(base_path)
+        path
       end
 
       private
@@ -58,13 +63,34 @@ module Kontena
     end
 
     class << self
-      def get(stack, version = nil)
+      def pull(stack, version = nil)
         cache(stack, version).read
       end
 
+      def dputs(msg)
+        ENV["DEBUG"] && puts(msg)
+      end
+
       def cache(stack, version = nil)
         stack = CachedStack.new(stack, version)
-        stack.write(client.pull(stack.stack, stack.version)) unless stack.cached?
+        if stack.cached?
+          dputs "Reading from cache: #{stack.path}"
+        else
+          dputs "Retrieving #{stack.stack}:#{stack.version} from registry"
+          content = client.pull(stack.stack, stack.version)
+          yaml    = ::YAML.load(content)
+          new_stack = CachedStack.new(yaml['stack'], yaml['version'])
+          if new_stack.cached?
+            dputs "Already cached"
+            stack = new_stack
+          else
+            stack.stack = yaml['stack']
+            stack.version = yaml['version']
+            dputs "Writing #{stack.path}"
+            stack.write(content)
+            dputs "#{stack.stack}:#{stack.version} cached to #{stack.path}"
+          end
+        end
         stack
       end
 

data/lib/kontena/stacks_client.rb

@@ -7,31 +7,35 @@ module Kontena
     ACCEPT_YAML = { 'Accept' => 'application/yaml' }
     CT_YAML     = { 'Content-Type' => 'application/yaml' }
 
-    def path_to(repo_name, version = nil)
-      version ? "/stack/#{repo_name}/version/#{version}" : "/stack/#{repo_name}"
+    def path_to(stack_name, version = nil)
+      version ? "/stack/#{stack_name}/version/#{version}" : "/stack/#{stack_name}"
     end
 
-    def push(repo_name, version, data)
+    def push(stack_name, version, data)
       post('/stack/', data, {}, CT_YAML)
     end
 
-    def pull(repo_name, version = nil)
-      get(path_to(repo_name, version), {}, ACCEPT_YAML)
+    def show(stack_name)
+      get("#{path_to(stack_name, nil)}", {}, ACCEPT_JSON)
+    end
+
+    def versions(stack_name)
+      get("#{path_to(stack_name, nil)}/versions", {}, ACCEPT_JSON)['versions']
+    end
+
+    def pull(stack_name, version = nil)
+      get(path_to(stack_name, version), {}, ACCEPT_YAML)
     rescue StandardError => ex
-      ex.message << " : #{path_to(repo_name, version)}"
+      ex.message << " : #{path_to(stack_name, version)}"
       raise ex, ex.message
     end
 
     def search(query)
-      get('/search', { q: query }, {}, ACCEPT_JSON)
-    end
-
-    def versions(repo_name)
-      get("#{path_to(repo_name)}/versions", {}, ACCEPT_JSON)
+      get('/search', { q: query }, {}, ACCEPT_JSON)['stacks']
     end
 
-    def destroy(repo_name, version = nil)
-      delete(path_to(repo_name, version))
+    def destroy(stack_name, version = nil)
+      delete(path_to(stack_name, version), {})
     end
   end
 end

data/spec/fixtures/stack-with-ifs.yml

@@ -0,0 +1,51 @@
+stack: user/stackname
+version: 0.1.1
+variables:
+  db:
+    type: enum
+    required: true
+    options:
+      - value: mysql
+        label: MySQL
+        description: Regular MySQL
+      - value: galera
+        label: Galera cluster
+        description: A mega super galera cluster
+    from: prompt
+  GALERA_NODES:
+    type: integer
+    min: 1
+    from:
+      prompt: Number of Galera nodes
+    only_if:
+      db: galera
+  no_wp:
+    type: boolean
+    as: boolean # default boolean output is string
+    from:
+      prompt: Skip wordpress?
+services:
+  wordpress:
+    skip_if: no_wp
+    extends:
+      file: docker-compose_v2.yml
+      service: wordpress
+    image: wordpress
+    stateful: true
+    deploy:
+      strategy: ha
+  mysql:
+    only_if:
+      db: mysql
+    extends:
+      file: docker-compose_v2.yml
+      service: mysql
+    image: mysql
+  galera:
+    only_if:
+      db: galera
+    extends:
+      file: docker-compose_v2.yml
+      service: mysql
+    image: galera
+    instances: $GALERA_NODES

data/spec/kontena/cli/master/users/invite_command_spec.rb

@@ -12,8 +12,7 @@ describe Kontena::Cli::Master::Users::InviteCommand do
 
   describe "#invite" do
     it 'makes invitation request for all given users' do
-      expect(client).to receive(:post).with("/oauth2/authorize", {email: 'john@example.org', response_type: "invite"}).once
-      expect(client).to receive(:post).with("/oauth2/authorize", {email: 'jane@example.org', response_type: "invite"}).once
+      expect(client).to receive(:post).with("/oauth2/authorize", {email: 'john@example.org', external_id: nil, response_type: "invite"}).once
 
       subject.run(['john@example.org', 'jane@example.org'])
     end

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

@@ -7,12 +7,12 @@ describe Kontena::Cli::Stacks::DeployCommand do
 
   describe '#execute' do
     it 'requires api url' do
-      expect(subject).to receive(:require_api_url).once
+      expect(described_class.requires_current_master?).to be_truthy
       subject.run(['test-stack'])
     end
 
     it 'requires token' do
-      expect(subject).to receive(:require_token).and_return(token)
+      expect(described_class.requires_current_master_token?).to be_truthy
       subject.run(['test-stack'])
     end
 

data/spec/kontena/cli/stacks/install_command_spec.rb

@@ -21,13 +21,13 @@ describe Kontena::Cli::Stacks::InstallCommand do
 
     it 'requires api url' do
       allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
-      expect(subject).to receive(:require_api_url).once
+      expect(described_class.requires_current_master?).to be_truthy
       subject.run([])
     end
 
     it 'requires token' do
       allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
-      expect(subject).to receive(:require_token).and_return(token)
+      expect(described_class.requires_current_master_token?).to be_truthy
       subject.run([])
     end
 

data/spec/kontena/cli/stacks/remove_command_spec.rb

@@ -9,14 +9,14 @@ describe Kontena::Cli::Stacks::RemoveCommand do
     it 'requires api url' do
       allow(subject).to receive(:forced?).and_return(true)
       allow(subject).to receive(:wait_stack_removal)
-      expect(subject).to receive(:require_api_url).once
+      expect(described_class.requires_current_master?).to be_truthy
       subject.run(['test-stack'])
     end
 
     it 'requires token' do
       allow(subject).to receive(:forced?).and_return(true)
       allow(subject).to receive(:wait_stack_removal)
-      expect(subject).to receive(:require_token).and_return(token)
+      expect(described_class.requires_current_master_token?).to be_truthy
       subject.run(['test-stack'])
     end
 

data/spec/kontena/cli/stacks/show_command_spec.rb

@@ -8,13 +8,13 @@ describe Kontena::Cli::Stacks::ShowCommand do
   describe '#execute' do
     it 'requires api url' do
       allow(subject).to receive(:forced?).and_return(true)
-      expect(subject).to receive(:require_api_url).once
+      expect(described_class.requires_current_master?).to be_truthy
       subject.run(['test-stack'])
     end
 
     it 'requires token' do
       allow(subject).to receive(:forced?).and_return(true)
-      expect(subject).to receive(:require_token).and_return(token)
+      expect(described_class.requires_current_master_token?).to be_truthy
       subject.run(['test-stack'])
     end
 

data/spec/kontena/cli/stacks/upgrade_command_spec.rb

@@ -17,26 +17,24 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
     it 'requires api url' do
       allow(subject).to receive(:require_config_file).and_return(true)
       allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
-      expect(subject).to receive(:require_api_url).once
+      expect(described_class.requires_current_master?).to be_truthy
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'requires token' do
       allow(subject).to receive(:require_config_file).and_return(true)
       allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
-      expect(subject).to receive(:require_token).and_return(token)
+      expect(described_class.requires_current_master_token?).to be_truthy
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'requires stack file' do
       allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
-      allow(subject).to receive(:require_token).and_return(token)
       expect(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'uses kontena.yml as default stack file' do
-      allow(subject).to receive(:require_token).and_return(token)
       expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
       expect(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
       subject.run(['stack-name'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors:
 - Kontena, Inc
@@ -370,10 +370,13 @@ files:
 - lib/kontena/cli/stacks/list_command.rb
 - lib/kontena/cli/stacks/logs_command.rb
 - lib/kontena/cli/stacks/monitor_command.rb
-- lib/kontena/cli/stacks/pull_command.rb
-- lib/kontena/cli/stacks/push_command.rb
+- lib/kontena/cli/stacks/registry/pull_command.rb
+- lib/kontena/cli/stacks/registry/push_command.rb
+- lib/kontena/cli/stacks/registry/remove_command.rb
+- lib/kontena/cli/stacks/registry/search_command.rb
+- lib/kontena/cli/stacks/registry/show_command.rb
+- lib/kontena/cli/stacks/registry_command.rb
 - lib/kontena/cli/stacks/remove_command.rb
-- lib/kontena/cli/stacks/search_command.rb
 - lib/kontena/cli/stacks/service_generator.rb
 - lib/kontena/cli/stacks/service_generator_v2.rb
 - lib/kontena/cli/stacks/show_command.rb
@@ -442,6 +445,7 @@ files:
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml
 - spec/fixtures/stack-with-env-file.yml
+- spec/fixtures/stack-with-ifs.yml
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/wordpress-scaled.yml
@@ -556,6 +560,7 @@ test_files:
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml
 - spec/fixtures/stack-with-env-file.yml
+- spec/fixtures/stack-with-ifs.yml
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/wordpress-scaled.yml

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

@@ -1,12 +0,0 @@
-require_relative 'common'
-
-module Kontena::Cli::Stacks
-  class PullCommand < Kontena::Command
-    include Kontena::Cli::Common
-    include Common
-
-    def execute
-    end
-  end
-end
-

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

@@ -1,17 +0,0 @@
-require_relative 'common'
-
-module Kontena::Cli::Stacks
-  class PushCommand < Kontena::Command
-    include Kontena::Cli::Common
-    include Common
-
-    parameter "FILENAME", "Stack file path"
-
-    requires_current_account_token
-
-    def execute
-      file = YAML::Reader.new(self.filename, skip_variables: true, replace_missing: "filler")
-      stacks_client.push(file.yaml['stack'], file.yaml['version'], file.raw_content)
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-require_relative 'common'
-
-module Kontena::Cli::Stacks
-  class SearchCommand < Kontena::Command
-    include Kontena::Cli::Common
-    include Common
-
-    parameter '[QUERY]', "Query string"
-
-    requires_current_account_token
-
-    def execute
-      puts stacks_client.search(query).inspect
-    end
-  end
-end
-