kontena-cli 0.15.4 → 0.15.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23539e03b622f33edc9607ab98af092b191d154d
-  data.tar.gz: 9ae1dc2c686f48abe68974a475350bbad66c72e3
+  metadata.gz: ed3274a66dc5dcee8f9e8fa4ee7841664910fc88
+  data.tar.gz: 52690daf0a91bba1cbbd2e1578366aa4955b28c6
 SHA512:
-  metadata.gz: aa487d49f1f2efc5b11148ab2e275fbdea6f883536e9c00cf5d77721a63236b313de4b6a09510ad833b00e953506c20fca04c8a942010778879bdd066c0fbfec
-  data.tar.gz: 32b2a556d786634fb2c3ff0d776cdffc3ad0d1c338309d3cb90bea4693b36d3c9e86e49c11a6d37446ca42ea64388d0ca37cc844fe690fd42f45a774c6c914cd
+  metadata.gz: 5cb2fe4b739883ad79eb9cc411de73772924a6b43a9d2df560051759566edb85d9f40be029d87ac2226a9fa5bfe23ae26d28994cf32465872932d616d65578b6
+  data.tar.gz: 6620468258c43d296b89cfa297044c2159692643770b0ef986cdd04941c8e76b5683a1fd6807b3fb150ee6ac1a4d200f657c6f171874adbb62b800f0662ce09d

data/VERSION

@@ -1 +1 @@
-0.15.4
+0.15.5.rc1

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

@@ -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/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
+          abort("Error while parsing #{file}".colorize(:red)+ " "+e.message)
+        end
       end
 
       # @return [Array] array of validation errors
@@ -80,7 +88,9 @@ 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)

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?

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

@@ -5,29 +5,24 @@ module Kontena::Cli::Master
     parameter "NAME", "Master name to use"
 
     def execute
-      master = find_master_by_name(name)
-      if !master.nil?
+      master = settings['servers'].find { |s| s['name'] == name }
+
+      if master
         self.current_master = master['name']
         puts "Using master: #{master['name'].cyan} (#{master['url']})"
         puts "Using grid: #{current_grid.cyan}" if current_grid
+
         grids = client(require_token).get('grids')['grids']
         if grids.size > 1
           puts ""
-          puts "You have access to following grids and can switch between them using 'kontena grid use <name>'"
+          puts "You have access to following grids:"
           puts ""
           grids.each do |grid|
             puts "  * #{grid['name']}"
           end
-          puts ""
         end
       else
-        abort "Could not resolve master by name [#{name}]. For a list of known masters please run: kontena master list".colorize(:red)
-      end
-    end
-
-    def find_master_by_name(name)
-      settings['servers'].each do |server|
-        return server if server['name'] == name
+        abort "Could not resolve master with name: #{name}".colorize(:red)
       end
     end
 

data/lib/kontena/cli/services/services_helper.rb

@@ -97,11 +97,7 @@ module Kontena
           if service['env'].to_a.size > 0
             puts "  env: "
             service['env'].to_a.each do |e|
-              if e.length > 50
-                puts "    - #{e[0..50]}..."
-              else
-                puts "    - #{e}"
-              end
+              puts "    - #{e}"
             end
           end
 

data/spec/fixtures/kontena-malformed-yaml.yml

@@ -0,0 +1,6 @@
+version: '2'
+services:
+  wordpress:
+    build: .
+      context: .
+      dockerfile: Dockerfile.alternative

data/spec/fixtures/kontena-not-hash-service-config.yml

@@ -0,0 +1,3 @@
+version: '2'
+services:
+  wordpress: 'service config cannot be string'    

data/spec/kontena/cli/app/yaml/reader_spec.rb

@@ -156,6 +156,28 @@ describe Kontena::Cli::Apps::YAML::Reader do
     end
   end
 
+  context 'when yaml file is malformed' do
+    it 'exits the execution' do
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path)
+        .and_return(fixture('kontena-malformed-yaml.yml'))
+      expect {
+        subject.execute
+      }.to raise_error(SystemExit)
+    end
+  end
+
+  context 'when service config is not hash' do
+    it 'returns error' do
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path)
+        .and_return(fixture('kontena-not-hash-service-config.yml'))
+
+      outcome = subject.execute
+      expect(outcome[:errors].size).to eq(1)
+    end
+  end
+
   describe '#v2?' do
     context 'version 1' do
       it 'returns false' do
@@ -407,4 +429,30 @@ describe Kontena::Cli::Apps::YAML::Reader do
       end
     end
   end
+
+  describe '#stack_name' do
+    it 'returns nil for v1' do
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('kontena.yml'))
+        .and_return(fixture('kontena.yml'))
+      name = subject.stack_name
+      expect(name).to be_nil
+    end
+
+    it 'returns name for v2 if defined' do
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('kontena.yml'))
+        .and_return(fixture('kontena_v2.yml'))
+      name = subject.stack_name
+      expect(name).to eq('test-project')
+    end
+
+    it 'returns nil for v2 if not defined' do
+      allow(File).to receive(:read)
+        .with(absolute_yaml_path('kontena.yml'))
+        .and_return(fixture('docker-compose.yml'))
+      name = subject.stack_name
+      expect(name).to be_nil
+    end
+  end
 end

data/spec/kontena/cli/master/use_command_spec.rb

@@ -34,5 +34,10 @@ describe Kontena::Cli::Master::UseCommand do
       expect(client).to receive(:get).with('grids')
       subject.run(['some_master'])
     end
+
+    it 'should abort with error message if master is not configured' do
+      expect { subject.run(['not_existing']) }.to raise_error(
+        SystemExit, /Could not resolve master with name: not_existing/)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -397,6 +397,8 @@ files:
 - spec/fixtures/kontena-build.yml
 - spec/fixtures/kontena-internal-extend.yml
 - spec/fixtures/kontena-invalid.yml
+- spec/fixtures/kontena-malformed-yaml.yml
+- spec/fixtures/kontena-not-hash-service-config.yml
 - spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml
@@ -466,9 +468,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -483,6 +485,8 @@ test_files:
 - spec/fixtures/kontena-build.yml
 - spec/fixtures/kontena-internal-extend.yml
 - spec/fixtures/kontena-invalid.yml
+- spec/fixtures/kontena-malformed-yaml.yml
+- spec/fixtures/kontena-not-hash-service-config.yml
 - spec/fixtures/kontena-with-env-file.yml
 - spec/fixtures/kontena-with-variables.yml
 - spec/fixtures/kontena.yml