kontena-cli 0.16.0.pre5 → 0.16.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24c6e241c38b9d4dece50e6d97443dc68d7a4e38
-  data.tar.gz: 9fdd643f7b747b5898d1d40a651f98dba8b216aa
+  metadata.gz: 35b0390bffba7709f3efa1c42838fa47483991e5
+  data.tar.gz: 1dc946fc0f3b3e498df9b3a8a766edf7d38ca0ed
 SHA512:
-  metadata.gz: 185b33efb5684e45c185af579c6c777a824fdb0a04db46f48dc470f1ba1c57577fa9cbc2a797c853913e07ec9b18708ef92a86ca6f8305c5fc7dc0e61b2611c4
-  data.tar.gz: 2278e96ea747b84bea482dc92b62dbdd799f890067978881084aa2b1cd77a7af4713cbffb27fc3f8545b81d6e3fa1a158fb5255550287ff529c62d08cc647984
+  metadata.gz: 4bf3bda5f481fb4648465cb0fb687fc59341557bf94c78dbb20773fa9fc7ff889c891cab3063f81100a5f00986fd1cebe2847914c1c34f00962563cba2d59101
+  data.tar.gz: a3c18982f577d7cdc29d08d93c963a41414dbc770af349d97cc43f7d2c434f2958c5bade13ef8e6768073de63cebd87e193ebff84dd0ff11f4beac616c5d1389

data/Dockerfile

@@ -9,9 +9,12 @@ RUN apk update && \
   ca-certificates libssl1.0 openssl libstdc++ && \
   gem install kontena-cli --no-rdoc --no-ri -v ${CLI_VERSION} && \
   adduser kontena -D -h /home/kontena -s /bin/sh && \
+  echo "gem: --user-install" > /home/kontena/.gemrc && \
   chown -R kontena.kontena /home/kontena && \
   chmod +sx /usr/local/bin/docker
 
+ENV PATH=$PATH:/home/kontena/.gem/ruby/2.3.0/bin
+
 VOLUME ["/home/kontena"]
 WORKDIR /home/kontena
 USER kontena

data/VERSION

@@ -1 +1 @@
-0.16.0.pre5
+0.16.0.pre6

data/bin/kontena

@@ -25,10 +25,11 @@ rescue Excon::Errors::SocketError => exc
   end
 rescue Kontena::Errors::StandardError => exc
   raise exc if ENV['DEBUG']
-  abort(exc.message)
+  puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
+  exit 1
 rescue => exc
   raise exc if ENV['DEBUG']
-  $stderr.puts "Kontena error: #{exc.message}"
-  $stderr.puts "Rerun the command with environment DEBUG=true set to get the full exception"
+  $stderr.puts " [#{Kontena.pastel.red('error')}] #{exc.message}"
+  $stderr.puts "         Rerun the command with environment DEBUG=true set to get the full exception"
   abort
 end

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

@@ -53,7 +53,7 @@ module Kontena
         if master_id.to_s =~ /^[0-9a-f]{16,32}$/
           master_id
         else
-          abort 'Cloud Master registration failed'
+          exit_with_error 'Cloud Master registration failed'
         end
       end
 
@@ -104,5 +104,3 @@ module Kontena
     end
   end
 end
-
-

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

@@ -33,7 +33,7 @@ module Kontena
           ENV["DEBUG"] && puts("Trying to request / from #{new_master.url}")
           client = Kontena::Client.new(new_master.url, nil, ignore_ssl_errors: true)
           client.get('/')
-        rescue
+        rescue 
           ENV["DEBUG"] && puts("HTTPS test failed: #{$!} #{$!.message}")
           unless retried
             new_master.url = "http://#{command.result[:public_ip]}"

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

@@ -13,14 +13,7 @@ module Kontena
 
         cmd = "grid create --silent test"
         ENV["DEBUG"] && puts("Running: #{cmd}")
-      
-        spinner "Creating initial grid 'test'" do
-          Kontena.run(cmd)
-        end
-
-        spinner "Selecting 'test' as current grid" do
-          Kontena.run("grid use --silent test")
-        end
+        Kontena.run(cmd)
       end
     end
   end

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

@@ -15,7 +15,7 @@ module Kontena
         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 users invite --roles master_admin your@email.address.example.com"
         puts "    kontena master join <master_url> <invite_code>"
         puts
       end

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

@@ -18,7 +18,8 @@ module Kontena::Cli::Apps
       require_config_file(filename)
       @services = services_from_yaml(filename, service_list, service_prefix)
       if services.none?{ |name, service| service['build'] }
-        abort 'Not found any service with build option'.colorize(:red)
+        error 'Not found any service with build option'
+        abort
       end
       process_docker_images(services, true, no_cache?)
     end

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

@@ -9,7 +9,7 @@ module Kontena::Cli::Apps
     include Kontena::Cli::Services::ServicesHelper
 
     def require_config_file(filename)
-      abort("File #{filename} does not exist") unless File.exists?(filename)
+      exit_with_error("File #{filename} does not exist") unless File.exists?(filename)
     end
 
     # @param [String] filename
@@ -39,7 +39,7 @@ module Kontena::Cli::Apps
         generator_klass = ServiceGenerator
       end
       yaml_services.each do |service_name, config|
-        abort("Image is missing for #{service_name}. Aborting.") unless config['image']
+        exit_with_error("Image is missing for #{service_name}. Aborting.") unless config['image']
         services[service_name] = generator_klass.new(config).generate
       end
       services
@@ -62,12 +62,7 @@ module Kontena::Cli::Apps
 
     def project_name_from_yaml(file)
       reader = YAML::Reader.new(file, true)
-      outcome = reader.execute
-      if outcome[:version].to_i == 2
-        outcome[:name]
-      else
-        nil
-      end
+      reader.stack_name
     end
 
     # @return [String]

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

@@ -13,7 +13,8 @@ module Kontena::Cli::Apps
     option ['--no-build'], :flag, 'Don\'t build an image, even if it\'s missing', default: false
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
     option '--async', :flag, 'Run deploys async/parallel'
-    option '--force-deploy', :flag, 'Force deploy even if service does not have any changes'
+    option '--force', :flag, 'Force deploy even if service does not have any changes'
+    option '--force-deploy', :flag, '[DEPRECATED: use --force]'
 
     parameter "[SERVICE] ...", "Services to start"
 
@@ -44,13 +45,15 @@ module Kontena::Cli::Apps
       queue.each do |service|
         name = service['id'].split('/').last
         options = {}
-        options[:force] = true if force_deploy?
-        deploy_service(token, name, options)
-        print "deploying #{unprefixed_name(name).colorize(:cyan)}"
-        unless async?
-          wait_for_deploy_to_finish(token, service['id'])
-        else
-          puts ''
+        options[:force] = true if force? || force_deploy? # deprecated
+        if force_deploy?
+          warning " --force-deploy will deprecate in the future, use --force"
+        end
+        spinner "Deploying #{unprefixed_name(name).colorize(:cyan)} " do
+          deploy_service(token, name, options)
+          unless async?
+            wait_for_deploy_to_finish(token, service['id'])
+          end
         end
       end
     end
@@ -90,19 +93,24 @@ module Kontena::Cli::Apps
     # @param [String] name
     # @param [Hash] options
     def create(name, options)
-      puts "creating #{name.colorize(:cyan)}"
-      name = prefixed_name(name)
-      data = { 'name' => name }
+      data = { 'name' => prefixed_name(name) }
       data.merge!(options)
-      create_service(token, current_grid, data)
+      result = nil
+      spinner "Creating #{name.colorize(:cyan)} " do
+        result = create_service(token, current_grid, data)
+      end
+      result
     end
 
-    # @param [String] id
+    # @param [String] name
     # @param [Hash] options
-    def update(id, options)
-      puts "updating #{id.colorize(:cyan)}"
-      id = prefixed_name(id)
-      update_service(token, id, options)
+    def update(name, options)
+      prefixed_name = prefixed_name(name)
+      result = nil
+      spinner "Updating #{name.colorize(:cyan)} " do
+        result = update_service(token, prefixed_name, options)
+      end
+      result
     end
 
     # @param [String] name

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

@@ -8,8 +8,8 @@ module Kontena::Cli::Apps
       services.each do |name, service|
         if service['build'] && (!image_exist?(service['image']) || force_build)
           dockerfile = service['build']['dockerfile'] || 'Dockerfile'
-          abort("'#{service['image']}' is not valid Docker image name") unless validate_image_name(service['image'])
-          abort("'#{service['build']['context']}' does not have #{dockerfile}") unless dockerfile_exist?(service['build']['context'], dockerfile)
+          raise ("'#{service['image']}' is not valid Docker image name") unless validate_image_name(service['image'])
+          raise ("'#{service['build']['context']}' does not have #{dockerfile}") unless dockerfile_exist?(service['build']['context'], dockerfile)
           if service['hooks'] && service['hooks']['pre_build']
             puts "Running pre_build hook".colorize(:cyan)
             run_pre_build_hook(service['hooks']['pre_build'])
@@ -43,7 +43,7 @@ module Kontena::Cli::Apps
       end
       cmd << build_context
       ret = system(cmd.join(' '))
-      abort("Failed to build image #{service['image'].colorize(:cyan)}") unless ret
+      raise ("Failed to build image #{service['image'].colorize(:cyan)}") unless ret
       ret
     end
 
@@ -51,7 +51,7 @@ module Kontena::Cli::Apps
     # @return [Integer]
     def push_docker_image(image)
       ret = system("docker push #{image}")
-      abort("Failed to push image #{image.colorize(:cyan)}") unless ret
+      raise ("Failed to push image #{image.colorize(:cyan)}") unless ret
       ret
     end
 
@@ -73,7 +73,7 @@ module Kontena::Cli::Apps
     def run_pre_build_hook(hook)
       hook.each do |h|
         ret = system(h['cmd'])
-        abort("Failed to run pre_build hook: #{h['name']}!".colorize(:red)) unless ret
+        raise ("Failed to run pre_build hook: #{h['name']}!") unless ret
       end
     end
   end

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

@@ -78,8 +78,10 @@ module Kontena::Cli::Apps
 
     def colors
       if(@colors.nil? || @colors.size == 0)
-        @colors = [:green, :magenta, :yellow, :cyan, :red,
-                   :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+        @colors = %i(
+          red green yellow blue magenta cyan bright_red bright_green
+          bright_yellow bright_blue bright_magenta bright_cyan
+        )
       end
       @colors
     end

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

@@ -29,6 +29,7 @@ module Kontena::Cli::Apps
     end
 
     private
+
     def remove_services(services)
       services.find_all {|service_name, options| options['links'] && options['links'].size > 0 }.each do |service_name, options|
         delete(service_name, options, false)
@@ -41,17 +42,17 @@ module Kontena::Cli::Apps
 
     def delete(name, options, async = true)
       unless deleted_services.include?(name)
-        spinner "deleting #{name.colorize(:cyan)}" do
-          service = get_service(token, prefixed_name(name)) rescue nil
-          if(service)
+        service = get_service(token, prefixed_name(name)) rescue nil
+        if(service)
+          spinner "removing #{pastel.cyan(name)}" do
             delete_service(token, prefixed_name(name))
             unless async
               wait_for_delete_to_finish(service)
             end
-            deleted_services << name
-          else
-            puts "No such service: #{name}".colorize(:red)
           end
+          deleted_services << name
+        else
+          warning "No such service #{name}"
         end
       end
     end
@@ -63,7 +64,6 @@ module Kontena::Cli::Apps
       end
     end
 
-
     ##
     #
     # @return [Array]

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

@@ -27,10 +27,11 @@ module Kontena::Cli::Apps
     def restart_services(services)
       services.each do |service_name, opts|
         if service_exists?(service_name)
-          puts "restarting #{prefixed_name(service_name)}"
-          restart_service(token, prefixed_name(service_name))
+          spinner "Sending restart signal to #{service_name.colorize(:cyan)} " do
+            restart_service(token, prefixed_name(service_name))
+          end
         else
-          puts "No such service: #{service_name}".colorize(:red)
+          warning "No such service: #{service_name}"
         end
       end
     end

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

@@ -19,13 +19,15 @@ module Kontena::Cli::Apps
       yml_service = services_from_yaml(filename, [service], service_prefix)
       if yml_service[service]
         options = yml_service[service]
-        abort("Service has already instances defined in #{filename}. Please update #{filename} and deploy service instead") if options['container_count']
-        scale_service(require_token, prefixed_name(service), instances)
+        exit_with_error("Service has already instances defined in #{filename}. Please update #{filename} and deploy service instead") if options['container_count']
+        spinner "Scaling #{service.colorize(:cyan)} " do
+          scale_service(require_token, prefixed_name(service), instances)
+          wait_for_deploy_to_finish(token, parse_service_id(prefixed_name(service)))
+        end
+
       else
-        abort("Service not found")
+        exit_with_error("Service not found")
       end
     end
-
-
   end
 end

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

@@ -28,10 +28,11 @@ module Kontena::Cli::Apps
     def start_services(services)
       services.each do |service_name, opts|
         if service_exists?(service_name)
-          puts "starting #{prefixed_name(service_name)}"
-          start_service(token, prefixed_name(service_name))
+          spinner "Starting #{service_name.colorize(:cyan)} " do
+            start_service(token, prefixed_name(service_name))
+          end
         else
-          puts "No such service: #{service_name}".colorize(:red)
+          warning "No such service: #{service_name}"
         end
       end
     end

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

@@ -28,10 +28,11 @@ module Kontena::Cli::Apps
     def stop_services(services)
       services.each do |service_name, opts|
         if service_exists?(service_name)
-          puts "stopping #{prefixed_name(service_name)}"
-          stop_service(token, prefixed_name(service_name))
+          spinner "Sending stop signal to #{service_name.colorize(:cyan)} " do
+            stop_service(token, prefixed_name(service_name))
+          end
         else
-          puts "No such service: #{service_name}".colorize(:red)
+          warning "No such service: #{service_name}"
         end
       end
     end

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

@@ -27,13 +27,17 @@ 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?
@@ -47,7 +51,11 @@ module Kontena::Cli::Apps
         content = content % { project: ENV['project'], grid: ENV['grid'] }
         interpolate(content)
         replace_dollar_dollars(content)
-        @yaml = ::YAML.load(content)
+        begin
+          @yaml = ::YAML.load(content)
+        rescue Psych::SyntaxError => e
+          raise "Error while parsing #{file}".colorize(:red)+ " "+e.message
+        end
       end
 
       # @return [Array] array of validation errors
@@ -80,10 +88,12 @@ module Kontena::Cli::Apps
       # @return [Hash]
       def parse_services(service_name = nil)
         if service_name.nil?
-          services.each { |name, config| services[name] = process_config(config) }
+          services.each do |name, config|
+            services[name] = process_config(config)
+          end
           services
         else
-          abort("Service '#{service_name}' not found in #{file}".colorize(:red)) unless services.key?(service_name)
+          raise ("Service '#{service_name}' not found in #{file}") unless services.key?(service_name)
           process_config(services[service_name])
         end
       end
@@ -132,7 +142,7 @@ module Kontena::Cli::Apps
         if filename
           parent_config = from_external_file(filename, extended_service)
         else
-          abort("Service '#{extended_service}' not found in #{file}".colorize(:red)) unless services.key?(extended_service)
+          raise ("Service '#{extended_service}' not found in #{file}") unless services.key?(extended_service)
           parent_config = process_config(services[extended_service])
         end
         ServiceExtender.new(service_config).extend(parent_config)

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

@@ -43,6 +43,10 @@ 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,7 +53,11 @@ module Kontena::Cli::Apps
           notifications: []
         }
         if yaml.key?('services')
-          yaml['services'].each do |service, options|
+          yaml['services'].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?