kontena-cli 1.3.0 → 1.3.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e6348ba5806ac61abf7550937caf49faabbde1
-  data.tar.gz: fbf5b4479c3f0bd793282e5cc087e9f7650846f8
+  metadata.gz: 6045b4c6dceb33697e5f728679d1021cfba62519
+  data.tar.gz: d13307a8b2ecffa1b2bd5b4f02ad965a97db23fd
 SHA512:
-  metadata.gz: d19ca552651121df5f07a874e26129e944ecf771eaf347157cb5950a04650e68e4328e52ca44fbccde947c66eababbccf55ceb7c7ae6a676a743c88617edd0ca
-  data.tar.gz: 7204d1996106cbb9b2e6bb2f7902d74bfed8835467b326c16ec501b922a74eed835c5a96deca4b760e68487d7462d990b04f9cef2f55a2d289320accbc61913f
+  metadata.gz: 269cce5ddd6f2c6b47ce1df51c9d1d7b5abd1787d0eea28e9f10f5fcf9c85ecaafc6d655a281734dd33ed437a31d4f32d54fdfa575985be52f38535a5c735e6f
+  data.tar.gz: ee09b9b9522f59438db81170a0d9c6e7c79cec94c29e70d271f7b3cdafaec1cc83374d0d9664a4546b91f82288e63960c2b031920eabc985614fe8dc273995a1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1.rc1

data/kontena-cli.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "retriable", "~> 2.1.0"
   spec.add_runtime_dependency "opto", "1.8.5"
   spec.add_runtime_dependency "semantic", "~> 1.5"
-  spec.add_runtime_dependency "safe_yaml", "~> 1.0"
   spec.add_runtime_dependency "liquid", "~> 4.0.0"
   spec.add_runtime_dependency "tty-table", "~> 0.8.0"
   spec.add_runtime_dependency "websocket-driver-kontena", "0.6.5"

data/lib/kontena/autoload_core.rb

@@ -1,6 +1,6 @@
 # stdlib
 autoload :JSON, 'json'
-autoload :YAML, 'safe_yaml'
+autoload :YAML, 'yaml'
 autoload :URI, 'uri'
 autoload :Logger, 'logger'
 autoload :FileUtils, 'fileutils'

data/lib/kontena/cli/apps/common.rb

@@ -2,6 +2,7 @@ require_relative '../services/services_helper'
 require_relative './service_generator'
 require_relative './service_generator_v2'
 require_relative './yaml/reader'
+require 'yaml'
 
 module Kontena::Cli::Apps
   module Common

data/lib/kontena/cli/apps/config_command.rb

@@ -1,5 +1,5 @@
 require_relative 'common'
-require 'pp'
+require 'yaml'
 
 module Kontena::Cli::Apps
   class ConfigCommand < Kontena::Command

data/lib/kontena/cli/apps/init_command.rb

@@ -4,9 +4,6 @@ require_relative 'dockerfile_generator'
 require_relative 'docker_compose_generator'
 require_relative 'kontena_yml_generator'
 
-require "safe_yaml"
-SafeYAML::OPTIONS[:default_mode] = :safe
-
 module Kontena::Cli::Apps
   class InitCommand < Kontena::Command
     include Kontena::Cli::Common

data/lib/kontena/cli/apps/kontena_yml_generator.rb

@@ -1,6 +1,4 @@
 require_relative 'common'
-require "safe_yaml"
-SafeYAML::OPTIONS[:default_mode] = :safe
 
 module Kontena::Cli::Apps
   class KontenaYmlGenerator

data/lib/kontena/cli/apps/yaml/reader.rb

@@ -1,5 +1,3 @@
-require "safe_yaml"
-SafeYAML::OPTIONS[:default_mode] = :safe
 require_relative 'service_extender'
 require_relative 'validator'
 require_relative 'validator_v2'

data/lib/kontena/cli/master/config/import_command.rb

@@ -40,8 +40,6 @@ module Kontena::Cli::Master::Config
         require 'json'
         JSON.parse(data)
       when 'yaml', 'yml'
-        require "safe_yaml"
-        SafeYAML::OPTIONS[:default_mode] = :safe
         YAML.safe_load(data)
       else
         exit_with_error "Unknown input format '#{self.format}'"

data/lib/kontena/cli/nodes/list_command.rb

@@ -66,7 +66,7 @@ module Kontena::Cli::Nodes
         unless quiet?
           grid_health = grid_health(grid, grid_nodes)
           grid_nodes.each do |node|
-            node['name'] = health_icon(node_health(node, grid_health)) + " " + node['name']
+            node['name'] = health_icon(node_health(node, grid_health)) + " " + (node['name'] || '(initializing)')
           end
         end
 

data/lib/kontena/cli/plugins/install_command.rb

@@ -14,28 +14,16 @@ module Kontena::Cli::Plugins
       installed_version = Kontena::PluginManager.instance.installed(name)
 
       if installed_version
-        installed = spinner "Upgrading plugin #{name.colorize(:cyan)}" do |spin|
-          begin
-            Kontena::PluginManager.instance.upgrade_plugin(name, pre: pre?)
-          rescue => ex
-            $stderr.puts pastel.red("#{ex.class.name} : #{ex.message}")
-            logger.error(ex)
-            spin.fail!
-          end
+        installed = spinner "Upgrading plugin #{name.colorize(:cyan)}" do
+          Kontena::PluginManager.instance.upgrade_plugin(name, pre: pre?)
         end
 
-        spinner "Running cleanup" do |spin|
+        spinner "Running cleanup" do
           Kontena::PluginManager.instance.cleanup_plugin(name)
         end
       else
-        installed = spinner "Installing plugin #{name.colorize(:cyan)}" do |spin|
-          begin
-            Kontena::PluginManager.instance.install_plugin(name, pre: pre?, version: version)
-          rescue => ex
-            $stderr.puts pastel.red("#{ex.class.name} : #{ex.message}")
-            logger.error(ex)
-            spin.fail!
-          end
+        installed = spinner "Installing plugin #{name.colorize(:cyan)}" do
+          Kontena::PluginManager.instance.install_plugin(name, pre: pre?, version: version)
         end
       end
 

data/lib/kontena/cli/plugins/uninstall_command.rb

@@ -6,9 +6,11 @@ module Kontena::Cli::Plugins
     include Kontena::Cli::Common
 
     parameter 'NAME', 'Plugin name'
+
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
+      exit_with_error "Plugin #{pastel.cyan(name)} is not installed" unless Kontena::PluginManager.instance.installed(name) && !ENV['NO_PLUGINS']
       confirm unless forced?
       spinner "Uninstalling plugin #{pastel.cyan(name)}" do |spin|
         begin

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

@@ -2,9 +2,7 @@ require_relative 'yaml/reader'
 require_relative '../services/services_helper'
 require_relative 'service_generator_v2'
 require_relative '../../stacks_client'
-
-require "safe_yaml"
-SafeYAML::OPTIONS[:default_mode] = :safe
+require 'yaml'
 
 module Kontena::Cli::Stacks
   module Common

data/lib/kontena/cli/stacks/registry/show_command.rb

@@ -14,8 +14,6 @@ module Kontena::Cli::Stacks::Registry
 
     def execute
       require 'semantic'
-      require "safe_yaml"
-      SafeYAML::OPTIONS[:default_mode] = :safe
       unless versions?
         stack = ::YAML.safe_load(stacks_client.show(stack_name, stack_version))
         puts "#{stack['stack']}:"

data/lib/kontena/cli/stacks/yaml/reader.rb

@@ -25,8 +25,6 @@ module Kontena::Cli::Stacks
       attr_reader :file, :raw_content, :errors, :notifications, :defaults, :values, :registry
 
       def initialize(file, skip_validation: false, skip_variables: false, variables: nil, values: nil, defaults: nil)
-        require "safe_yaml"
-        SafeYAML::OPTIONS[:default_mode] = :safe
         require_relative 'service_extender'
         require_relative 'validator_v3'
         require_relative 'opto'

data/lib/kontena/cli/vault/export_command.rb

@@ -12,8 +12,7 @@ module Kontena::Cli::Vault
     def execute
       require 'shellwords'
       require 'json'
-      require "safe_yaml"
-      SafeYAML::OPTIONS[:default_mode] = :safe
+      require 'yaml'
       meth = json? ? :to_json : :to_yaml
       puts(
         Kontena.run!(['vault', 'ls', '--return']).sort.map do |secret|

data/lib/kontena/cli/vault/import_command.rb

@@ -16,8 +16,6 @@ module Kontena::Cli::Vault
 
     def parsed_input
       require "json"
-      require "safe_yaml"
-      SafeYAML::OPTIONS[:default_mode] = :safe
       json? ? JSON.load(input) : YAML.safe_load(input)
     end
 

data/lib/kontena/main_command.rb

@@ -9,25 +9,30 @@ class Kontena::MainCommand < Kontena::Command
     exit 0
   end
 
+  banner Kontena.pastel.green("Getting started:"), false
+  banner ' - Create a Kontena Master (see "kontena plugin search" for a list of', false
+  banner '   provisioning plugins)', false
+  banner ' - Or log into an existing master, use: "kontena master login <master url>"', false
+  banner ' - Read more about Kontena at https://www.kontena.io/docs/', false
+
+  subcommand "master", "Kontena Master specific commands", load_subcommand('master_command')
   subcommand "cloud", "Kontena Cloud specific commands", load_subcommand('cloud_command')
-  subcommand "logout", "Logout from Kontena Masters or Kontena Cloud accounts", load_subcommand('logout_command')
+  subcommand "node", "Node specific commands", load_subcommand('node_command')
   subcommand "grid", "Grid specific commands", load_subcommand('grid_command')
-  subcommand "app", "App specific commands", load_subcommand('app_command')
   subcommand "stack", "Stack specific commands", load_subcommand('stack_command')
   subcommand "service", "Service specific commands", load_subcommand('service_command')
+  subcommand "container", "Container specific commands", load_subcommand('container_command')
   subcommand "vault", "Vault specific commands", load_subcommand('vault_command')
-  subcommand "certificate", "LE Certificate specific commands", load_subcommand('certificate_command')
-  subcommand "node", "Node specific commands", load_subcommand('node_command')
-  subcommand "master", "Master specific commands", load_subcommand('master_command')
   subcommand "vpn", "VPN specific commands", load_subcommand('vpn_command')
-  subcommand "registry", "Registry specific commands", load_subcommand('registry_command')
-  subcommand "container", "Container specific commands", load_subcommand('container_command')
   subcommand "etcd", "Etcd specific commands", load_subcommand('etcd_command')
+  subcommand "certificate", "LE Certificate specific commands", load_subcommand('certificate_command')
+  subcommand "registry", "Registry specific commands", load_subcommand('registry_command')
   subcommand "external-registry", "External registry specific commands", load_subcommand('external_registry_command')
+  subcommand "volume", "Volume specific commands [EXPERIMENTAL]", load_subcommand('volume_command')
+  subcommand "app", "App specific commands", load_subcommand('app_command')
+  subcommand "plugin", "Plugin specific commands", load_subcommand('plugin_command')
   subcommand "whoami", "Shows current logged in user", load_subcommand('whoami_command')
-  subcommand "plugin", "Plugin related commands", load_subcommand('plugin_command')
   subcommand "version", "Show CLI and current master version", load_subcommand('version_command')
-  subcommand "volume", "Volume specific commands [EXPERIMENTAL]", load_subcommand('volume_command')
 
   def execute
   end
@@ -40,12 +45,17 @@ class Kontena::MainCommand < Kontena::Command
   end
 
   def subcommand_missing(name)
+    extend Kontena::Cli::Common
     if known_plugin_subcommand?(name)
-      extend Kontena::Cli::Common
       exit_with_error "The '#{name}' plugin has not been installed. Use: kontena plugin install #{name}"
-    else
-      super(name)
+    elsif name == 'login'
+      exit_with_error "Use 'kontena master login' to log into a Kontena Master\n"+
+             "         or 'kontena cloud login' for logging into your Kontena Cloud account"
+    elsif name == 'logout'
+      exit_with_error "Use 'kontena master logout' to log out from a Kontena Master\n"+
+             "         or 'kontena cloud logout' for logging out from your Kontena Cloud account"
     end
+    super
   end
 
   def known_plugin_subcommand?(name)

data/lib/kontena/plugin_manager.rb

@@ -37,7 +37,7 @@ module Kontena
         minimal_deps: true
       )
       plugin_version = version.nil? ? Gem::Requirement.default : Gem::Requirement.new(version)
-      without_safe { cmd.install(prefix(plugin_name), plugin_version) }
+      cmd.install(prefix(plugin_name), plugin_version)
       cmd.installed_gems
     end
 
@@ -110,7 +110,7 @@ module Kontena
       options = []
       options += ['-q', '--no-verbose'] unless ENV["DEBUG"]
       cmd.handle_options options
-      without_safe { cmd.execute }
+      cmd.execute
     rescue Gem::SystemExitException => e
       return true if e.exit_code == 0
       raise
@@ -136,14 +136,6 @@ module Kontena
 
     private
 
-    # Execute block without SafeYAML. Gem does security internally.
-    def without_safe(&block)
-      SafeYAML::OPTIONS[:default_mode] = :unsafe if Object.const_defined?(:SafeYAML)
-      yield
-    ensure
-      SafeYAML::OPTIONS[:default_mode] = :safe if Object.const_defined?(:SafeYAML)
-    end
-
     def plugin_debug?
       @plugin_debug ||= ENV['DEBUG'] == 'plugin'
     end

data/lib/kontena/scripts/completer.rb

@@ -139,7 +139,7 @@ helper.logger.debug { "Completing #{words.inspect}" }
 
 begin
   completion = []
-  completion.push %w(cloud logout grid app service stack vault certificate node master vpn registry container etcd external-registry whoami plugin version) if words.size < 2
+  completion.push %w(cloud grid app service stack vault certificate node master vpn registry container etcd external-registry whoami plugin version) if words.size < 2
   if words.size > 0
     case words[0]
       when 'plugin'

data/lib/kontena/stacks_cache.rb

@@ -8,8 +8,6 @@ module Kontena
       attr_accessor :version
 
       def initialize(stack, version = nil)
-        require "safe_yaml"
-        SafeYAML::OPTIONS[:default_mode] = :safe
         unless version
           stack, version = stack.split(':', 2)
         end

data/spec/kontena/cli/app/config_command_spec.rb

@@ -1,5 +1,6 @@
 require "kontena/cli/apps/config_command"
 require 'ruby_dig'
+require 'yaml'
 
 describe Kontena::Cli::Apps::ConfigCommand do
   include FixturesHelpers

data/spec/kontena/cli/nodes/list_command_spec.rb

@@ -111,6 +111,46 @@ describe Kontena::Cli::Nodes::ListCommand do
         end
       end
 
+      context "with two online nodes and one initializing node" do
+        before do
+          allow(client).to receive(:get).with('grids/test-grid/nodes').and_return(
+            { "nodes" => [
+                {
+                  "connected" => true,
+                  "name" => "node-1",
+                  "node_number" => 1,
+                  "initial_member" => true,
+                  'agent_version' => '1.1-dev',
+                },
+                {
+                  "connected" => true,
+                  "name" => "node-2",
+                  "node_number" => 2,
+                  "initial_member" => true,
+                  'agent_version' => '1.1-dev',
+                },
+                # node has just connected, but not sent any node_info yet
+                {
+                  "connected" => false,
+                  "name" => nil,
+                  "node_number" => nil,
+                  "initial_member" => false,
+                  'agent_version' => nil,
+                },
+              ]
+            }
+          )
+        end
+
+        it "outputs two nodes with warning and one initializing" do
+          expect{subject.run([])}.to output_table [
+            [':warning node-1', '1.1-dev', 'online',  '1 / 3', '-'],
+            [':warning node-2', '1.1-dev', 'online',  '2 / 3', '-'],
+            [':offline (initializing)', '', 'offline', '-', '-'],
+          ]
+        end
+      end
+
       context "with two online nodes and one offline node" do
         before do
           allow(client).to receive(:get).with('grids/test-grid/nodes').and_return(

data/spec/kontena/cli/plugins/install_command_spec.rb

@@ -0,0 +1,10 @@
+require 'kontena/cli/plugins/install_command'
+
+describe Kontena::Cli::Plugins::InstallCommand do
+  let(:subject) { described_class.new([]) }
+
+  it 'exits with error if plugin not found' do
+    expect(Kontena::PluginManager.instance).to receive(:install_plugin).and_raise(StandardError, 'bar')
+    expect{subject.run(['foofoo'])}.to exit_with_error.and output(/StandardError/).to_stderr
+  end
+end

data/spec/kontena/cli/vault/{import_spec.rb → import_command_spec.rb}

@@ -23,7 +23,7 @@ describe Kontena::Cli::Vault::ImportCommand do
   end
 
   it 'dies if the yml contains something odd' do
-    expect(File).to receive(:read).with('foo.yml').and_return({foo: 'bar', bar: { foo: ["bar"] }}.to_yaml)
+    expect(File).to receive(:read).with('foo.yml').and_return("foo: bar\nbar:\n  foo:\n    - bar\n")
     expect(subject).to receive(:exit_with_error).with(/Invalid value/).and_call_original
     expect{subject.run(['--force', 'foo.yml'])}.to exit_with_error
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -626,6 +612,7 @@ files:
 - spec/kontena/cli/nodes/health_command_spec.rb
 - spec/kontena/cli/nodes/list_command_spec.rb
 - spec/kontena/cli/nodes/ssh_command_spec.rb
+- spec/kontena/cli/plugins/install_command_spec.rb
 - spec/kontena/cli/registry/create_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/events_command_spec.rb
@@ -660,8 +647,8 @@ files:
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
 - spec/kontena/cli/table_generator_spec.rb
-- spec/kontena/cli/vault/export_spec.rb
-- spec/kontena/cli/vault/import_spec.rb
+- spec/kontena/cli/vault/export_command_spec.rb
+- spec/kontena/cli/vault/import_command_spec.rb
 - spec/kontena/cli/vault/update_command_spec.rb
 - spec/kontena/cli/vault/write_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb
@@ -695,9 +682,9 @@ 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.8
@@ -781,6 +768,7 @@ test_files:
 - spec/kontena/cli/nodes/health_command_spec.rb
 - spec/kontena/cli/nodes/list_command_spec.rb
 - spec/kontena/cli/nodes/ssh_command_spec.rb
+- spec/kontena/cli/plugins/install_command_spec.rb
 - spec/kontena/cli/registry/create_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/events_command_spec.rb
@@ -815,8 +803,8 @@ test_files:
 - spec/kontena/cli/stacks/yaml/service_extender_spec.rb
 - spec/kontena/cli/stacks/yaml/validator_v3_spec.rb
 - spec/kontena/cli/table_generator_spec.rb
-- spec/kontena/cli/vault/export_spec.rb
-- spec/kontena/cli/vault/import_spec.rb
+- spec/kontena/cli/vault/export_command_spec.rb
+- spec/kontena/cli/vault/import_command_spec.rb
 - spec/kontena/cli/vault/update_command_spec.rb
 - spec/kontena/cli/vault/write_command_spec.rb
 - spec/kontena/cli/version_command_spec.rb