From b0246a240c18a4b0fdb3dfb5106ad205bfa9c9fe Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Tue, 5 Mar 2019 10:09:31 +1100 Subject: [PATCH] feat: remove 'no data' message when there are no rows. --- lib/pact_broker/client/can_i_deploy.rb | 11 ++++++++--- lib/pact_broker/client/matrix/text_formatter.rb | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/pact_broker/client/can_i_deploy.rb b/lib/pact_broker/client/can_i_deploy.rb index 5afab988..1d8c3257 100644 --- a/lib/pact_broker/client/can_i_deploy.rb +++ b/lib/pact_broker/client/can_i_deploy.rb @@ -52,7 +52,7 @@ def create_result(matrix) def success_message(matrix) message = format_matrix(matrix) if format != 'json' - message = 'Computer says yes \o/ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.green(matrix.reason)}" + message = 'Computer says yes \o/ ' + message + "\n\n" + Term::ANSIColor.green(matrix.reason) end message end @@ -60,13 +60,18 @@ def success_message(matrix) def failure_message(matrix) message = format_matrix(matrix) if format != 'json' - message = 'Computer says no ¯\_(ツ)_/¯ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.red(matrix.reason)}" + message = 'Computer says no ¯\_(ツ)_/¯ ' + message + "\n\n" + Term::ANSIColor.red(matrix.reason) end message end def format_matrix(matrix) - Matrix::Formatter.call(matrix, format) + formatted_matrix = Matrix::Formatter.call(matrix, format) + if format != 'json' && formatted_matrix.size > 0 + "\n\n" + formatted_matrix + else + formatted_matrix + end end def format diff --git a/lib/pact_broker/client/matrix/text_formatter.rb b/lib/pact_broker/client/matrix/text_formatter.rb index 83530c16..5b99ae0d 100644 --- a/lib/pact_broker/client/matrix/text_formatter.rb +++ b/lib/pact_broker/client/matrix/text_formatter.rb @@ -16,7 +16,9 @@ class TextFormatter ] def self.call(matrix) - data = matrix[:matrix].collect do | line | + matrix_rows = matrix[:matrix] + return "" if matrix_rows.size == 0 + data = matrix_rows.collect do | line | Line.new( lookup(line, :consumer, :name), lookup(line, :consumer, :version, :number),