kontena-cli 1.4.0 → 1.4.1.pre1

data/spec/kontena/main_command_spec.rb

@@ -12,4 +12,17 @@ describe Kontena::MainCommand do
       end
     end
   end
+
+  describe '#subcommand_missing' do
+    it 'suggests plugin install for known plugin commands' do
+      expect(subject).to receive(:known_plugin_subcommand?).with('testplugin').and_return(true)
+      expect(subject).to receive(:exit_with_error).with(/plugin has not been installed/).and_call_original
+      expect{subject.run(['testplugin', 'master', 'create'])}.to exit_with_error
+    end
+
+    it 'runs normal error handling for unknown sub commands' do
+      expect(subject).to receive(:known_plugin_subcommand?).with('testplugin').and_return(false)
+      expect{subject.run(['testplugin', 'master', 'create'])}.to raise_error(Clamp::UsageError)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -45,24 +45,17 @@ RSpec.configure do |config|
   end
 
   config.around(:each) do |example|
-    catch :exit_with_error do
-      begin
-        example.run
-      rescue SystemExit
-        puts "Got SystemExit: #{$!.message} - Exit code: #{$!.status}"
-      end
-    end
-  end
-
-  unless ENV["DEBUG"]
-    config.before(:each) do
-      $stdout = StringIO.new
-      $stderr = StringIO.new
-    end
+    stdout = $stdout
+    stderr = $stderr
+    $stdout = $stderr = StringIO.new
 
-    config.after(:each) do
-      $stdout = STDOUT
-      $stderr = STDERR
+    begin
+      example.run
+    rescue SystemExit => exc
+      fail "SystemExit with code #{exc.status}: \n#{$stderr.string}"
+    ensure
+      $stdout = stdout
+      $stderr = stderr
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: kontena-websocket-client
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +254,10 @@ files:
 - lib/kontena/callbacks/master/deploy/90_proptip_after_deploy.rb
 - lib/kontena/cli/bytes_helper.rb
 - lib/kontena/cli/certificate/authorize_command.rb
+- lib/kontena/cli/certificate/common.rb
+- lib/kontena/cli/certificate/export_command.rb
 - lib/kontena/cli/certificate/get_command.rb
+- lib/kontena/cli/certificate/import_command.rb
 - lib/kontena/cli/certificate/list_command.rb
 - lib/kontena/cli/certificate/register_command.rb
 - lib/kontena/cli/certificate/remove_command.rb
@@ -440,6 +443,7 @@ 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.rb
+- lib/kontena/cli/stacks/yaml/opto/certificates_resolver.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/service_link_resolver.rb
@@ -525,15 +529,25 @@ files:
 - omnibus/resources/kontena/pkg/welcome.html.erb
 - omnibus/wrappers/sh/kontena
 - spec/fixtures/api/node.json
+- spec/fixtures/certificates/test/ca-key.pem
+- spec/fixtures/certificates/test/ca.pem
+- spec/fixtures/certificates/test/ca.srl
+- spec/fixtures/certificates/test/cert.pem
+- spec/fixtures/certificates/test/csr.pem
+- spec/fixtures/certificates/test/key.pem
+- spec/fixtures/certificates/test/real-cert.pem
 - spec/fixtures/docker-compose-invalid.yml
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
+- spec/fixtures/docker-compose_v2_with_variables.yml
 - spec/fixtures/kontena-malformed-yaml.yml
 - spec/fixtures/kontena-not-hash-service-config.yml
 - spec/fixtures/kontena_build_v3.yml
 - spec/fixtures/kontena_v3.yml
+- spec/fixtures/kontena_v3_with_compose_variables.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml
+- spec/fixtures/stack-with-anchors.yml
 - spec/fixtures/stack-with-dependencies-dep-1-1.yml
 - spec/fixtures/stack-with-dependencies-dep-1.yml
 - spec/fixtures/stack-with-dependencies-dep-2.yml
@@ -550,6 +564,9 @@ files:
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/stack-with-volumes.yml
+- spec/kontena/cli/certificates/export_command_spec.rb
+- spec/kontena/cli/certificates/import_command_spec.rb
+- spec/kontena/cli/certificates/show_command_spec.rb
 - spec/kontena/cli/cloud/login_command_spec.rb
 - spec/kontena/cli/cloud/logout_command_spec.rb
 - spec/kontena/cli/cloud/master/add_command_spec.rb
@@ -567,7 +584,6 @@ files:
 - spec/kontena/cli/grids/use_command_spec.rb
 - spec/kontena/cli/helpers/exec_helper_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
-- spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/init_cloud_command_spec.rb
 - spec/kontena/cli/master/join_command_spec.rb
@@ -591,7 +607,7 @@ files:
 - spec/kontena/cli/nodes/ssh_command_spec.rb
 - spec/kontena/cli/nodes/update_command_spec.rb
 - spec/kontena/cli/plugins/install_command_spec.rb
-- spec/kontena/cli/registry/create_spec.rb
+- spec/kontena/cli/registry/create_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/events_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
@@ -621,6 +637,7 @@ files:
 - spec/kontena/cli/stacks/upgrade_command_spec.rb
 - spec/kontena/cli/stacks/validate_command_spec.rb
 - spec/kontena/cli/stacks/yaml/custom_validators/affinities_validator_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/certificates_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/opto/prompt_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/opto/service_link_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver_spec.rb
@@ -640,6 +657,7 @@ files:
 - spec/kontena/cli/volumes/list_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
+- spec/kontena/command_spec.rb
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
 - spec/kontena/main_command_spec.rb
@@ -673,26 +691,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.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.6.14
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool
 test_files:
 - spec/fixtures/api/node.json
+- spec/fixtures/certificates/test/ca-key.pem
+- spec/fixtures/certificates/test/ca.pem
+- spec/fixtures/certificates/test/ca.srl
+- spec/fixtures/certificates/test/cert.pem
+- spec/fixtures/certificates/test/csr.pem
+- spec/fixtures/certificates/test/key.pem
+- spec/fixtures/certificates/test/real-cert.pem
 - spec/fixtures/docker-compose-invalid.yml
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
+- spec/fixtures/docker-compose_v2_with_variables.yml
 - spec/fixtures/kontena-malformed-yaml.yml
 - spec/fixtures/kontena-not-hash-service-config.yml
 - spec/fixtures/kontena_build_v3.yml
 - spec/fixtures/kontena_v3.yml
+- spec/fixtures/kontena_v3_with_compose_variables.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.yml
+- spec/fixtures/stack-with-anchors.yml
 - spec/fixtures/stack-with-dependencies-dep-1-1.yml
 - spec/fixtures/stack-with-dependencies-dep-1.yml
 - spec/fixtures/stack-with-dependencies-dep-2.yml
@@ -709,6 +737,9 @@ test_files:
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/stack-with-volumes.yml
+- spec/kontena/cli/certificates/export_command_spec.rb
+- spec/kontena/cli/certificates/import_command_spec.rb
+- spec/kontena/cli/certificates/show_command_spec.rb
 - spec/kontena/cli/cloud/login_command_spec.rb
 - spec/kontena/cli/cloud/logout_command_spec.rb
 - spec/kontena/cli/cloud/master/add_command_spec.rb
@@ -726,7 +757,6 @@ test_files:
 - spec/kontena/cli/grids/use_command_spec.rb
 - spec/kontena/cli/helpers/exec_helper_spec.rb
 - spec/kontena/cli/helpers/log_helper_spec.rb
-- spec/kontena/cli/main_command_spec.rb
 - spec/kontena/cli/master/current_command_spec.rb
 - spec/kontena/cli/master/init_cloud_command_spec.rb
 - spec/kontena/cli/master/join_command_spec.rb
@@ -750,7 +780,7 @@ test_files:
 - spec/kontena/cli/nodes/ssh_command_spec.rb
 - spec/kontena/cli/nodes/update_command_spec.rb
 - spec/kontena/cli/plugins/install_command_spec.rb
-- spec/kontena/cli/registry/create_spec.rb
+- spec/kontena/cli/registry/create_command_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/events_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
@@ -780,6 +810,7 @@ test_files:
 - spec/kontena/cli/stacks/upgrade_command_spec.rb
 - spec/kontena/cli/stacks/validate_command_spec.rb
 - spec/kontena/cli/stacks/yaml/custom_validators/affinities_validator_spec.rb
+- spec/kontena/cli/stacks/yaml/opto/certificates_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/opto/prompt_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/opto/service_link_resolver_spec.rb
 - spec/kontena/cli/stacks/yaml/opto/vault_cert_prompt_resolver_spec.rb
@@ -799,6 +830,7 @@ test_files:
 - spec/kontena/cli/volumes/list_command_spec.rb
 - spec/kontena/cli/vpn/create_command_spec.rb
 - spec/kontena/client_spec.rb
+- spec/kontena/command_spec.rb
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
 - spec/kontena/main_command_spec.rb

data/spec/kontena/cli/main_command_spec.rb

@@ -1,19 +0,0 @@
-require "kontena/main_command"
-
-describe Kontena::MainCommand do
-
-  let(:subject) { described_class.new(File.basename($0)) }
-  describe '#subcommand_missing' do
-    it 'suggests plugin install for known plugin commands' do
-      expect(subject).to receive(:known_plugin_subcommand?).with('testplugin').and_return(true)
-      expect(subject).to receive(:exit_with_error).with(/plugin has not been installed/).and_call_original
-      expect{subject.run(['testplugin', 'master', 'create'])}.to exit_with_error
-    end
-
-    it 'runs normal error handling for unknown sub commands' do
-      expect(subject).to receive(:known_plugin_subcommand?).with('testplugin').and_return(false)
-      expect{subject.run(['testplugin', 'master', 'create'])}.to raise_error(Clamp::UsageError)
-    end
-  end
-end
-