kontena-cli 1.1.0 → 1.1.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e2dfaafb984f7f7c0ca63566203262c8692a33f
-  data.tar.gz: '0280a6505d2d6568203b61221cc753dd297a4461'
+  metadata.gz: 76963be4ff231516ea09ffc1261b2945f7728f78
+  data.tar.gz: ea1f2e4fa944e33af0d7c5b9abea939485805346
 SHA512:
-  metadata.gz: 537c7d6ee6d2aea359559e70ce0a8b593fd22c6a1da3c612a839b8adc32aed53f98d4e3f99625824afb900fc888005f34ff5f0a0faa06bbf563f795c4da56b58
-  data.tar.gz: 8d1f092a778f4f0933cd785d6ea7e149dc2d9ca843b5172380aed4ff81654da622782402b85a80a838b7439306689e108e9346a03b7c266792d24157eedfc15a
+  metadata.gz: 66580e1af2b505487e82ae8458f5fed6f2965438df752e0ae8581108fe067932dc8205276117f3fc0a00bba46ddb17f3c5b19f8d224b82c78cd2e90af8853b0c
+  data.tar.gz: ce4aef539d02fb0ee56f6850a7657d8d0b2466bca5db2d7633ae4d01c28e75ce36330ef1df8a7c46644abd6df79cd8fa9ffbe7d716595bc0155ad71466e8e27f

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1.rc1

data/kontena-cli.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "hash_validator", "~> 0.7.0"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
-  spec.add_runtime_dependency "opto", "~> 1.8.0"
+  spec.add_runtime_dependency "opto", "1.8.3"
   spec.add_runtime_dependency "semantic", "~> 1.5"
   spec.add_runtime_dependency "safe_yaml", "~> 1.0"
   spec.add_runtime_dependency "liquid", "~> 4.0.0"

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

@@ -4,7 +4,7 @@ module Kontena
 
       include Kontena::Cli::Common
 
-      matches_commands 'master create'
+      matches_commands 'master create', 'master init_cloud'
 
       def cloud_user_data
         return @cloud_user_data if @cloud_user_data
@@ -27,8 +27,7 @@ module Kontena
       def after
         return unless current_master
         return unless command.exit_code == 0
-        return unless current_master.username.to_s == 'admin'
-        return nil if command.skip_auth_provider?
+        return nil if command.respond_to?(:skip_auth_provider?) && command.skip_auth_provider?
         return nil unless cloud_user_data
 
         invite_response = nil
@@ -51,11 +50,15 @@ module Kontena
 
         return nil if role_status.to_i > 0
 
-        spinner "Adding #{cloud_user_data[:email]} to grid 'test'" do |spin|
-          grid_add_status = Kontena.run("grid user add --grid test #{cloud_user_data[:email].shellescape}")
-          spin.fail if grid_add_status.to_i > 0
+        if current_master.grid
+          spinner "Adding #{cloud_user_data[:email]} to grid '#{current_master.grid}'" do |spin|
+            grid_add_status = Kontena.run("grid user add --grid #{current_master.grid} #{cloud_user_data[:email].shellescape}")
+            spin.fail if grid_add_status.to_i > 0
+          end
         end
 
+        return unless current_master.username.to_s == 'admin'
+
         new_user_token = nil
         spinner "Creating an access token for #{cloud_user_data[:email]}" do |spin|
           new_user_token = Kontena.run("master token create -e 0 -s user --return -u #{cloud_user_data[:email].shellescape}", returning: :result)

data/lib/kontena/cli/common.rb

@@ -247,6 +247,7 @@ module Kontena
         if self.respond_to?(:force?) && self.force?
           return
         end
+        exit_with_error 'Command requires --force' unless $stdout.tty? && $stdin.tty?
         puts message if message
         puts "Destructive command. To proceed, type \"#{name}\" or re-run this command with --force option."
 
@@ -257,6 +258,7 @@ module Kontena
         if self.respond_to?(:force?) && self.force?
           return
         end
+        exit_with_error 'Command requires --force' unless $stdout.tty? && $stdin.tty?
         prompt.yes?(message) || error('Aborted command.')
       end
 

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

@@ -23,6 +23,10 @@ module Kontena::Cli::Plugins
             spin.fail!
           end
         end
+
+        spinner "Running cleanup" do |spin|
+          Kontena::PluginManager.instance.cleanup_plugin(name)
+        end
       else
         installed = spinner "Installing plugin #{name.colorize(:cyan)}" do |spin|
           begin

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

@@ -13,12 +13,20 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
+      target_service = target
+
+      target_service = "null/#{target_service}" unless target_service.include?('/')
 
       service = client(token).get("services/#{parse_service_id(name)}")
-      existing_targets = service['links'].map{|l| l['grid_service_id'].split('/')[1]}
-      exit_with_error("Service is already linked to #{target.to_s}") if existing_targets.include?(target.to_s)
-      links = service['links'].map{|l| {name: l['grid_service_id'].split('/')[1], alias: l['alias']} }
-      links << {name: target.to_s, alias: target.to_s}
+      existing_targets = service['links'].map{ |l| l['id'].split('/', 2)[1] }
+      if existing_targets.include?(target_service.to_s)
+        exit_with_error("Service is already linked to #{target.to_s}")
+      end
+      links = service['links'].map{ |l|
+        { name: l['id'].split('/', 2)[1], alias: l['alias'] }
+      }
+      links << {name: target_service.to_s, alias: target.to_s}
+      links.compact!
       data = {links: links}
       spinner "Linking #{name.colorize(:cyan)} to #{target.colorize(:cyan)} " do
         update_service(token, name, data)

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

@@ -13,13 +13,19 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-
+      target_service = target
+      target_service = "null/#{target_service}" unless target_service.include?('/')
+      target_id = "#{current_grid}/#{target_service}"
       service = client(token).get("services/#{parse_service_id(name)}")
-      links = service['links'].map{|l| {name: l['grid_service_id'].split('/')[1], alias: l['alias']} }
-      exit_with_error("Service is not linked to #{target.to_s}") unless links.find{|l| l[:name] == target.to_s}
-      links.delete_if{|l| l[:name] == target.to_s}
+      links = service['links']
+      unless links.find { |l| l['id'] == target_id }
+        exit_with_error("Service is not linked to #{target.to_s}")
+      end
+      links.delete_if { |l| l['id'] == target_id }
       data = {links: links}
-      update_service(token, name, data)
+      spinner "Unlinking #{name.colorize(:cyan)} from #{target.colorize(:cyan)} " do
+        update_service(token, name, data)
+      end
     end
   end
 end

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

@@ -49,13 +49,16 @@ module Kontena::Cli::Stacks
       data['log_opts'] = options['log_opt'] if options['log_opt'] && !options['log_opt'].empty?
       deploy_opts = options['deploy'] || {}
       data['strategy'] = deploy_opts['strategy'] if deploy_opts['strategy']
-      deploy = {}
-      deploy['wait_for_port'] = deploy_opts['wait_for_port'] if deploy_opts.has_key?('wait_for_port')
-      deploy['min_health'] = deploy_opts['min_health'] if deploy_opts.has_key?('min_health')
-      deploy['interval'] = parse_relative_time(deploy_opts['interval']) if deploy_opts.has_key?('interval')
-      unless deploy.empty?
-        data['deploy_opts'] = deploy
-      end
+      deploy = {
+        'wait_for_port' => deploy_opts['wait_for_port'],
+        'min_health' => deploy_opts['min_health']
+      }
+      if deploy_opts.has_key?('interval')
+        deploy['interval'] = parse_relative_time(deploy_opts['interval'])
+      else
+        deploy['interval'] = nil
+      end      
+      data['deploy_opts'] = deploy
       data['hooks'] = options['hooks'] || {}
       data['secrets'] = options['secrets'] if options['secrets']
       data['build'] = parse_build_options(options) if options['build']

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

@@ -0,0 +1,15 @@
+module Kontena::Cli::Stacks
+  module YAML
+    module Opto
+      module Resolvers; end
+      module Setters; end
+    end
+  end
+end
+require 'opto'
+require_relative 'opto/vault_setter'
+require_relative 'opto/vault_resolver'
+require_relative 'opto/prompt_resolver'
+require_relative 'opto/service_instances_resolver'
+require_relative 'opto/vault_cert_prompt_resolver'
+require_relative 'opto/service_link_resolver'

data/lib/kontena/cli/stacks/yaml/opto/prompt_resolver.rb

@@ -1,9 +1,12 @@
+require 'kontena/cli/stacks/yaml/opto'
+require 'kontena/cli/common'
+
 module Kontena::Cli::Stacks
   module YAML
-    class Prompt < Opto::Resolver
+    class Prompt < ::Opto::Resolver
       include Kontena::Cli::Common
 
-      using Opto::Extension::HashStringOrSymbolKey
+      using ::Opto::Extension::HashStringOrSymbolKey
 
       def enum?
         option.type == 'enum'
@@ -50,10 +53,16 @@ module Kontena::Cli::Stacks
         prompt.yes?(question_text, default: option.default == false ? false : true)
       end
 
-      def ask
-        prompt.ask(question_text, default: option.default)
+      def echo?
+        return true if option.handler.nil?
+        return true if option.handler.options.nil?
+        return true if option.handler.options[:echo].nil?
+        option.handler.options[:echo]
       end
 
+      def ask
+        prompt.ask(question_text, default: option.default, echo: echo?)
+      end
 
       def resolve
         return nil if option.skip?
@@ -68,4 +77,3 @@ module Kontena::Cli::Stacks
     end
   end
 end
-

data/lib/kontena/cli/stacks/yaml/opto/service_instances_resolver.rb

@@ -1,6 +1,6 @@
 module Kontena::Cli::Stacks
   module YAML
-    class Opto::Resolvers::ServiceInstances < Opto::Resolver
+    class Opto::Resolvers::ServiceInstances < ::Opto::Resolver
       def resolve
         read_command = Kontena::Cli::Stacks::ShowCommand.new([self.stack])
         stack = read_command.fetch_stack(self.stack)

data/lib/kontena/cli/stacks/yaml/opto/service_link_resolver.rb

@@ -1,45 +1,76 @@
-module Kontena::Cli::Stacks
-  module YAML
-    class Opto::Resolvers::ServiceLink < Opto::Resolver
-      include Kontena::Cli::Common
-
-      def resolve
-        message = hint['prompt']
-        name_filter = hint['name']
-        image_filter = hint['image']
-        raise "prompt missing" unless message
-
-        services = client.get("grids/#{current_grid}/services")['services']
-        services = filter_by_image(services, image_filter) if image_filter
-        services = filter_by_name(services, name_filter) if name_filter
-        prompt.select(message) do |menu|
-          menu.choice "<none>", nil unless option.required?
-          services.each do |s|
-            if s.dig('stack', 'name') == 'null'
-              name = s['name']
-            else
-              name = "#{s.dig('stack', 'name')}/#{s['name']}"
-            end
-            menu.choice name, "#{s.dig('stack', 'name')}/#{s['name']}"
-          end
+module Kontena::Cli::Stacks::YAML::Opto::Resolvers
+  class ServiceLink < ::Opto::Resolver
+    include Kontena::Cli::Common
+
+    def resolve
+      message = hint['prompt']
+      name_filter = hint['name']
+      image_filter = hint['image']
+      raise "prompt missing" unless message
+
+      services = get_services
+      services = filter_by_image(services, image_filter) if image_filter
+      services = filter_by_name(services, name_filter) if name_filter
+      return nil if services.size == 0
+      prompt.select(message) do |menu|
+        menu.default(default_index(services)) if option.default
+        menu.choice "<none>", nil unless option.required?
+        services.each do |s|
+          menu.choice service_name(s), service_link(s)
         end
       end
+    end
 
-      def filter_by_image(services, image)
-        services.select { |s|
-          s['image'].include?(image)
-        }
-      end
+    # @return [Array<Hash>]
+    def get_services
+      client.get("grids/#{current_grid}/services")['services']
+    rescue
+      []
+    end
 
-      def filter_by_name(services, name)
-        services.select { |s|
-          s['name'].include?(name)
-        }
+    # @param [Array<Hash>] services
+    # @return [Integer]
+    def default_index(services)
+      index = services.index {|s| service_link(s) == option.default }
+      if index
+        index.to_i + 1
+      else
+        0
       end
+    end
+
+    # @param [Hash] service
+    # @return [String]
+    def service_link(service)
+      grid, stack, service = service['id'].split('/')
+      "#{stack}/#{service}"
+    end
 
-      def stack
-        ENV['STACK']
+    # @param [Hash] service
+    # @return [String]
+    def service_name(service)
+      grid, stack, service = service['id'].split('/')
+      if stack == 'null'.freeze
+        service
+      else
+        "#{stack}/#{service}"
       end
     end
+
+    def filter_by_image(services, image)
+      services.select { |s|
+        s['image'].include?(image)
+      }
+    end
+
+    def filter_by_name(services, name)
+      services.select { |s|
+        s['name'].include?(name)
+      }
+    end
+
+    def stack
+      ENV['STACK']
+    end
   end
 end

data/lib/kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver.rb

@@ -1,15 +1,38 @@
-module Kontena::Cli::Stacks
-  module YAML
-    class Opto::Resolvers::VaultCertPrompt < Opto::Resolver
-      include Kontena::Cli::Common
+module Kontena::Cli::Stacks::YAML::Opto::Resolvers
+  class VaultCertPrompt < ::Opto::Resolver
+    include Kontena::Cli::Common
 
-      def resolve
-        message = hint || 'Select SSL certs'
-        secrets = client.get("grids/#{current_grid}/secrets")['secrets'].select{ |s|
-          s['name'].match(/(ssl|cert)/i)
-        }
-        prompt.multi_select(hint, secrets.map{ |s| s['name'] })
+    def resolve
+      message = hint || 'Select SSL certs'
+      secrets = get_secrets.select{ |s|
+        s['name'].match(/(ssl|cert)/i)
+      }
+      if secrets.size > 0
+        prompt.multi_select(hint) do |menu|
+          menu.default(*default_indexes(secrets)) if option.default
+          secrets.each do |s|
+            menu.choice s['name']
+          end
+        end
       end
     end
+
+    # @return [Array<Hash>] secrets
+    def get_secrets
+      client.get("grids/#{current_grid}/secrets")['secrets']
+    rescue
+      []
+    end
+
+    # @param [Array<Hash>] secrets
+    # @return [Array<Integer>]
+    def default_indexes(secrets)
+      indexes = []
+      option.default.to_a.each do |name|
+        index = secrets.index { |s| s['name'] == name }
+        indexes << index.to_i + 1 if index
+      end
+      indexes
+    end
   end
 end

data/lib/kontena/cli/stacks/yaml/opto/vault_resolver.rb

@@ -1,6 +1,6 @@
 module Kontena::Cli::Stacks
   module YAML
-    class Opto::Resolvers::Vault < Opto::Resolver
+    class Opto::Resolvers::Vault < ::Opto::Resolver
       def resolve
         raise RuntimeError, "Missing or empty vault secret name" if hint.to_s.empty?
         require 'shellwords'

data/lib/kontena/cli/stacks/yaml/opto/vault_setter.rb

@@ -1,6 +1,6 @@
 module Kontena::Cli::Stacks
   module YAML
-    class Opto::Setters::Vault < Opto::Setter
+    class Opto::Setters::Vault < ::Opto::Setter
       def set(value)
         require 'shellwords'
         ENV["DEBUG"] && STDERR.puts("Setting to vault: #{hint}")
@@ -9,4 +9,3 @@ module Kontena::Cli::Stacks
     end
   end
 end
-

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

@@ -2,6 +2,11 @@ require_relative '../../../util'
 
 module Kontena::Cli::Stacks
   module YAML
+    module Opto
+      module Resolvers; end
+      module Setters; end
+    end
+
     class Reader
       include Kontena::Util
       include Kontena::Cli::Common
@@ -12,13 +17,7 @@ module Kontena::Cli::Stacks
         require 'yaml'
         require_relative 'service_extender'
         require_relative 'validator_v3'
-        require 'opto'
-        require_relative 'opto/vault_setter'
-        require_relative 'opto/vault_resolver'
-        require_relative 'opto/prompt_resolver'
-        require_relative 'opto/service_instances_resolver'
-        require_relative 'opto/vault_cert_prompt_resolver'
-        require_relative 'opto/service_link_resolver'
+        require_relative 'opto'
         require 'liquid'
 
         @file = file
@@ -88,7 +87,7 @@ module Kontena::Cli::Stacks
       # @return [Opto::Group]
       def variables
         return @variables if @variables
-        @variables = Opto::Group.new(
+        @variables = ::Opto::Group.new(
           (internals_interpolated_yaml['variables'] || {}).merge('STACK' => { type: :string, value: env['STACK']}, 'GRID' => {type: :string, value: env['GRID']}),
           defaults: {
             from: :env,

data/lib/kontena/plugin_manager.rb

@@ -33,7 +33,6 @@ module Kontena
       )
       plugin_version = version.nil? ? Gem::Requirement.default : Gem::Requirement.new(version)
       without_safe { cmd.install(prefix(plugin_name), plugin_version) }
-      cleanup_plugin(plugin_name)
       cmd.installed_gems
     end
 
@@ -123,7 +122,7 @@ module Kontena
     def cleanup_plugin(plugin_name)
       require 'rubygems/commands/cleanup_command'
       cmd = Gem::Commands::CleanupCommand.new
-      options = ['--norc']
+      options = []
       options += ['-q', '--no-verbose'] unless ENV["DEBUG"]
       cmd.handle_options options
       without_safe { cmd.execute }

data/lib/kontena_cli.rb

@@ -41,7 +41,7 @@ module Kontena
   end
 
   def self.simple_terminal?
-    ENV['KONTENA_SIMPLE_TERM'] || !$stdout.tty?
+    on_windows? || ENV['KONTENA_SIMPLE_TERM'] || !$stdout.tty?
   end
 
   def self.pastel

data/spec/kontena/cli/cloud/master/add_command_spec.rb

@@ -115,7 +115,6 @@ describe Kontena::Cli::Cloud::Master::AddCommand do
 
       subject.register_current
     end
-
   end
 end
 

data/spec/kontena/cli/common_spec.rb

@@ -128,35 +128,42 @@ describe Kontena::Cli::Common do
     end
   end
 
-  describe '#confirm_command' do
-    it 'returns true if input matches' do
-      allow(subject).to receive(:ask).and_return('name-to-confirm')
-
-      expect(subject.confirm_command('name-to-confirm')).to be_truthy
-      expect{subject.confirm_command('name-to-confirm')}.to_not raise_error
+  context 'confirm' do
+    before(:each) do
+      expect($stdout).to receive(:tty?).at_least(:once).and_return(true)
+      expect($stdin).to receive(:tty?).at_least(:once).and_return(true)
     end
 
-    it 'raises error unless input matches' do
-      expect(subject).to receive(:ask).and_return('wrong-name')
-      expect(subject).to receive(:error).with(/did not match/)
+    describe '#confirm_command' do
+      it 'returns true if input matches' do
+        allow(subject).to receive(:ask).and_return('name-to-confirm')
 
-      subject.confirm_command('name-to-confirm')
-    end
-  end
+        expect(subject.confirm_command('name-to-confirm')).to be_truthy
+        expect{subject.confirm_command('name-to-confirm')}.to_not raise_error
+      end
 
-  describe '#confirm' do
-    it 'returns true if confirmed' do
-      allow(subject.prompt).to receive(:yes?).and_return(true)
+      it 'raises error unless input matches' do
+        expect(subject).to receive(:ask).and_return('wrong-name')
+        expect(subject).to receive(:error).with(/did not match/)
 
-      expect(subject.confirm).to be_truthy
-      expect{subject.confirm}.to_not raise_error
+        subject.confirm_command('name-to-confirm')
+      end
     end
 
-    it 'raises error unless confirmed' do
-      expect(subject.prompt).to receive(:yes?).and_return(false)
-      expect(subject).to receive(:error).with(/Aborted/)
+    describe '#confirm' do
+      it 'returns true if confirmed' do
+        allow(subject.prompt).to receive(:yes?).and_return(true)
 
-      subject.confirm
+        expect(subject.confirm).to be_truthy
+        expect{subject.confirm}.to_not raise_error
+      end
+
+      it 'raises error unless confirmed' do
+        expect(subject.prompt).to receive(:yes?).and_return(false)
+        expect(subject).to receive(:error).with(/Aborted/)
+
+        subject.confirm
+      end
     end
   end
 

data/spec/kontena/cli/master/init_cloud_command_spec.rb

@@ -0,0 +1,28 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/master/init_cloud_command"
+
+describe Kontena::Cli::Master::InitCloudCommand do
+
+  include ClientHelpers
+  include RequirementsHelper
+
+  mock_current_master
+
+  let(:cloud_client) { double(:cc) }
+
+  before(:each) do
+    allow(subject).to receive(:current_account).and_return('foo')
+    allow(subject).to receive(:cloud_auth?).and_return(true)
+  end
+
+  describe '#execute' do
+    expect_to_require_current_master
+    expect_to_require_current_master_token
+  end
+
+  it 'runs the invite self after deploy callback' do
+    expect(Kontena).to receive(:run).with('cloud master add --current --force').and_return(true)
+    expect_any_instance_of(Kontena::Callbacks::InviteSelfAfterDeploy).to receive(:after).and_return(true)
+    subject.run(['--force'])
+  end
+end

data/spec/kontena/cli/services/link_command_spec.rb

@@ -25,7 +25,7 @@ describe Kontena::Cli::Services::LinkCommand do
     it 'aborts if service is already linked' do
       allow(client).to receive(:get).and_return({
         'links' => [
-          {'alias' => 'service-b', 'grid_service_id' => "grid/service-b"}
+          {'alias' => 'service-b', 'id' => "grid/null/service-b"}
         ]
       })
       expect {
@@ -35,7 +35,7 @@ describe Kontena::Cli::Services::LinkCommand do
 
     it 'sends link to master' do
       expect(client).to receive(:put).with(
-        'services/test-grid/null/service-a', {links: [{name: 'service-b', alias: 'service-b'}]}
+        'services/test-grid/null/service-a', {links: [{name: 'null/service-b', alias: 'service-b'}]}
       )
       subject.run(['service-a', 'service-b'])
     end

data/spec/kontena/cli/services/unlink_command_spec.rb

@@ -9,7 +9,7 @@ describe Kontena::Cli::Services::UnlinkCommand do
     before(:each) do
       allow(client).to receive(:get).and_return({
         'links' => [
-          {'alias' => 'service-b', 'grid_service_id' => "grid/service-b"}
+          {'alias' => 'service-b', 'id' => "test-grid/null/service-b", 'name' => 'service-b'}
         ]
       })
     end

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

@@ -335,12 +335,16 @@ describe Kontena::Cli::Stacks::ServiceGenerator do
         expect(result['deploy_opts']['interval']).to eq(60)
       end
 
-      it 'does not return deploy_opts if no deploy options are defined' do
+      it 'returns nil values if no deploy options are defined' do
         data = {
           'image' => 'foo/bar:latest'
         }
         result = subject.send(:parse_data, data)
-        expect(result['deploy_opts']).to be_nil
+        expect(result['deploy_opts']).to eq({
+          'interval' => nil,
+          'min_health' => nil,
+          'wait_for_port' => nil
+          })
       end
     end
 
@@ -381,5 +385,5 @@ describe Kontena::Cli::Stacks::ServiceGenerator do
         expect(result['secrets']).to be_nil
       end
     end
-  end  
+  end
 end

data/spec/kontena/cli/stacks/yaml/opto/prompt_resolver_spec.rb

@@ -0,0 +1,27 @@
+require 'opto'
+require 'kontena_cli'
+require 'kontena/cli/stacks/yaml/opto'
+
+describe Kontena::Cli::Stacks::YAML::Prompt do
+
+  describe 'echoing' do
+    let(:option_without_echo) { Opto::Option.new(type: 'string', name: 'foo', from: 'prompt', echo: false) }
+    let(:option_with_echo) { Opto::Option.new(type: 'string', name: 'foo', from: 'prompt') }
+    let(:prompt) { double(:prompt) }
+
+    before(:each) do
+      allow(Kontena).to receive(:prompt).and_return(prompt)
+    end
+
+    it 'turns echo off when variable has "echo: false"' do
+      expect(prompt).to receive(:ask).with(/Enter/, hash_including(echo: false))
+      option_without_echo.value
+    end
+
+    it 'keeps echo on when variable does not have "echo: false"' do
+      expect(prompt).to receive(:ask).with(/Enter/, hash_not_including(echo: false))
+      option_with_echo.value
+    end
+  end
+end
+

data/spec/kontena/cli/stacks/yaml/opto/service_link_resolver_spec.rb

@@ -0,0 +1,54 @@
+require 'opto'
+require 'kontena/cli/stacks/yaml/opto/service_link_resolver'
+
+describe Kontena::Cli::Stacks::YAML::Opto::Resolvers::ServiceLink do
+  let(:subject) do
+    described_class.new({'prompt' => 'foo'})
+  end
+
+  describe '#resolve' do
+    it 'returns nil if no matching services' do
+      expect(subject).to receive(:get_services).and_return([])
+      expect(subject).not_to receive(:prompt)
+      expect(subject.resolve).to be_nil
+    end
+
+    it 'prompts user if matching services' do
+      prompt = double(:prompt)
+      allow(subject).to receive(:prompt).and_return(prompt)
+      expect(prompt).to receive(:select).and_return('null/bar')
+      expect(subject).to receive(:get_services).and_return([
+        {'id' => 'foo/null/bar'}
+      ])
+      expect(subject.resolve).to eq('null/bar')
+    end
+  end
+
+  describe '#default_index' do
+    let(:option) do
+      ::Opto::Option.new(default: 'foo/bar')
+    end
+    let(:subject) do
+      described_class.new({'prompt' => 'foo'}, option)
+    end
+
+    it 'returns matching index' do
+      services = [
+        {'id' => 'test/foo/foo'},
+        {'id' => 'test/foo/bar'},
+        {'id' => 'test/asd/asd'}
+      ]
+      index = subject.default_index(services)
+      expect(index).to eq(2)
+    end
+
+    it 'returns 0 if no matches' do
+      services = [
+        {'id' => 'test/foo/foo'},
+        {'id' => 'test/asd/asd'}
+      ]
+      index = subject.default_index(services)
+      expect(index).to eq(0)
+    end
+  end
+end

data/spec/kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver_spec.rb

@@ -0,0 +1,73 @@
+require 'opto'
+require 'kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver'
+
+describe Kontena::Cli::Stacks::YAML::Opto::Resolvers::VaultCertPrompt do
+  describe '#resolve' do
+    it 'returns nil if no matching secrets' do
+      expect(subject).to receive(:get_secrets).and_return([])
+      expect(subject).not_to receive(:prompt)
+      expect(subject.resolve).to be_nil
+    end
+
+    it 'prompts user if matching secrets' do
+      prompt = double(:prompt)
+      allow(subject).to receive(:prompt).and_return(prompt)
+      expect(prompt).to receive(:multi_select).and_return('ssl-cert')
+      expect(subject).to receive(:get_secrets).and_return([{'name' => 'ssl-cert'}])
+      subject.resolve
+    end
+  end
+
+  describe '#default_indexes' do
+    let(:option) do
+      Opto::Option.new(default: ['ssl-cert-1', 'ssl-cert-3'])
+    end
+
+    let(:subject) do
+      described_class.new('foo', option)
+    end
+
+    it 'returns all default indexes if found' do
+      secrets = [
+        {'name' => 'ssl-cert-1'},
+        {'name' => 'ssl-cert-2'},
+        {'name' => 'ssl-cert-3'}
+      ]
+      indexes = subject.default_indexes(secrets)
+      expect(indexes).to eq([1, 3])
+    end
+
+    it 'returns partially found defaults' do
+      secrets = [
+        {'name' => 'ssl-cert-a'},
+        {'name' => 'ssl-cert-b'},
+        {'name' => 'ssl-cert-3'}
+      ]
+      indexes = subject.default_indexes(secrets)
+      expect(indexes).to eq([3])
+    end
+
+    it 'returns empty array if no matches' do
+      secrets = [
+        {'name' => 'ssl-cert-a'}
+      ]
+      indexes = subject.default_indexes(secrets)
+      expect(indexes).to eq([])
+    end
+
+    it 'returns empty array if no secrets' do
+      secrets = []
+      indexes = subject.default_indexes(secrets)
+      expect(indexes).to eq([])
+    end
+
+    it 'returns empty array if no defaults' do
+      secrets = [
+        {'name' => 'ssl-cert-a'}
+      ]
+      allow(subject.option).to receive(:default).and_return([])
+      indexes = subject.default_indexes(secrets)
+      expect(indexes).to eq([])
+    end
+  end
+end

data/spec/kontena/kontena_cli_spec.rb

@@ -1,28 +1,37 @@
 require_relative '../spec_helper'
 require 'kontena_cli'
+require 'kontena/light_prompt'
 
 describe Kontena do
-  let(:subject) { described_class }
+  context 'prompt' do
+    it 'uses light prompt on windows' do
+      allow(ENV).to receive(:[]).with('OS').and_return('Windows_NT')
+      expect(Kontena.prompt).to be_kind_of(Kontena::LightPrompt)
+    end
+  end
 
   describe '#run' do
-    let(:whoami) { double(:whoami_command) }
+    let(:whoami) { double(:whoami) }
 
     before(:each) do
-      expect(Kontena::MainCommand).to receive(:new).and_call_original
       expect(Kontena::Cli::WhoamiCommand).to receive(:new).and_return(whoami)
       expect(whoami).to receive(:run).with(['--bash-completion-path']).and_return(true)
     end
 
     it 'accepts a command line as string' do
-      subject.run('whoami --bash-completion-path')
+
+      Kontena.run('whoami --bash-completion-path')
     end
 
     it 'accepts a command line as a list of parameters' do
-      subject.run('whoami', '--bash-completion-path')
+      Kontena.run('whoami', '--bash-completion-path')
     end
 
     it 'accepts a command line as an array' do
-      subject.run(['whoami', '--bash-completion-path'])
+      Kontena.run(['whoami', '--bash-completion-path'])
     end
   end
 end
+
+
+

data/spec/kontena/main_command_spec.rb

@@ -0,0 +1,16 @@
+require_relative '../spec_helper'
+require 'kontena/main_command'
+
+describe Kontena::MainCommand do
+  let(:subject) { described_class.new('kontena') }
+
+  describe '--version' do
+    it 'outputs the version number and exits' do
+      expect do
+        expect{subject.run(['--version'])}.to output(/kontena-cli #{Kontena::Cli::VERSION}/).to_stdout
+      end.to raise_error(SystemExit) do |exc|
+        expect(exc.status).to eq 0
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: opto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +433,7 @@ files:
 - lib/kontena/cli/stacks/yaml/custom_validators/extends_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/hooks_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/secrets_validator.rb
+- lib/kontena/cli/stacks/yaml/opto.rb
 - lib/kontena/cli/stacks/yaml/opto/prompt_resolver.rb
 - lib/kontena/cli/stacks/yaml/opto/service_instances_resolver.rb
 - lib/kontena/cli/stacks/yaml/opto/service_link_resolver.rb
@@ -555,6 +556,7 @@ files:
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
+- spec/kontena/cli/master/init_cloud_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
@@ -582,6 +584,9 @@ files:
 - spec/kontena/cli/stacks/service_generator_v2_spec.rb
 - spec/kontena/cli/stacks/show_command_spec.rb
 - spec/kontena/cli/stacks/upgrade_command_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/prompt_resolver_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/service_link_resolver_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
@@ -592,6 +597,7 @@ files:
 - spec/kontena/client_spec.rb
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
+- spec/kontena/main_command_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
@@ -615,9 +621,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8
@@ -683,6 +689,7 @@ test_files:
 - spec/kontena/cli/helpers/log_helper_spec.rb
 - spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
+- spec/kontena/cli/master/init_cloud_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
@@ -710,6 +717,9 @@ test_files:
 - spec/kontena/cli/stacks/service_generator_v2_spec.rb
 - spec/kontena/cli/stacks/show_command_spec.rb
 - spec/kontena/cli/stacks/upgrade_command_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/prompt_resolver_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/service_link_resolver_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
@@ -720,6 +730,7 @@ test_files:
 - spec/kontena/client_spec.rb
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
+- spec/kontena/main_command_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb