kontena-cli 1.4.2 → 1.4.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76466bba61423d4a43ef601327a87c9cb75b41e6c5b50f7aee2082d1963e7b97
-  data.tar.gz: f0e3ac1f4834dc8e34b506353b73bb259de4c971459b700fb6a9d631f97e9de7
+  metadata.gz: 2c89aaf80a9dadce77e13ea22f0625d29a9a3aab7d32c4509b810fbe9249922f
+  data.tar.gz: 0321b6425831606908933ed2385e38a4982430ad7f6b6e14438b41a2b85aa1d7
 SHA512:
-  metadata.gz: 6f439ebc6e887a909d231125e91e04118b354c2836821445e8a121af79f84a169a20f05af23338a36d6abdf246af00fe3605b572aedad7124a88cbb42896cfad
-  data.tar.gz: 96155c93f018bc53c498b9d04c943ebe238817f012cbd62f4fd594b5dab6e7c1557bf4ab9c4421985768534399aec40286583442c00a735d4885b3878ce0cb41
+  metadata.gz: 0f4d405d097a668e02dcf85edee1d8da793e4ceffb988f188b9b3069ab762cb645ec95be3c6abe8633d54571dec44087684e04c1d4e25c178d83cabe7ada00cb
+  data.tar.gz: 5ff4310c6e174dd1723c0a5ab6df3525f73e8f49e8b07b09e5198e1ecb4ef3430450f5d2265560f67186c30e807cab5f44c11b38f325a42f3d46e6b9621ac38a

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3.rc1

data/lib/kontena/cli/certificate/get_command.rb

@@ -4,7 +4,7 @@ module Kontena::Cli::Certificate
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    BANNER = "This command is now deprecated in favor of 'kontena certificate request' command".colorize(:red)
+    BANNER = Kontena.pastel.yellow("[DEPRECATED] This command is now deprecated in favor of 'kontena certificate request' command")
 
     banner BANNER
 
@@ -14,7 +14,7 @@ module Kontena::Cli::Certificate
 
 
     def execute
-      puts BANNER
+      warn BANNER
 
       require_api_url
       token = require_token

data/lib/kontena/cli/certificate_command.rb

@@ -7,7 +7,7 @@ class Kontena::Cli::CertificateCommand < Kontena::Command
   subcommand "register", "Register to LetsEncrypt", load_subcommand('certificate/register_command')
   subcommand "authorize", "Create DNS authorization for domain", load_subcommand('certificate/authorize_command')
   subcommand "request", "Request certificate for domain", load_subcommand('certificate/request_command')
-  subcommand "get", "Get certificate for domain", load_subcommand('certificate/get_command')
+  subcommand "get", "Get certificate for domain [DEPRECATED]", load_subcommand('certificate/get_command')
   subcommand "import", "Import certificate from file", load_subcommand('certificate/import_command')
   subcommand ["remove", "rm"], "Remove certificate for domain", load_subcommand('certificate/remove_command')
 

data/lib/kontena/cli/cloud_command.rb

@@ -1,9 +1,13 @@
 
 class Kontena::Cli::CloudCommand < Kontena::Command
+  include Kontena::Cli::Common
+
   subcommand "login", "Authenticate to Kontena Cloud", load_subcommand('cloud/login_command')
   subcommand "logout", "Logout from Kontena Cloud", load_subcommand('cloud/logout_command')
   subcommand "master", "Master specific commands", load_subcommand('cloud/master_command')
 
-  def execute
+  def subcommand_missing(name)
+    return super(name) unless %w(platform node org organization image-repository ir region token).include?(name)
+    exit_with_error "The #{pastel.cyan('cloud')} plugin has not been installed. Use: #{pastel.cyan('kontena plugin install cloud')}"
   end
-end
+end

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

@@ -1,4 +1,4 @@
-require 'io/console'
+require 'tty-screen'
 require 'kontena-websocket-client'
 
 module Kontena::Cli::Helpers
@@ -107,7 +107,7 @@ module Kontena::Cli::Helpers
       Thread.new do
         begin
           if tty
-            console_height, console_width = IO.console.winsize
+            console_height, console_width = TTY::Screen.size
             websocket_exec_write(ws, 'tty_size' => {
               width: console_width, height: console_height
             })

data/lib/kontena/cli/master/token/current_command.rb

@@ -28,7 +28,7 @@ module Kontena::Cli::Master::Token
 
       if self.expires_in?
         if current_master.token.expires_at.to_i > 0
-          puts Time.now.utc.to_i - current_master.token.expires_at
+          puts current_master.token.expires_at - Time.now.utc.to_i
         end
         exit 0
       end

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

@@ -24,10 +24,10 @@ module Kontena::Cli::Stacks
     requires_current_master_token
 
     def execute
-      set_env_variables(stack_name, current_grid)
-
       install_dependencies unless skip_dependencies?
 
+      set_env_variables(stack_name, current_grid)
+
       stack # runs validations
 
       hint_on_validation_notifications(reader.notifications)
@@ -42,6 +42,7 @@ module Kontena::Cli::Stacks
     def install_dependencies
       dependencies = loader.dependencies
       return if dependencies.nil?
+
       dependencies.each do |dependency|
         target_name = "#{stack_name}-#{dependency['name']}"
         caret "Installing dependency #{pastel.cyan(dependency['stack'])} as #{pastel.cyan(target_name)}"
@@ -56,6 +57,7 @@ module Kontena::Cli::Stacks
         cmd << dependency['stack']
         Kontena.run!(cmd)
       end
+
     end
 
     def create_stack

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

@@ -7,8 +7,7 @@ module Kontena::Cli::Stacks::Registry
 
     banner "Pushes (uploads) a stack to the stack registry"
 
-    include Kontena::Cli::Stacks::Common::StackFileOrNameParam
-    include Kontena::Cli::Stacks::Common::StackValuesFromOption
+    parameter "[FILE]", "Kontena stack file path", default: "kontena.yml", attribute_name: :source
 
     requires_current_account_token
 
@@ -20,17 +19,22 @@ module Kontena::Cli::Stacks::Registry
     end
 
     def includes_local_extends?
-      stack.fetch(:services) { {} }.any? { |svc| svc['extends'] && svc[:extends]['file'] }
+      loader.yaml.fetch('services', {}).any? { |_, svc| svc.key?('extends') && svc['extends'].key?('file') }
     end
 
     def execute
-      set_env_variables(stack_name, 'validate', 'validate-platform')
-
+      exit_with_error "Can only perform push from local files" unless loader.origin == "file"
       exit_with_error "Stack file contains dependencies to local files" if includes_local_dependencies?
       exit_with_error "Stack file has services that extend from local files" if includes_local_extends?
 
-      spinner("Pushing #{pastel.cyan(source)} to stacks registry as #{loader.stack_name}") do
-        stacks_client.push(stack_name, loader.stack_name.version, loader.content) unless dry_run?
+      spinner("Pushing #{pastel.cyan(source)} to stack registry as #{loader.stack_name}") do
+        unless dry_run?
+          stacks_client.push(
+            loader.stack_name.stack_name,
+            loader.stack_name.version,
+            loader.content
+          )
+        end
       end
     end
   end

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

@@ -29,8 +29,6 @@ module Kontena::Cli::Stacks
 
     # @return [Kontena::Cli::Stacks::ChangeResolver]
     def execute
-      set_env_variables(stack_name, current_grid)
-
       old_data = spinner "Reading stack #{pastel.cyan(stack_name)} from master" do
         gather_master_data(stack_name)
       end

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

@@ -39,13 +39,6 @@ module Kontena::Cli::Stacks
     end
 
     def execute
-      if online?
-        set_env_variables(stack_name, require_current_grid)
-      else
-        config.current_master = nil
-        set_env_variables(stack_name, 'validate', 'validate-platform')
-      end
-
       if dependency_tree?
         puts ::YAML.dump('name' => stack_name, 'stack' => source, 'depends' => stack['dependencies'])
         exit 0
@@ -53,6 +46,13 @@ module Kontena::Cli::Stacks
 
       validate_dependencies if dependencies?
 
+      if online?
+        set_env_variables(stack_name, require_current_grid)
+      else
+        config.current_master = nil
+        set_env_variables(stack_name, 'validate', 'validate-platform')
+      end
+
       stack # runs validations
 
       hint_on_validation_notifications(reader.notifications, dependencies? ? loader.source : nil)

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

@@ -6,8 +6,7 @@ module Kontena::Cli::Stacks
       def resolve
         return nil unless current_master && current_grid
         require 'kontena/cli/stacks/show_command'
-        read_command = Kontena::Cli::Stacks::ShowCommand.new([self.stack])
-        stack = read_command.fetch_stack(self.stack)
+        stack = client.get("stacks/#{current_grid}/#{self.stack}")
         service = stack['services'].find { |s| s['name'] == hint }
         if service
           service['instances']

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

@@ -63,7 +63,7 @@ module Kontena::Cli::Stacks
       # Values that are set always when parsing stacks
       # @return [Hash] a hash of key value pairs
       def default_envs
-        @default_envs ||= {
+        {
           'GRID' => env['GRID'],
           'STACK' => env['STACK'],
           'PLATFORM' => env['PLATFORM'] || env['GRID']

data/lib/kontena/plugin_manager/loader.rb

@@ -40,7 +40,7 @@ module Kontena
         require(path)
         Kontena.logger.debug { "Loaded plugin #{spec.name}" } if plugin_debug?
 
-        report_tracking
+        report_tracking(spec)
         true
       rescue ScriptError, LoadError, StandardError => ex
         warn " [#{Kontena.pastel.red('error')}] Failed to load plugin: #{spec.name} from #{spec.gem_dir}\n\tRerun the command with environment DEBUG=true set to get the full exception."
@@ -79,7 +79,7 @@ module Kontena
         @load_path_before = $LOAD_PATH.dup
       end
 
-      def report_tracking
+      def report_tracking(spec)
         return unless plugin_debug?
         added_features = ($LOADED_FEATURES - @loaded_features_before).map {|feat| "- #{feat}"}
         added_paths = ($LOAD_PATH - @load_path_before).map {|feat| "- #{feat}"}

data/spec/kontena/cli/cloud_command_spec.rb

@@ -0,0 +1,17 @@
+require 'kontena/cli/cloud_command'
+
+describe Kontena::Cli::CloudCommand do
+  let(:subject) { described_class.new('kontena') }
+
+
+  describe '#subcommand_missing' do
+    it 'suggests plugin install for known cloud plugin commands' do
+      expect{subject.run(['platform', 'xyz'])}.to exit_with_error.and output(/has not been installed/).to_stderr
+      expect{subject.run(['organization', 'xyz'])}.to exit_with_error.and output(/has not been installed/).to_stderr
+      expect{subject.run(['ir', 'xyz'])}.to exit_with_error.and output(/has not been installed/).to_stderr
+      expect{subject.run(['region', 'xyz'])}.to exit_with_error.and output(/has not been installed/).to_stderr
+      expect{subject.run(['node', 'xyz'])}.to exit_with_error.and output(/has not been installed/).to_stderr
+      expect{subject.run(['token', 'xyz'])}.to exit_with_error.and output(/has not been installed/).to_stderr
+    end
+  end
+end

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

@@ -273,7 +273,7 @@ describe Kontena::Cli::Helpers::ExecHelper do
 
       it 'connects and sends messages from stdin' do
         stdin_eol = false
-        allow(IO.console).to receive(:winsize).and_return([100, 100])
+        allow(TTY::Screen).to receive(:size).and_return([100, 100])
         expect(websocket_client).to receive(:send).once.with('{"tty_size":{"width":100,"height":100}}')
         expect(websocket_client).to receive(:send).once.with('{"cmd":["test-tty"]}')
 

data/spec/kontena/cli/master/token/current_spec.rb

@@ -0,0 +1,40 @@
+require 'kontena/cli/master/token_command'
+require 'kontena/cli/master/token/current_command'
+
+describe Kontena::Cli::Master::Token::CurrentCommand do
+
+  include ClientHelpers
+  include RequirementsHelper
+
+  expect_to_require_current_master
+  expect_to_require_current_master_token
+
+  let(:master) { double(token: double(access_token: 'foo', refresh_token: 'bar', expires_at: Time.now.utc.to_i + 999)) }
+
+  before do
+    allow(subject).to receive(:current_master).and_return(master)
+  end
+
+  it 'runs master token show with the current token' do
+    expect(Kontena).to receive(:run!).with(['master', 'token', 'show', 'foo'])
+    subject.execute
+  end
+
+  describe '--token' do
+    it 'outputs the current access token' do
+      expect{subject.run(['--token'])}.to output(/\Afoo\Z/).to_stdout
+    end
+  end
+
+  describe '--refresh-token' do
+    it 'outputs the current refresh token' do
+      expect{subject.run(['--refresh-token'])}.to output(/\Abar\Z/).to_stdout
+    end
+  end
+
+  describe 'expires-in' do
+    it 'reports time until token expiration' do
+      expect{subject.run(['--expires-in'])}.to output(/\A[0-9]{3}\Z/).to_stdout
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ require 'clamp'
 require 'ruby_dig'
 require 'kontena_cli'
 require 'webmock/rspec'
+require 'tmpdir'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -570,6 +570,7 @@ files:
 - spec/kontena/cli/cloud/login_command_spec.rb
 - spec/kontena/cli/cloud/logout_command_spec.rb
 - spec/kontena/cli/cloud/master/add_command_spec.rb
+- spec/kontena/cli/cloud_command_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/containers/exec_command_spec.rb
 - spec/kontena/cli/containers/list_command_spec.rb
@@ -589,6 +590,7 @@ files:
 - spec/kontena/cli/master/join_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
+- spec/kontena/cli/master/token/current_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/user/invite_command_spec.rb
 - spec/kontena/cli/master/user/remove_command_spec.rb
@@ -692,9 +694,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.7.3
@@ -744,6 +746,7 @@ test_files:
 - spec/kontena/cli/cloud/login_command_spec.rb
 - spec/kontena/cli/cloud/logout_command_spec.rb
 - spec/kontena/cli/cloud/master/add_command_spec.rb
+- spec/kontena/cli/cloud_command_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/containers/exec_command_spec.rb
 - spec/kontena/cli/containers/list_command_spec.rb
@@ -763,6 +766,7 @@ test_files:
 - spec/kontena/cli/master/join_command_spec.rb
 - spec/kontena/cli/master/login_command_spec.rb
 - spec/kontena/cli/master/logout_command_spec.rb
+- spec/kontena/cli/master/token/current_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/master/user/invite_command_spec.rb
 - spec/kontena/cli/master/user/remove_command_spec.rb