kontena-cli 1.2.0.pre1 → 1.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f03d83329e4ddcebc48f226b38df3d4eb9b6f96f
-  data.tar.gz: 451423d5bc02c8c01a18170cbb665a455d26a3d2
+  metadata.gz: fc1d241dbb42a8927a437e28fee00aba525bea78
+  data.tar.gz: f12240579934c0bad6f3d441c2744f0f5e9a5f8d
 SHA512:
-  metadata.gz: 24c1bd893acbaf99a21795710024e0673e79e0685f83f3478f6a708568c2f12f440f6caa463068406a22de4f232de2e6120017ca64334e8fc7dd7977932df3a1
-  data.tar.gz: c56ff810d3d4809d2c9d8c3c705389a0c801baf407290e89ec8ee718f3ef04b2d87112122eb379c498032da63994ee0b3f58cb609f24f45105ceeaca994819bf
+  metadata.gz: 5137972ce9856d048eb8e972f8e20bea52c75a014e04f12a2d34290e870830c2d321fd8a2f264243f65aa12ab8446e3b6b2d1fe8cca5b8b036db947789e4d96b
+  data.tar.gz: 064fbf5dc12b11581a36b83ccd96fc961a23fdc5decb1995c1dd15cc8d2793ade68c060eb05dc87e38da4ff1d5f2f3332ac397c01333d0e057729fa06deb4ae1

data/VERSION

@@ -1 +1 @@
-1.2.0.pre1
+1.2.0.pre2

data/lib/kontena/callback.rb

@@ -9,7 +9,7 @@ class Kontena::Callback
   # Register callback for command types it is supposed to run with.
   def self.matches_commands(*commands)
     cmd_types = {}
-    
+
     commands.each do |cmd|
       cmd_class, cmd_type = cmd.split(' ', 2)
 
@@ -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}")
+              ENV["DEBUG"] && $stderr.puts("Execution aborted by #{klass}")
               exit 1
             end
           end

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

@@ -10,7 +10,7 @@ module Kontena
         return unless command.exit_code == 0
         return unless config.current_master
 
-        ENV["DEBUG"] && STDERR.puts("Removing current master from config")
+        ENV["DEBUG"] && $stderr.puts("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/50_authenticate_after_deploy.rb

@@ -8,8 +8,8 @@ module Kontena
       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}")
+        ENV["DEBUG"] && $stderr.puts("Command result: #{command.result.inspect}")
+        ENV["DEBUG"] && $stderr.puts("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)
@@ -35,11 +35,11 @@ module Kontena
 
         # Figure out if HTTPS works, if not, try HTTP
         begin
-          ENV["DEBUG"] && STDERR.puts("Trying to request / from #{new_master.url}")
+          ENV["DEBUG"] && $stderr.puts("Trying to request / from #{new_master.url}")
           client = Kontena::Client.new(new_master.url, nil, ignore_ssl_errors: true)
           client.get('/')
-        rescue
-          ENV["DEBUG"] && STDERR.puts("HTTPS test failed: #{$!} #{$!.message}")
+        rescue => ex
+          ENV["DEBUG"] && $stderr.puts("HTTPS test failed: #{ex.class.name} #{ex.message}")
           unless retried
             new_master.url = "http://#{command.result[:public_ip]}"
             retried = true
@@ -51,7 +51,7 @@ module Kontena
         require 'shellwords'
         cmd = "master login --no-login-info --skip-grid-auto-select --verbose --name #{command.result[:name].shellescape} --code #{command.result[:code].shellescape} #{new_master.url.shellescape}"
         Retriable.retriable do
-          ENV["DEBUG"] && STDERR.puts("Running: #{cmd}")
+          ENV["DEBUG"] && $stderr.puts("Running: #{cmd}")
           Kontena.run(cmd)
         end
       end

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

@@ -12,7 +12,7 @@ module Kontena
         return unless config.current_master.name == command.result[:name]
 
         cmd = "grid create --silent test"
-        ENV["DEBUG"] && STDERR.puts("Running: #{cmd}")
+        ENV["DEBUG"] && $stderr.puts("Running: #{cmd}")
         Retriable.retriable do
           Kontena.run(cmd)
         end

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

@@ -39,7 +39,7 @@ module Kontena
         end
 
         return nil unless invite_response
-        ENV["DEBUG"] && STDERR.puts("Got invite code: #{invite_response['invite_code']}")
+        ENV["DEBUG"] && $stderr.puts("Got invite code: #{invite_response['invite_code']}")
 
         role_status = nil
 

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

@@ -22,7 +22,7 @@ module Kontena
           puts
         end
         puts "  To invite more users you can use:"
-        puts "  #{Kontena.pastel.green.on_black("  kontena master users invite email_address@example.com  ")}"
+        puts "  #{Kontena.pastel.green.on_black("  kontena master user invite email_address@example.com  ")}"
         puts
         puts "  The users can then join the master by using the invite code: "
         puts "  #{Kontena.pastel.green.on_black("  kontena master join #{current_master.url} <invite_code>  ")}"

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

@@ -108,15 +108,15 @@ module Kontena::Cli::Apps
     def display_notifications(messages, color = :yellow)
       messages.each do |files|
         files.each do |file, services|
-          STDERR.puts "#{file}:".colorize(color)
+          $stderr.puts "#{file}:".colorize(color)
           services.each do |service|
             service.each do |name, errors|
-              STDERR.puts "  #{name}:".colorize(color)
+              $stderr.puts "  #{name}:".colorize(color)
               if errors.is_a?(String)
-                STDERR.puts "    - #{errors}".colorize(color)
+                $stderr.puts "    - #{errors}".colorize(color)
               else
                 errors.each do |key, error|
-                  STDERR.puts "    - #{key}: #{error.to_json}".colorize(color)
+                  $stderr.puts "    - #{key}: #{error.to_json}".colorize(color)
                 end
               end
             end
@@ -126,12 +126,12 @@ module Kontena::Cli::Apps
     end
 
     def hint_on_validation_notifications(errors)
-      STDERR.puts "YAML contains the following unsupported options and they were rejected:".colorize(:yellow)
+      $stderr.puts "YAML contains the following unsupported options and they were rejected:".colorize(:yellow)
       display_notifications(errors)
     end
 
     def abort_on_validation_errors(errors)
-      STDERR.puts "YAML validation failed! Aborting.".colorize(:red)
+      $stderr.puts "YAML validation failed! Aborting.".colorize(:red)
       display_notifications(errors, :red)
       abort
     end

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

@@ -53,8 +53,8 @@ module Kontena::Cli::Apps
         replace_dollar_dollars(content)
         begin
           @yaml = ::YAML.safe_load(content)
-        rescue Psych::SyntaxError => e
-          raise "Error while parsing #{file}".colorize(:red)+ " "+e.message
+        rescue Psych::SyntaxError => ex
+          raise ex.class, "Error while parsing #{file} : #{ex.message}"
         end
       end
 

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

@@ -52,10 +52,10 @@ module Kontena::Cli::Cloud
 
     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
-        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."
+        $stderr.puts "Your current environment does not seem to support opening a local graphical WWW browser."
+        $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'
       end
 

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

@@ -84,7 +84,7 @@ module Kontena::Cli::Cloud::Master
         puts "   Cloud than the one they currently have as their username in the"
         puts "   master will not be able to authenticate before an administrator"
         puts "   of the Kontena Master creates an invitation code for them"
-        puts "   (kontena master users invite old@email.example.com)"
+        puts "   (kontena master user invite old@email.example.com)"
         exit_with_error "Aborted" unless prompt.yes?("Proceed?")
       end
 

data/lib/kontena/cli/common.rb

@@ -12,7 +12,7 @@ module Kontena
 
       def logger
         return @logger if @logger
-        @logger = Logger.new(ENV["DEBUG"] ? STDERR : STDOUT)
+        @logger = Logger.new(ENV["DEBUG"] ? $stderr : $stdout)
         @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
         @logger.progname = 'COMMON'
         @logger
@@ -131,8 +131,8 @@ module Kontena
         client = Kontena::Client.new(server.url, server.token)
         logger.debug "Trying to invalidate refresh token on #{server.name}"
         client.refresh_token
-      rescue
-        logger.debug "Refreshing failed: #{$!} : #{$!.message}"
+      rescue => ex
+        logger.debug "Refreshing failed: #{ex.class.name} : #{ex.message}"
       end
 
       def require_current_master
@@ -289,7 +289,7 @@ module Kontena
         msg = "Press any key to continue or ctrl-c to cancel.. (Automatically continuing in ? seconds)"
 
         reader_thread = Thread.new do
-          Thread.main['any_key.char'] = STDIN.getch
+          Thread.main['any_key.char'] = $stdin.getch
         end
 
         countdown_thread = Thread.new do
@@ -316,7 +316,7 @@ module Kontena
         return any_key_to_continue_with_timeout(timeout) if timeout
         msg = "Press any key to continue or ctrl-c to cancel.. "
         print pastel.bright_cyan("#{msg}")
-        char = STDIN.getch
+        char = $stdin.getch
         print "\r#{' ' * msg.length}\r"
         if char == "\u0003"
           error "Canceled"

data/lib/kontena/cli/config.rb

@@ -22,11 +22,11 @@ module Kontena
         self
       end
 
-      class TokenExpiredError < StandardError;  end
+      TokenExpiredError = Class.new(StandardError)
 
       def initialize
         super
-        @logger = Logger.new(ENV["DEBUG"] ? STDERR : STDOUT)
+        @logger = Logger.new(ENV["DEBUG"] ? $stderr : $stdout)
         @logger.level = ENV["DEBUG"].nil? ? Logger::INFO : Logger::DEBUG
         @logger.progname = 'CONFIG'
         load_settings_from_env || load_settings_from_config_file
@@ -41,7 +41,7 @@ module Kontena
         return nil unless ENV['KONTENA_URL']
         logger.debug 'Loading configuration from ENV'
         servers << Server.new(
-          url: ENV['KONTENA_URL'], 
+          url: ENV['KONTENA_URL'],
           name: 'default',
           token: Token.new(access_token: ENV['KONTENA_TOKEN'], parent_type: :master, parent_name: 'default'),
           grid: ENV['KONTENA_GRID'],
@@ -172,7 +172,7 @@ module Kontena
         logger.debug "Migrating from legacy style configuration"
         {
           'current_server' => 'default',
-          'servers' => [ 
+          'servers' => [
             settings['server'].merge(
               'name' => 'default',
               'account' => 'kontena'
@@ -303,7 +303,7 @@ module Kontena
       def require_current_master_token
         require_current_master
         token = current_master.token
-        if token && token.access_token 
+        if token && token.access_token
           return token unless token.expired?
           raise TokenExpiredError, "The access token has expired and needs to be refreshed."
         end
@@ -364,7 +364,7 @@ module Kontena
         raise ArgumentError, "You have not selected a grid. Use: kontena grid"
       end
 
-      # Name of the currently selected grid. Can override using 
+      # Name of the currently selected grid. Can override using
       # KONTENA_GRID environment variable.
       #
       # @return [String, NilClass]
@@ -433,7 +433,7 @@ module Kontena
         JSON.pretty_generate(to_hash)
       end
 
-      # Write the current configuration to config file. 
+      # Write the current configuration to config file.
       # Does nothing if using settings from environment variables.
       def write
         return nil if ENV['KONTENA_URL']
@@ -518,7 +518,7 @@ module Kontena
         def account
           return @account if @account
           return config.find_account('master') unless parent
-          @account = 
+          @account =
             case parent_type
             when :master then config.find_account(parent.account)
             when :account then parent

data/lib/kontena/cli/containers/exec_command.rb

@@ -16,7 +16,7 @@ module Kontena::Cli::Containers
       result = client(token).post("containers/#{current_grid}/#{container_id}/exec", payload)
 
       puts result[0].join(" ") unless result[0].size == 0
-      STDERR.puts result[1].join(" ") unless result[1].size == 0
+      $stderr.puts result[1].join(" ") unless result[1].size == 0
       exit result[2]
     end
   end

data/lib/kontena/cli/localhost_web_server.rb

@@ -39,7 +39,7 @@ module Kontena
     #
     # @return [Hash] query_params
     def serve_one
-      ENV["DEBUG"] && STDERR.puts("Waiting for connection on port #{port}..")
+      ENV["DEBUG"] && $stderr.puts("Waiting for connection on port #{port}..")
       socket = server.accept
 
       content = socket.recvfrom(2048).first.split(/(?:\r)?\n/)
@@ -56,7 +56,7 @@ module Kontena
 
       body = content.join("\n")
 
-      ENV["DEBUG"] && STDERR.puts("Got request: \"#{request.inspect}\n  Headers: #{headers.inspect}\n  Body: #{body}\"")
+      ENV["DEBUG"] && $stderr.puts("Got request: \"#{request.inspect}\n  Headers: #{headers.inspect}\n  Body: #{body}\"")
 
       get_request = request[/GET (\/cb.+?) HTTP/, 1]
       if get_request
@@ -82,7 +82,7 @@ module Kontena
         socket.close
         server.close
         uri = URI.parse("http://localhost#{get_request}")
-        ENV["DEBUG"] && STDERR.puts("  * Parsing params: \"#{uri.query}\"")
+        ENV["DEBUG"] && $stderr.puts("  * Parsing params: \"#{uri.query}\"")
         params = {}
         URI.decode_www_form(uri.query).each do |key, value|
           if value.to_s == ''

data/lib/kontena/cli/master/{users → user}/invite_command.rb

@@ -1,7 +1,7 @@
 require_relative '../../common'
-require_relative 'roles/add_command'
+require_relative 'role/add_command'
 
-module Kontena::Cli::Master::Users
+module Kontena::Cli::Master::User
   class InviteCommand < Kontena::Command
     include Kontena::Cli::Common
 
@@ -41,9 +41,9 @@ module Kontena::Cli::Master::Users
           roles.each do |role|
             Kontena.run("master users role add #{role.shellescape} #{email.shellescape}")
           end
-        rescue
-          STDERR.puts "Failed to invite #{email}".colorize(:red)
-          ENV["DEBUG"] && STDERR.puts("#{$!} - #{$!.message} -- #{$!.backtrace}")
+        rescue => ex
+          $stderr.puts pastel.red("Failed to invite #{email}")
+          ENV["DEBUG"] && $stderr.puts("#{ex} : #{ex.message}\n#{ex.backtrace.join("\n  ")}")
         end
       end
     end

data/lib/kontena/cli/master/{users → user}/list_command.rb

@@ -1,6 +1,6 @@
 require_relative '../../common'
 
-module Kontena::Cli::Master::Users
+module Kontena::Cli::Master::User
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
 

data/lib/kontena/cli/master/{users → user}/remove_command.rb

@@ -1,6 +1,6 @@
 require_relative '../../common'
 
-module Kontena::Cli::Master::Users
+module Kontena::Cli::Master::User
   class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
@@ -15,9 +15,8 @@ module Kontena::Cli::Master::Users
       email_list.each do |email|
         begin
           client(token).delete("users/#{email}")
-        rescue => exc
-          STDERR.puts "Failed to remove user #{email}".colorize(:red)
-          STDERR.puts exc.message
+        rescue => ex
+          $stderr.puts pastel.red("Failed to remove user #{email} : #{ex.message}")
         end
       end
     end

data/lib/kontena/cli/master/{users/roles → user/role}/add_command.rb

@@ -1,7 +1,7 @@
 require_relative '../../../common'
 
-module Kontena::Cli::Master::Users
-  module Roles
+module Kontena::Cli::Master::User
+  module Role
     class AddCommand < Kontena::Command
       include Kontena::Cli::Common
 
@@ -19,8 +19,8 @@ module Kontena::Cli::Master::Users
           begin
             response = client(token).post("users/#{email}/roles", data)
             puts "Added role #{role} to #{email}" unless running_silent?
-          rescue => exc
-            abort "Failed to add role #{role} to #{email} : #{exc.message}".colorize(:red)
+          rescue => ex
+            abort pastel.red("Failed to add role #{role} to #{email} : #{ex.message}")
           end
         end
       end

data/lib/kontena/cli/master/{users/roles → user/role}/remove_command.rb

@@ -1,6 +1,6 @@
 require_relative '../../../common'
 
-module Kontena::Cli::Master::Users::Roles
+module Kontena::Cli::Master::User::Role
   class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
@@ -18,9 +18,8 @@ module Kontena::Cli::Master::Users::Roles
         begin
           response = client(token).delete("users/#{email}/roles/#{role}")
           puts "Removed role #{role} from #{email}" if response
-        rescue => exc
-          puts "Failed to remove role #{role} from #{email}".colorize(:red)
-          puts exc.message
+        rescue => ex
+          $stderr.puts pastel.red("Failed to remove role #{role} from #{email} : #{ex.message}")
         end
       end
     end

data/lib/kontena/cli/master/{users → user}/role_command.rb

@@ -1,8 +1,6 @@
-module Kontena::Cli::Master::Users
-
-
+module Kontena::Cli::Master::User
   class RoleCommand < Kontena::Command
-    subcommand "add", "Add role to user", load_subcommand('master/users/roles/add_command')
-    subcommand ["remove", "rm"], "Remove role from user", load_subcommand('master/users/roles/remove_command')
+    subcommand "add", "Add role to user", load_subcommand('master/user/role/add_command')
+    subcommand ["remove", "rm"], "Remove role from user", load_subcommand('master/user/role/remove_command')
   end
 end

data/lib/kontena/cli/master/user_command.rb

@@ -0,0 +1,11 @@
+require 'kontena/cli/master/user_command'
+
+module Kontena::Cli::Master
+  class UserCommand < Kontena::Command
+    subcommand "invite", "Invite user to Kontena Master", load_subcommand('master/user/invite_command')
+    subcommand ["remove", "rm"], "Remove user from Kontena Master", load_subcommand('master/user/remove_command')
+    subcommand ["list", "ls"], "List users", load_subcommand('master/user/list_command')
+    subcommand "role", "User role specific commands", load_subcommand('master/user/role_command')
+  end
+end
+