kontena-cli 1.4.3 → 1.5.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d785a1ae86f7e7450509061ed82b9d9c6bb3e21af0104b9b2d4338150c6a6e76
-  data.tar.gz: 78a7f31ac3116200301d56e3ad52aadb473cdfc4e341c43fe7bd8711acc9ed89
+  metadata.gz: 3d3147d4def0570ae7d592b83163f2a55bebcf939901adba261c18a78e3189e7
+  data.tar.gz: c6a3f61cfc69c56a62b1ae5e75ca45c5880937d8861a5e65c2f3074981070a44
 SHA512:
-  metadata.gz: 6a0a5ebdc9759841bb3967110e00ad4fec841a680f9837f9e5b2a2d1515cc614e00c7eda2b5a0520c97aee5beb4f5ff4d3f52b87b9db5e6678cdbe912b34f83f
-  data.tar.gz: cebf05eb5e1d5552459fb85b2c5bf6c23137cb59865f1ffc69d8cfd0f6f4976bdcb25b53af383da27167d9fd97b03a985acb26d7068940c8f51a31ee842ae512
+  metadata.gz: 7c1b25a00c0c46e046d62d530a316d77949b766c6272b8bf56685fdb6ce902c1a7ed29b527b5ab18f985fa7adac46f95e42b1c6e74b04bea7916d362490290cb
+  data.tar.gz: dc54b0386062eea65878e11b0339658091afbfafa5beb45241ce46507c9dd3c4889897b653557cabc520593151faa4e213fd16138d15c3a548a9b67fb31bfd85

data/Dockerfile

@@ -1,12 +1,16 @@
-FROM alpine:3.5
+FROM alpine:3.6
 MAINTAINER Kontena, Inc. <info@kontena.io>
 
-ADD https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 /usr/local/bin/docker
 ARG CLI_VERSION
 
 RUN apk update && \
   apk --update add ruby ruby-json ruby-bigdecimal ruby-io-console \
-  ca-certificates libssl1.0 openssl libstdc++ && \
+  curl ca-certificates libssl1.0 openssl libstdc++ && \
+  curl -sL https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz > /tmp/docker.tgz && \
+  cd /tmp && \
+  tar zxf docker.tgz && \
+  mv docker/docker /usr/local/bin/ && \
+  rm -rf /tmp/docker* && \
   chmod +x /usr/local/bin/docker
 
 RUN apk --update add --virtual build-dependencies ruby-dev build-base openssl-dev && \

data/Gemfile

@@ -2,11 +2,15 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kontena-cli.gemspec
 gemspec
-group :development, :test do
+
+group :test do
   gem "rspec"
-  gem 'simplecov', :require => false, :group => :test
   gem "kontena-plugin-hello", path: "./examples/kontena-plugin-hello"
+  gem 'simplecov', :require => false, :group => :test
+  gem 'webmock', '~> 3.0', require: false
+end
+
+group :development do
   gem 'pry', require: false
   gem 'pry-byebug', require: false
-  gem 'webmock', '~> 3.0', require: false
 end

data/README.md

@@ -4,7 +4,7 @@
 This is a command line tool for [Kontena](http://www.kontena.io).
 
 ## Installation
-> Prerequisities: [Ruby](https://www.ruby-lang.org/en/) version 2.1.0 or greater.
+> Prerequisities: [Ruby](https://www.ruby-lang.org/en/) version 2.2.0 or greater.
 
 Install it yourself as:
 

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.5.0.pre1

data/bin/kontena

@@ -10,6 +10,7 @@ STDOUT.sync = true
 
 if ARGV[0] == 'complete'
   ARGV.delete_at(0)
+  $VERSION_WARNING_ADDED=true
   require 'kontena/scripts/completer'
 else
   ENV['DEBUG'] = "true" if ARGV.any? { |arg| arg == '-D' || arg == '--debug'}

data/kontena-cli.gemspec

@@ -18,16 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.1.0"
+  spec.required_ruby_version = ">= 2.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "excon", "~> 0.49.0"
-  spec.add_runtime_dependency "tty-prompt", "0.13.1"
-  spec.add_runtime_dependency "clamp", "~> 1.1.0"
+  spec.add_runtime_dependency "excon", "0.60.0"
+  spec.add_runtime_dependency "tty-prompt", "0.14.0"
+  spec.add_runtime_dependency "clamp", "~> 1.2.1"
   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.1"
+  spec.add_runtime_dependency "hash_validator", "0.8.0"
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
   spec.add_runtime_dependency "opto", "1.8.7"
   spec.add_runtime_dependency "semantic", "~> 1.5"

data/lib/kontena/cli/browser_launcher.rb

@@ -0,0 +1,61 @@
+require 'kontena/util'
+
+module Kontena
+  module Cli
+    class BrowserLauncher
+      def self.open(url)
+        Kontena::Cli::BrowserLauncher.new(url).launch
+      end
+
+      attr_reader :url
+
+      def initialize(url)
+        @url = url
+      end
+
+      def launch
+        system(*command)
+      end
+
+      def command
+        cmd = if Kontena.on_windows?
+          ['cmd', '/c', 'start', '/b', url.gsub(/&/, '^&')]
+        elsif RUBY_PLATFORM =~ /darwin/
+          ["open", url]
+        elsif Kontena.browserless?
+          raise RuntimeError, "Environment variable DISPLAY not set, assuming non-desktop session, unable to open browser. Try using '--remote' option."
+        else
+          [detect_unixlike_command, url]
+        end
+
+        Kontena.logger.debug { "Using %p to launch browser" % cmd }
+
+        cmd
+      end
+
+      def detect_unixlike_command
+        Kontena.logger.debug { "Assuming unix-like environment, looking for browser" }
+
+        cmd = %w(
+          xdg-open
+          sensible-browser
+          x-www-browser
+        ).find { |c| !which(c).nil? }
+
+        if cmd.nil?
+          if ENV['BROWSER']
+            cmd = which(ENV['BROWSER'])
+            return cmd unless cmd.nil?
+          end
+          raise RuntimeError, "Unable to launch a local browser. Try installing xdg-utils or sensible-utils package, setting BROWSER environment variable or using the --remote option"
+        end
+
+        cmd
+      end
+
+      def which(cmd)
+        Kontena::Util.which(cmd)
+      end
+    end
+  end
+end

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

@@ -13,22 +13,36 @@ module Kontena::Cli::Certificate
     option '--type', 'AUTHORIZATION_TYPE', 'Authorization type, either tls-sni-01 or dns-01', default: 'dns-01'
     option '--linked-service', "LINKED_SERVICE", 'A service (usually LB) where the tls-sni-01 challenge certificate is bundled to'
 
-    def execute
-      require_api_url
-      token = require_token
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    def requires_linked_service?
+      case type
+      when 'dns-01'
+        false
+      when 'http-01'
+        true
+      when 'tls-sni-01'
+        true
+      else
+        fail "Invalid authorization --type=#{type}"
+      end
+    end
 
-      exit_with_error "Service link needs to be given with tls-sni-01 auth type" if self.type == 'tls-sni-01' && self.linked_service.nil?
+    def execute
+      exit_with_error "--linked-service is required with --type=#{type}" if requires_linked_service? && !self.linked_service
 
       data = {
         domain: domain,
         authorization_type: self.type
       }
-      data['linked_service'] = service_path(self.linked_service) if self.type == 'tls-sni-01'
+      data[:linked_service] = service_path(self.linked_service) if self.linked_service
       retried = false
 
       response = nil
       retry_on_le_registration do
-        response = client(token).post("grids/#{current_grid}/domain_authorizations", data)
+        response = client.post("grids/#{current_grid}/domain_authorizations", data)
       end
 
       case self.type
@@ -37,28 +51,38 @@ module Kontena::Cli::Certificate
         puts "Record name: #{response.dig('challenge_opts', 'record_name')}.#{domain}"
         puts "Record type: #{response.dig('challenge_opts', 'record_type')}"
         puts "Record content: #{response.dig('challenge_opts', 'record_content')}"
+      when 'http-01'
+        domain_auth = spinner "Waiting for http-01 challenge to be deployed into #{response.dig('linked_service', 'id').colorize(:cyan)} " do
+          wait_for_domain_auth_deployed(response)
+        end
+        if domain_auth['state'] == 'deploy_error'
+          exit_with_error "Linked services deploy failed. Check service events for details"
+        else
+          puts "HTTP challenge is deployed, you can now request the actual certificate"
+        end
       when 'tls-sni-01'
-        state = nil
-        spinner "Waiting for tls-sni-01 certificate to be deployed into #{response.dig('linked_service', 'id').colorize(:cyan)} " do
-          state = wait_for_domain_auth_deployed(token, response['id'])
+        domain_auth = spinner "Waiting for tls-sni-01 challenge to be deployed into #{response.dig('linked_service', 'id').colorize(:cyan)} " do
+          wait_for_domain_auth_deployed(response)
         end
-        if state == 'deploy_error'
-          puts "Linked services deploy failed. Check service events for details"
+        if domain_auth['state'] == 'deploy_error'
+          exit_with_error "Linked services deploy failed. Check service events for details"
         else
           puts "TLS-SNI challenge certificate is deployed, you can now request the actual certificate"
         end
       else
         exit_with_error "Unknown authorization type: #{self.type}"
       end
-
     end
 
-    def wait_for_domain_auth_deployed(token, domain_auth_id)
-      state = nil
+    def wait_for_domain_auth_deployed(domain_auth)
       Timeout.timeout(300) {
-        sleep 1 until (state = client(token).get("domain_authorizations/#{domain_auth_id}")['status']) != 'deploying'
+        while domain_auth['status'] == 'deploying' do
+          sleep 1
+
+          domain_auth = client.get("domain_authorizations/#{domain_auth['id']}")
+        end
+        return domain_auth
       }
-      state
     end
 
     def service_path(linked_service)

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

@@ -24,7 +24,7 @@ module Kontena::Cli::Certificate
       response = client(token).post("certificates/#{current_grid}/certificate", data)
       puts "Certificate successfully received and stored into vault with keys:"
       response.each do |secret|
-        puts secret.colorize(:green)
+        puts pastel.green(secret)
       end
       puts "Use the #{secret}_BUNDLE with Kontena loadbalancer!"
 

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

@@ -74,7 +74,7 @@ module Kontena::Cli::Cloud
         exit_with_error "Parsing remote login URL failed."
       end
 
-      puts "Please visit #{verification_uri.to_s.colorize(:cyan)} and enter the code"
+      puts "Please visit #{pastel.cyan(verification_uri.to_s)} and enter the code"
       puts
       puts "#{auth_request_response['user_code']}"
       puts
@@ -105,7 +105,7 @@ module Kontena::Cli::Cloud
       end
 
       require_relative '../localhost_web_server'
-      require 'launchy'
+      require 'kontena/cli/browser_launcher'
 
       uri = URI.parse(kontena_account.authorization_endpoint)
       uri.host ||= kontena_account.url
@@ -137,12 +137,11 @@ module Kontena::Cli::Cloud
       puts
 
       server_thread  = Thread.new { Thread.main['response'] = web_server.serve_one }
-      browser_thread = Thread.new { Launchy.open(uri.to_s) }
+      Kontena::Cli::BrowserLauncher.open(uri.to_s)
 
       spinner "Waiting for browser authorization response" do
         server_thread.join
       end
-      browser_thread.join
 
       update_token(Thread.main['response'])
     end

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

@@ -146,7 +146,7 @@ module Kontena::Cli::Cloud::Master
       elsif self.id?
         puts response['data']['id']
       else
-        puts "Registered master.".colorize(:green)
+        puts pastel.green("Registered master.")
         puts "ID: #{response['data']['id']}"
         puts "Client ID: #{response['data']['attributes']['client-id']}"
         puts "Client Secret: #{response['data']['attributes']['client-secret']}"

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

@@ -20,7 +20,7 @@ module Kontena::Cli::Cloud::Master
       end
 
       unless response && response.kind_of?(Hash) && response['data'].kind_of?(Array)
-        abort "Listing masters failed".colorize(:red)
+        abort pastel.red("Listing masters failed")
       end
 
       return Array(response['data']) if self.return?

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

@@ -26,7 +26,7 @@ module Kontena::Cli::Cloud::Master
       spinner "Retrieving a list of registered masters on Kontena Cloud" do
         response = cloud_client.get('user/masters')
         unless response && response.kind_of?(Hash) && response['data'].kind_of?(Array)
-          abort 'Listing masters failed'.colorize(:red)
+          abort pastel.red('Listing masters failed')
         end
       end
 

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

@@ -25,7 +25,7 @@ module Kontena::Cli::Cloud::Master
     def execute
       attrs = get_attributes
       unless attrs
-        puts "Failed to obtain master credentials".colorize(:red)
+        puts pastel.red("Failed to obtain master credentials")
         exit 1
       end
 

data/lib/kontena/cli/common.rb

@@ -154,7 +154,7 @@ module Kontena
           logger.debug { msg }
           return
         end
-        puts " [#{ success ? 'done'.colorize(:green) : 'fail'.colorize(:red)}] #{msg}"
+        puts " [#{ success ? pastel.green('done') : pastel.red('fail')}] #{msg}"
       end
 
       def warning(msg)
@@ -270,7 +270,7 @@ module Kontena
         exit_with_error 'Command requires --force' unless $stdout.tty? && $stdin.tty?
         puts "Destructive command. To proceed, type \"#{name}\" or re-run this command with --force option."
 
-        ask("Enter '#{name}' to confirm: ") == name || error("Confirmation did not match #{name}. Aborted command.")
+        ask("Enter '#{name}' to confirm: ") == name.to_s || error("Confirmation did not match #{name}. Aborted command.")
       end
 
       def confirm(message = 'Destructive command. You can skip this prompt by running this command with --force option. Are you sure?')

data/lib/kontena/cli/etcd_command.rb

@@ -4,7 +4,7 @@ class Kontena::Cli::EtcdCommand < Kontena::Command
   subcommand "set", "Set a value on the specified key", load_subcommand('etcd/set_command')
   subcommand ["mkdir", "mk"], "Create a directory", load_subcommand('etcd/mkdir_command')
   subcommand ["list", "ls"], "List a directory", load_subcommand('etcd/list_command')
-  subcommand "rm", "Remove a key or a directory", load_subcommand('etcd/remove_command')
+  subcommand ["remove", "rm"], "Remove a key or a directory", load_subcommand('etcd/remove_command')
   subcommand "health", "Check etcd health", load_subcommand('etcd/health_command')
 
   def execute

data/lib/kontena/cli/external_registries/add_command.rb

@@ -6,8 +6,8 @@ module Kontena::Cli::ExternalRegistries
     parameter '[URL]', 'Docker Registry url', default: 'https://index.docker.io/v2/'
 
     option ['-u', '--username'], 'USERNAME', 'Username', required: true
-    option ['-e', '--email'], 'EMAIL', 'Email', required: true
     option ['-p', '--password'], 'PASSWORD', 'Password', required: true
+    option ['-e', '--email'], 'EMAIL', 'Email', required: false
 
     def execute
       require_api_url
@@ -17,7 +17,7 @@ module Kontena::Cli::ExternalRegistries
       self.url = "https://#{self.url}" unless self.url.start_with?('http')
 
       data = { username: username, password: password, email: email, url: url }
-      spinner "Adding #{url.colorize(:cyan)} to external registries " do
+      spinner "Adding #{pastel.cyan(url)} to external registries " do
         client(token).post("grids/#{current_grid}/external_registries", data)
       end
     end

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

@@ -9,7 +9,7 @@ module Kontena::Cli::ExternalRegistries
       require_api_url
       token = require_token
       confirm_command(name) unless forced?
-      spinner "Removing #{name.colorize(:cyan)} external-registry from #{current_grid.colorize(:cyan)} grid " do
+      spinner "Removing #{pastel.cyan(name)} external-registry from #{pastel.cyan(current_grid)} grid " do
         client(token).delete("external_registries/#{current_grid}/#{name}")
       end
     end

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

@@ -122,14 +122,24 @@ module Kontena::Cli::Grids
       def self.included(base)
         base.option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
         base.option "--statsd-server", "STATSD_SERVER", "Statsd server address (host:port)"
-        base.option "--log-forwarder", "LOG_FORWARDER", "Set grid wide log forwarder (set to 'none' to disable)"
+        base.option "--log-forwarder", "LOG_FORWARDER", "Set grid wide log forwarder" do |log_forwarder|
+          if log_forwarder == 'none'
+            warn "[DEPRECATED] --log-forwarder none will be replaced with --no-log-forwarder"
+          end
+          log_forwarder
+        end
+        base.option "--no-log-forwarder", :flag, "Disable log forwarding"
         base.option "--log-opt", "[LOG_OPT]", "Set log options (key=value)", multivalued: true
       end
 
       def validate_log_opts
-        if !log_opt_list.empty? && log_forwarder.nil?
+        if !log_opt_list.empty? && (log_forwarder.nil? || no_log_forwarder?)
           raise Kontena::Errors::StandardError.new(1, "Need to specify --log-forwarder when using --log-opt")
         end
+
+        if no_log_forwarder? && !log_forwarder.nil? && log_forwarder != "none"
+          exit_with_error "Can't use --log-forwarder and --no-log-forwarder together"
+        end
       end
 
       def parse_log_opts
@@ -156,9 +166,9 @@ module Kontena::Cli::Grids
           }
         end
 
-        if log_forwarder
+        if log_forwarder || no_log_forwarder?
           payload[:logs] = {
-            forwarder: log_forwarder,
+            forwarder: no_log_forwarder? ? 'none' : log_forwarder,
             opts: parse_log_opts
           }
         end

data/lib/kontena/cli/grids/events_command.rb

@@ -37,9 +37,9 @@ module Kontena::Cli::Grids
 
       time = log['created_at']
       if log['severity'] == 2
-        time = time.colorize(:yellow)
+        time = pastel.yellow(time)
       elsif log['severity'] >= 3
-        time = time.colorize(:red)
+        time = pastel.red(time)
       end
 
       puts '%-25s %-25s %-40s %s' % [