kontena-cli 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783db978846f2562ae4376aafaf2cc331e3c2335
-  data.tar.gz: 8bf9cf6feb781b34997c5805d93739cce03002ab
+  metadata.gz: 3373d4421b6f61fd8e141235ecc1c00d98ff9953
+  data.tar.gz: 577e0ebe31f0536ac54376be8154278651ee2caa
 SHA512:
-  metadata.gz: e9b55c7c46b7feafe97f4ef835584545bdfcf6d8cf44a31b2870468da4a8c372d72d1192d126986bb9ed453ce6e4cbb581bab92405c9b06b52ce0d8fed3eec12
-  data.tar.gz: 9aac40ace507b5ac790652cb003ad1e51142303ede988e0f8133df68d3a9e8192a5e1f2ee6861b87b46ee31cd19023594020dc60b090a89b6a1d911e356dd130
+  metadata.gz: 10a7dff3ac50b99808ca0754e8de9a77740f2535801dc304574d2c25082e79c32a5503765c6c39f15f7b66ed9fa70b6026c851e7ac9bd78ef0d6f9ec4b9c4e50
+  data.tar.gz: 54af8670055cbeac319144712d3add58bd1a334b385d48cab3a35acab0f5b324f70eb98557589e0ebfbeeeefd04b95e6ec3366c6f07058595371e56e92e08ca1

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

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

@@ -15,7 +15,7 @@ module Kontena::Cli::Services
       puts "%-30.30s %-40.40s %-10s %-8s" % ['NAME', 'IMAGE', 'INSTANCES', 'STATEFUL']
       grids['services'].each do |service|
         state = service['stateful'] ? 'yes' : 'no'
-        puts "%-30.30s %-40.40s %-10.10s %-8s" % [service['id'], service['image'], service['container_count'], state]
+        puts "%-30.30s %-40.40s %-10.10s %-8s" % [service['name'], service['image'], service['container_count'], state]
       end
     end
 
@@ -50,7 +50,7 @@ module Kontena::Cli::Services
         end
       end
       puts "  containers:"
-      result = client(token).get("services/#{current_grid}/#{service_id}/containers")
+      result = client(token).get("services/#{parse_service_id(service_id)}/containers")
       result['containers'].each do |container|
         puts "    #{container['name']}:"
         puts "      rev: #{container['deploy_rev']}"
@@ -67,7 +67,7 @@ module Kontena::Cli::Services
     end
 
     def scale(service_id, count, options)
-      client(require_token).put("services/#{current_grid}/#{service_id}", {container_count: count})
+      client(require_token).put("services/#{parse_service_id(service_id)}", {container_count: count})
       self.deploy(service_id, options)
     end
 
@@ -85,20 +85,20 @@ module Kontena::Cli::Services
     def restart(service_id)
       require_api_url
       token = require_token
-      result = client(token).post("services/#{current_grid}/#{service_id}/restart", {})
+      result = client(token).post("services/#{parse_service_id(service_id)}/restart", {})
     end
 
     def stop(service_id)
       require_api_url
       token = require_token
-      result = client(token).post("services/#{current_grid}/#{service_id}/stop", {})
+      result = client(token).post("services/#{parse_service_id(service_id)}/stop", {})
     end
 
     def start(service_id)
       require_api_url
       token = require_token
 
-      result = client(token).post("services/#{current_grid}/#{service_id}/start", {})
+      result = client(token).post("services/#{parse_service_id(service_id)}/start", {})
     end
 
     def create(name, image, options)
@@ -126,7 +126,7 @@ module Kontena::Cli::Services
       require_api_url
       token = require_token
 
-      result = client(token).delete("services/#{current_grid}/#{service_id}")
+      result = client(token).delete("services/#{parse_service_id(service_id)}")
     end
 
     private

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

@@ -7,22 +7,36 @@ module Kontena
       module ServicesHelper
         include Kontena::Cli::Common
 
+        # @param [String] token
+        # @param [String] grid_id
+        # @param [Hash] data
         def create_service(token, grid_id, data)
           client(token).post("grids/#{grid_id}/services", data)
         end
 
+        # @param [String] token
+        # @param [String] service_id
+        # @param [Hash] data
         def update_service(token, service_id, data)
-          client(token).put("services/#{current_grid}/#{service_id}", data)
+          param = parse_service_id(service_id)
+          client(token).put("services/#{param}", data)
         end
 
+        # @param [String] token
+        # @param [String] service_id
         def get_service(token, service_id)
-          client(token).get("services/#{current_grid}/#{service_id}")
+          param = parse_service_id(service_id)
+          client(token).get("services/#{param}")
         end
 
+        # @param [String] token
+        # @param [String] service_id
+        # @param [Hash] data
         def deploy_service(token, service_id, data)
-          client(token).post("services/#{current_grid}/#{service_id}/deploy", data)
+          param = parse_service_id(service_id)
+          client(token).post("services/#{param}/deploy", data)
           print 'deploying '
-          until client(token).get("services/#{current_grid}/#{service_id}")['state'] != 'deploying' do
+          until client(token).get("services/#{param}")['state'] != 'deploying' do
             print '.'
             sleep 1
           end
@@ -30,6 +44,18 @@ module Kontena
           puts ''
         end
 
+        # @param [String] service_id
+        # @return [String]
+        def parse_service_id(service_id)
+          if service_id.to_s.include?('/')
+            param = service_id
+          else
+            param = "#{current_grid}/#{service_id}"
+          end
+        end
+
+        # @param [Array<String>] port_options
+        # @return [Array<Hash>]
         def parse_ports(port_options)
           port_options.map{|p|
             node_port, container_port, protocol = p.split(':')
@@ -44,6 +70,8 @@ module Kontena
           }
         end
 
+        # @param [Array<String>] link_options
+        # @return [Array<Hash>]
         def parse_links(link_options)
           link_options.map{|l|
             service_name, alias_name = l.split(':')
@@ -58,6 +86,8 @@ module Kontena
           }
         end
 
+        # @param [String] memory
+        # @return [Integer]
         def parse_memory(memory)
           if memory.end_with?('k')
             memory.to_i * 1000

data/lib/kontena/cli/stacks/stacks.rb

@@ -44,7 +44,7 @@ module Kontena::Cli::Stacks
           data[:strategy] = service['deploy']['strategy'] if service['deploy']['strategy']
           data[:wait_for_port] = service['deploy']['wait_for_port'] if service['deploy']['wait_for_port']
         end
-        deploy_service(token, service['id'], data)
+        deploy_service(token, service['id'].split('/').last, data)
       end
     end
 

data/lib/kontena/scripts/completer

@@ -35,7 +35,6 @@ class Helper
     services = client.get("grids/#{current_grid}/services")['services']
     results = []
     results.push services.map{|s| s['name']}
-    results.push services.map{|s| s['id']}
 
     results
   rescue

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

@@ -76,9 +76,7 @@ module Kontena::Cli::Services
             protocol: 'tcp'
         }]
         port_options = subject.parse_ports(['80:80'])
-
         expect(port_options).to eq(valid_result)
-
       end
     end
 
@@ -91,13 +89,21 @@ module Kontena::Cli::Services
 
       it 'returns hash of link options' do
         valid_result = [{
-                            name: 'db',
-                            alias: 'mysql',
-                        }]
+            name: 'db',
+            alias: 'mysql',
+        }]
         link_options = subject.parse_links(['db:mysql'])
-
         expect(link_options).to eq(valid_result)
+      end
+    end
+
+    describe '#parse_service_id' do
+      it 'adds current_grid if service_id is missing prefix' do
+        expect(subject.parse_service_id('mysql')).to eq('test-grid/mysql')
+      end
 
+      it 'does not add current_grid if service id includes prefix' do
+        expect(subject.parse_service_id('second-grid/mysql')).to eq('second-grid/mysql')
       end
     end
   end

data/spec/kontena/cli/stacks/stacks_spec.rb

@@ -198,6 +198,7 @@ content
           it 'deploys only given services' do
             allow(subject).to receive(:current_dir).and_return("kontena-test")
             allow(options).to receive(:service).and_return(['wordpress'])
+            allow(subject).to receive(:deploy_services).and_return({})
             expect(subject).to receive(:create).once.with('wordpress', anything).and_return({})
             expect(subject).not_to receive(:create).with('mysql', services['mysql'])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler