kontena-cli 1.4.0.pre6 → 1.4.0.pre7

data/spec/kontena/plugin_manager/uninstaller_spec.rb

@@ -0,0 +1,19 @@
+require 'kontena/plugin_manager'
+
+describe Kontena::PluginManager::Uninstaller do
+  let(:subject) { described_class.new('foo') }
+  let(:installed) { double(name: 'double', base_dir: '/tmp') }
+  let(:command) { double }
+
+  before(:each) do
+    allow(subject).to receive(:installed).with('foo').and_return(installed)
+  end
+
+  context '#uninstall' do
+    it 'runs the gem uninstaller' do
+      expect(subject).to receive(:command).with(installed).and_return(command)
+      expect(command).to receive(:uninstall).and_return(true)
+      subject.uninstall
+    end
+  end
+end

data/spec/kontena/plugin_manager_spec.rb

@@ -2,7 +2,7 @@ require 'kontena_cli'
 
 describe Kontena::PluginManager do
 
-  let(:subject) { described_class.instance }
+  let(:subject) { described_class }
 
   before(:each) { subject.init }
   describe '#load_plugins' do
@@ -19,9 +19,9 @@ describe Kontena::PluginManager do
     end
   end
 
-  describe 'spec_has_valid_dependency?' do
+  context 'Loader' do
     before(:each) do
-      stub_const('Kontena::PluginManager::MIN_CLI_VERSION', '0.15.99999')
+      stub_const('Kontena::PluginManager::Loader::MIN_CLI_VERSION', '0.15.99999')
     end
 
     it 'returns true if spec dependency > than MIN_CLI_VERSION' do
@@ -30,7 +30,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.16.0'
       end
-      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_truthy
+      expect(Kontena::PluginManager::Loader.new.send(:spec_has_valid_dependency?, spec)).to be_truthy
     end
 
     it 'returns true if spec dependency > than MIN_CLI_VERSION and is prerelease' do
@@ -39,7 +39,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
       end
-      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_truthy
+      expect(Kontena::PluginManager::Loader.new.send(:spec_has_valid_dependency?, spec)).to be_truthy
     end
 
     it 'returns false if spec dependency < than MIN_CLI_VERSION' do
@@ -48,7 +48,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.15.0'
       end
-      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_falsey
+      expect(Kontena::PluginManager::Loader.new.send(:spec_has_valid_dependency?, spec)).to be_falsey
     end
 
     it 'returns false if spec dependency < than MIN_CLI_VERSION and is prerelease' do
@@ -57,7 +57,7 @@ describe Kontena::PluginManager do
         s.version     = '0.1.0'
         s.add_runtime_dependency 'kontena-cli', '>= 0.15.0.beta1'
       end
-      expect(subject.send(:spec_has_valid_dependency?, spec)).to be_falsey
+      expect(Kontena::PluginManager::Loader.new.send(:spec_has_valid_dependency?, spec)).to be_falsey
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre6
+  version: 1.4.0.pre7
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.8.7
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 description: Command-line client for the Kontena container and microservices platform
 email:
 - info@kontena.io
@@ -252,41 +252,13 @@ files:
 - 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
-- lib/kontena/cli/app_command.rb
-- lib/kontena/cli/apps/build_command.rb
-- lib/kontena/cli/apps/common.rb
-- lib/kontena/cli/apps/config_command.rb
-- lib/kontena/cli/apps/deploy_command.rb
-- lib/kontena/cli/apps/docker_compose_generator.rb
-- lib/kontena/cli/apps/docker_helper.rb
-- lib/kontena/cli/apps/dockerfile_generator.rb
-- lib/kontena/cli/apps/init_command.rb
-- lib/kontena/cli/apps/kontena_yml_generator.rb
-- lib/kontena/cli/apps/list_command.rb
-- lib/kontena/cli/apps/logs_command.rb
-- lib/kontena/cli/apps/monitor_command.rb
-- lib/kontena/cli/apps/remove_command.rb
-- lib/kontena/cli/apps/restart_command.rb
-- lib/kontena/cli/apps/scale_command.rb
-- lib/kontena/cli/apps/service_generator.rb
-- lib/kontena/cli/apps/service_generator_v2.rb
-- lib/kontena/cli/apps/show_command.rb
-- lib/kontena/cli/apps/start_command.rb
-- lib/kontena/cli/apps/stop_command.rb
-- lib/kontena/cli/apps/yaml/custom_validators/affinities_validator.rb
-- lib/kontena/cli/apps/yaml/custom_validators/build_validator.rb
-- lib/kontena/cli/apps/yaml/custom_validators/extends_validator.rb
-- lib/kontena/cli/apps/yaml/custom_validators/hooks_validator.rb
-- lib/kontena/cli/apps/yaml/custom_validators/secrets_validator.rb
-- lib/kontena/cli/apps/yaml/reader.rb
-- lib/kontena/cli/apps/yaml/service_extender.rb
-- lib/kontena/cli/apps/yaml/validations.rb
-- lib/kontena/cli/apps/yaml/validator.rb
-- lib/kontena/cli/apps/yaml/validator_v2.rb
 - lib/kontena/cli/bytes_helper.rb
 - lib/kontena/cli/certificate/authorize_command.rb
 - lib/kontena/cli/certificate/get_command.rb
+- lib/kontena/cli/certificate/list_command.rb
 - lib/kontena/cli/certificate/register_command.rb
+- lib/kontena/cli/certificate/request_command.rb
+- lib/kontena/cli/certificate/show_command.rb
 - lib/kontena/cli/certificate_command.rb
 - lib/kontena/cli/cloud/login_command.rb
 - lib/kontena/cli/cloud/logout_command.rb
@@ -343,6 +315,7 @@ files:
 - lib/kontena/cli/helpers/exec_helper.rb
 - lib/kontena/cli/helpers/health_helper.rb
 - lib/kontena/cli/helpers/log_helper.rb
+- lib/kontena/cli/helpers/time_helper.rb
 - lib/kontena/cli/localhost_web_server.rb
 - lib/kontena/cli/log_formatters/compact.rb
 - lib/kontena/cli/log_formatters/strip_color.rb
@@ -399,6 +372,7 @@ files:
 - lib/kontena/cli/plugins/install_command.rb
 - lib/kontena/cli/plugins/list_command.rb
 - lib/kontena/cli/plugins/search_command.rb
+- lib/kontena/cli/plugins/show_command.rb
 - lib/kontena/cli/plugins/uninstall_command.rb
 - lib/kontena/cli/registry/create_command.rb
 - lib/kontena/cli/registry/remove_command.rb
@@ -452,12 +426,14 @@ files:
 - lib/kontena/cli/stacks/service_generator.rb
 - lib/kontena/cli/stacks/service_generator_v2.rb
 - lib/kontena/cli/stacks/show_command.rb
+- lib/kontena/cli/stacks/stack_name.rb
 - lib/kontena/cli/stacks/stacks_helper.rb
 - lib/kontena/cli/stacks/stop_command.rb
 - lib/kontena/cli/stacks/upgrade_command.rb
 - lib/kontena/cli/stacks/validate_command.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/affinities_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/build_validator.rb
+- lib/kontena/cli/stacks/yaml/custom_validators/certificates_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/extends_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/hooks_validator.rb
 - lib/kontena/cli/stacks/yaml/custom_validators/secrets_validator.rb
@@ -470,6 +446,10 @@ files:
 - 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/stack_file_loader.rb
+- lib/kontena/cli/stacks/yaml/stack_file_loader/file_loader.rb
+- lib/kontena/cli/stacks/yaml/stack_file_loader/registry_loader.rb
+- lib/kontena/cli/stacks/yaml/stack_file_loader/uri_loader.rb
 - lib/kontena/cli/stacks/yaml/validations.rb
 - lib/kontena/cli/stacks/yaml/validator_v3.rb
 - lib/kontena/cli/subcommand_loader.rb
@@ -506,7 +486,12 @@ files:
 - lib/kontena/machine/random_name.rb
 - lib/kontena/main_command.rb
 - lib/kontena/plugin_manager.rb
+- lib/kontena/plugin_manager/cleaner.rb
+- lib/kontena/plugin_manager/common.rb
+- lib/kontena/plugin_manager/installer.rb
+- lib/kontena/plugin_manager/loader.rb
 - lib/kontena/plugin_manager/rubygems_client.rb
+- lib/kontena/plugin_manager/uninstaller.rb
 - lib/kontena/presets/github_auth_provider.yml
 - lib/kontena/presets/kontena_auth_provider.yml
 - lib/kontena/scripts/completer
@@ -525,7 +510,7 @@ files:
 - omnibus/Gemfile.lock
 - omnibus/README.md
 - omnibus/config/projects/kontena.rb
-- omnibus/config/software/kontena.rb
+- omnibus/config/software/kontena-cli.rb
 - omnibus/config/software/liblzma.rb
 - omnibus/omnibus.rb
 - omnibus/package-scripts/kontena/postinst
@@ -538,27 +523,22 @@ files:
 - omnibus/resources/kontena/pkg/welcome.html.erb
 - omnibus/wrappers/sh/kontena
 - spec/fixtures/api/node.json
-- spec/fixtures/app.json
 - spec/fixtures/docker-compose-invalid.yml
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
-- spec/fixtures/health.yml
-- spec/fixtures/kontena-build.yml
-- spec/fixtures/kontena-internal-extend.yml
-- spec/fixtures/kontena-invalid.yml
 - spec/fixtures/kontena-malformed-yaml.yml
 - spec/fixtures/kontena-not-hash-service-config.yml
-- spec/fixtures/kontena-with-env-file.yml
-- spec/fixtures/kontena-with-variables.yml
-- spec/fixtures/kontena.yml
-- spec/fixtures/kontena_build_v2.yml
 - spec/fixtures/kontena_build_v3.yml
-- spec/fixtures/kontena_numeric_version.yml
-- spec/fixtures/kontena_v2.yml
 - spec/fixtures/kontena_v3.yml
-- spec/fixtures/mysql.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.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
+- spec/fixtures/stack-with-dependencies-dep-3.yml
+- spec/fixtures/stack-with-dependencies-dep_2-removed.yml
+- spec/fixtures/stack-with-dependencies-dep_3-added.yml
+- spec/fixtures/stack-with-dependencies.yml
 - spec/fixtures/stack-with-env-file.yml
 - spec/fixtures/stack-with-ifs.yml
 - spec/fixtures/stack-with-invalid-liquid.yml
@@ -568,22 +548,6 @@ files:
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/stack-with-volumes.yml
-- spec/fixtures/wordpress-scaled.yml
-- spec/fixtures/wordpress.yml
-- spec/kontena/cli/app/build_command_spec.rb
-- spec/kontena/cli/app/common_spec.rb
-- spec/kontena/cli/app/config_command_spec.rb
-- spec/kontena/cli/app/deploy_command_spec.rb
-- spec/kontena/cli/app/docker_helper_spec.rb
-- spec/kontena/cli/app/init_command_spec.rb
-- spec/kontena/cli/app/logs_command_spec.rb
-- spec/kontena/cli/app/scale_spec.rb
-- spec/kontena/cli/app/service_generator_spec.rb
-- spec/kontena/cli/app/service_generator_v2_spec.rb
-- spec/kontena/cli/app/yaml/reader_spec.rb
-- spec/kontena/cli/app/yaml/service_extender_spec.rb
-- spec/kontena/cli/app/yaml/validator_spec.rb
-- spec/kontena/cli/app/yaml/validator_v2_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
@@ -650,13 +614,20 @@ files:
 - spec/kontena/cli/stacks/service_generator_spec.rb
 - spec/kontena/cli/stacks/service_generator_v2_spec.rb
 - spec/kontena/cli/stacks/show_command_spec.rb
+- spec/kontena/cli/stacks/stack_name_spec.rb
 - spec/kontena/cli/stacks/stop_command_spec.rb
 - 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/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
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader/file_loader_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader/registry_loader_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader/uri_loader_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
 - spec/kontena/cli/table_generator_spec.rb
 - spec/kontena/cli/vault/export_command_spec.rb
@@ -669,7 +640,12 @@ files:
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
 - spec/kontena/main_command_spec.rb
+- spec/kontena/plugin_manager/cleaner_spec.rb
+- spec/kontena/plugin_manager/common_spec.rb
+- spec/kontena/plugin_manager/installer_spec.rb
+- spec/kontena/plugin_manager/loader_spec.rb
 - spec/kontena/plugin_manager/rubygems_client_spec.rb
+- spec/kontena/plugin_manager/uninstaller_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb
@@ -699,33 +675,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Kontena command line tool
 test_files:
 - spec/fixtures/api/node.json
-- spec/fixtures/app.json
 - spec/fixtures/docker-compose-invalid.yml
 - spec/fixtures/docker-compose.yml
 - spec/fixtures/docker-compose_v2.yml
-- spec/fixtures/health.yml
-- spec/fixtures/kontena-build.yml
-- spec/fixtures/kontena-internal-extend.yml
-- spec/fixtures/kontena-invalid.yml
 - spec/fixtures/kontena-malformed-yaml.yml
 - spec/fixtures/kontena-not-hash-service-config.yml
-- spec/fixtures/kontena-with-env-file.yml
-- spec/fixtures/kontena-with-variables.yml
-- spec/fixtures/kontena.yml
-- spec/fixtures/kontena_build_v2.yml
 - spec/fixtures/kontena_build_v3.yml
-- spec/fixtures/kontena_numeric_version.yml
-- spec/fixtures/kontena_v2.yml
 - spec/fixtures/kontena_v3.yml
-- spec/fixtures/mysql.yml
 - spec/fixtures/stack-internal-extend.yml
 - spec/fixtures/stack-invalid.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
+- spec/fixtures/stack-with-dependencies-dep-3.yml
+- spec/fixtures/stack-with-dependencies-dep_2-removed.yml
+- spec/fixtures/stack-with-dependencies-dep_3-added.yml
+- spec/fixtures/stack-with-dependencies.yml
 - spec/fixtures/stack-with-env-file.yml
 - spec/fixtures/stack-with-ifs.yml
 - spec/fixtures/stack-with-invalid-liquid.yml
@@ -735,22 +706,6 @@ test_files:
 - spec/fixtures/stack-with-prompted-variables.yml
 - spec/fixtures/stack-with-variables.yml
 - spec/fixtures/stack-with-volumes.yml
-- spec/fixtures/wordpress-scaled.yml
-- spec/fixtures/wordpress.yml
-- spec/kontena/cli/app/build_command_spec.rb
-- spec/kontena/cli/app/common_spec.rb
-- spec/kontena/cli/app/config_command_spec.rb
-- spec/kontena/cli/app/deploy_command_spec.rb
-- spec/kontena/cli/app/docker_helper_spec.rb
-- spec/kontena/cli/app/init_command_spec.rb
-- spec/kontena/cli/app/logs_command_spec.rb
-- spec/kontena/cli/app/scale_spec.rb
-- spec/kontena/cli/app/service_generator_spec.rb
-- spec/kontena/cli/app/service_generator_v2_spec.rb
-- spec/kontena/cli/app/yaml/reader_spec.rb
-- spec/kontena/cli/app/yaml/service_extender_spec.rb
-- spec/kontena/cli/app/yaml/validator_spec.rb
-- spec/kontena/cli/app/yaml/validator_v2_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
@@ -817,13 +772,20 @@ test_files:
 - spec/kontena/cli/stacks/service_generator_spec.rb
 - spec/kontena/cli/stacks/service_generator_v2_spec.rb
 - spec/kontena/cli/stacks/show_command_spec.rb
+- spec/kontena/cli/stacks/stack_name_spec.rb
 - spec/kontena/cli/stacks/stop_command_spec.rb
 - 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/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
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader/file_loader_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader/registry_loader_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader/uri_loader_spec.rb
+- spec/kontena/cli/stacks/yaml/stack_file_loader_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
 - spec/kontena/cli/table_generator_spec.rb
 - spec/kontena/cli/vault/export_command_spec.rb
@@ -836,7 +798,12 @@ test_files:
 - spec/kontena/config_spec.rb
 - spec/kontena/kontena_cli_spec.rb
 - spec/kontena/main_command_spec.rb
+- spec/kontena/plugin_manager/cleaner_spec.rb
+- spec/kontena/plugin_manager/common_spec.rb
+- spec/kontena/plugin_manager/installer_spec.rb
+- spec/kontena/plugin_manager/loader_spec.rb
 - spec/kontena/plugin_manager/rubygems_client_spec.rb
+- spec/kontena/plugin_manager/uninstaller_spec.rb
 - spec/kontena/plugin_manager_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_helpers.rb

data/lib/kontena/cli/app_command.rb

@@ -1,22 +0,0 @@
-
-class Kontena::Cli::AppCommand < Kontena::Command
-
-  warn Kontena.pastel.yellow("[DEPRECATED] The `kontena app` commands are deprecated in favor of `kontena stack` commands and will be removed in future releases")
-
-  subcommand "init", "Init Kontena application", load_subcommand('apps/init_command')
-  subcommand "build", "Build Kontena services", load_subcommand('apps/build_command')
-  subcommand "config", "View service configurations", load_subcommand('apps/config_command')
-  subcommand "deploy", "Deploy Kontena services", load_subcommand('apps/deploy_command')
-  subcommand "scale", "Scale services", load_subcommand('apps/scale_command')
-  subcommand "start", "Start services", load_subcommand('apps/start_command')
-  subcommand "stop", "Stop services", load_subcommand('apps/stop_command')
-  subcommand "restart", "Restart services", load_subcommand('apps/restart_command')
-  subcommand "show", "Show service details", load_subcommand('apps/show_command')
-  subcommand ["ps", "list", "ls"], "List services", load_subcommand('apps/list_command')
-  subcommand ["logs"], "Show service logs", load_subcommand('apps/logs_command')
-  subcommand "monitor", "Monitor services", load_subcommand('apps/monitor_command')
-  subcommand ["remove","rm"], "Remove services", load_subcommand('apps/remove_command')
-
-  def execute
-  end
-end