kontena-cli 0.17.0.pre5 → 1.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3835d40a477a0fb0ab94945857b84a1ab33d006f
-  data.tar.gz: 5f177bfca7d455d0861ddad86d3f83c79512697a
+  metadata.gz: 449b75212c33f152d3b6d1179301ad0da967b5a2
+  data.tar.gz: a4190acf5dbd76ddd258afd7aafd7aa186d3e606
 SHA512:
-  metadata.gz: 291def87302aa7427d81ee28ff0040f4bc4b8d235f775bf42530e243fdf461c1e5022e853bd88a3807b887470e893cc469f0eb6c40315041c80bdd2f2611ebbf
-  data.tar.gz: 15705cab01e27db243cbe6d9be9c7b18a748027755ab7674b1f34ac5482b9c036d9d005e2cfb8cb12eab7a316532a0b0330976b648fdb42768b59f665771ba9d
+  metadata.gz: 5689de9e2585507122dde4432c24c3d58bcaec6acf8ff93748f1611449e2c337a52ae608ecf4abf853fdfdee039b990baa7cab7bff870853cb4f5afe603cdbd4
+  data.tar.gz: 5531cc8ff20f5477c1912f06fabf78c73cbe44531141fc60db08430857191605d59fff266122cba3d4c733cb2338498944abe117b0decacb9ebdbe6963dcfe87

data/VERSION

@@ -1 +1 @@
-0.17.0.pre5
+1.0.0.pre1

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

@@ -7,29 +7,28 @@ module Kontena::Cli::Stacks
     include Common
 
     parameter "NAME", "Stack name"
-
-    attr_reader :services
+    parameter "[SERVICES] ...", "Stack services to monitor", attribute_name: 'selected_services'
 
     def execute
       require_api_url
       token = require_token
 
       response = client(token).get("grids/#{current_grid}/services?stack=#{name}")
-      show_monitor(response['services'])
-
-      @services = services_from_yaml(filename, service_list, service_prefix)
-      if services.size > 0
-        show_monitor(services)
-      elsif !service_list.empty?
-        puts "No such service: #{service_list.join(', ')}".colorize(:red)
+      services = response['services']
+      if selected_services
+        services.delete_if{ |s| !selected_services.include?(s['name'])}
       end
+      show_monitor(token, services)
     end
 
-    def show_monitor(services)
+    # @param [String] token
+    # @param [Array<Hash>]
+    def show_monitor(token, services)
       loop do
         nodes = {}
         services.each do |service|
           result = client(token).get("services/#{service['id']}/containers") rescue nil
+          service['instances'] = 0
           if result
             service['instances'] = result['containers'].size
             result['containers'].each do |container|
@@ -78,8 +77,10 @@ module Kontena::Cli::Stacks
 
     def colors
       if(@colors.nil? || @colors.size == 0)
-        @colors = [:green, :magenta, :yellow, :cyan, :red,
-                   :light_green, :light_yellow, :ligh_magenta, :light_cyan, :light_red]
+        @colors = %i(
+          red green yellow blue magenta cyan bright_red bright_green
+          bright_yellow bright_blue bright_magenta bright_cyan
+        )
       end
       @colors
     end

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

@@ -7,7 +7,7 @@ module Kontena::Cli::Stacks
     include Common
 
     parameter "NAME", "Stack name"
-    parameter "FILE", "Kontena stack file"
+    parameter "[FILE]", "Kontena stack file", default: "kontena.yml"
     option '--deploy', :flag, 'Deploy after upgrade'
 
     def execute
@@ -18,7 +18,7 @@ module Kontena::Cli::Stacks
       spinner "Upgrading stack #{pastel.cyan(name)} " do
         update_stack(token, stack)
       end
-      Kontena.run("stack deploy #{name}")
+      Kontena.run("stack deploy #{name}") if deploy?
     end
 
     def update_stack(token, stack)

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

@@ -15,19 +15,34 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
     end
 
     it 'requires api url' do
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      allow(subject).to receive(:require_config_file).and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
       expect(subject).to receive(:require_api_url).once
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
     it 'requires token' do
-      allow(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      allow(subject).to receive(:require_config_file).and_return(true)
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
       expect(subject).to receive(:require_token).and_return(token)
       subject.run(['stack-name', './path/to/kontena.yml'])
     end
 
+    it 'requires stack file' do
+      allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+      allow(subject).to receive(:require_token).and_return(token)
+      expect(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
+      subject.run(['stack-name', './path/to/kontena.yml'])
+    end
+
+    it 'uses kontena.yml as default stack file' do
+      allow(subject).to receive(:require_token).and_return(token)
+      expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
+      expect(subject).to receive(:stack_from_yaml).with('kontena.yml').and_return(stack)
+      subject.run(['stack-name'])
+    end
+
     it 'sends stack to master' do
-      
       allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
       allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
       expect(client).to receive(:put).with(
@@ -46,5 +61,30 @@ describe Kontena::Cli::Stacks::UpgradeCommand do
       )
       subject.run(['stack-b',  './path/to/kontena.yml'])
     end
+
+    context '--deploy option' do
+      context 'when given' do
+        it 'triggers deploy' do
+          allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
+          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+          allow(client).to receive(:put).with(
+            'stacks/test-grid/stack-a', anything
+          ).and_return({})
+          expect(Kontena).to receive(:run).with("stack deploy stack-a").once
+          subject.run(['--deploy', 'stack-a', './path/to/kontena.yml'])
+        end
+      end
+      context 'when not given' do
+        it 'does not trigger deploy' do
+          allow(subject).to receive(:require_config_file).with('./path/to/kontena.yml').and_return(true)
+          allow(subject).to receive(:stack_from_yaml).with('./path/to/kontena.yml').and_return(stack)
+          allow(client).to receive(:put).with(
+            'stacks/test-grid/stack-a', anything
+          ).and_return({})
+          expect(Kontena).not_to receive(:run).with("stack deploy stack-a")
+          subject.run(['stack-a', './path/to/kontena.yml'])
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.17.0.pre5
+  version: 1.0.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler