kontena-cli 1.0.6 → 1.1.0.pre1

data/spec/kontena/client_spec.rb

@@ -294,5 +294,44 @@ describe Kontena::Client do
         expect{subject.get('test')}.to raise_error(Kontena::Errors::StandardError, "You are wrong")
       end
     end
+
+    context 'version warning' do
+      let(:client) { double(:client) }
+      let(:response) { double(:response) }
+      let(:cli_version) { Kontena::Cli::VERSION }
+
+      before(:each) do
+        allow(subject).to receive(:http_client).and_return(client)
+        allow(client).to receive(:request).and_return(response)
+        allow(response).to receive(:body).and_return("hello")
+        allow(response).to receive(:headers).and_return({})
+      end
+
+      it 'warns the user once if server version differs enough from master version' do
+        bumped_version = cli_version.split('.')[0] + '.' + (cli_version.split('.')[1].to_i + 1).to_s + '.0' # 1.5.4 --> 1.6.0
+        expect(response).to receive(:headers).at_least(:once).and_return({'X-Kontena-Version' => bumped_version})
+        expect(subject).to receive(:check_version_and_warn).at_least(:once).and_call_original
+        expect(subject).to receive(:add_version_warning).with(bumped_version).once.and_return(true)
+        expect(subject.get("test")).to eq 'hello'
+        expect(subject.get("test")).to eq 'hello'
+      end
+
+      it 'does not warn the user if server version does not differ too much' do
+        bumped_version = cli_version.split('.')[0] + '.' + cli_version.split('.')[1] + '.' + (cli_version.split('.')[2].to_i + 1).to_s # 1.5.4 --> 1.5.5
+        expect(response).to receive(:headers).at_least(:once).and_return({'X-Kontena-Version' => bumped_version})
+        expect(subject).to receive(:check_version_and_warn).at_least(:once).and_call_original
+        expect(subject).not_to receive(:at_exit)
+        expect(subject).not_to receive(:add_version_warning)
+        expect(subject.get("test")).to eq 'hello'
+      end
+
+      it 'does not warn the user if server version is not there at all' do
+        expect(response).to receive(:headers).at_least(:once).and_return({})
+        allow(subject).to receive(:check_version_and_warn).at_least(:once).and_call_original
+        expect(subject).not_to receive(:at_exit)
+        expect(subject).not_to receive(:add_version_warning)
+        expect(subject.get("test")).to eq 'hello'
+      end
+    end
   end
 end

data/spec/kontena/plugin_manager_spec.rb

@@ -5,14 +5,14 @@ describe Kontena::PluginManager do
 
   let(:subject) { described_class.instance }
 
+  before(:each) { subject.init }
   describe '#load_plugins' do
     it 'includes hello plugin' do
-      plugins = subject.load_plugins
-      expect(plugins.any?{ |p| p.name == 'kontena-plugin-hello' }).to be_truthy
+      expect(subject.plugins.any?{ |p| p.name == 'kontena-plugin-hello' }).to be_truthy
     end
 
     it 'allows plugin to register as a sub-command' do
-      plugins = subject.load_plugins
+      plugins = subject.init
       main = Kontena::MainCommand.new(File.basename($0))
       expect {
         main.run(['hello'])
@@ -31,7 +31,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.16.0'
       end
-      expect(subject.spec_has_valid_dependency?(spec)).to be_truthy
+      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_truthy
     end
 
     it 'returns true if spec dependency > than MIN_CLI_VERSION and is prerelease' do
@@ -40,7 +40,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
       end
-      expect(subject.spec_has_valid_dependency?(spec)).to be_truthy
+      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_truthy
     end
 
     it 'returns false if spec dependency < than MIN_CLI_VERSION' do
@@ -49,7 +49,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.15.0'
       end
-      expect(subject.spec_has_valid_dependency?(spec)).to be_falsey
+      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_falsey
     end
 
     it 'returns false if spec dependency < than MIN_CLI_VERSION and is prerelease' do
@@ -58,7 +58,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.15.0.beta1'
       end
-      expect(subject.spec_has_valid_dependency?(spec)).to be_falsey
+      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_falsey
     end
   end
 end

data/spec/spec_helper.rb

@@ -61,3 +61,4 @@ end
 require_relative 'support/client_helpers'
 require_relative 'support/requirements_helper'
 require_relative 'support/fixtures_helpers'
+require_relative 'support/output_helpers'

data/spec/support/output_helpers.rb

@@ -0,0 +1,51 @@
+module OutputHelpers
+  extend RSpec::Matchers::DSL
+
+  matcher :return_and_output do |expected, *lines|
+    supports_block_expectations
+
+    match do |block|
+      stdout = lines.flatten.join("\n") + "\n"
+
+      begin
+        expect{@return = block.call}.to output(stdout).to_stdout
+      rescue Exception => error
+        @error = error
+
+        return false
+      else
+        return values_match? expected, @return
+      end
+    end
+
+    failure_message do |block|
+      if @error
+        return @error
+      else
+        return "expected #{block} to return #{expected}, but returned #{@return}"
+      end
+    end
+  end
+
+  matcher :output_table do |lines|
+    supports_block_expectations
+
+    match do |block|
+      stdout = Regexp.new('^' + lines.map{|fields| fields.join('\s+')}.join('\n') + '\n$', Regexp::MULTILINE)
+
+      begin
+        expect{@return = block.call}.to output(stdout).to_stdout
+      rescue Exception => error
+        @error = error
+
+        return false
+      else
+        return true
+      end
+    end
+
+    failure_message do |block|
+      return @error
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +218,7 @@ files:
 - lib/kontena/callbacks/master/deploy/40_install_ssl_certificate_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/50_authenticate_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/55_create_initial_grid_after_deploy.rb
+- lib/kontena/callbacks/master/deploy/56_set_server_provider_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/60_configure_auth_provider_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb
 - lib/kontena/callbacks/master/deploy/90_proptip_after_deploy.rb
@@ -293,6 +294,7 @@ files:
 - lib/kontena/cli/grids/create_command.rb
 - lib/kontena/cli/grids/current_command.rb
 - lib/kontena/cli/grids/env_command.rb
+- lib/kontena/cli/grids/health_command.rb
 - lib/kontena/cli/grids/list_command.rb
 - lib/kontena/cli/grids/logs_command.rb
 - lib/kontena/cli/grids/remove_command.rb
@@ -307,6 +309,7 @@ files:
 - lib/kontena/cli/grids/users/add_command.rb
 - lib/kontena/cli/grids/users/list_command.rb
 - lib/kontena/cli/grids/users/remove_command.rb
+- lib/kontena/cli/helpers/health_helper.rb
 - lib/kontena/cli/helpers/log_helper.rb
 - lib/kontena/cli/localhost_web_server.rb
 - lib/kontena/cli/login_command.rb
@@ -343,6 +346,7 @@ files:
 - lib/kontena/cli/master/users_command.rb
 - lib/kontena/cli/master_command.rb
 - lib/kontena/cli/node_command.rb
+- lib/kontena/cli/nodes/health_command.rb
 - lib/kontena/cli/nodes/label_command.rb
 - lib/kontena/cli/nodes/labels/add_command.rb
 - lib/kontena/cli/nodes/labels/list_command.rb
@@ -416,12 +420,15 @@ files:
 - lib/kontena/cli/stacks/yaml/custom_validators/hooks_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/secrets_validator.rb
 - lib/kontena/cli/stacks/yaml/opto/prompt_resolver.rb
+- lib/kontena/cli/stacks/yaml/opto/service_instances_resolver.rb
 - lib/kontena/cli/stacks/yaml/opto/vault_resolver.rb
 - lib/kontena/cli/stacks/yaml/opto/vault_setter.rb
 - lib/kontena/cli/stacks/yaml/reader.rb
 - lib/kontena/cli/stacks/yaml/service_extender.rb
 - lib/kontena/cli/stacks/yaml/validations.rb
 - lib/kontena/cli/stacks/yaml/validator_v3.rb
+- lib/kontena/cli/vault/export_command.rb
+- lib/kontena/cli/vault/import_command.rb
 - lib/kontena/cli/vault/list_command.rb
 - lib/kontena/cli/vault/read_command.rb
 - lib/kontena/cli/vault/remove_command.rb
@@ -437,7 +444,9 @@ files:
 - lib/kontena/cli/whoami_command.rb
 - lib/kontena/client.rb
 - lib/kontena/command.rb
+- lib/kontena/debug_instrumentor.rb
 - lib/kontena/errors.rb
+- lib/kontena/light_prompt.rb
 - lib/kontena/machine/cert_helper.rb
 - lib/kontena/machine/cloud_config/cloudinit.yml
 - lib/kontena/machine/cloud_config/node_generator.rb
@@ -500,6 +509,7 @@ files:
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/containers/list_command_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
+- spec/kontena/cli/grids/health_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
@@ -514,6 +524,8 @@ files:
 - spec/kontena/cli/master/users/remove_command_spec.rb
 - spec/kontena/cli/master/users/roles/add_command_spec.rb
 - spec/kontena/cli/master/users/roles/remove_command_spec.rb
+- spec/kontena/cli/nodes/health_command_spec.rb
+- spec/kontena/cli/nodes/list_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
@@ -534,6 +546,8 @@ files:
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
+- spec/kontena/cli/vault/export_spec.rb
+- spec/kontena/cli/vault/import_spec.rb
 - spec/kontena/cli/version_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
@@ -542,6 +556,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/fixtures_helpers.rb
+- spec/support/output_helpers.rb
 - spec/support/requirements_helper.rb
 - tasks/release.rake
 - tasks/rspec.rake
@@ -560,9 +575,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -617,6 +632,7 @@ test_files:
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/containers/list_command_spec.rb
 - spec/kontena/cli/containers/logs_command_spec.rb
+- spec/kontena/cli/grids/health_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/add_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/list_command_spec.rb
 - spec/kontena/cli/grids/trusted_subnets/remove_command_spec.rb
@@ -631,6 +647,8 @@ test_files:
 - spec/kontena/cli/master/users/remove_command_spec.rb
 - spec/kontena/cli/master/users/roles/add_command_spec.rb
 - spec/kontena/cli/master/users/roles/remove_command_spec.rb
+- spec/kontena/cli/nodes/health_command_spec.rb
+- spec/kontena/cli/nodes/list_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/link_command_spec.rb
 - spec/kontena/cli/services/restart_command_spec.rb
@@ -651,6 +669,8 @@ test_files:
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
+- spec/kontena/cli/vault/export_spec.rb
+- spec/kontena/cli/vault/import_spec.rb
 - spec/kontena/cli/version_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
@@ -659,4 +679,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
 - spec/support/fixtures_helpers.rb
+- spec/support/output_helpers.rb
 - spec/support/requirements_helper.rb