kontena-cli 1.3.0.pre1 → 1.3.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ab10349d6c3c14f160614a1889a8de25719076
-  data.tar.gz: 5969036b74c54688c2ced991d4ec63c02f84c539
+  metadata.gz: 3cecf22e1d7197b410494d6fbbc265d052c2cb36
+  data.tar.gz: 84f981033ed64b0ba6a85344544d1981a723fd21
 SHA512:
-  metadata.gz: 8b54fac59b78a266deb4111a1e66841826e43bf41b494f9a63955cb661e9bd5f58c6251625e4f2e8fb62173a975cdc374336d47d4f6368d5076ee1db393da60f
-  data.tar.gz: c488fdc913c0806f16deb27c891064c48141c19fd67944f7b80117f946f6b9ad2a61034772e09837261625dab84469eee9606fbd2626aa15e8840b175b0aafdf
+  metadata.gz: 3dabb9b18fe5a4f0c62bb31686311a6fa65c46cc953fb803a0a53f6dad0ea4a7f36e777c995a0b01957e114eb288517b9ecfd41f1648a2555956ed2751f45cc1
+  data.tar.gz: 8203264603f9bb1c79fefd5ce372a85481531eea3e70d44b0aaad9ac57a27a8f641bc13739cc3684bb9a0ca3a2e5cf974d46bf3c9bcb17bb57e39dd9d277f53d

data/VERSION

@@ -1 +1 @@
-1.3.0.pre1
+1.3.0.pre2

data/bin/kontena

@@ -12,7 +12,8 @@ if ARGV[0] == 'complete'
   ARGV.delete_at(0)
   require 'kontena/scripts/completer'
 else
+  ENV['DEBUG'] ||= "true" if ARGV.any? { |arg| arg == '-D' || arg == '--debug'}
   require 'kontena_cli'
-  Kontena::PluginManager.instance.init
+  Kontena::PluginManager.instance.init unless ENV['NO_PLUGINS']
   Kontena::MainCommand.run
 end

data/lib/kontena/callback.rb

@@ -44,7 +44,7 @@ class Kontena::Callback
           if klass.instance_methods.include?(state)
             cb = klass.new(obj)
             if cb.send(state).kind_of?(FalseClass)
-              ENV["DEBUG"] && $stderr.puts("Execution aborted by #{klass}")
+              Kontena.logger.debug { "Execution aborted by #{klass}" }
               exit 1
             end
           end

data/lib/kontena/callbacks/auth/01_list_and_select_grid_after_master_auth.rb

@@ -2,8 +2,6 @@ module Kontena
   module Callbacks
     class ListAndSelectGrid < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master login'
 
       def after_load
@@ -15,6 +13,7 @@ module Kontena
       # Runs kontena grids list --use which will auto join the first available
       # grid
       def after
+        extend Kontena::Cli::Common
         return if command.skip_grid_auto_select?
         return unless current_master
         return unless command.exit_code == 0

data/lib/kontena/callbacks/master/01_clear_current_master_after_terminate.rb

@@ -2,15 +2,14 @@ module Kontena
   module Callbacks
     class ClearCurrentMasterAfterTerminate < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master terminate'
 
       def after
+        extend Kontena::Cli::Common
         return unless command.exit_code == 0
         return unless config.current_master
 
-        ENV["DEBUG"] && $stderr.puts("Removing current master from config")
+        logger.debug { "Removing current master from config" }
         config.servers.delete_at(config.find_server_index(config.current_master.name))
         config.current_server = nil
         config.write

data/lib/kontena/callbacks/master/deploy/01_show_logo_before_deploy.rb

@@ -2,11 +2,10 @@ module Kontena
   module Callbacks
     class DisplayLogoBeforeMasterDeploy < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def before
+        extend Kontena::Cli::Common
         display_logo
       end
     end

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

@@ -2,11 +2,11 @@ module Kontena
   module Callbacks
     class BeforeDeployConfigurationWizard < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def after_load
+        extend Kontena::Cli::Common
+
         command.class_eval do
           option ['--no-prompt'], :flag, "Don't ask questions"
           option ['--skip-auth-provider'], :flag, "Skip auth provider configuration (single user mode)"

data/lib/kontena/callbacks/master/deploy/40_install_ssl_certificate_after_deploy.rb

@@ -2,11 +2,11 @@ module Kontena
   module Callbacks
     class InstallSslCertificateAfterDeploy < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def after
+        extend Kontena::Cli::Common
+
         return unless command.exit_code == 0
         return unless command.result.kind_of?(Hash)
         return unless command.result.has_key?(:ssl_certificate)

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

@@ -1,16 +1,16 @@
-require 'securerandom'
-
 module Kontena
   module Callbacks
     class AuthenticateAfterDeploy < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def after
-        ENV["DEBUG"] && $stderr.puts("Command result: #{command.result.inspect}")
-        ENV["DEBUG"] && $stderr.puts("Command exit code: #{command.exit_code.inspect}")
+        extend Kontena::Cli::Common
+
+        require 'securerandom'
+        extend Kontena::Cli::Common
+        logger.debug { "Command result: #{command.result.inspect}" }
+        logger.debug { "Command exit code: #{command.exit_code.inspect}" }
         return unless command.exit_code == 0
         return unless command.result.kind_of?(Hash)
         return unless command.result.has_key?(:public_ip)
@@ -36,11 +36,11 @@ module Kontena
 
         # Figure out if HTTPS works, if not, try HTTP
         begin
-          ENV["DEBUG"] && $stderr.puts("Trying to request / from #{new_master.url}")
+          logger.debug { "Trying to request / from #{new_master.url}" }
           client = Kontena::Client.new(new_master.url, nil, ignore_ssl_errors: true)
           client.get('/')
         rescue => ex
-          ENV["DEBUG"] && $stderr.puts("HTTPS test failed: #{ex.class.name} #{ex.message}")
+          logger.debug { "HTTPS test failed: #{ex.class.name} #{ex.message}" }
           unless retried
             new_master.url = "http://#{command.result[:public_ip]}"
             retried = true
@@ -57,7 +57,7 @@ module Kontena
           new_master.url
         ]
         Retriable.retriable do
-          ENV["DEBUG"] && $stderr.puts("Running: #{cmd}")
+          logger.debug { "Running: #{cmd}" }
           Kontena.run!(cmd)
         end
       end

data/lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb

@@ -2,11 +2,11 @@ module Kontena
   module Callbacks
     class CreateInitialGridAfterDeploy < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def after
+        extend Kontena::Cli::Common
+
         return unless command.exit_code == 0
         return unless config.current_master
         return unless config.current_master.name == command.result[:name]

data/lib/kontena/callbacks/master/deploy/56_set_server_provider_after_deploy.rb

@@ -2,11 +2,10 @@ module Kontena
   module Callbacks
     class SetServerProviderAfterDeploy < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def after
+        extend Kontena::Cli::Common
         return unless command.exit_code == 0
         return unless config.current_master
         return unless config.current_master.name == command.result[:name]

data/lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb

@@ -2,8 +2,6 @@ module Kontena
   module Callbacks
     class ConfigureAuthProviderAfterDeploy < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def init_cloud_args
@@ -16,6 +14,7 @@ module Kontena
       end
 
       def after
+        extend Kontena::Cli::Common
         return unless command.exit_code == 0
         return unless command.result.kind_of?(Hash)
         return unless command.result.has_key?(:name)

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

@@ -2,8 +2,6 @@ module Kontena
   module Callbacks
     class InviteSelfAfterDeploy < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create', 'master init_cloud'
 
       def cloud_user_data
@@ -25,6 +23,7 @@ module Kontena
       end
 
       def after
+        extend Kontena::Cli::Common
         return unless current_master
         return unless command.exit_code == 0
         return nil if command.respond_to?(:skip_auth_provider?) && command.skip_auth_provider?
@@ -37,7 +36,7 @@ module Kontena
         end
 
         return nil unless invite_response
-        ENV["DEBUG"] && $stderr.puts("Got invite code: #{invite_response['invite_code']}")
+        logger.debug { "Got invite code: #{invite_response['invite_code']}" }
 
         success = spinner "Adding master_admin role for #{cloud_user_data[:email]}" do |spin|
           spin.fail! unless Kontena.run(["master", "user", "role", "add", "--silent", "master_admin", cloud_user_data[:email]])

data/lib/kontena/callbacks/master/deploy/90_proptip_after_deploy.rb

@@ -2,11 +2,11 @@ module Kontena
   module Callbacks
     class SuggestInvitingYourself < Kontena::Callback
 
-      include Kontena::Cli::Common
-
       matches_commands 'master create'
 
       def after
+        extend Kontena::Cli::Common
+
         return unless current_master
         return unless command.exit_code == 0
         return if current_master.username.to_s == 'admin'

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

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative '../services/services_helper'
 require_relative './service_generator'
 require_relative './service_generator_v2'

data/lib/kontena/cli/apps/init_command.rb

@@ -4,6 +4,8 @@ require_relative 'dockerfile_generator'
 require_relative 'docker_compose_generator'
 require_relative 'kontena_yml_generator'
 
+require "safe_yaml"
+SafeYAML::OPTIONS[:default_mode] = :safe
 
 module Kontena::Cli::Apps
   class InitCommand < Kontena::Command

data/lib/kontena/cli/apps/kontena_yml_generator.rb

@@ -1,5 +1,6 @@
-require 'yaml'
 require_relative 'common'
+require "safe_yaml"
+SafeYAML::OPTIONS[:default_mode] = :safe
 
 module Kontena::Cli::Apps
   class KontenaYmlGenerator

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

@@ -9,7 +9,9 @@ module Kontena::Cli::Apps
     option ['-f', '--file'], 'FILE', 'Specify an alternate Kontena compose file', attribute_name: :filename, default: 'kontena.yml'
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
 
-    parameter "[SERVICE] ...", "Services to start"
+    option ['-q', '--quiet'], :flag, "Output the identifying column only"
+
+    parameter "[SERVICE] ...", "Services to list"
 
     attr_reader :services
 
@@ -17,6 +19,12 @@ module Kontena::Cli::Apps
       require_config_file(filename)
 
       @services = services_from_yaml(filename, service_list, service_prefix, true)
+
+      if quiet?
+        puts services.map(&:first).join("\n")
+        exit 0
+      end
+
       if services.size > 0
         show_services(services)
       elsif !service_list.empty?
@@ -32,7 +40,7 @@ module Kontena::Cli::Apps
       services.each do |service_name, opts|
         service = get_service(token, prefixed_name(service_name)) rescue false
         if service
-          name = service['name'].sub("#{@service_prefix}-", '')
+          name = service['name'].sub("#{service_prefix}-", '')
           state = service['stateful'] ? 'yes' : 'no'
           ports = service['ports'].map{|p|
             "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"

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

@@ -1,4 +1,5 @@
-require 'yaml'
+require "safe_yaml"
+SafeYAML::OPTIONS[:default_mode] = :safe
 require_relative 'service_extender'
 require_relative 'validator'
 require_relative 'validator_v2'

data/lib/kontena/cli/apps/yaml/service_extender.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 require_relative '../../../util'
 
 module Kontena::Cli::Apps

data/lib/kontena/cli/cloud/login_command.rb

@@ -4,10 +4,11 @@ module Kontena::Cli::Cloud
   class LoginCommand < Kontena::Command
     include Kontena::Cli::Common
 
-    option ['-t', '--token'], '[TOKEN]', 'Use a pre-generated access token', environment_variable: 'KONTENA_ACCOUNT_TOKEN'
+    option ['-t', '--token'], '[TOKEN]', 'Use a pre-generated access token', environment_variable: 'KONTENA_CLOUD_TOKEN'
     option ['-c', '--code'], '[CODE]', 'Use an authorization code'
     option ['-v', '--verbose'], :flag, 'Increase output verbosity'
     option ['-f', '--force'], :flag, 'Force reauthentication'
+    option ['-r', '--remote'], :flag, 'Remote login'
 
     def execute
       if self.code && self.force?
@@ -35,8 +36,11 @@ module Kontena::Cli::Cloud
           finish and return
         end
       end
-
-      web_flow
+      if remote?
+        remote_login
+      else
+        web_flow
+      end
       finish
     end
 
@@ -51,13 +55,53 @@ module Kontena::Cli::Cloud
       true
     end
 
+    def remote_login
+      client_id = kontena_account.client_id || Kontena::Client::CLIENT_ID
+      params = {
+        client_id: client_id
+      }
+      cloud_url = kontena_account.url
+      client = Kontena::Client.new(cloud_url, nil)
+      auth_request_response = client.post('/auth_requests', params, {}, { 'Content-Type' => 'application/x-www-form-urlencoded' }) rescue nil
+      if !auth_request_response.kind_of?(Hash)
+        exit_with_error "Remote login request failed"
+      elsif auth_request_response['error']
+        exit_with_error "Remote login request failed: #{auth_request_response['error']}"
+      end
+      begin
+        verification_uri = URI.parse(auth_request_response['verification_uri'])
+      rescue => e
+        exit_with_error "Parsing remote login URL failed."
+      end
+
+      puts "Please visit #{verification_uri.to_s.colorize(:cyan)} and enter the code"
+      puts
+      puts "#{auth_request_response['user_code']}"
+      puts
+      puts "Once the authentication is complete you can close the browser"
+      puts "window or tab and return to this window to continue."
+      puts
+
+      code_request_params = {
+        client_id: client_id,
+        device_code: auth_request_response['device_code']
+      }
+      code_response = nil
+      spinner "Waiting for authentication" do
+        until code_response do
+          code_response = client.post("/auth_requests/code",  code_request_params, {}, { 'Content-Type' => 'application/x-www-form-urlencoded' }) rescue nil
+          sleep 1
+        end
+      end
+      update_token(code_response)
+    end
+
     def web_flow
       if Kontena.browserless? && !force?
-        $stderr.puts "Your current environment does not seem to support opening a local graphical WWW browser."
+        $stderr.puts "Your current environment does not seem to support opening a local graphical WWW browser. Using remote login instead."
         $stderr.puts
-        $stderr.puts "You can perorm a login on another computer, copy the token and use it with 'kontena cloud login --token <token>'."
-        $stderr.puts "There will be an easier way to log in from a browserless environment soon."
-        exit_with_error 'Unable to launch a web browser'
+        remote_login
+        return
       end
 
       require_relative '../localhost_web_server'

data/lib/kontena/cli/cloud/master/list_command.rb

@@ -2,6 +2,7 @@ module Kontena::Cli::Cloud::Master
   class ListCommand < Kontena::Command
 
     include Kontena::Cli::Common
+    include Kontena::Cli::TableGenerator::Helper
 
     callback_matcher 'cloud-master', 'list'
 
@@ -9,22 +10,24 @@ module Kontena::Cli::Cloud::Master
 
     requires_current_account_token
 
+    def fields
+      quiet? ? ['id'] : %w(id name owner url connected)
+    end
+
     def execute
-      response = cloud_client.get('user/masters')
+      response = spin_if(!quiet?, "Retrieving Master list from Kontena Cloud") do
+        cloud_client.get('user/masters')
+      end
+
       unless response && response.kind_of?(Hash) && response['data'].kind_of?(Array)
         abort "Listing masters failed".colorize(:red)
       end
 
-      if response['data'].empty?
-        return [] if self.return?
-        puts "No masters registered"
-      else
-        return response['data'] if self.return?
-        puts '%-26.26s %-24s %-12s %s' % ['ID', 'NAME', 'OWNER', 'URL']
-        response['data'].each do |data|
-          attr = data['attributes']
-          puts '%-26.26s %-24s %-12s %s' % [data['id'], attr['name'], attr['owner'], attr['url']]
-        end
+      return Array(response['data']) if self.return?
+
+      print_table(response['data']) do |row|
+        row.merge!(row['attributes'])
+        row['connected'] = !!row['connected'] ? pastel.green('yes') : pastel.red('no')
       end
     end
   end