kontena-cli 1.3.5 → 1.4.0.pre1

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

@@ -7,8 +7,6 @@ describe Kontena::Cli::Nodes::ListCommand do
   let(:subject) { described_class.new("kontena") }
 
   before do
-    Kontena.pastel.resolver.color.disable!
-
     allow(subject).to receive(:health_icon) {|health| health.inspect }
     allow(subject).to receive(:client).and_return(client)
   end

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

@@ -0,0 +1,76 @@
+require 'kontena/cli/nodes/remove_command'
+
+describe Kontena::Cli::Nodes::RemoveCommand do
+  include ClientHelpers
+  include OutputHelpers
+
+  context 'for an offline node without a node token' do
+    let :node do
+      {
+        "id" => 'test-grid/node-1',
+        "name" => 'node-1',
+        "has_token" => false,
+        "connected" => false,
+      }
+    end
+
+    before do
+      expect(client).to receive(:get).with('nodes/test-grid/node-1').and_return(node)
+    end
+
+    it 'removes the node' do
+      expect(subject).to receive(:confirm_command).with('node-1')
+      expect(client).to receive(:delete).with('nodes/test-grid/node-1')
+
+      subject.run(['node-1'])
+    end
+
+    it 'removes the node with --force' do
+      expect(client).to receive(:delete).with('nodes/test-grid/node-1')
+
+      subject.run(['--force', 'node-1'])
+    end
+  end
+
+  context 'for an online node without a node token' do
+    let :node do
+      {
+        "id" => 'test-grid/node-1',
+        "name" => 'node-1',
+        "has_token" => false,
+        "connected" => true,
+      }
+    end
+
+    before do
+      expect(client).to receive(:get).with('nodes/test-grid/node-1').and_return(node)
+    end
+
+    it 'does not remove the node' do
+      expect(client).not_to receive(:delete)
+
+      expect{subject.run(['node-1'])}.to output(" [error] Node node-1 is still online. You must terminate the node before removing it.\n").to_stderr
+    end
+  end
+
+  context 'for an online node with a node token' do
+    let :node do
+      {
+        "id" => 'test-grid/node-1',
+        "name" => 'node-1',
+        "has_token" => true,
+        "connected" => true,
+      }
+    end
+
+    before do
+      expect(client).to receive(:get).with('nodes/test-grid/node-1').and_return(node)
+    end
+
+    it 'removes the node' do
+      expect(client).to receive(:delete).with('nodes/test-grid/node-1')
+
+      expect{subject.run(['--force', 'node-1'])}.to output(/\[warn\] Node node-1 is still connected using a node token, but will be force-disconnected/).to_stderr
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'kontena/cli/nodes/reset_token_command'
+
+describe Kontena::Cli::Nodes::ResetTokenCommand do
+  include ClientHelpers
+  include OutputHelpers
+
+  it 'prompts on token update' do
+    expect(subject).to receive(:confirm).with("Resetting the node token will disconnect the agent (unless using --no-reset-connection), and require you to reconfigure the kontena-agent using the new `kontena node env` values before it will be able to reconnect. Are you sure?")
+
+    expect(client).to receive(:put).with('nodes/test-grid/test-node/token', {token: nil, reset_connection: true})
+
+    subject.run(['test-node'])
+  end
+
+  it 'PUTs token with reset_connection' do
+    expect(client).to receive(:put).with('nodes/test-grid/test-node/token', {token: 'asdf', reset_connection: true})
+
+    subject.run(['--force', '--token=asdf', 'test-node'])
+  end
+
+  it 'PUTs to generate token with reset_connection' do
+    expect(client).to receive(:put).with('nodes/test-grid/test-node/token', {token: nil, reset_connection: true})
+
+    subject.run(['--force', 'test-node'])
+  end
+
+  it 'PUTs to generate token without reset_connection' do
+    expect(client).to receive(:put).with('nodes/test-grid/test-node/token', {token: nil, reset_connection: false})
+
+    subject.run(['--force', '--no-reset-connection', 'test-node'])
+  end
+
+  it 'PUTs to clear token without reset_connection' do
+    expect(client).to receive(:put).with('nodes/test-grid/test-node/token', {token: '', reset_connection: false})
+
+    subject.run(['--force', '--no-reset-connection', '--clear-token', 'test-node'])
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'kontena/cli/nodes/show_command'
+
+describe Kontena::Cli::Nodes::ShowCommand do
+  include ClientHelpers
+  include OutputHelpers
+  include FixturesHelpers
+
+  let(:subject) { described_class.new("kontena") }
+
+  let(:node) {
+    JSON.load(fixture('api/node.json'))
+  }
+
+  before do
+    allow(client).to receive(:get).with('nodes/test-grid/core-01').and_return(node)
+  end
+
+  it "outputs the node info" do
+    expect{subject.run(['core-01'])}.to output_lines([
+      'development/core-01:',
+      '  id: XI4K:NPOL:EQJ4:S4V7:EN3B:DHC5:KZJD:F3U2:PCAN:46EV:IO4A:63S5',
+      '  agent version: 1.4.0.dev',
+      '  docker version: 1.12.6',
+      '  connected: yes',
+      '  last connect: 2017-07-04T08:36:02.235Z',
+      '  last seen: 2017-07-04T08:36:02.280Z',
+      '  public ip: 91.150.10.190',
+      '  private ip: 192.168.66.101',
+      '  overlay ip: 10.81.0.1',
+      '  os: Container Linux by CoreOS 1409.5.0 (Ladybug)',
+      '  kernel: 4.11.6-coreos-r1',
+      '  drivers:',
+      '    storage: overlay',
+      '    volume: local',
+      '  initial node: yes',
+      '  labels:',
+      '    - test',
+      '  stats:',
+      '    cpus: 1',
+      '    load: 1.49 0.34 0.11',
+      '    memory: 0.39 of 0.97 GB',
+      '    filesystem:',
+      '      - /var/lib/docker: 2.89 of 15.57 GB',
+    ])
+  end
+end

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

@@ -16,6 +16,11 @@ describe Kontena::Cli::Nodes::SshCommand do
     allow(client).to receive(:get).with('nodes/test-grid/test-node').and_return(node)
   end
 
+  it "fails if using both --any and a node name as a command" do
+    expect(subject).to_not receive(:exec)
+    expect{subject.run(['--any', 'ls', '-l'])}.to exit_with_error.and output(/Cannot combine --any with a node name/).to_stderr
+  end
+
   it "uses the public IP by default" do
     expect(subject).to receive(:exec).with('ssh', 'core@192.0.2.10')
     subject.run ['test-node']

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

@@ -0,0 +1,24 @@
+require 'kontena/cli/nodes/update_command'
+
+describe Kontena::Cli::Nodes::UpdateCommand do
+  include ClientHelpers
+  include OutputHelpers
+
+  it 'PUTs with empty parameters by default' do
+    expect(client).to receive(:put).with('nodes/test-grid/test-node', {})
+
+    subject.run(['test-node'])
+  end
+
+  it 'PUTs with labels' do
+    expect(client).to receive(:put).with('nodes/test-grid/test-node', {labels: ['test1=yes', 'test2=no']})
+
+    subject.run(['-l', 'test1=yes', '--label=test2=no', 'test-node'])
+  end
+
+  it 'PUTs with empty labels' do
+    expect(client).to receive(:put).with('nodes/test-grid/test-node', {labels: []})
+
+    subject.run(['--clear-labels', 'test-node'])
+  end
+end

data/spec/kontena/cli/stacks/deploy_command_spec.rb

@@ -24,4 +24,25 @@ describe Kontena::Cli::Stacks::DeployCommand do
       subject.run(['test-stack'])
     end
   end
+
+  it 'exits with error if the stack deploy fails to start' do
+    expect(client).to receive(:post).with('stacks/test-grid/test-stack/deploy', {}).once.and_return({
+        'id' => '59524bd753caed000801b6a3',
+        'stack_id' => 'test-grid/test-stack',
+        'created_at' => '2017-06-27T12:13:11.181Z',
+        'state' => 'created',
+        'service_deploys' => [],
+    })
+
+    expect(client).to receive(:get).with('stacks/test-grid/test-stack/deploys/59524bd753caed000801b6a3').once.and_return({
+        'id' => '59524bd753caed000801b6a3',
+        'stack_id' => 'test-grid/test-stack',
+        'created_at' => '2017-06-27T12:13:11.181Z',
+        'state' => 'error',
+        'service_deploys' => [],
+    })
+    expect(subject).to receive(:sleep).once
+
+    expect{subject.run(['test-stack'])}.to exit_with_error.and output(/deploy failed/).to_stderr
+  end
 end

data/spec/kontena/cli/stacks/logs_command_spec.rb

@@ -15,10 +15,6 @@ describe Kontena::Cli::Stacks::LogsCommand do
     ]
   end
   
-  before(:each) do
-    Kontena.pastel.resolver.color.disable!
-  end
-
   it "shows stack logs" do
     expect(client).to receive(:get).with('stacks/test-grid/test-stack/container_logs', {
       limit: 100,

data/spec/kontena/cli/table_generator_spec.rb

@@ -5,10 +5,6 @@ require 'kontena/cli/common'
 describe Kontena::Cli::TableGenerator do
   let(:data) { [{'a' => 'a1', 'b' => 'b1', 'c' => 'c1'}, {'a' => 'a2', 'b' => 'b2', 'c' => 'c2'}] }
 
-  before do
-    Kontena.pastel.resolver.color.disable!
-  end
-
   context Kontena::Cli::TableGenerator::Helper do
     let(:klass) { Class.new(Kontena::Command) }
 

data/spec/spec_helper.rb

@@ -33,6 +33,11 @@ RSpec.configure do |config|
     Kontena::Cli::Config.reset_instance
   end
 
+  # disable pastel colors for all specs, regardless of order
+  config.before(:all) do
+    Kontena.pastel.resolver.color.disable!
+  end
+
   config.after(:each) do
     RSpec::Mocks.space.proxy_for(File).reset
     RSpec::Mocks.space.proxy_for(Kontena::Cli::Config).reset

data/spec/support/output_helpers.rb

@@ -90,21 +90,10 @@ module OutputHelpers
     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
+      @expected = lines.flatten
+      @actual = CaptureStdoutLines.capture(block)
 
-        return false
-      else
-        return true
-      end
-    end
-
-    failure_message do |block|
-      return @error
+      values_match?(@actual, @expected)
     end
   end
 

data/tasks/release.rake

@@ -2,9 +2,9 @@ namespace :release do
   VERSION = Gem::Version.new(File.read('VERSION').strip)
   DOCKER_NAME = 'kontena/cli'
   if VERSION.prerelease?
-    DOCKER_VERSIONS = []
+    DOCKER_VERSIONS = ['edge']
   else
-    DOCKER_VERSIONS = [VERSION.to_s.match(/(\d+\.\d+)/)[1]]
+    DOCKER_VERSIONS = ['latest', VERSION.to_s.match(/(\d+\.\d+)/)[1]]
   end
 
   desc 'Build all'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -381,6 +381,8 @@ files:
 - lib/kontena/cli/master/users_command.rb
 - lib/kontena/cli/master_command.rb
 - lib/kontena/cli/node_command.rb
+- lib/kontena/cli/nodes/create_command.rb
+- lib/kontena/cli/nodes/env_command.rb
 - lib/kontena/cli/nodes/health_command.rb
 - lib/kontena/cli/nodes/label_command.rb
 - lib/kontena/cli/nodes/labels/add_command.rb
@@ -388,6 +390,7 @@ files:
 - lib/kontena/cli/nodes/labels/remove_command.rb
 - lib/kontena/cli/nodes/list_command.rb
 - lib/kontena/cli/nodes/remove_command.rb
+- lib/kontena/cli/nodes/reset_token_command.rb
 - lib/kontena/cli/nodes/show_command.rb
 - lib/kontena/cli/nodes/ssh_command.rb
 - lib/kontena/cli/nodes/update_command.rb
@@ -536,6 +539,7 @@ files:
 - omnibus/resources/kontena/pkg/license.html.erb
 - 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
@@ -609,9 +613,18 @@ files:
 - spec/kontena/cli/master/user/remove_command_spec.rb
 - spec/kontena/cli/master/user/role/add_command_spec.rb
 - spec/kontena/cli/master/user/role/remove_command_spec.rb
+- spec/kontena/cli/nodes/create_command_spec.rb
+- spec/kontena/cli/nodes/env_command_spec.rb
 - spec/kontena/cli/nodes/health_command_spec.rb
+- spec/kontena/cli/nodes/labels/add_command_spec.rb
+- spec/kontena/cli/nodes/labels/list_command_spec.rb
+- spec/kontena/cli/nodes/labels/remove_command_spec.rb
 - spec/kontena/cli/nodes/list_command_spec.rb
+- spec/kontena/cli/nodes/remove_command_spec.rb
+- spec/kontena/cli/nodes/reset_token_command_spec.rb
+- spec/kontena/cli/nodes/show_command_spec.rb
 - 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/services/containers_command_spec.rb
@@ -682,16 +695,17 @@ 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.7.1
+rubygems_version: 2.6.8
 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
@@ -765,9 +779,18 @@ test_files:
 - spec/kontena/cli/master/user/remove_command_spec.rb
 - spec/kontena/cli/master/user/role/add_command_spec.rb
 - spec/kontena/cli/master/user/role/remove_command_spec.rb
+- spec/kontena/cli/nodes/create_command_spec.rb
+- spec/kontena/cli/nodes/env_command_spec.rb
 - spec/kontena/cli/nodes/health_command_spec.rb
+- spec/kontena/cli/nodes/labels/add_command_spec.rb
+- spec/kontena/cli/nodes/labels/list_command_spec.rb
+- spec/kontena/cli/nodes/labels/remove_command_spec.rb
 - spec/kontena/cli/nodes/list_command_spec.rb
+- spec/kontena/cli/nodes/remove_command_spec.rb
+- spec/kontena/cli/nodes/reset_token_command_spec.rb
+- spec/kontena/cli/nodes/show_command_spec.rb
 - 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/services/containers_command_spec.rb