kontena-cli 1.2.0.pre2 → 1.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc1d241dbb42a8927a437e28fee00aba525bea78
-  data.tar.gz: f12240579934c0bad6f3d441c2744f0f5e9a5f8d
+  metadata.gz: fbe93b31f3b0185a1f79d87967898a48dd6c3a8b
+  data.tar.gz: d94145ce8dbb0289a75785293802b25f8a29e48f
 SHA512:
-  metadata.gz: 5137972ce9856d048eb8e972f8e20bea52c75a014e04f12a2d34290e870830c2d321fd8a2f264243f65aa12ab8446e3b6b2d1fe8cca5b8b036db947789e4d96b
-  data.tar.gz: 064fbf5dc12b11581a36b83ccd96fc961a23fdc5decb1995c1dd15cc8d2793ade68c060eb05dc87e38da4ff1d5f2f3332ac397c01333d0e057729fa06deb4ae1
+  metadata.gz: b6f6a68a4ef272bdc3f8ef941e155d7536eb3c429fd726dc00d98fe8ee6cd15a39f1f600ad218f7d1041a33db88d01a23f4d6d692ef0af1f2ad9b25de3a54725
+  data.tar.gz: 1e0552a145da0f8cebebe1ef1305052385f25077b7d903d58a4bc4f4fda7622e323e712af13b2bcce79319fc0950d55e59c01ae4cd63f97b8c5876d3ff2b0c2c

data/VERSION

@@ -1 +1 @@
-1.2.0.pre2
+1.2.0.pre3

data/lib/kontena/callbacks/master/deploy/70_invite_self_after_deploy.rb

@@ -32,7 +32,7 @@ module Kontena
 
         invite_response = nil
         spinner "Creating user #{cloud_user_data[:email]} into Kontena Master" do |spin|
-          invite_response = Kontena.run("master users invite --external-id #{cloud_user_data[:id]} --return #{cloud_user_data[:email].shellescape}", returning: :result)
+          invite_response = Kontena.run(["master", "user", "invite", "--external-id", cloud_user_data[:id], "--return", cloud_user_data[:email]], returning: :result)
           unless invite_response.kind_of?(Hash) && invite_response.has_key?('invite_code')
             spin.fail
           end
@@ -44,7 +44,7 @@ module Kontena
         role_status = nil
 
         spinner "Adding master_admin role for #{cloud_user_data[:email]}" do |spin|
-          role_status = Kontena.run("master users role add --silent master_admin #{cloud_user_data[:email].shellescape}")
+          role_status = Kontena.run(["master", "user", "role", "add", "--silent", "master_admin", cloud_user_data[:email]])
           spin.fail if role_status.to_i > 0
         end
 
@@ -52,7 +52,7 @@ module Kontena
 
         if current_master.grid
           spinner "Adding #{cloud_user_data[:email]} to grid '#{current_master.grid}'" do |spin|
-            grid_add_status = Kontena.run("grid user add --grid #{current_master.grid} #{cloud_user_data[:email].shellescape}")
+            grid_add_status = Kontena.run(["grid", "user", "add", "--grid", current_master.grid, cloud_user_data[:email]])
             spin.fail if grid_add_status.to_i > 0
           end
         end
@@ -61,7 +61,7 @@ module Kontena
 
         new_user_token = nil
         spinner "Creating an access token for #{cloud_user_data[:email]}" do |spin|
-          new_user_token = Kontena.run("master token create -e 0 -s user --return -u #{cloud_user_data[:email].shellescape}", returning: :result)
+          new_user_token = Kontena.run(["master", "token", "create", "-e", "0", "-s", "user", "--return", "-u", cloud_user_data[:email]], returning: :result)
         end
 
         master_name = current_master.name.dup

data/lib/kontena/cli/master/user/invite_command.rb

@@ -39,7 +39,7 @@ module Kontena::Cli::Master::User
             puts "  * command: kontena master join #{current_master.url} #{response['invite_code']}"
           end
           roles.each do |role|
-            Kontena.run("master users role add #{role.shellescape} #{email.shellescape}")
+            Kontena.run(["master", "user", "role", "add", role, email])
           end
         rescue => ex
           $stderr.puts pastel.red("Failed to invite #{email}")

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

@@ -10,6 +10,13 @@ module Kontena::Cli::Nodes
       require_api_url
       require_current_grid
       token = require_token
+
+      node = client(token).get("nodes/#{current_grid}/#{node_id}")
+
+      if node['connected']
+        exit_with_error "Node #{node['name']} is still online. You must terminate the node before removing it."
+      end
+
       confirm_command(node_id) unless forced?
 
       spinner "Removing #{node_id.colorize(:cyan)} node from #{current_grid.colorize(:cyan)} grid " do

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

@@ -18,7 +18,7 @@ module Kontena::Cli::Nodes
       exit_with_error "Cannot combine --any with a node name" if node_id && any?
 
       if node_id
-        node = client.get("grids/#{current_grid}/nodes/#{node_id}")
+        node = client.get("nodes/#{current_grid}/#{node_id}")
       elsif any?
         nodes = client.get("grids/#{current_grid}/nodes")['nodes']
         node = nodes.select{ |node| node['connected'] }.first

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

@@ -110,6 +110,11 @@ module Kontena::Cli::Stacks
     def generate_volumes(yaml_volumes)
       return [] unless yaml_volumes
       yaml_volumes.map do |name, config|
+        if config['external'].is_a?(TrueClass)
+          config['external'] = name
+        elsif config['external']['name']
+          config['external'] = config['external']['name']
+        end
         config.merge('name' => name)
       end
     end

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

@@ -92,21 +92,7 @@ module Kontena::Cli::Stacks
             yaml['volumes'].each do |volume, options|
               if options.is_a?(Hash)
                 option_errors = validate_volume_options(options)
-                if option_errors.valid?
-                  if !options.key?('driver') && options.key?('driver_opts')
-                    result[:errors] << { 'volumes' => { volume => { 'driver_opts' => 'defined without defining driver' } } }
-                  end
-                  if options.key?('external')
-                    unless options['external'].is_a?(FalseClass)
-                      ['driver', 'driver_opts', 'scope'].each do |key|
-                        result[:errors] << { 'volumes' => { volume => { key => 'specified together with external' } } } if options.key?(key)
-                      end
-                    end
-                  end
-                  if options.key?('driver') && !options.key?('scope')
-                    result[:errors] << { 'volumes' => { volume => { 'scope' => 'required value missing' } } }
-                  end
-                else
+                unless option_errors.valid?
                   result[:errors] << { 'volumes' => { volume => option_errors.errors } }
                 end
               else

data/lib/kontena/cli/volumes/remove_command.rb

@@ -7,11 +7,14 @@ module Kontena::Cli::Volumes
 
     banner "Removes a volume"
     parameter 'VOLUME', 'Volume'
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     requires_current_master
     requires_current_master_token
 
     def execute
+      confirm_command(volume) unless forced?
+
       spinner "Removing volume #{pastel.cyan(volume)} " do
         remove_volume(volume)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre2
+  version: 1.2.0.pre3
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler