kontena-cli 1.3.1 → 1.3.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91cdadc1294c3d21ef618f5155c7fc912a9cbac4
-  data.tar.gz: d4f0fdf48bf6ae37dc1e5d9d51bf62a7b52f0bc8
+  metadata.gz: '09dd9aa199b2377f60c7fd461743a5512cc6ad13'
+  data.tar.gz: 81eec9b635ccc3d4207224a9c6c5acefcfb6cc59
 SHA512:
-  metadata.gz: 208dee14f5a5146a1011e45e6fa5b5a9a75d1d5bd996499e1f72004f47c24152df061bb849fb2fa217a6e2826bd328aa3cfb0857007fd2970551848d6414baf7
-  data.tar.gz: 2e86990d5b0dce819a9abbf88a92da9d710456ac8e85bdf7bbd654b2847d8632770c7803e877b04d1aa2c86858cc94dc6378198e4e0c093f8a61feacdadcf555
+  metadata.gz: 27ba045edeccbb29fa363edfc57e77ddd7f7adea2db57f1842e4735a6145a16d22040ac078363e78d81542e03a840192ea176b54e3bbed5e08545e322a83d980
+  data.tar.gz: '0328929022b14facc2ccd0642345c218411124192dca88405a5e95437914ee0411d87f41bddc6a9e22839fb8957586da89eccbc9e3ec6000910f5379d13b2f85'

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2.rc1

data/lib/kontena/cli/containers/exec_command.rb

@@ -29,7 +29,7 @@ module Kontena::Cli::Containers
       end
       ws.on :open do
         ws.text(cmd)
-        stdin_reader = self.stream_stdin_to_ws(ws) if self.interactive?
+        stdin_reader = self.stream_stdin_to_ws(ws, tty: self.tty?) if self.interactive?
       end
       ws.on :close do |e|
         if e.reason.include?('code: 404')

data/lib/kontena/cli/helpers/exec_helper.rb

@@ -5,10 +5,10 @@ module Kontena::Cli::Helpers
 
     # @param [WebSocket::Client::Simple] ws
     # @return [Thread]
-    def stream_stdin_to_ws(ws)
+    def stream_stdin_to_ws(ws, tty: nil)
       require 'io/console'
       Thread.new {
-        if STDIN.tty?
+        if tty
           STDIN.raw {
             while char = STDIN.readpartial(1024)
               ws.text(JSON.dump({ stdin: char }))

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

@@ -70,7 +70,7 @@ module Kontena::Cli::Nodes
           end
         end
 
-        grid_nodes.sort { |n| n['node_number'] }
+        grid_nodes.sort_by { |n| n['node_number'] }
       end
     end
 

data/lib/kontena/cli/services/exec_command.rb

@@ -131,7 +131,7 @@ module Kontena::Cli::Services
       end
       ws.on :open do
         ws.text(cmd)
-        stdin_stream = self.stream_stdin_to_ws(ws)
+        stdin_stream = self.stream_stdin_to_ws(ws, tty: self.tty?)
       end
       ws.on :close do |e|
         if e.code != 1000

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

@@ -7,6 +7,8 @@ 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
@@ -133,7 +135,7 @@ describe Kontena::Cli::Nodes::ListCommand do
                 {
                   "connected" => false,
                   "name" => nil,
-                  "node_number" => nil,
+                  "node_number" => 3,
                   "initial_member" => false,
                   'agent_version' => nil,
                 },
@@ -146,7 +148,7 @@ describe Kontena::Cli::Nodes::ListCommand 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', '-', '-'],
+            [':offline (initializing)', 'offline', '-', '-'], # missing agent_version
           ]
         end
       end

data/spec/kontena/cli/table_generator_spec.rb

@@ -5,6 +5,10 @@ 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/support/output_helpers.rb

@@ -32,11 +32,13 @@ module OutputHelpers
     supports_block_expectations
 
     match do |block|
+      @errors = []
+
       @expected = lines
       begin
         @real = CaptureStdoutLines.capture(block)
       rescue Exception => error
-        @error = error
+        @errors = [error.to_s]
         return false
       end
 
@@ -52,23 +54,27 @@ module OutputHelpers
         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!
+          fields = real.split(/\s{2,}/)
+          unless values_match?(fields, expected)
+            @errors << [
+              "on line #{line}:",
+              " expected: #{expected}",
+              " received: #{fields}",
+            ].join("\n")
           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")}"
+        @errors << [
+          "expected #{@expected.size} lines but got #{@real.size} lines instead:",
+          " Expected:", @expected.map{|l| l.inspect},
+          " Received:", @real.map{|l| l.split(/\s{2,}/).inspect},
+        ].join("\n")
       end
-      @error.nil?
+      @errors.empty?
     end
 
     failure_message do |block|
-      @error
+      @errors.join "\n"
     end
 
     chain :with_header do |header|
@@ -78,10 +84,6 @@ module OutputHelpers
     chain :without_header do
       @no_header = true
     end
-
-    failure_message do |block|
-      return @error
-    end
   end
 
   matcher :output_lines do |lines|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2.rc1
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -682,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