kontena-cli 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d90de6f0d32f0df7c0e8f24b2edb8f63ba07d2
-  data.tar.gz: 9dc2b6c41695d579821fcfab99ce0b7698abf12b
+  metadata.gz: 10854e373ea991c16cef416e5148423e0f8e16f7
+  data.tar.gz: e207bfb58dab4e3e419f09281752228df9f7f835
 SHA512:
-  metadata.gz: 5b9247a7fe9163ad3a74b9bcca84bd0b3deed06d87055385c6e6ad7aeb30a7e0fcbeec62a6ade97fb25b85bb03c96787d43dca0e18c5e0539663d2b332961eee
-  data.tar.gz: 643fc68f3b4b2e5ddf54a1181aabac84411814037170774e0c91cfcfb54e320f14d8edc992492e1f3e1b4321fabbccffdb4c9abf377be8dd4473b77f934b6531
+  metadata.gz: 9f7c2b00ca9f065983bff7d18da412655be0bf1819ff3e0b27ef197a8b31e17ad30dcdcc209eb8226caa88c2c212d9b28e6e9c19b01989fb64eb0ff2f2030afb
+  data.tar.gz: a503b7cdc96de4171e17d5e241a91f342eef50eed0fa727665f923125f776c962775157d22f14d0797cbd7d42b044451853336c8b4d1e9957b7bb8ab94b46cde

data/VERSION

@@ -1 +1 @@
-0.14.5
+0.14.6

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

@@ -52,6 +52,7 @@ module Kontena::Cli::Apps
       deploy = {}
       deploy['wait_for_port'] = deploy_opts['wait_for_port'] if deploy_opts.has_key?('wait_for_port')
       deploy['min_health'] = deploy_opts['min_health'] if deploy_opts.has_key?('min_health')
+      deploy['interval'] = parse_relative_time(deploy_opts['interval']) if deploy_opts.has_key?('interval')
       unless deploy.empty?
         data['deploy_opts'] = deploy
       end

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

@@ -27,6 +27,7 @@ module Kontena::Cli::Apps::YAML
        optional('strategy') { inclusion?(%w(ha daemon random)) }
        optional('wait_for_port') { int? }
        optional('min_health') { float? }
+       optional('interval') { format?(/^\d+(min|h|d|)$/) }
      end
      base.optional('hooks').schema do
        optional('post_start').each do

data/spec/kontena/cli/app/service_generator_spec.rb

@@ -324,6 +324,17 @@ describe Kontena::Cli::Apps::ServiceGenerator do
         expect(result['strategy']).to eq('daemon')
       end
 
+      it 'sets interval if deploy.interval is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'interval' => '1min'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result['deploy_opts']['interval']).to eq(60)
+      end
+
       it 'does not return deploy_opts if no deploy options are defined' do
         data = {
           'image' => 'foo/bar:latest'

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

@@ -62,6 +62,26 @@ describe Kontena::Cli::Apps::YAML::Validator do
       end
     end
 
+    context 'deploy' do
+      it 'validates interval' do
+        
+        result = subject.validate_options('deploy' => {'interval' => '1xyz'})
+        expect(result.messages.key?('deploy')).to be_truthy
+
+        result = subject.validate_options('deploy' => {'interval' => '1min'})
+        expect(result.messages.key?('deploy')).to be_falsey
+
+        result = subject.validate_options('deploy' => {'interval' => '1h'})
+        expect(result.messages.key?('deploy')).to be_falsey
+
+        result = subject.validate_options('deploy' => {'interval' => '1d'})
+        expect(result.messages.key?('deploy')).to be_falsey
+
+        result = subject.validate_options('deploy' => {'interval' => '100'})
+        expect(result.messages.key?('deploy')).to be_falsey
+      end
+    end
+
     context 'command' do
       it 'is optional' do
         result = subject.validate_options({})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler