kontena-cli 0.16.0.pre3 → 0.16.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0396ae545ef65b7d8f8011ff078e644d593a94
-  data.tar.gz: b146002d263311acb234c18fc39c9bd187dc360c
+  metadata.gz: 36e047ed9eeab9703d96bf167ae05ae212a8d696
+  data.tar.gz: 4c947a57f0d149044c1aa255e317db8115d2e305
 SHA512:
-  metadata.gz: 050323b6a272b3ba7ee93bd21dc7b717b6254297c0e53a55035ed42cc4d0c0e98a021eea80fb5037b725e504c59116ac5b56435ca21defce0752567ac8082a73
-  data.tar.gz: fff1427644f1620501fb95660e609090dfd2e2d8b8dfaaf4b29005bfedfb8e705204f238810960f9b64816b0c1605664289be0e77aed6f333aa6f485ab7dad6a
+  metadata.gz: dd2d2120ea3c23cfb2d3be1d867ec2b05475a9c6f9abfa689efe9ff6682ea6740ff10079163c104a7f3fcc65a818ce2fb688a48fea6f8703cc4a8bb4248bebd0
+  data.tar.gz: 86e61055eb8c0c34e0569c5bc26ae0f96055cca0dc90c3c6f8eaacae09752c7409ae666ca038a1a6a0ef8ce03b44327eec08d72e5ef383fd0215fd7d88937f9e

data/VERSION

@@ -1 +1 @@
-0.16.0.pre3
+0.16.0.pre4

data/lib/kontena/callbacks/master/deploy/04_default_master_version.rb

@@ -0,0 +1,18 @@
+module Kontena
+  module Callbacks
+    class DefaultMasterVersion < Kontena::Callback
+
+      matches_commands 'master create'
+
+      def after_load
+        # Only run this for prerelease cli
+        return unless Kontena::Cli::VERSION =~ /\d\.(?:pre|rc|beta|edge)/
+        version_switch = command.recognised_options.find {|opt| opt.switches.include?('--version')}
+        if version_switch
+          version_switch.instance_variable_set(:@default_value, 'edge')
+        end
+      end
+    end
+  end
+end
+

data/lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb

@@ -84,13 +84,13 @@ module Kontena
               command.skip_auth_provider = false
             when :custom
               puts
-              puts 'Learn how to configure custom user authentication provider after installation at: www.kontena.io/docs/configuring-custom-auth-provider'
+              puts 'Learn how to configure custom user authentication provider after installation at: www.kontena.io/docs/using-kontena/authentication'
               puts
               command.cloud_master_id = nil
               command.skip_auth_provider = true
             when :none
               puts
-              puts "You have selected to use Kontena Master in single user mode. You can configure an authentication provider later. For more information, see here: www.kontena.io/docs/configuring-custom-auth-provider"
+              puts "You have selected to use Kontena Master in single user mode. You can configure an authentication provider later. For more information, see here: www.kontena.io/docs/using-kontena/authentication"
               puts
               command.cloud_master_id = nil
               command.skip_auth_provider = true

data/lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb

@@ -44,7 +44,7 @@ module Kontena
         end
 
         require 'shellwords'
-        cmd = "master login --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
+        cmd = "master login --skip-grid-auto-select --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
         ENV["DEBUG"] && puts("Running: #{cmd}")
         Kontena.run(cmd)
       end

data/lib/kontena/command.rb

@@ -6,38 +6,51 @@ class Kontena::Command < Clamp::Command
   attr_reader :result
   attr_reader :exit_code
 
-
-  def self.inherited(where)
-    return if where.has_subcommands?
-    return if where.callback_matcher
-
-    name_parts = where.name.split('::')[-2, 2]
-
-    unless name_parts.compact.empty?
-      # 1: Remove trailing 'Command' from for example AuthCommand
-      # 2: Convert the string from CamelCase to under_score
-      # 3: Convert the string into a symbol
-      #
-      # In comes: ['ExternalRegistry', 'UseCommand']
-      # Out goes: [:external_registry, :use]
-      name_parts = name_parts.map { |np|
-        np.gsub(/Command$/, '').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase.
-        to_sym
-      }
-      where.callback_matcher(*name_parts)
+  module Finalizer
+    def self.extended(obj)
+      # Tracepoint is used to trigger finalize once the command is completely
+      # loaded. If done through def self.inherited the finalizer and
+      # after_load callbacks would run before the options are defined.
+      TracePoint.trace(:end) do |t|
+        if obj == t.self
+          obj.finalize
+          t.disable
+        end
+      end
     end
 
-    # Run all #after_load callbacks for this command.
-    [name_parts.last, :all].compact.uniq.each do |cmd_type|
-      [name_parts.first, :all].compact.uniq.each do |cmd_class|
-        if Kontena::Callback.callbacks.fetch(cmd_class, {}).fetch(cmd_type, nil)
-          Kontena::Callback.callbacks[cmd_class][cmd_type].each do |cb|
-            if cb.instance_methods.include?(:after_load)
-              cb.new(where).after_load
+    def finalize
+      return if self.has_subcommands?
+      return if self.callback_matcher
+
+      name_parts = self.name.split('::')[-2, 2]
+
+      unless name_parts.compact.empty?
+        # 1: Remove trailing 'Command' from for example AuthCommand
+        # 2: Convert the string from CamelCase to under_score
+        # 3: Convert the string into a symbol
+        #
+        # In comes: ['ExternalRegistry', 'UseCommand']
+        # Out goes: [:external_registry, :use]
+        name_parts = name_parts.map { |np|
+          np.gsub(/Command$/, '').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase.
+          to_sym
+        }
+        self.callback_matcher(*name_parts)
+      end
+
+      # Run all #after_load callbacks for this command.
+      [name_parts.last, :all].compact.uniq.each do |cmd_type|
+        [name_parts.first, :all].compact.uniq.each do |cmd_class|
+          if Kontena::Callback.callbacks.fetch(cmd_class, {}).fetch(cmd_type, nil)
+            Kontena::Callback.callbacks[cmd_class][cmd_type].each do |cb|
+              if cb.instance_methods.include?(:after_load)
+                cb.new(self).after_load
+              end
             end
           end
         end
@@ -45,6 +58,10 @@ class Kontena::Command < Clamp::Command
     end
   end
 
+  def self.inherited(where)
+    where.extend Finalizer
+  end
+
   def self.callback_matcher(cmd_class = nil, cmd_type = nil)
     unless cmd_class
       if @command_class.nil?
@@ -59,7 +76,7 @@ class Kontena::Command < Clamp::Command
   end
 
   def run_callbacks(state)
-    if self.class.respond_to?(:callback_matcher) && !self.class.callback_matcher.compact.empty?
+    if self.class.respond_to?(:callback_matcher) && !self.class.callback_matcher.nil? && !self.class.callback_matcher.compact.empty?
       Kontena::Callback.run_callbacks(self.class.callback_matcher, state, self)
     end
   end
@@ -146,7 +163,7 @@ class Kontena::Command < Clamp::Command
   end
 
   def run(arguments)
-    ENV["DEBUG"] && puts("Running #{self} -- callback matcher = '#{self.class.callback_matcher.map(&:to_s).join(' ')}'")
+    ENV["DEBUG"] && puts("Running #{self} -- callback matcher = '#{self.class.callback_matcher.nil? ? "nil" : self.class.callback_matcher.map(&:to_s).join(' ')}'")
     @arguments = arguments
 
     run_callbacks :before_parse unless help_requested?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre3
+  version: 0.16.0.pre4
 platform: ruby
 authors:
 - Kontena, Inc
@@ -212,6 +212,7 @@ files:
 - lib/kontena/callbacks/auth/01_list_and_select_grid_after_master_auth.rb
 - lib/kontena/callbacks/master/01_clear_current_master_after_terminate.rb
 - lib/kontena/callbacks/master/deploy/01_show_logo_before_deploy.rb
+- lib/kontena/callbacks/master/deploy/04_default_master_version.rb
 - lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb
 - lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb