kontena-cli 0.16.0.pre5 → 0.16.0.pre6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (100) hide show
  1. checksums.yaml +4 -4
  2. data/Dockerfile +3 -0
  3. data/VERSION +1 -1
  4. data/bin/kontena +4 -3
  5. data/lib/kontena/callbacks/master/deploy/05_before_deploy_configuration_wizard.rb +1 -3
  6. data/lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb +1 -1
  7. data/lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb +1 -8
  8. data/lib/kontena/callbacks/master/deploy/90_suggest_inviting_yourself_after_deploy.rb +1 -1
  9. data/lib/kontena/cli/apps/build_command.rb +2 -1
  10. data/lib/kontena/cli/apps/common.rb +3 -8
  11. data/lib/kontena/cli/apps/deploy_command.rb +25 -17
  12. data/lib/kontena/cli/apps/docker_helper.rb +5 -5
  13. data/lib/kontena/cli/apps/monitor_command.rb +4 -2
  14. data/lib/kontena/cli/apps/remove_command.rb +7 -7
  15. data/lib/kontena/cli/apps/restart_command.rb +4 -3
  16. data/lib/kontena/cli/apps/scale_command.rb +7 -5
  17. data/lib/kontena/cli/apps/start_command.rb +4 -3
  18. data/lib/kontena/cli/apps/stop_command.rb +4 -3
  19. data/lib/kontena/cli/apps/yaml/reader.rb +15 -5
  20. data/lib/kontena/cli/apps/yaml/validator.rb +4 -0
  21. data/lib/kontena/cli/apps/yaml/validator_v2.rb +5 -1
  22. data/lib/kontena/cli/cloud/login_command.rb +1 -1
  23. data/lib/kontena/cli/cloud/logout_command.rb +14 -0
  24. data/lib/kontena/cli/cloud/master/show_command.rb +0 -2
  25. data/lib/kontena/cli/cloud_command.rb +2 -0
  26. data/lib/kontena/cli/common.rb +98 -26
  27. data/lib/kontena/cli/containers/inspect_command.rb +1 -1
  28. data/lib/kontena/cli/etcd/get_command.rb +2 -2
  29. data/lib/kontena/cli/etcd/list_command.rb +2 -2
  30. data/lib/kontena/cli/etcd/mkdir_command.rb +1 -1
  31. data/lib/kontena/cli/etcd/remove_command.rb +1 -1
  32. data/lib/kontena/cli/etcd/set_command.rb +1 -1
  33. data/lib/kontena/cli/external_registries/add_command.rb +3 -1
  34. data/lib/kontena/cli/external_registries/delete_command.rb +1 -1
  35. data/lib/kontena/cli/external_registries/remove_command.rb +5 -1
  36. data/lib/kontena/cli/grids/cloud_config_command.rb +1 -1
  37. data/lib/kontena/cli/grids/create_command.rb +14 -6
  38. data/lib/kontena/cli/grids/current_command.rb +1 -1
  39. data/lib/kontena/cli/grids/env_command.rb +2 -2
  40. data/lib/kontena/cli/grids/list_command.rb +1 -1
  41. data/lib/kontena/cli/grids/remove_command.rb +6 -5
  42. data/lib/kontena/cli/grids/show_command.rb +2 -2
  43. data/lib/kontena/cli/grids/trusted_subnets/add_command.rb +3 -1
  44. data/lib/kontena/cli/grids/trusted_subnets/remove_command.rb +6 -2
  45. data/lib/kontena/cli/grids/use_command.rb +1 -1
  46. data/lib/kontena/cli/helpers/log_helper.rb +4 -2
  47. data/lib/kontena/cli/login_command.rb +1 -1
  48. data/lib/kontena/cli/logout_command.rb +3 -31
  49. data/lib/kontena/cli/master/config/export_command.rb +1 -2
  50. data/lib/kontena/cli/master/config/import_command.rb +3 -4
  51. data/lib/kontena/cli/master/create_command.rb +1 -2
  52. data/lib/kontena/cli/master/login_command.rb +10 -12
  53. data/lib/kontena/cli/master/logout_command.rb +23 -0
  54. data/lib/kontena/cli/master/use_command.rb +1 -1
  55. data/lib/kontena/cli/master_command.rb +2 -0
  56. data/lib/kontena/cli/nodes/labels/remove_command.rb +1 -1
  57. data/lib/kontena/cli/nodes/remove_command.rb +3 -1
  58. data/lib/kontena/cli/nodes/update_command.rb +3 -2
  59. data/lib/kontena/cli/plugins/install_command.rb +9 -2
  60. data/lib/kontena/cli/plugins/search_command.rb +1 -1
  61. data/lib/kontena/cli/registry/create_command.rb +9 -8
  62. data/lib/kontena/cli/registry/delete_command.rb +2 -2
  63. data/lib/kontena/cli/registry/remove_command.rb +6 -3
  64. data/lib/kontena/cli/services/create_command.rb +7 -5
  65. data/lib/kontena/cli/services/delete_command.rb +1 -1
  66. data/lib/kontena/cli/services/deploy_command.rb +4 -1
  67. data/lib/kontena/cli/services/envs/add_command.rb +3 -1
  68. data/lib/kontena/cli/services/envs/remove_command.rb +3 -1
  69. data/lib/kontena/cli/services/link_command.rb +4 -2
  70. data/lib/kontena/cli/services/remove_command.rb +15 -1
  71. data/lib/kontena/cli/services/restart_command.rb +3 -1
  72. data/lib/kontena/cli/services/scale_command.rb +4 -1
  73. data/lib/kontena/cli/services/secrets/link_command.rb +9 -7
  74. data/lib/kontena/cli/services/secrets/unlink_command.rb +1 -1
  75. data/lib/kontena/cli/services/services_helper.rb +21 -10
  76. data/lib/kontena/cli/services/start_command.rb +3 -1
  77. data/lib/kontena/cli/services/stop_command.rb +3 -1
  78. data/lib/kontena/cli/services/unlink_command.rb +1 -1
  79. data/lib/kontena/cli/services/update_command.rb +7 -5
  80. data/lib/kontena/cli/spinner.rb +99 -37
  81. data/lib/kontena/cli/stacks/common.rb +2 -4
  82. data/lib/kontena/cli/vault/remove_command.rb +3 -1
  83. data/lib/kontena/cli/vault/update_command.rb +4 -2
  84. data/lib/kontena/cli/vault/write_command.rb +4 -2
  85. data/lib/kontena/cli/vpn/create_command.rb +26 -10
  86. data/lib/kontena/cli/vpn/delete_command.rb +1 -1
  87. data/lib/kontena/cli/vpn/remove_command.rb +6 -4
  88. data/lib/kontena/client.rb +13 -5
  89. data/lib/kontena/errors.rb +3 -1
  90. data/lib/kontena_cli.rb +1 -1
  91. data/spec/fixtures/kontena-malformed-yaml.yml +6 -0
  92. data/spec/fixtures/kontena-not-hash-service-config.yml +3 -0
  93. data/spec/kontena/cli/app/docker_helper_spec.rb +2 -2
  94. data/spec/kontena/cli/app/yaml/reader_spec.rb +48 -0
  95. data/spec/kontena/cli/cloud/logout_command_spec.rb +37 -0
  96. data/spec/kontena/cli/common_spec.rb +46 -1
  97. data/spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb +3 -3
  98. data/spec/kontena/cli/master/logout_command_spec.rb +85 -0
  99. data/spec/kontena/cli/master/use_command_spec.rb +4 -0
  100. metadata +12 -2
@@ -0,0 +1,85 @@
1
+ require_relative "../../../spec_helper"
2
+ require 'kontena/cli/master/logout_command'
3
+
4
+ describe Kontena::Cli::Master::LogoutCommand do
5
+
6
+ include ClientHelpers
7
+
8
+ let(:server) do
9
+ spy('server')
10
+ end
11
+
12
+ let(:subject) do
13
+ described_class.new(File.basename($0))
14
+ end
15
+
16
+ describe '#logout' do
17
+ context 'with all options' do
18
+ before(:each) do
19
+ allow(Kontena::Cli::Config.instance).to receive(:servers).and_return([server])
20
+ allow(Kontena::Cli::Config.instance).to receive(:write)
21
+ allow(server).to receive(:token=).with(nil)
22
+ end
23
+
24
+ it 'reads servers from config' do
25
+ expect(Kontena::Cli::Config.instance).to receive(:servers).and_return([server])
26
+ subject.run(['--all'])
27
+ end
28
+
29
+ it 'invalidates refresh_token for each server' do
30
+ expect(subject).to receive(:use_refresh_token).with(server)
31
+ subject.run(['--all'])
32
+ end
33
+
34
+ it 'clears token' do
35
+ expect(server).to receive(:token=).with(nil)
36
+ subject.run(['--all'])
37
+ end
38
+
39
+ it 'writes config file' do
40
+ allow(subject).to receive(:use_refresh_token).with(server)
41
+ expect(Kontena::Cli::Config.instance).to receive(:write)
42
+ subject.run(['--all'])
43
+ end
44
+ end
45
+
46
+ context 'without all options' do
47
+ before(:each) do
48
+ allow(Kontena::Cli::Config.instance).to receive(:current_master).and_return(server)
49
+ allow(Kontena::Cli::Config.instance).to receive(:write)
50
+ allow(server).to receive(:token=).with(nil)
51
+ end
52
+
53
+ it 'reads current master from config' do
54
+ expect(Kontena::Cli::Config.instance).to receive(:current_master).and_return(server)
55
+ subject.run([])
56
+ end
57
+
58
+ it 'invalidates refresh_token for current master' do
59
+ expect(subject).to receive(:use_refresh_token).with(server)
60
+ subject.run([])
61
+ end
62
+
63
+ it 'clears token' do
64
+ allow(subject).to receive(:use_refresh_token).with(server)
65
+ expect(server).to receive(:token=).with(nil)
66
+ subject.run([])
67
+ end
68
+
69
+ it 'writes config file' do
70
+ allow(subject).to receive(:use_refresh_token).with(server)
71
+ expect(Kontena::Cli::Config.instance).to receive(:write)
72
+ subject.run([])
73
+ end
74
+ end
75
+
76
+ context 'current master is not selected' do
77
+ it 'outputs warning' do
78
+ allow(Kontena::Cli::Config.instance).to receive(:current_master).and_return(nil)
79
+ expect {
80
+ subject.run([])
81
+ }.to output("Current master has not been selected\n").to_stderr
82
+ end
83
+ end
84
+ end
85
+ end
@@ -15,5 +15,9 @@ describe Kontena::Cli::Master::UseCommand do
15
15
  subject.run(['some_master'])
16
16
  expect(subject.config.current_server).to eq 'some_master'
17
17
  end
18
+
19
+ it 'should abort with error message if master is not configured' do
20
+ expect { subject.run(['not_existing']) }.to output(/Could not resolve master with name: 'not_existing'/).to_stderr
21
+ end
18
22
  end
19
23
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kontena-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.0.pre5
4
+ version: 0.16.0.pre6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kontena, Inc
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-29 00:00:00.000000000 Z
11
+ date: 2016-10-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -250,6 +250,7 @@ files:
250
250
  - lib/kontena/cli/certificate/register_command.rb
251
251
  - lib/kontena/cli/certificate_command.rb
252
252
  - lib/kontena/cli/cloud/login_command.rb
253
+ - lib/kontena/cli/cloud/logout_command.rb
253
254
  - lib/kontena/cli/cloud/master/add_command.rb
254
255
  - lib/kontena/cli/cloud/master/delete_command.rb
255
256
  - lib/kontena/cli/cloud/master/list_command.rb
@@ -313,6 +314,7 @@ files:
313
314
  - lib/kontena/cli/master/join_command.rb
314
315
  - lib/kontena/cli/master/list_command.rb
315
316
  - lib/kontena/cli/master/login_command.rb
317
+ - lib/kontena/cli/master/logout_command.rb
316
318
  - lib/kontena/cli/master/token/common.rb
317
319
  - lib/kontena/cli/master/token/create_command.rb
318
320
  - lib/kontena/cli/master/token/current_command.rb
@@ -420,6 +422,8 @@ files:
420
422
  - spec/fixtures/kontena-build.yml
421
423
  - spec/fixtures/kontena-internal-extend.yml
422
424
  - spec/fixtures/kontena-invalid.yml
425
+ - spec/fixtures/kontena-malformed-yaml.yml
426
+ - spec/fixtures/kontena-not-hash-service-config.yml
423
427
  - spec/fixtures/kontena-with-env-file.yml
424
428
  - spec/fixtures/kontena-with-variables.yml
425
429
  - spec/fixtures/kontena.yml
@@ -443,6 +447,7 @@ files:
443
447
  - spec/kontena/cli/app/yaml/service_extender_spec.rb
444
448
  - spec/kontena/cli/app/yaml/validator_spec.rb
445
449
  - spec/kontena/cli/app/yaml/validator_v2_spec.rb
450
+ - spec/kontena/cli/cloud/logout_command_spec.rb
446
451
  - spec/kontena/cli/common_spec.rb
447
452
  - spec/kontena/cli/containers/containers_helper_spec.rb
448
453
  - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
@@ -451,6 +456,7 @@ files:
451
456
  - spec/kontena/cli/grids/use_command_spec.rb
452
457
  - spec/kontena/cli/helpers/log_helper_spec.rb
453
458
  - spec/kontena/cli/master/current_command_spec.rb
459
+ - spec/kontena/cli/master/logout_command_spec.rb
454
460
  - spec/kontena/cli/master/use_command_spec.rb
455
461
  - spec/kontena/cli/master/users/invite_command_spec.rb
456
462
  - spec/kontena/cli/master/users/remove_command_spec.rb
@@ -507,6 +513,8 @@ test_files:
507
513
  - spec/fixtures/kontena-build.yml
508
514
  - spec/fixtures/kontena-internal-extend.yml
509
515
  - spec/fixtures/kontena-invalid.yml
516
+ - spec/fixtures/kontena-malformed-yaml.yml
517
+ - spec/fixtures/kontena-not-hash-service-config.yml
510
518
  - spec/fixtures/kontena-with-env-file.yml
511
519
  - spec/fixtures/kontena-with-variables.yml
512
520
  - spec/fixtures/kontena.yml
@@ -530,6 +538,7 @@ test_files:
530
538
  - spec/kontena/cli/app/yaml/service_extender_spec.rb
531
539
  - spec/kontena/cli/app/yaml/validator_spec.rb
532
540
  - spec/kontena/cli/app/yaml/validator_v2_spec.rb
541
+ - spec/kontena/cli/cloud/logout_command_spec.rb
533
542
  - spec/kontena/cli/common_spec.rb
534
543
  - spec/kontena/cli/containers/containers_helper_spec.rb
535
544
  - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
@@ -538,6 +547,7 @@ test_files:
538
547
  - spec/kontena/cli/grids/use_command_spec.rb
539
548
  - spec/kontena/cli/helpers/log_helper_spec.rb
540
549
  - spec/kontena/cli/master/current_command_spec.rb
550
+ - spec/kontena/cli/master/logout_command_spec.rb
541
551
  - spec/kontena/cli/master/use_command_spec.rb
542
552
  - spec/kontena/cli/master/users/invite_command_spec.rb
543
553
  - spec/kontena/cli/master/users/remove_command_spec.rb