kontena-cli 0.15.5 → 0.16.0.pre1

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

@@ -0,0 +1,24 @@
+module Kontena
+  module Callbacks
+    class SuggestInvitingYourself < Kontena::Callback
+
+      include Kontena::Cli::Common
+
+      matches_commands 'master create'
+
+      def after
+        return unless current_master
+        return unless command.exit_code == 0
+        return unless current_master.username.to_s == 'admin'
+
+        puts
+        puts "Protip:"
+        puts "  You are currently using Kontena Master administrator account."
+        puts "  Consider inviting yourself as a regular user. Use: "
+        puts "    kontena master users invite -r master_admin your@email.address.example.com"
+        puts "    kontena master join <master_url> <invite_code>"
+        puts
+      end
+    end
+  end
+end

data/lib/kontena/cli/app_command.rb

@@ -12,7 +12,7 @@ require_relative 'apps/monitor_command'
 require_relative 'apps/show_command'
 require_relative 'apps/scale_command'
 
-class Kontena::Cli::AppCommand < Clamp::Command
+class Kontena::Cli::AppCommand < Kontena::Command
 
   subcommand "init", "Init Kontena application", Kontena::Cli::Apps::InitCommand
   subcommand "build", "Build Kontena services", Kontena::Cli::Apps::BuildCommand
@@ -27,6 +27,7 @@ class Kontena::Cli::AppCommand < Clamp::Command
   subcommand ["logs"], "Show service logs", Kontena::Cli::Apps::LogsCommand
   subcommand "monitor", "Monitor services", Kontena::Cli::Apps::MonitorCommand
   subcommand ["remove","rm"], "Remove services", Kontena::Cli::Apps::RemoveCommand
+
   def execute
   end
 end

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

@@ -2,7 +2,7 @@ require_relative 'common'
 require_relative 'docker_helper'
 
 module Kontena::Cli::Apps
-  class BuildCommand < Clamp::Command
+  class BuildCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
     include DockerHelper

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

@@ -62,7 +62,12 @@ module Kontena::Cli::Apps
 
     def project_name_from_yaml(file)
       reader = YAML::Reader.new(file, true)
-      reader.stack_name
+      outcome = reader.execute
+      if outcome[:version].to_i == 2
+        outcome[:name]
+      else
+        nil
+      end
     end
 
     # @return [String]

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

@@ -2,7 +2,7 @@ require_relative 'common'
 require 'pp'
 
 module Kontena::Cli::Apps
-  class ConfigCommand < Clamp::Command
+  class ConfigCommand < Kontena::Command
     include Kontena::Cli::Common    
     include Common
 

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

@@ -3,7 +3,7 @@ require_relative 'common'
 require_relative 'docker_helper'
 
 module Kontena::Cli::Apps
-  class DeployCommand < Clamp::Command
+  class DeployCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -6,7 +6,7 @@ require_relative 'kontena_yml_generator'
 
 
 module Kontena::Cli::Apps
-  class InitCommand < Clamp::Command
+  class InitCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 
@@ -17,8 +17,6 @@ module Kontena::Cli::Apps
 
 
     def execute
-      require 'highline/import'
-
       if File.exist?('Dockerfile')
         puts 'Found Dockerfile'
       elsif create_dockerfile?
@@ -67,7 +65,7 @@ module Kontena::Cli::Apps
     end
 
     def create_dockerfile?
-      ['', 'y', 'yes'].include? ask('Dockerfile not found. Do you want to create it? [Yn]: ').downcase
+      prompt.yes?('Dockerfile not found. Do you want to create it?')
     end
 
     def create_env_file(env)
@@ -85,7 +83,7 @@ module Kontena::Cli::Apps
     end
 
     def create_docker_compose_yml?
-      ['', 'y', 'yes'].include? ask("#{docker_compose_file} not found. Do you want to create it? [Yn]: ").downcase
+      prompt.yes?("#{docker_compose_file} not found. Do you want to create it?")
     end
 
   end

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class ListCommand < Clamp::Command
+  class ListCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -2,7 +2,7 @@ require_relative 'common'
 require_relative '../helpers/log_helper'
 
 module Kontena::Cli::Apps
-  class LogsCommand < Clamp::Command
+  class LogsCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Helpers::LogHelper

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class MonitorCommand < Clamp::Command
+  class MonitorCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class RemoveCommand < Clamp::Command
+  class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common
@@ -41,8 +41,7 @@ module Kontena::Cli::Apps
 
     def delete(name, options, async = true)
       unless deleted_services.include?(name)
-        print "deleting #{name.colorize(:cyan)}"
-        ShellSpinner " " do
+        spinner "deleting #{name.colorize(:cyan)}" do
           service = get_service(token, prefixed_name(name)) rescue nil
           if(service)
             delete_service(token, prefixed_name(name))

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class RestartCommand < Clamp::Command
+  class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Common
 

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class ScaleCommand < Clamp::Command
+  class ScaleCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class ShowCommand < Clamp::Command
+  class ShowCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class StartCommand < Clamp::Command
+  class StartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -1,7 +1,7 @@
 require_relative 'common'
 
 module Kontena::Cli::Apps
-  class StopCommand < Clamp::Command
+  class StopCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
     include Common

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

@@ -27,17 +27,13 @@ module Kontena::Cli::Apps
         Dir.chdir(File.dirname(File.expand_path(file))) do
           result[:version] = yaml['version'] || '1'
           result[:name] = yaml['name']
+          result[:services] = parse_services(service_name)
           result[:errors] = errors
           result[:notifications] = notifications
-          result[:services] = parse_services(service_name) unless errors.count > 0
         end
         result
       end
 
-      def stack_name
-        yaml['name'] if v2?
-      end
-
       ##
       # @return [true|false]
       def v2?
@@ -51,11 +47,7 @@ module Kontena::Cli::Apps
         content = content % { project: ENV['project'], grid: ENV['grid'] }
         interpolate(content)
         replace_dollar_dollars(content)
-        begin
-          @yaml = ::YAML.load(content)
-        rescue Psych::SyntaxError => e
-          abort("Error while parsing #{file}".colorize(:red)+ " "+e.message)
-        end
+        @yaml = ::YAML.load(content)
       end
 
       # @return [Array] array of validation errors
@@ -88,9 +80,7 @@ module Kontena::Cli::Apps
       # @return [Hash]
       def parse_services(service_name = nil)
         if service_name.nil?
-          services.each do |name, config|
-            services[name] = process_config(config)
-          end
+          services.each { |name, config| services[name] = process_config(config) }
           services
         else
           abort("Service '#{service_name}' not found in #{file}".colorize(:red)) unless services.key?(service_name)

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

@@ -43,10 +43,6 @@ module Kontena::Cli::Apps
         }
 
         yaml.each do |service, options|
-          unless options.is_a?(Hash)
-            result[:errors] << { service => { 'options' => 'must be a mapping not a string'}  }            
-            next
-          end
           key_errors = validate_keys(options)
           option_errors = validate_options(options)
           result[:errors] << { service => option_errors.messages } if option_errors.failure?

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

@@ -53,11 +53,7 @@ module Kontena::Cli::Apps
           notifications: []
         }
         if yaml.key?('services')
-          yaml['services'].each do |service, options|            
-            unless options.is_a?(Hash)
-              result[:errors] << { service => { 'options' => 'must be a mapping not a string'} }
-              next
-            end
+          yaml['services'].each do |service, options|
             key_errors = validate_keys(options)
             option_errors = validate_options(options)
             result[:errors] << { service => option_errors.messages } if option_errors.failure?

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

@@ -1,6 +1,6 @@
 
 module Kontena::Cli::Certificate
-  class AuthorizeCommand < Clamp::Command
+  class AuthorizeCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

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

@@ -1,6 +1,6 @@
 
 module Kontena::Cli::Certificate
-  class GetCommand < Clamp::Command
+  class GetCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

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

@@ -1,6 +1,6 @@
 
 module Kontena::Cli::Certificate
-  class RegisterCommand < Clamp::Command
+  class RegisterCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

data/lib/kontena/cli/certificate_command.rb

@@ -2,7 +2,7 @@ require_relative 'certificate/register_command'
 require_relative 'certificate/authorize_command'
 require_relative 'certificate/get_command'
 
-class Kontena::Cli::CertificateCommand < Clamp::Command
+class Kontena::Cli::CertificateCommand < Kontena::Command
 
 
   subcommand "register", "Register to LetsEncrypt", Kontena::Cli::Certificate::RegisterCommand

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

@@ -0,0 +1,128 @@
+require 'uri'
+
+module Kontena::Cli::Cloud
+  class LoginCommand < Kontena::Command
+    include Kontena::Cli::Common
+
+    option ['-t', '--token'], '[TOKEN]', 'Use a pre-generated access token'
+    option ['-c', '--code'], '[CODE]', 'Use an authorization code'
+    option ['-v', '--verbose'], :flag, 'Increase output verbosity'
+
+    def execute
+      require_relative '../localhost_web_server'
+      require 'launchy'
+
+      if self.code
+        kontena_account.token ||= Kontena::Cli::Config::Token.new(access_token: self.token, parent_type: :account, parent_name: kontena_account.name)
+        client = Kontena::Client.new(kontena_account.token_endpoint, kontena_account.token)
+        response = nil
+        begin
+          vspinner "Exchanging authorization code to access token" do
+            response = client.exchange_code(self.code)
+            raise Kontena::Errors::StandardError.new(400, 'Code exchange failed') unless response
+          end
+        end
+        if response && response.kind_of?(Hash) && response['access_token']
+          kontena_account.token.access_token = response['access_token']
+          kontena_account.token.refresh_token = response['refresh_token']
+          kontena_account.token.expires_at = response['expires_in'].to_i > 0 ? Time.now.utc.to_i + response['expires_in'].to_i : nil
+          logger.debug "Code exchanged succesfully"
+        else
+          puts "Code exchange failed".colorize(:red)
+          exit 1
+        end
+      elsif self.token.nil?
+        token = kontena_account.token ||= Kontena::Cli::Config::Token.new(parent_type: :account, parent_name: ENV['KONTENA_ACCOUNT'] || 'kontena')
+      elsif self.token
+        kontena_account.token = Kontena::Cli::Config::Token.new(access_token: self.token, parent_type: :account, parent_name: ENV['KONTENA_ACCOUNT'] || 'kontena')
+      end
+
+      client = Kontena::Client.new(kontena_account.userinfo_endpoint, kontena_account.token, prefix: '')
+
+      if kontena_account.token.access_token
+        auth_ok = false
+        vspinner "Verifying current access token" do
+          auth_ok = client.authentication_ok?(kontena_account.userinfo_endpoint)
+        end
+
+        if auth_ok
+          config.write
+          display_logo
+          display_login_info(only: :account)
+          exit 0
+        end
+      end
+
+      uri = URI.parse(kontena_account.authorization_endpoint)
+      uri.host ||= kontena_account.url
+
+      web_server = Kontena::LocalhostWebServer.new
+
+      params = {
+        client_id: kontena_account.client_id || Kontena::Client::CLIENT_ID,
+        response_type: 'code',
+        redirect_uri: "http://localhost:#{web_server.port}/cb"
+      }
+
+      uri.query = URI.encode_www_form(params)
+
+      puts "Opening a browser to #{uri.scheme}://#{uri.host}"
+      puts
+      puts "If you are running this command over an ssh connection or it's"
+      puts "otherwise not possible to open a browser from this terminal"
+      puts "then you must use a pregenerated access token using the --token"
+      puts "option : kontena cloud login --token <access_token>"
+      puts
+      puts "Once the authentication is complete you can close the browser"
+      puts "window or tab and return to this window to continue."
+      puts
+      any_key_to_continue
+
+      puts "If the browser does not open, try visiting this URL manually:"
+      puts "<#{uri.to_s}>"
+      puts
+
+      server_thread  = Thread.new { Thread.main['response'] = web_server.serve_one }
+      browser_thread = Thread.new { Launchy.open(uri.to_s) }
+      
+      server_thread.join
+      browser_thread.join
+
+      response = Thread.main['response']
+
+      # If the master responds with a code, then exchange it to a token
+      if response && response.kind_of?(Hash) && response['code']
+        logger.debug 'Account responded with code, exchanging to token'
+        response = client.exchange_code(response['code'])
+      end
+
+      if response && response.kind_of?(Hash) && response['access_token']
+        kontena_account.token = Kontena::Cli::Config::Token.new
+        kontena_account.token.access_token = response['access_token']
+        kontena_account.token.refresh_token = response['refresh_token']
+        kontena_account.token.expires_at = response['expires_in'].to_i > 0 ? Time.now.utc.to_i + response['expires_in'].to_i : nil
+      else
+        puts "Authentication failed".colorize(:red)
+        exit 1
+      end
+
+      uri = URI.parse(kontena_account.userinfo_endpoint)
+      path = uri.path
+      uri.path = '/'
+
+      client = Kontena::Client.new(uri.to_s, kontena_account.token)
+
+      response = client.get(path) rescue nil
+      if response && response.kind_of?(Hash)
+        kontena_account.username = response['username']
+        config.write
+        display_logo
+        display_login_info(only: :account)
+        exit 0
+      else
+        puts "Authentication failed".colorize(:red)
+        exit 1
+      end
+    end
+  end
+end