kontena-cli 1.4.0.pre6 → 1.4.0.pre7

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

@@ -24,6 +24,7 @@ describe Kontena::Cli::Nodes::ShowCommand do
       '  connected: yes',
       '  last connect: 2017-07-04T08:36:02.235Z',
       '  last seen: 2017-07-04T08:36:02.280Z',
+      '  availability: active',
       '  public ip: 91.150.10.190',
       '  private ip: 192.168.66.101',
       '  overlay ip: 10.81.0.1',
@@ -43,4 +44,34 @@ describe Kontena::Cli::Nodes::ShowCommand do
       '      - /var/lib/docker: 2.89 of 15.57 GB',
     ])
   end
+
+  it 'does not fail with missing fs stats' do
+    node_info = node
+    node_info.delete('resource_usage')
+    allow(client).to receive(:get).with('nodes/test-grid/core-01').and_return(node_info)
+
+    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',
+      '  availability: active',
+      '  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'
+    ])
+  end
 end

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

@@ -16,9 +16,24 @@ 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
+  describe '--any flag' do
+    context 'used together with a node name' do
+      it "fails and outputs an error message" 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
+    end
+
+    context 'used when there are no connected nodes' do
+      before do
+        expect(subject.client).to receive(:get).with("grids/test-grid/nodes").and_return('nodes' => [ { 'connected' => false } ])
+      end
+
+      it "fails and outputs an error message" do
+        expect(subject).to_not receive(:exec)
+        expect{subject.run(['--any'])}.to exit_with_error.and output(/no online nodes/).to_stderr
+      end
+    end
   end
 
   it "uses the public IP by default" do

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

@@ -4,7 +4,7 @@ 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).to receive(:installer).and_raise(StandardError, 'bar')
     expect{subject.run(['foofoo'])}.to exit_with_error.and output(/StandardError/).to_stderr
   end
 end

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

@@ -6,6 +6,10 @@ describe Kontena::Cli::Stacks::BuildCommand do
 
   mock_current_master
 
+  before(:each) do
+    ENV['STACK'] = nil
+  end
+
   let(:subject) do
     described_class.new(File.basename($0))
   end
@@ -33,24 +37,14 @@ describe Kontena::Cli::Stacks::BuildCommand do
     end
 
     before(:each) do
-      allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_read_and_dump).with('kontena.yml', hash_including(:name, :values)).and_return(stack)
+      allow(subject).to receive(:stack_name).and_return('stack-a')
+      allow(subject).to receive(:stack).and_return(stack)
       allow(subject).to receive(:system).and_return(true)
     end
 
     expect_to_require_current_master
     expect_to_require_current_master_token
 
-    it 'requires config file' do
-      expect(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      subject.run([])
-    end
-
-    it 'reads stack file' do
-      expect(subject).to receive(:stack_read_and_dump).with('kontena.yml', hash_including(:name, :values)).and_return(stack)
-      subject.run([])
-    end
-
     it 'builds docker image' do
       expect(subject).to receive(:system).with('docker', 'build', '-t', 'registry.kontena.local/test:latest', '--pull', File.expand_path('.'))
       subject.run([])

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

@@ -2,101 +2,74 @@ require "kontena/cli/stacks/common"
 require "kontena/cli/stacks/yaml/reader"
 
 describe Kontena::Cli::Stacks::Common do
+  include FixturesHelpers
 
   let(:klass) do
     Class.new(Kontena::Command) do
       include Kontena::Cli::Stacks::Common
       include Kontena::Cli::Common
-      include Kontena::Cli::Stacks::Common::StackNameParam
       include Kontena::Cli::Stacks::Common::StackFileOrNameParam
       include Kontena::Cli::Stacks::Common::StackNameOption
       include Kontena::Cli::Stacks::Common::StackValuesToOption
       include Kontena::Cli::Stacks::Common::StackValuesFromOption
-    end
-  end
-
-  let(:subject) { klass.new('') }
-
-  context 'stack yaml reader methods' do
-    let(:reader) { double(:reader) }
-
-    before(:each) do
-      allow(reader).to receive(:execute).and_return({ errors: [], notifications: [] })
-      allow(reader).to receive(:raw_content).and_return("")
-      allow(reader).to receive(:stack_name).and_return('foo')
-      allow(subject).to receive(:set_env_variables).and_return(true)
-    end
-
-    describe '#stack_read_and_dump' do
-      it 'passes args to reader' do
-        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).with('foo', values: { 'value' => 'value' }, defaults: { 'default' => 'default' }).and_return(reader)
-        subject.stack_read_and_dump('foo', name: 'name', values: { 'value' => 'value' }, defaults: { 'default' => 'default' })
-      end
-
-      it 'returns a stack hash' do
-        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).and_return(reader)
-        expect(subject.stack_read_and_dump('foo')).to be_kind_of Hash
-      end
-    end
-
-    describe '#stack_from_yaml' do
-      it 'passes args to reader' do
-        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).with('foo', values: { 'value' => 'value' }, defaults: { 'default' => 'default' }).and_return(reader)
-        subject.stack_from_yaml('foo', name: 'name', values: { 'value' => 'value' }, defaults: { 'default' => 'default' })
-      end
-
-      it 'returns a stack hash' do
-        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).and_return(reader)
-        expect(subject.stack_from_yaml('foo')).to be_kind_of Hash
-      end
-    end
-
-    describe '#reader_from_yaml' do
-      it 'passes args to reader' do
-        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).with('foo', values: { 'value' => 'value' }, defaults: { 'default' => 'default' }).and_return(reader)
-        subject.reader_from_yaml('foo', name: 'name', values: { 'value' => 'value' }, defaults: { 'default' => 'default' })
-      end
 
-      it 'returns a reader' do
-        expect(Kontena::Cli::Stacks::YAML::Reader).to receive(:new).and_return(reader)
-        expect(subject.reader_from_yaml('foo')).to eq reader
+      def what
+        [source]
       end
     end
   end
 
-  describe '#stack_name' do
-  end
-
-  describe '#stack_from_reader' do
-  end
-
-  describe '#stack_from_yaml' do
-  end
+  let(:subject) { klass.new('kontena') }
 
-  describe '#require_config_file' do
+  before do
+    allow(ENV).to receive(:[]).with('GRID').and_return('test-grid')
+    allow(ENV).to receive(:[]).with('STACK').and_return('test-stack')
   end
 
-  describe '#generate_volumes' do
+  describe '#loader' do
+    it 'returns a loader' do
+      expect(subject.instance([fixture_path('kontena_v3.yml')]).loader).to respond_to(:reader)
+      expect(subject.instance([fixture_path('kontena_v3.yml')]).loader).to respond_to(:dependencies)
+      expect(subject.instance([fixture_path('kontena_v3.yml')]).loader).to respond_to(:stack_name)
+    end
   end
 
-  describe '#generate_services' do
+  describe '#reader' do
+    it 'returns a YAML reader for the stack file param' do
+      expect(subject.instance([fixture_path('kontena_v3.yml')]).reader).to respond_to(:execute)
+      expect(subject.instance([fixture_path('kontena_v3.yml')]).reader).to respond_to(:variable_values)
+    end
   end
 
-  describe '#set_env_variables' do
-  end
+  describe '#stack' do
+    it 'returns a stack result' do
+      expect(subject.instance([fixture_path('kontena_v3.yml')]).stack).to respond_to(:[])
+      expect(subject.instance([fixture_path('kontena_v3.yml')]).stack['name']).to eq ::YAML.safe_load(fixture('kontena_v3.yml'))['stack'].split('/').last
+    end
 
-  describe '#current_dir' do
+    it 'sets the stack name' do
+      expect(subject.instance(['-n', 'foo', fixture_path('kontena_v3.yml')]).stack['name']).to eq 'foo'
+    end
   end
 
-  describe '#display_notifications' do
-  end
+  describe '#values_from_options' do
+    it 'is a hash that has key value pairs from -v params' do
+      expect(subject.instance(['-v', 'foo=bar', '-v', 'bar=baz', fixture_path('kontena_v3.yml')]).values_from_options).to match hash_including('foo' => 'bar', 'bar' => 'baz')
+    end
 
-  describe '#hint_on_validation_notifications' do
-  end
+    context '--values-from' do
+      before do
+        allow(File).to receive(:exist?).with('vars.yml').and_return(true)
+        expect(File).to receive(:read).with('vars.yml').and_return(::YAML.dump('baz' => 'bag', 'bar' => 'boo'))
+      end
 
-  describe '#abort_on_validation_errors' do
-  end
+      it 'includes values read from --values-from file' do
+        expect(subject.instance(['--values-from', 'vars.yml', fixture_path('kontena_v3.yml')]).values_from_options).to match hash_including('baz' => 'bag', 'bar' => 'boo')
+      end
 
-  describe '#stacks_client' do
+      it 'includes values read from --values-from file, overriden by -v values' do
+        expect(subject.instance(['-v', 'foo=bar', '-v', 'bar=baz', '--values-from', 'vars.yml', fixture_path('kontena_v3.yml')]).values_from_options).to match hash_including('foo' => 'bar', 'bar' => 'baz', 'baz' => 'bag')
+      end
+    end
   end
 end

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

@@ -4,56 +4,82 @@ describe Kontena::Cli::Stacks::InstallCommand do
 
   include ClientHelpers
   include RequirementsHelper
+  include FixturesHelpers
+
   mock_current_master
 
+  before(:each) do
+    ENV['STACK'] = nil
+  end
+
   describe '#execute' do
-    let(:stack) do
+    let(:stack_expectation) do
       {
-        name: 'stack-a',
-        stack: 'user/stack-a',
-        version: '1.0.0',
-        registry: 'file://kontena.yml',
-        source: "YAML content",
-        services: []
+        'name' => 'stackname',
+        'stack' => 'user/stackname',
+        'version' => '0.1.1',
+        'registry' => 'file://',
+        'services' => array_including(hash_including('name', 'image')),
+        'variables' => {},
+        'volumes' => [],
+        'dependencies' => nil,
+        'source' => /stack:/,
+        'parent_name' => nil,
+        'expose' => nil
       }
     end
 
     expect_to_require_current_master
     expect_to_require_current_master_token
 
-    before(:each) do
-      allow(subject).to receive(:yaml_content).and_return("YAML content")
-    end
-
     it 'sends stack to master' do
-      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_read_and_dump).with('kontena.yml', hash_including(name: nil, values: nil)).and_return(stack)
-      expect(client).to receive(:post).with(
-        'grids/test-grid/stacks', stack
-      )
-      subject.run([])
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq 'grids/test-grid/stacks'
+        expect(data).to match hash_including(stack_expectation)
+        expect(data['services'].find { |s| s['name'] == 'wordpress' }['env']).to match array_including("WORDPRESS_DB_PASSWORD=stackname_secret")
+        expect(data['services'].find { |s| s['name'] == 'mysql' }['env']).to match array_including("MYSQL_ROOT_PASSWORD=stackname_secret")
+      end.and_return({})
+      subject.run(['--no-deploy', fixture_path('kontena_v3.yml')])
     end
 
     it 'allows to override stack name' do
-      allow(File).to receive(:exist?).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:require_config_file).with('kontena.yml').and_return(true)
-      allow(subject).to receive(:stack_read_and_dump).with('kontena.yml', hash_including(name: 'stack-b', values: nil)).and_return(stack)
-      stack_b = stack
-      stack_b[:name] = 'stack-b'
-      expect(client).to receive(:post).with(
-        'grids/test-grid/stacks', stack
-      )
-      subject.run(['--name', 'stack-b'])
+      expect(client).to receive(:post) do |path, data|
+        expect(path).to eq 'grids/test-grid/stacks'
+        expect(data).to match hash_including(stack_expectation.merge('name' => 'stack-a'))
+        expect(data['services'].find { |s| s['name'] == 'wordpress' }['env']).to match array_including("WORDPRESS_DB_PASSWORD=stack-a_secret")
+        expect(data['services'].find { |s| s['name'] == 'mysql' }['env']).to match array_including("MYSQL_ROOT_PASSWORD=stack-a_secret")
+      end.and_return({})
+      subject.run(['--no-deploy', '--name', 'stack-a', fixture_path('kontena_v3.yml')])
     end
 
     it 'accepts a stack name as filename' do
-      expect(File).to receive(:exist?).with('user/stack:1.0.0').and_return(false)
-      expect(subject).to receive(:stack_read_and_dump).with('user/stack:1.0.0', name: nil, values: nil).and_return(stack)
+      allow(File).to receive(:exist?).with('user/stack:1.0.0').at_least(:once).and_return(false)
+      expect(subject.loader_class).to receive(:for).with('user/stack:1.0.0').and_return(subject.loader_class.for(fixture_path('kontena_v3.yml')))
+      allow(subject.loader_class).to receive(:for).and_call_original
       expect(client).to receive(:post).with(
-        'grids/test-grid/stacks', stack
+        'grids/test-grid/stacks', hash_including(stack_expectation)
       )
-      subject.run(['user/stack:1.0.0'])
+      subject.run(['--no-deploy', 'user/stack:1.0.0'])
+    end
+
+    context '--[no-]deploy' do
+      it 'runs deploy for the stack after install by default' do
+        expect(client).to receive(:post).with(
+           'grids/test-grid/stacks', hash_including(stack_expectation)
+        )
+        expect(Kontena).to receive(:run!).with(['stack', 'deploy', 'stackname']).and_return(true)
+        subject.run([fixture_path('kontena_v3.yml')])
+      end
+    end
+
+    context 'with a stack including dependencies' do
+
+      it 'installs all the dependencies' do
+        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_1", "--parent-name", "deptest", '-v', 'dep_1.dep_var=1', '--no-deploy', fixture_path('stack-with-dependencies-dep-1.yml')])
+        expect(Kontena).to receive(:run!).with(["stack", "install", "-n", "deptest-dep_2", "--parent-name", "deptest", "-v", "dep_var=1", '--no-deploy', fixture_path('stack-with-dependencies-dep-2.yml')])
+        expect(client).to receive(:post).with('grids/test-grid/stacks', hash_including('stack' => 'user/depstack1', 'name' => 'deptest'))
+        subject.run(['-n', 'deptest', '--no-deploy', '-v', 'dep_1.dep_1.dep_var=1', fixture_path('stack-with-dependencies.yml')])
+      end
     end
   end
 end

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

@@ -16,4 +16,48 @@ describe Kontena::Cli::Stacks::ListCommand do
       subject.run([])
     end
   end
+
+  describe '#build_depths' do
+    it 'returns an array of hashes with "depth" field updated' do
+      items = [
+        {
+          'depth' => 0, #stack1 1
+          'name' => 'stack1_d1',
+          'children' => [
+            { 'name' => 'stack2_d2' },
+            { 'name' => 'stack4_d2' }
+          ]
+        },
+        {
+          'depth' => 0,
+          'name' => 'stack2_d2',
+          'children' => [
+            { 'name' => 'stack3_d3' },
+          ]
+        },
+        {
+          'depth' => 0,
+          'name' => 'stack3_d3',
+          'children' => []
+        },
+        {
+          'depth' => 0,
+          'name' => 'stack4_d2',
+          'children' => [
+            { 'name' => 'stack5_d3' }
+          ]
+        },
+        {
+          'depth' => 0,
+          'name' => 'stack5_d3',
+          'children' => []
+        }
+      ].shuffle
+
+      subject.build_depths(items).each do |item|
+        depth_expectation = item['name'].split('_d').last.to_i
+        expect(item['depth']).to eq depth_expectation
+      end
+    end
+  end
 end

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

@@ -14,7 +14,7 @@ describe Kontena::Cli::Stacks::LogsCommand do
       },
     ]
   end
-  
+
   it "shows stack logs" do
     expect(client).to receive(:get).with('stacks/test-grid/test-stack/container_logs', {
       limit: 100,
@@ -25,4 +25,15 @@ describe Kontena::Cli::Stacks::LogsCommand do
     ]
   end
 
+  it "shows stack service logs" do
+    expect(client).to receive(:get).with('grids/test-grid/container_logs', {
+      limit: 100,
+      services: 'test-stack/mysql,test-stack/myapp'
+    }) { { 'logs' => logs } }
+
+    expect{subject.run(['test-stack', 'mysql', 'myapp'])}.to output_lines [
+      "2016-09-07T15:19:04.362690 [test-stack.mysql-1]: mysql log message 1",
+    ]
+  end
+
 end