kontena-cli 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9098c361090e27d591cbc3aaf746971edd630c
-  data.tar.gz: e94b8da1edbde7c98655dd8a18ea4cdfc5a8dc07
+  metadata.gz: 3615565de0efd69d3810d5e83d3d82c57346b113
+  data.tar.gz: 3b1e0c7d0ebab40e3c475e3a17162b1a99d4abd1
 SHA512:
-  metadata.gz: f940dcc0927a58225f36484c4a8c19b0039a562c3a52b3463a40f6588236e92cf68afa314b476d01f20a19b081316f2816ab05ad64b9eb531361f723dfa611a5
-  data.tar.gz: 1934f827f62632aaa7591dc6679fc1f7f76655fbf85283213b00b0d5913e9d57d28e2edaee97712b6b0d9b46f64a65e45f534fea462c53ee42c0cfd9696676c8
+  metadata.gz: fd94b5f72eefbc5d03a0def4247bc2d2fe485f88934b2c7b00665df2d19f041e0e692bd881a2afa92dbad5df3aa8e47633f48bde0efeed7a0b5eae74cb583d09
+  data.tar.gz: 63ca406ab1b5cfd55a2650eecf8e4ac0064ddd5692ff7aa704b626a93f3d5a98f3ceaf3e6080d2164cc3ead655a822050eed93f6a3cfbb5767c55c3a7d59cc3a

data/VERSION

@@ -1 +1 @@
-0.11.5
+0.11.6

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

@@ -146,15 +146,15 @@ module Kontena::Cli::Apps
       data[:image] = parse_image(options['image'])
       data[:env] = options['environment']
       data[:container_count] = options['instances']
-      data[:links] = parse_links(options['links']) if options['links']
-      data[:ports] = parse_ports(options['ports']) if options['ports']
+      data[:links] = parse_links(options['links'] || [])
+      data[:ports] = parse_ports(options['ports'] || [])
       data[:memory] = parse_memory(options['mem_limit']) if options['mem_limit']
       data[:memory_swap] = parse_memory(options['memswap_limit']) if options['memswap_limit']
       data[:cpu_shares] = options['cpu_shares'] if options['cpu_shares']
-      data[:volumes] = options['volumes'] if options['volumes']
-      data[:volumes_from] = options['volumes_from'] if options['volumes_from']
+      data[:volumes] = options['volumes'] || []
+      data[:volumes_from] = options['volumes_from'] || []
       data[:cmd] = options['command'].split(" ") if options['command']
-      data[:affinity] = options['affinity'] if options['affinity']
+      data[:affinity] = options['affinity'] || []
       data[:user] = options['user'] if options['user']
       data[:stateful] = options['stateful'] == true
       data[:privileged] = options['privileged'] unless options['privileged'].nil?

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

@@ -1,7 +1,10 @@
 module Kontena::Cli::Apps
   module DockerHelper
 
-    def process_docker_images(services, force_build = false, no_cache=false)
+    # @param [Hash] services
+    # @param [Boolean] force_build
+    # @param [Boolean] no_cache
+    def process_docker_images(services, force_build = false, no_cache = false)
       if services.none?{|name, service| service['build']}
         puts "Not found any service with build option"
         return
@@ -20,31 +23,44 @@ module Kontena::Cli::Apps
       end
     end
 
+    # @param [String] name
+    # @return [Boolean]
     def validate_image_name(name)
-      !(/^[\w.\/\-]+:?+[\w+.]+$/ =~ name).nil?
+      !(/^[\w.\/\-:]+:?+[\w+.]+$/ =~ name).nil?
     end
 
-
+    # @param [String] name
+    # @param [String] path
+    # @param [String] dockerfile
+    # @param [Boolean] no_cache
+    # @return [Integer]
     def build_docker_image(name, path, dockerfile, no_cache=false)
       cmd = ["docker build -t #{name}"]
       cmd << "-f #{File.join(File.expand_path(path), dockerfile)}" if dockerfile != "Dockerfile"
       cmd << "--no-cache" if no_cache
-      cmd << path      
+      cmd << path
       ret = system(cmd.join(' '))
       abort("Failed to build image #{name.colorize(:cyan)}") unless ret
       ret
     end
 
+    # @param [String] image
+    # @return [Integer]
     def push_docker_image(image)
       ret = system("docker push #{image}")
       abort("Failed to push image #{image.colorize(:cyan)}") unless ret
       ret
     end
 
+    # @param [String] image
+    # @return [Boolean]
     def image_exist?(image)
       `docker history #{image} 2>&1` ; $?.success?
     end
 
+    # @param [String] path
+    # @param [String] dockerfile
+    # @return [Boolean]
     def dockerfile_exist?(path, dockerfile)
       file = File.join(File.expand_path(path), dockerfile)
       File.exist?(file)

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Services
     def execute
       require_api_url
       token = require_token
-      restart_service(token, name, {})
+      restart_service(token, name)
     end
   end
 end

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

@@ -153,6 +153,14 @@ module Kontena
             end
           end
 
+          unless service['memory'].to_s.empty?
+            puts "  memory: #{int_to_filesize(service['memory'])}"
+          end
+
+          unless service['memory_swap'].to_s.empty?
+            puts "  memory_swap: #{int_to_filesize(service['memory_swap'])}"
+          end
+
           unless service['pid'].to_s.empty?
             puts "  pid: #{service['pid']}"
           end
@@ -212,7 +220,7 @@ module Kontena
         # @param [String] token
         # @param [String] service_id
         def restart_service(token, service_id)
-          param = parse_service_id(service_id)          
+          param = parse_service_id(service_id)
           client(token).post("services/#{param}/restart", {})
         end
 
@@ -310,6 +318,16 @@ module Kontena
           end
           secrets
         end
+
+        def int_to_filesize(int)
+          {
+            'B'  => 1000,
+            'KB' => 1000 * 1000,
+            'MB' => 1000 * 1000 * 1000,
+            'GB' => 1000 * 1000 * 1000 * 1000,
+            'TB' => 1000 * 1000 * 1000 * 1000 * 1000
+          }.each_pair { |e, s| return "#{(int.to_i / (s / 1000))}#{e}" if int < s }
+        end
       end
     end
   end

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

@@ -107,7 +107,7 @@ yml
     ["TEST_ENV_VAR=test2","", "TEST_ENV_VAR2=test3"]
   end
 
-  describe '#deploy' do
+  describe '.run' do
 
     before(:each) do
       allow(subject).to receive(:wait_for_deploy_to_finish).and_return(true)
@@ -280,16 +280,348 @@ yml
   end
 
   describe '#parse_data' do
-    it 'adds empty hooks hash if not defined' do
-      data = {'image' => 'foo/bar:latest'}
-      result = subject.send(:parse_data, data)
-      expect(result[:hooks]).to eq({})
+
+    context 'volumes' do
+      it 'returns volumes if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'volumes' => [
+            'mongodb-1'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:volumes]).to eq(data['volumes'])
+      end
+
+      it 'returns empty volumes if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:volumes]).to eq([])
+      end
+    end
+
+    context 'volumes_from' do
+      it 'returns volumes_from if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'volumes_from' => [
+            'mongodb-1'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:volumes_from]).to eq(data['volumes_from'])
+      end
+
+      it 'returns empty volumes_from if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:volumes_from]).to eq([])
+      end
+    end
+
+    context 'command' do
+      it 'returns cmd array if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'command' => 'ls -la'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:cmd]).to eq(data['command'].split(' '))
+      end
+
+      it 'does not return cmd if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result.has_key?(:cmd)).to be_falsey
+      end
+    end
+
+    context 'affinity' do
+      it 'returns affinity if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'affinity' => [
+            'label==az=b'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:affinity]).to eq(data['affinity'])
+      end
+
+      it 'returns affinity as empty array if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result.has_key?(:affinity)).to be_truthy
+        expect(result[:affinity]).to eq([])
+      end
+    end
+
+    context 'user' do
+      it 'returns user if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'user' => 'user'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:user]).to eq('user')
+      end
+
+      it 'does not return user if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result.has_key?(:user)).to be_falsey
+      end
+    end
+
+    context 'stateful' do
+      it 'returns stateful if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'stateful' => true
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:stateful]).to eq(true)
+      end
+
+      it 'returns stateful as false if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:stateful]).to eq(false)
+      end
+    end
+
+    context 'privileged' do
+      it 'returns privileged if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'privileged' => false
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:privileged]).to eq(false)
+      end
+
+      it 'does not return privileged if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:privileged]).to be_nil
+      end
+    end
+
+    context 'cap_add' do
+      it 'returns cap_drop if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'cap_add' => [
+            'NET_ADMIN'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:cap_add]).to eq(data['cap_add'])
+      end
+
+      it 'does not return cap_add if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:cap_add]).to be_nil
+      end
+    end
+
+    context 'cap_drop' do
+      it 'returns cap_drop if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'cap_drop' => [
+            'NET_ADMIN'
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:cap_drop]).to eq(data['cap_drop'])
+      end
+
+      it 'does not return cap_drop if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:cap_drop]).to be_nil
+      end
+    end
+
+    context 'net' do
+      it 'returns net if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'net' => 'host'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:net]).to eq('host')
+      end
+
+      it 'does not return pid if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:net]).to be_nil
+      end
+    end
+
+    context 'pid' do
+      it 'returns pid if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'pid' => 'host'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:pid]).to eq('host')
+      end
+
+      it 'does not return pid if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:pid]).to be_nil
+      end
     end
 
-    it 'read secrets if defined' do
-      data = {'image' => 'foo/bar:latest', 'secrets' => [{'secret' => 'MYSQL_ADMIN_PASSWORD', 'name' =>  'WORDPRESS_DB_PASSWORD', 'type' => 'env'}]}
-      result = subject.send(:parse_data, data)
-      expect(result[:secrets]).to eq([{'secret' => 'MYSQL_ADMIN_PASSWORD', 'name' => 'WORDPRESS_DB_PASSWORD', 'type' => 'env'}])
+    context 'log_driver' do
+      it 'returns log_driver if set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'log_driver' => 'syslog'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:log_driver]).to eq('syslog')
+      end
+
+      it 'does not return log_driver if not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:log_driver]).to be_nil
+      end
+    end
+
+    context 'log_opt' do
+      it 'returns log_opts hash if log_opt is set' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'log_driver' => 'fluentd',
+          'log_opt' => {
+            'fluentd-address' => '192.168.99.1:24224',
+            'fluentd-tag' => 'docker.{{.Name}}'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:log_opts]).to eq(data['log_opt'])
+      end
+
+      it 'does not return log_opts if log_opt is not set' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:log_opts]).to be_nil
+      end
+    end
+
+    context 'deploy_opts' do
+      it 'returns deploy_opts if deploy.wait_for_port is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'wait_for_port' => '8080'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:deploy_opts][:wait_for_port]).to eq('8080')
+      end
+
+      it 'returns deploy_opts if deploy.min_health is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'min_health' => '0.5'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:deploy_opts][:min_health]).to eq('0.5')
+      end
+
+      it 'sets strategy if deploy.strategy is defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'deploy' => {
+            'strategy' => 'daemon'
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:strategy]).to eq('daemon')
+      end
+
+      it 'does not return deploy_opts if no deploy options are defined' do
+        data = {
+          'image' => 'foo/bar:latest'
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:deploy_opts]).to be_nil
+      end
+    end
+
+    context 'hooks' do
+      it 'returns hooks hash if defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'hooks' => {
+            'post_start' => []
+          }
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:hooks]).to eq(data['hooks'])
+      end
+
+      it 'does returns empty hook hash if not defined' do
+        data = {'image' => 'foo/bar:latest'}
+        result = subject.send(:parse_data, data)
+        expect(result[:hooks]).to eq({})
+      end
+    end
+
+    context 'secrets' do
+      it 'returns secrets array if defined' do
+        data = {
+          'image' => 'foo/bar:latest',
+          'secrets' => [
+            {'secret' => 'MYSQL_ADMIN_PASSWORD', 'name' =>  'WORDPRESS_DB_PASSWORD', 'type' => 'env'}
+          ]
+        }
+        result = subject.send(:parse_data, data)
+        expect(result[:secrets]).to eq(data['secrets'])
+      end
+
+      it 'does not return secrets if not defined' do
+        data = {'image' => 'foo/bar:latest'}
+        result = subject.send(:parse_data, data)
+        expect(result[:secrets]).to be_nil
+      end
     end
   end
 end

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

@@ -12,6 +12,7 @@ describe Kontena::Cli::Apps::DockerHelper do
       it 'returns true' do
         expect(subject.validate_image_name('registry.kontena.local/image-name:latest')).to be_truthy
         expect(subject.validate_image_name('my-registry.com/organization/image_name:latest')).to be_truthy
+        expect(subject.validate_image_name('my-registry.com:5000/organization/image_name:latest')).to be_truthy
         expect(subject.validate_image_name('mysql:5.1')).to be_truthy
         expect(subject.validate_image_name('wordpress')).to be_truthy
       end
@@ -26,7 +27,6 @@ describe Kontena::Cli::Apps::DockerHelper do
         expect(subject.validate_image_name('mysql 5.1')).to be_falsey
         expect(subject.validate_image_name('*.mydomain.com/mysql')).to be_falsey
       end
-
     end
   end
 end

data/spec/kontena/cli/services/restart_command_spec.rb

@@ -0,0 +1,51 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/services/restart_command"
+
+describe Kontena::Cli::Services::RestartCommand do
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:client) do
+    double
+  end
+
+  let(:token) do
+    '1234567'
+  end
+
+  let(:settings) do
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'some_master', 'url' => 'some_master'},
+         {'name' => 'alias', 'url' => 'someurl', 'token' => token}
+     ]
+    }
+  end
+
+  describe '#execute' do
+
+    before(:each) do
+      allow(subject).to receive(:client).with(token).and_return(client)
+      allow(subject).to receive(:current_grid).and_return('test-grid')
+      allow(subject).to receive(:settings).and_return(settings)
+      allow(subject).to receive(:restart_service).and_return({})
+    end
+
+    it 'requires api url' do
+      expect(subject).to receive(:require_api_url).once
+      subject.run(['service'])
+    end
+
+    it 'requires token' do
+      expect(subject).to receive(:require_token).once
+      subject.run(['service'])
+    end
+
+    it 'triggers restart command' do
+      expect(subject).to receive(:restart_service).with(token, 'service')
+      subject.run(['service'])
+    end
+  end
+end

data/spec/kontena/cli/services/services_helper_spec.rb

@@ -41,6 +41,27 @@ module Kontena::Cli::Services
       end
     end
 
+    describe '#stop_service' do
+      it 'creates POST services/:id/stop request to Kontena Server' do
+        expect(client).to receive(:post).with('services/test-grid/test-service/stop', {})
+        subject.stop_service(token, 'test-service')
+      end
+    end
+
+    describe '#start_service' do
+      it 'creates POST services/:id/start request to Kontena Server' do
+        expect(client).to receive(:post).with('services/test-grid/test-service/start', {})
+        subject.start_service(token, 'test-service')
+      end
+    end
+
+    describe '#restart_service' do
+      it 'creates POST services/:id/restart request to Kontena Server' do
+        expect(client).to receive(:post).with('services/test-grid/test-service/restart', {})
+        subject.restart_service(token, 'test-service')
+      end
+    end
+
     describe '#deploy_service' do
       it 'creates POST services/:id/deploy request to Kontena Server' do
         allow(client).to receive(:get).with('services/test-grid/1').and_return({'state' => 'running'})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -301,6 +301,7 @@ files:
 - spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/register_command_spec.rb
+- spec/kontena/cli/services/restart_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
@@ -324,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool
@@ -338,5 +339,6 @@ test_files:
 - spec/kontena/cli/login_command_spec.rb
 - spec/kontena/cli/master/use_command_spec.rb
 - spec/kontena/cli/register_command_spec.rb
+- spec/kontena/cli/services/restart_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
 - spec/spec_helper.rb