kontena-cli 0.16.0.pre7 → 0.16.0.pre8

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

@@ -2,31 +2,24 @@ require_relative '../../../../spec_helper'
 require 'kontena/cli/apps/yaml/validator_v2'
 
 describe Kontena::Cli::Apps::YAML::ValidatorV2 do
-  describe '#validate_keys' do
-    it 'returns error on invalid key' do
-      result = subject.validate_keys('name' => 'wordpress')
-      expect(result['name'].size).to eq(1)
-    end
-  end
-
   describe '#validate_options' do
     context 'build' do
       it 'can be string' do
         result = subject.validate_options('build' => '.')
-        expect(result.success?).to be_truthy
-        expect(result.messages.key?('build')).to be_falsey
+        expect(result.valid?).to be_truthy
+        expect(result.errors.key?('build')).to be_falsey
       end
 
       it 'can be hash' do
         result = subject.validate_options('build' => { 'context' => '.' })
-        expect(result.success?).to be_truthy
-        expect(result.messages.key?('build')).to be_falsey
+        expect(result.valid?).to be_truthy
+        expect(result.errors.key?('build')).to be_falsey
       end
 
       it 'returns error if build is hash and context is missing' do
         result = subject.validate_options('build' => {})
-        expect(result.success?).to be_falsey
-        expect(result.messages.key?('build')).to be_truthy
+        expect(result.valid?).to be_falsey
+        expect(result.errors.key?('build')).to be_truthy
       end
 
       it 'returns error if optional dockerfile is not string' do
@@ -34,110 +27,110 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
           'context' => '.',
           'dockerfile' => 123
         })
-        expect(result.success?).to be_falsey
-        expect(result.messages.key?('build')).to be_truthy
+        expect(result.valid?).to be_falsey
+        expect(result.errors.key?('build')).to be_truthy
       end
     end
     it 'validates image is string' do
       result = subject.validate_options('image' => true)
-      expect(result.success?).to be_falsey
-      expect(result.messages.key?('image')).to be_truthy
+      expect(result.valid?).to be_falsey
+      expect(result.errors.key?('image')).to be_truthy
     end
 
     it 'validates stateful is boolean' do
       result = subject.validate_options('stateful' => 'bool')
-      expect(result.messages.key?('stateful')).to be_truthy
+      expect(result.errors.key?('stateful')).to be_truthy
     end
 
     it 'validates network_mode is host or bridge' do
       result = subject.validate_options('network_mode' => 'invalid')
-      expect(result.messages.key?('network_mode')).to be_truthy
+      expect(result.errors.key?('network_mode')).to be_truthy
 
       result = subject.validate_options('network_mode' => 'bridge')
-      expect(result.messages.key?('network_mode')).to be_falsey
+      expect(result.errors.key?('network_mode')).to be_falsey
 
       result = subject.validate_options('network_mode' => 'host')
-      expect(result.messages.key?('network_mode')).to be_falsey
+      expect(result.errors.key?('network_mode')).to be_falsey
     end
 
     context 'affinity' do
       it 'is optional' do
         result = subject.validate_options({})
-        expect(result.messages.key?('affinity')).to be_falsey
+        expect(result.errors.key?('affinity')).to be_falsey
       end
 
       it 'must be array' do
         result = subject.validate_options('affinity' => 'node==node1')
-        expect(result.messages.key?('affinity')).to be_truthy
+        expect(result.errors.key?('affinity')).to be_truthy
         result = subject.validate_options('affinity' => ['node==node1'])
-        expect(result.messages.key?('affinity')).to be_falsey
+        expect(result.errors.key?('affinity')).to be_falsey
       end
 
       it 'validates format' do
         result = subject.validate_options('affinity' => ['node=node1'])
-        expect(result.messages.key?('affinity')).to be_truthy
+        expect(result.errors.key?('affinity')).to be_truthy
 
         result = subject.validate_options('affinity' => ['node==node1', 'service!=mariadb'])
-        expect(result.messages.key?('affinity')).to be_falsey
+        expect(result.errors.key?('affinity')).to be_falsey
       end
     end
 
     context 'command' do
       it 'is optional' do
         result = subject.validate_options({})
-        expect(result.messages.key?('command')).to be_falsey
+        expect(result.errors.key?('command')).to be_falsey
       end
 
       it 'must be string or empty' do
         result = subject.validate_options('command' => 1234)
-        expect(result.messages.key?('command')).to be_truthy
+        expect(result.errors.key?('command')).to be_truthy
 
         result = subject.validate_options('command' => nil)
-        expect(result.messages.key?('command')).to be_falsey
+        expect(result.errors.key?('command')).to be_falsey
 
         result = subject.validate_options('command' => 'bundle exec rails s')
-        expect(result.messages.key?('command')).to be_falsey
+        expect(result.errors.key?('command')).to be_falsey
       end
     end
 
     it 'validates cpu_shares is integer' do
       result = subject.validate_options('cpu_shares' => '1m')
-      expect(result.messages.key?('cpu_shares')).to be_truthy
+      expect(result.errors.key?('cpu_shares')).to be_truthy
       result = subject.validate_options('cpu_shares' => 1024)
-      expect(result.messages.key?('cpu_shares')).to be_falsey
+      expect(result.errors.key?('cpu_shares')).to be_falsey
       result = subject.validate_options({})
-      expect(result.messages.key?('cpu_shares')).to be_falsey
+      expect(result.errors.key?('cpu_shares')).to be_falsey
     end
 
     it 'validates environment is array or hash' do
       result = subject.validate_options('environment' => 'KEY=VALUE')
-      expect(result.messages.key?('environment')).to be_truthy
+      expect(result.errors.key?('environment')).to be_truthy
       result = subject.validate_options('environment' => ['KEY=VALUE'])
-      expect(result.messages.key?('environment')).to be_falsey
+      expect(result.errors.key?('environment')).to be_falsey
       result = subject.validate_options('environment' => { 'KEY' => 'VALUE' })
-      expect(result.messages.key?('environment')).to be_falsey
+      expect(result.errors.key?('environment')).to be_falsey
     end
 
     context 'validates secrets' do
       it 'must be array' do
         result = subject.validate_options('secrets' => {})
-        expect(result.messages.key?('secrets')).to be_truthy
+        expect(result.errors.key?('secrets')).to be_truthy
       end
 
       context 'item' do
         it 'must contain secret' do
           result = subject.validate_options('secrets' => [{ 'name' => 'test', 'type' => 'env' }])
-          expect(result.messages.key?('secrets')).to be_truthy
+          expect(result.errors.key?('secrets')).to be_truthy
         end
 
         it 'must contain name' do
           result = subject.validate_options('secrets' => [{ 'secret' => 'test', 'type' => 'env' }])
-          expect(result.messages.key?('secrets')).to be_truthy
+          expect(result.errors.key?('secrets')).to be_truthy
         end
 
         it 'must contain type' do
           result = subject.validate_options('secrets' => [{ 'secret' => 'test', 'name' => 'test' }])
-          expect(result.messages.key?('secrets')).to be_truthy
+          expect(result.errors.key?('secrets')).to be_truthy
         end
 
         it 'accepts valid input' do
@@ -149,7 +142,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
                 'type' => 'env'
               }
             ])
-          expect(result.messages.key?('secrets')).to be_falsey
+          expect(result.errors.key?('secrets')).to be_falsey
         end
       end
     end
@@ -158,7 +151,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
       context 'options' do
         it 'must be hash' do
           result = subject.validate_options('logging' => { 'options' => [] })
-          expect(result.messages.key?('logging')).to be_truthy
+          expect(result.errors.key?('logging')).to be_truthy
           data = {
             'logging' => {
               'options' => {
@@ -167,7 +160,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
             }
           }
           result = subject.validate_options(data)
-          expect(result.messages.key?('logging')).to be_falsey
+          expect(result.errors.key?('logging')).to be_falsey
         end
       end
     end
@@ -176,7 +169,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
       context 'validates pre_build' do
         it 'must be array' do
           result = subject.validate_options('hooks' => { 'pre_build' => {} })
-          expect(result.messages.key?('hooks')).to be_truthy
+          expect(result.errors.key?('hooks')).to be_truthy
           data = {
             'hooks' => {
               'pre_build' => [
@@ -187,13 +180,13 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
             }
           }
           result = subject.validate_options(data)
-          expect(result.messages.key?('hooks')).to be_falsey
+          expect(result.errors.key?('hooks')).to be_falsey
         end
       end
       context 'post_start' do
         it 'must be array' do
           result = subject.validate_options('hooks' => { 'post_start' => {} })
-          expect(result.messages.key?('hooks')).to be_truthy
+          expect(result.errors.key?('hooks')).to be_truthy
           data = {
             'hooks' => {
               'post_start' => [
@@ -206,7 +199,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
             }
           }
           result = subject.validate_options(data)
-          expect(result.messages.key?('hooks')).to be_falsey
+          expect(result.errors.key?('hooks')).to be_falsey
         end
 
         context 'item' do
@@ -220,7 +213,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
                 }
               ]
             })
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
 
           it 'must contain cmd' do
@@ -233,7 +226,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
                 }
               ]
             })
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
 
           it 'must contain instance number or *' do
@@ -245,7 +238,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
                 }
               ]
             })
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
             data = {
               'hooks' => {
                 'post_start' => [
@@ -259,7 +252,7 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
               }
             }
             result = subject.validate_options(data)
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
 
           it 'may contain boolean oneshot' do
@@ -276,32 +269,32 @@ describe Kontena::Cli::Apps::YAML::ValidatorV2 do
               }
             }
             result = subject.validate_options(data)
-            expect(result.messages.key?('hooks')).to be_truthy
+            expect(result.errors.key?('hooks.post_start')).to be_truthy
           end
         end
 
         it 'validates depends_on is array' do
           result = subject.validate_options('depends_on' => 'web')
-          expect(result.messages.key?('depends_on')).to be_truthy
+          expect(result.errors.key?('depends_on')).to be_truthy
 
           result = subject.validate_options('depends_on' => ['web'])
-          expect(result.messages.key?('depends_on')).to be_falsey
+          expect(result.errors.key?('depends_on')).to be_falsey
         end
 
         it 'validates volumes is array' do
           result = subject.validate_options('volumes' => '/app')
-          expect(result.messages.key?('volumes')).to be_truthy
+          expect(result.errors.key?('volumes')).to be_truthy
 
           result = subject.validate_options('volumes' => ['/app'])
-          expect(result.messages.key?('volumes')).to be_falsey
+          expect(result.errors.key?('volumes')).to be_falsey
         end
 
         it 'validates volumes_from is array' do
           result = subject.validate_options('volumes_from' => 'mysql_data')
-          expect(result.messages.key?('volumes_from')).to be_truthy
+          expect(result.errors.key?('volumes_from')).to be_truthy
 
           result = subject.validate_options('volumes_from' => ['mysql_data'])
-          expect(result.messages.key?('volumes_from')).to be_falsey
+          expect(result.errors.key?('volumes_from')).to be_falsey
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.0.pre7
+  version: 0.16.0.pre8
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,89 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: dry-validation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-- !ruby/object:Gem::Dependency
-  name: dry-monads
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: dry-logic
+  name: hash_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: retriable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.1.0
 description: Kontena command line tool
 email:
 - info@kontena.io
@@ -218,7 +176,8 @@ files:
 - lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb
-- lib/kontena/callbacks/master/deploy/90_suggest_inviting_yourself_after_deploy.rb
+- lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb
+- lib/kontena/callbacks/master/deploy/90_proptip_after_deploy.rb
 - lib/kontena/cli/app_command.rb
 - lib/kontena/cli/apps/build_command.rb
 - lib/kontena/cli/apps/common.rb
@@ -240,6 +199,11 @@ files:
 - lib/kontena/cli/apps/show_command.rb
 - lib/kontena/cli/apps/start_command.rb
 - lib/kontena/cli/apps/stop_command.rb
+- lib/kontena/cli/apps/yaml/custom_validators/affinities_validator.rb
+- lib/kontena/cli/apps/yaml/custom_validators/build_validator.rb
+- lib/kontena/cli/apps/yaml/custom_validators/extends_validator.rb
+- lib/kontena/cli/apps/yaml/custom_validators/hooks_validator.rb
+- lib/kontena/cli/apps/yaml/custom_validators/secrets_validator.rb
 - lib/kontena/cli/apps/yaml/reader.rb
 - lib/kontena/cli/apps/yaml/service_extender.rb
 - lib/kontena/cli/apps/yaml/validations.rb
@@ -253,8 +217,8 @@ files:
 - lib/kontena/cli/cloud/login_command.rb
 - lib/kontena/cli/cloud/logout_command.rb
 - lib/kontena/cli/cloud/master/add_command.rb
-- lib/kontena/cli/cloud/master/delete_command.rb
 - lib/kontena/cli/cloud/master/list_command.rb
+- lib/kontena/cli/cloud/master/remove_command.rb
 - lib/kontena/cli/cloud/master/show_command.rb
 - lib/kontena/cli/cloud/master/update_command.rb
 - lib/kontena/cli/cloud/master_command.rb
@@ -313,10 +277,12 @@ files:
 - lib/kontena/cli/master/config_command.rb
 - lib/kontena/cli/master/create_command.rb
 - lib/kontena/cli/master/current_command.rb
+- lib/kontena/cli/master/init_cloud_command.rb
 - lib/kontena/cli/master/join_command.rb
 - lib/kontena/cli/master/list_command.rb
 - lib/kontena/cli/master/login_command.rb
 - lib/kontena/cli/master/logout_command.rb
+- lib/kontena/cli/master/remove_command.rb
 - lib/kontena/cli/master/token/common.rb
 - lib/kontena/cli/master/token/create_command.rb
 - lib/kontena/cli/master/token/current_command.rb