kontena-cli 1.3.0.pre1 → 1.3.0.pre2

data/spec/kontena/cli/table_generator_spec.rb

@@ -0,0 +1,118 @@
+require 'kontena/cli/table_generator'
+require 'kontena/command'
+require 'kontena/cli/common'
+
+describe Kontena::Cli::TableGenerator do
+  let(:data) { [{'a' => 'a1', 'b' => 'b1', 'c' => 'c1'}, {'a' => 'a2', 'b' => 'b2', 'c' => 'c2'}] }
+
+  context Kontena::Cli::TableGenerator::Helper do
+    let(:klass) { Class.new(Kontena::Command) }
+
+    it 'adds the quiet option' do
+      klass.include(described_class)
+      expect(klass.recognised_options.first.flag?).to be_truthy
+      expect(klass.recognised_options.first.long_switch).to eq '--quiet'
+      expect(klass.recognised_options.first.switches).to include '-q'
+      expect(klass.recognised_options.first.description).to match (/identifying column/)
+    end
+
+    context 'with the helper included' do
+
+      let(:subject) { klass.new([]) }
+
+      before(:each) do
+        klass.include(Kontena::Cli::Common)
+        klass.include(described_class)
+      end
+
+      it 'responds to print_table' do
+        expect(subject).to respond_to(:print_table)
+      end
+
+      it 'responds to generate_table' do
+        expect(subject).to respond_to(:print_table)
+      end
+
+      context '#print_table' do
+
+        include OutputHelpers
+
+        it 'outputs a table from an array and a list of fields' do
+          expect{subject.print_table(data, ['a', 'b'])}.to output_table([
+            ['a1', 'b1'],
+            ['a2', 'b2']
+          ]).with_header(['A', 'B'])
+        end
+
+        it 'outputs a table without a header when only one field' do
+          expect{subject.print_table(data, ['a'])}.to output_table([
+            ['a1'],
+            ['a2']
+          ]).without_header
+        end
+
+        it 'tries to read the fields from #fields method when none given' do
+          expect(subject).to receive(:fields).and_return(['a', 'b'])
+          expect{subject.print_table(data)}.to output_table([
+            ['a1', 'b1'],
+            ['a2', 'b2']
+          ]).with_header(['A', 'B'])
+        end
+
+        it 'tries to read render options from #render_options method' do
+          expect(subject).to receive(:render_options).and_return(mode: :ascii, border: { separator: '|' })
+          expect{subject.print_table(data)}.to output(/\|/).to_stdout
+        end
+      end
+    end
+  end
+
+  let(:klass) { described_class }
+
+  context 'with an array of hashes' do
+    context 'given a list of fields' do
+      it 'collects the fields listed from the hashes and capitalizes the field names' do
+        subject = klass.new(data, ['a', 'b'])
+        expect(subject).to receive(:create_table).with(['A', 'B'], [['a1', 'b1'], ['a2', 'b2']]).and_return(true)
+        subject.table
+      end
+    end
+
+    context 'given no list of fields' do
+      it 'uses all fields found in the data and creates field names for the header' do
+        data.each { |hash| expect(hash).to receive(:keys).and_call_original }
+        subject = klass.new(data)
+        expect(subject).to receive(:create_table).with(['A', 'B', 'C'], [['a1', 'b1', 'c1'], ['a2', 'b2', 'c2']]).and_return(true)
+        subject.table
+      end
+    end
+
+    context 'given one field' do
+      it 'creates a table of one column without a header (quiet mode)' do
+        subject = klass.new(data, 'a')
+        expect(subject).to receive(:create_table).with(nil, [['a1'], ['a2']]).and_return(true)
+        subject.table
+      end
+    end
+
+    context 'given a field mapping' do
+      it 'uses the field keys as header titles and values as data field keys' do
+        subject = klass.new(data, { 'First' => 'a', 'Third' => 'c' })
+        expect(subject).to receive(:create_table).with(['First', 'Third'], [['a1', 'c1'], ['a2', 'c2']]).and_return(true)
+        subject.table
+      end
+    end
+
+    context 'row formatting' do
+      it 'calls the format proc for all rows of data' do
+        format_proc = proc do |row|
+          row['d'] = [row['b'], row['c']].join('/')
+        end
+        expect(format_proc).to receive(:call).exactly(2).times.and_call_original
+        subject = klass.new(data, ['a', 'd'], row_format_proc: format_proc)
+        expect(subject).to receive(:create_table).with(['A', 'D'], [['a1', 'b1/c1'], ['a2', 'b2/c2']]).and_return(true)
+        subject.table
+      end
+    end
+  end
+end

data/spec/kontena/cli/version_command_spec.rb

@@ -3,7 +3,7 @@ require "kontena/cli/version_command"
 describe Kontena::Cli::VersionCommand do
 
   include ClientHelpers
-  
+
   let :http_client do
     double(:http_client)
   end
@@ -13,7 +13,7 @@ describe Kontena::Cli::VersionCommand do
       expect(client).to receive(:http_client).and_return(http_client)
       expect(http_client).to receive(:get).with(path: '/').and_return(double(body: '{"version": "0.1"}'))
 
-      expect { subject.run([]) }.to output("cli: #{Kontena::Cli::VERSION}\nmaster: 0.1 (someurl)\n").to_stdout
+      expect { subject.run([]) }.to output("cli: #{Kontena::Cli::VERSION}\nmaster: 0.1 (#{subject.current_master.url})\n").to_stdout
     end
   end
 end

data/spec/kontena/client_spec.rb

@@ -246,6 +246,7 @@ describe Kontena::Client do
             },
             double(:response,
               status: 418,
+              path: '/foo',
               reason_phrase: "I'm a teapot",
               headers: {
                 'Content-Type' => 'short/stout',
@@ -257,7 +258,7 @@ describe Kontena::Client do
       end
 
       it "raises StandardError with the status phrase" do
-        expect{subject.request(http_method: :brew, path: 'coffee')}.to raise_error(Kontena::Errors::StandardError, "I'm a teapot")
+        expect{subject.request(http_method: :brew, path: 'coffee')}.to raise_error(Kontena::Errors::StandardError, /I'm a teapot/)
       end
     end
 
@@ -272,7 +273,7 @@ describe Kontena::Client do
       end
 
       it "raises StandardError with the server error message" do
-        expect{subject.post('print', { 'code' => "8A/HyA==" })}.to raise_error(Kontena::Errors::StandardError, "lp0 (printer) on fire")
+        expect{subject.post('print', { 'code' => "8A/HyA==" })}.to raise_error(Kontena::Errors::StandardError, /lp0 \(printer\) on fire/)
       end
     end
 
@@ -290,7 +291,7 @@ describe Kontena::Client do
       end
 
       it "raises StandardError with the server error message" do
-        expect{subject.get('test')}.to raise_error(Kontena::Errors::StandardError, "You are wrong")
+        expect{subject.get('test')}.to raise_error(Kontena::Errors::StandardError, /You are wrong/)
       end
     end
 

data/spec/support/client_helpers.rb

@@ -21,8 +21,8 @@ module ClientHelpers
       {'current_server' => 'alias',
        'current_account' => 'kontena',
        'servers' => [
-           {'name' => 'some_master', 'url' => 'some_master'},
-           {'name' => 'alias', 'url' => 'someurl', 'token' => token, 'account' => 'master', 'grid' => current_grid},
+           {'name' => 'some_master', 'url' => 'http://someurl.example.com'},
+           {'name' => 'alias', 'url' => 'http://someurl.example.com/', 'token' => token, 'account' => 'master', 'grid' => current_grid},
        ]
       }
     end
@@ -31,7 +31,7 @@ module ClientHelpers
       RSpec::Mocks.space.proxy_for(File).reset
       allow(subject).to receive(:client).and_return(client)
       allow(subject).to receive(:current_grid).and_return(current_grid)
-      allow(File).to receive(:exist?).with(File.join(Dir.home, '.kontena/certs/.pem')).and_return(false)
+      allow(File).to receive(:exist?).with(File.join(Dir.home, '.kontena/certs/someurl.example.com.pem')).and_return(false)
       allow(File).to receive(:exist?).with(File.join(Dir.home, '.kontena_client.json')).and_return(true)
       allow(File).to receive(:readable?).with(File.join(Dir.home, '.kontena_client.json')).and_return(true)
       allow(File).to receive(:read).and_call_original

data/spec/support/output_helpers.rb

@@ -5,6 +5,7 @@ module OutputHelpers
     supports_block_expectations
 
     match do |block|
+      @expected = expected
       stdout = lines.flatten.join("\n") + "\n"
 
       begin
@@ -14,7 +15,7 @@ module OutputHelpers
 
         return false
       else
-        return values_match? expected, @return
+        return values_match? @expected, @return
       end
     end
 
@@ -22,7 +23,7 @@ module OutputHelpers
       if @error
         return @error
       else
-        return "expected #{block} to return #{expected}, but returned #{@return}"
+        return "expected #{block} to return #{@expected}, but returned #{@return}"
       end
     end
   end
@@ -31,18 +32,51 @@ module OutputHelpers
     supports_block_expectations
 
     match do |block|
-      stdout = Regexp.new('^' + lines.map{|fields| fields.join('\s+')}.join('\n') + '\n$', Regexp::MULTILINE)
-
-
+      @expected = lines
       begin
-        expect{@return = block.call}.to output(stdout).to_stdout
+        @real = CaptureStdoutLines.capture(block)
       rescue Exception => error
         @error = error
-
         return false
+      end
+
+      if @expected_header
+        @expected.unshift(@expected_header)
+      elsif @no_header
+        nil
       else
-        return true
+        @real.shift
+      end
+
+      if @expected.size == @real.size
+        line = 0
+        @real.zip(@expected) do |real, expected|
+          line += 1
+          error = values_match?(real.split(/\S+/), expected)
+          if error
+            @error ||= ""
+            @error << "\n#{error}"
+            @error.strip!
+          end
+        end
+      else
+        @error = "expected #{@expected.size} lines but got #{@real.size} lines instead:\n"
+        @error += "Expected:\n#{@expected.map(&:inspect).join("\n")}"
+        @error += "Received:\n#{@real.map(&:inspect).join("\n")}"
       end
+      @error.nil?
+    end
+
+    failure_message do |block|
+      @error
+    end
+
+    chain :with_header do |header|
+      @expected_header = header
+    end
+
+    chain :without_header do
+      @no_header = true
     end
 
     failure_message do |block|
@@ -71,4 +105,16 @@ module OutputHelpers
       return @error
     end
   end
+
+  module CaptureStdoutLines
+    def self.capture(block)
+      capture = StringIO.new
+      original = $stdout
+      $stdout = capture
+      block.call
+      capture.string.split(/[\r\n]/)
+    ensure
+      $stdout = original
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre1
+  version: 1.3.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -342,6 +342,8 @@ files:
 - lib/kontena/cli/helpers/health_helper.rb
 - lib/kontena/cli/helpers/log_helper.rb
 - lib/kontena/cli/localhost_web_server.rb
+- lib/kontena/cli/log_formatters/compact.rb
+- lib/kontena/cli/log_formatters/strip_color.rb
 - lib/kontena/cli/logout_command.rb
 - lib/kontena/cli/master/audit_log_command.rb
 - lib/kontena/cli/master/config/export_command.rb
@@ -466,6 +468,7 @@ files:
 - lib/kontena/cli/stacks/yaml/validations.rb
 - lib/kontena/cli/stacks/yaml/validator_v3.rb
 - lib/kontena/cli/subcommand_loader.rb
+- lib/kontena/cli/table_generator.rb
 - lib/kontena/cli/vault/export_command.rb
 - lib/kontena/cli/vault/import_command.rb
 - lib/kontena/cli/vault/list_command.rb
@@ -602,6 +605,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/registry/create_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/events_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
@@ -611,6 +615,7 @@ files:
 - spec/kontena/cli/services/secrets/link_command_spec.rb
 - spec/kontena/cli/services/secrets/unlink_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
+- spec/kontena/cli/services/stats_command_spec.rb
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/stacks/build_command_spec.rb
@@ -633,6 +638,7 @@ files:
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - 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/update_command_spec.rb
@@ -751,6 +757,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/registry/create_spec.rb
 - spec/kontena/cli/services/containers_command_spec.rb
 - spec/kontena/cli/services/events_command_spec.rb
 - spec/kontena/cli/services/exec_command_spec.rb
@@ -760,6 +767,7 @@ test_files:
 - spec/kontena/cli/services/secrets/link_command_spec.rb
 - spec/kontena/cli/services/secrets/unlink_command_spec.rb
 - spec/kontena/cli/services/services_helper_spec.rb
+- spec/kontena/cli/services/stats_command_spec.rb
 - spec/kontena/cli/services/unlink_command_spec.rb
 - spec/kontena/cli/services/update_command_spec.rb
 - spec/kontena/cli/stacks/build_command_spec.rb
@@ -782,6 +790,7 @@ test_files:
 - spec/kontena/cli/stacks/yaml/reader_spec.rb
 - 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/update_command_spec.rb