kontena-cli 0.16.0.pre9 → 0.16.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa76bec3b6a5ed5df0158f25414e20867de2a4a9
-  data.tar.gz: 37751c168d7c698026f87cc6399bc8a2d7a81f65
+  metadata.gz: 074582c5f337898b55470514cd0241dda4fd7186
+  data.tar.gz: f12755e0088565b92c5c0a670926cf5316392a28
 SHA512:
-  metadata.gz: e58a8e4e643e9ca4abad3630d3f0bb68d6006504f27338e7cca4374c85dc8227a9c66a2606da26fc04092e5a076812ab02121f209126f4d3af71fe4e3e166dfe
-  data.tar.gz: 834031757d11996be1724deffdd172fbc1dd2ef431b17792276a66000bdfcc35e434dbfe5002ca40aa66d38b239c03d5fc074b5d448f3df7b5bdee6da92a1cbc
+  metadata.gz: 5c53cc63797bea13a5a3b5b500e66b673763ca9af9eb4f78cb348a8a9a8990be9a048494b8aa3ce0384c54ef59f2e50d1fd8a8768b16bca84d11bd6790e8b832
+  data.tar.gz: 88e71e8730ec8d03001d3afc8d978cd917e28a5cbc00c782637e70a16fe4a4a275656fa4c50e0b325bcf29776a36d5d215746e12146bb2b0cebe377b622703ac

data/VERSION

@@ -1 +1 @@
-0.16.0.pre9
+0.16.0.rc1

data/kontena-cli.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "excon", "~> 0.49.0"
   spec.add_runtime_dependency "tty-prompt", "~> 0.7.1"
-  spec.add_runtime_dependency "clamp", "~> 1.0.0"
+  spec.add_runtime_dependency "clamp", "~> 1.1.0"
   spec.add_runtime_dependency "ruby_dig", "~> 0.0.2"
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "hash_validator", "~> 0.7.0"

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

@@ -50,6 +50,11 @@ 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
+        end
+
         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/register_command.rb

@@ -0,0 +1,9 @@
+module Kontena::Cli
+  class RegisterCommand < Kontena::Command
+    include Kontena::Cli::Common
+
+    def execute
+      exit_with_error "The register command has been removed in this version. Visit https://cloud.kontena.io/sign-up to create a Kontena Cloud account or use: kontena cloud login"
+    end
+  end
+end

data/lib/kontena/main_command.rb

@@ -25,9 +25,11 @@ require_relative 'cli/version_command'
 require_relative 'cli/stack_command'
 require_relative 'cli/certificate_command'
 require_relative 'cli/cloud_command'
+require_relative 'cli/register_command'
 
 class Kontena::MainCommand < Kontena::Command
   include Kontena::Util
+  include Kontena::Cli::Common
 
   subcommand "cloud", "Kontena Cloud specific commands", Kontena::Cli::CloudCommand
   subcommand "logout", "Logout from Kontena Masters or Kontena Cloud accounts", Kontena::Cli::LogoutCommand
@@ -47,7 +49,8 @@ class Kontena::MainCommand < Kontena::Command
   subcommand "whoami", "Shows current logged in user", Kontena::Cli::WhoamiCommand
   subcommand "plugin", "Plugin related commands", Kontena::Cli::PluginCommand
   subcommand "version", "Show version", Kontena::Cli::VersionCommand
-  subcommand "login", "Login to Kontena Master (removed, use kontena master login)", Kontena::Cli::LoginCommand
+  subcommand "login", "[DEPRECATED] Login to Kontena Master", Kontena::Cli::LoginCommand
+  subcommand "register", "[DEPRECATED] Register a Kontena Cloud account", Kontena::Cli::RegisterCommand
 
   def execute
   end
@@ -58,4 +61,16 @@ class Kontena::MainCommand < Kontena::Command
   def self.register(command, description, command_class)
     subcommand(command, description, command_class)
   end
+
+  def subcommand_missing(name)
+    if known_plugin_subcommand?(name)
+      exit_with_error "The '#{name}' plugin has not been installed. Use: kontena plugin install #{name}"
+    else
+      super(name)
+    end
+  end
+
+  def known_plugin_subcommand?(name)
+    ['vagrant', 'packet', 'digitalocean', 'azure', 'upcloud', 'aws'].include?(name)
+  end
 end

data/lib/kontena/plugin_manager.rb

@@ -26,7 +26,7 @@ module Kontena
               else
                 plugin_name = spec.name.sub('kontena-plugin-', '')
                 STDERR.puts " [#{Kontena.pastel.red('error')}] Plugin #{Kontena.pastel.cyan(plugin_name)} (#{spec.version}) is not compatible with the current cli version."
-                STDERR.puts "         To update plugin, run 'kontena plugin install #{plugin_name}'"
+                STDERR.puts "         To update the plugin, run 'kontena plugin install #{plugin_name}'"
               end
             rescue LoadError => exc
               STDERR.puts " [#{Kontena.pastel.red('error')}] Failed to load plugin: #{spec.name}"

data/spec/kontena/cli/main_command_spec.rb

@@ -0,0 +1,20 @@
+require_relative "../../spec_helper"
+require "kontena/main_command"
+
+describe Kontena::MainCommand do
+
+  let(:subject) { described_class.new(File.basename($0)) }
+  describe '#subcommand_missing' do
+    it 'suggests plugin install for known plugin commands' do
+      expect(subject).to receive(:known_plugin_subcommand?).with('testplugin').and_return(true)
+      expect(subject).to receive(:exit_with_error).with(/plugin has not been installed/).and_raise(StandardError)
+      expect{subject.run(['testplugin', 'master', 'create'])}.to raise_error(StandardError)
+    end
+
+    it 'runs normal error handling for unknown sub commands' do
+      expect(subject).to receive(:known_plugin_subcommand?).with('testplugin').and_return(false)
+      expect{subject.run(['testplugin', 'master', 'create'])}.to raise_error(Clamp::UsageError)
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre9
+  version: 0.16.0.rc1
 platform: ruby
 authors:
 - Kontena, Inc
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: ruby_dig
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +313,7 @@ files:
 - lib/kontena/cli/plugins/list_command.rb
 - lib/kontena/cli/plugins/search_command.rb
 - lib/kontena/cli/plugins/uninstall_command.rb
+- lib/kontena/cli/register_command.rb
 - lib/kontena/cli/registry/create_command.rb
 - lib/kontena/cli/registry/delete_command.rb
 - lib/kontena/cli/registry/remove_command.rb
@@ -424,6 +425,7 @@ files:
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
 - spec/kontena/cli/grids/use_command_spec.rb
 - 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/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
@@ -516,6 +518,7 @@ test_files:
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
 - spec/kontena/cli/grids/use_command_spec.rb
 - 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/logout_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb