From 6b9b4ea6267b9aef2ec9f6fc290f2d5fd002a62c Mon Sep 17 00:00:00 2001 From: Samuel Beaulieu Date: Wed, 16 Feb 2022 13:07:05 -0600 Subject: [PATCH] (DIO-2700) Vmfloaty should not use the Colorize gem removing cosmetic use of colorize --- lib/vmfloaty.rb | 1 - lib/vmfloaty/utils.rb | 4 ++-- lib/vmfloaty/version.rb | 2 +- spec/vmfloaty/utils_spec.rb | 6 +++--- vmfloaty.gemspec | 1 - 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/vmfloaty.rb b/lib/vmfloaty.rb index 846bf4d..237632b 100644 --- a/lib/vmfloaty.rb +++ b/lib/vmfloaty.rb @@ -2,7 +2,6 @@ require 'rubygems' require 'commander' -require 'colorize' require 'json' require 'pp' require 'uri' diff --git a/lib/vmfloaty/utils.rb b/lib/vmfloaty/utils.rb index bfd4a4a..a24d7c5 100644 --- a/lib/vmfloaty/utils.rb +++ b/lib/vmfloaty/utils.rb @@ -137,7 +137,7 @@ class Utils metadata = [host_data['state'], host_data['template'], duration, *tag_pairs] message = "- #{hostname}.#{host_data['domain']} (#{metadata.join(', ')})".gsub(/^/, ' ' * indent) if host_data['state'] && host_data['state'] == 'destroyed' - output_target.puts message.colorize(:red) + output_target.puts "- DESTROYED #{hostname}.#{host_data['domain']}".gsub(/^/, ' ' * indent) else output_target.puts message end @@ -201,7 +201,7 @@ class Utils rescue StandardError => e FloatyLogger.error "#{name.ljust(width)} #{e.red}" end - puts message.colorize(status_response['status']['ok'] ? :default : :red) + puts message when 'NonstandardPooler' pools = status_response pools.delete 'ok' diff --git a/lib/vmfloaty/version.rb b/lib/vmfloaty/version.rb index fd1b9c7..119c4c5 100644 --- a/lib/vmfloaty/version.rb +++ b/lib/vmfloaty/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class Vmfloaty - VERSION = '1.5.0' + VERSION = '1.6.0' end diff --git a/spec/vmfloaty/utils_spec.rb b/spec/vmfloaty/utils_spec.rb index bade876..a567b0c 100644 --- a/spec/vmfloaty/utils_spec.rb +++ b/spec/vmfloaty/utils_spec.rb @@ -466,13 +466,13 @@ describe Utils do subject end - it 'prints in red when destroyed' do + it 'prints DESTROYED and hostname when destroyed' do fallback = { 'vmpooler_fallback' => 'vmpooler' } service.config.merge! fallback response_body_vmpooler[fqdn_hostname]['state'] = 'destroyed' - default_output_second_line_red = " - #{fqdn} (destroyed, #{template}, 7.67/48 hours, user: bob, role: agent)".red + default_output_second_line = " - DESTROYED #{fqdn}" expect($stdout).to receive(:puts).with(default_output_first_line) - expect($stdout).to receive(:puts).with(default_output_second_line_red) + expect($stdout).to receive(:puts).with(default_output_second_line) subject end diff --git a/vmfloaty.gemspec b/vmfloaty.gemspec index c79a040..5b15eff 100644 --- a/vmfloaty.gemspec +++ b/vmfloaty.gemspec @@ -24,7 +24,6 @@ Gem::Specification.new do |s| s.test_files = Dir['spec/**/*'] s.require_path = 'lib' - s.add_dependency 'colorize', '~> 0.8.1' s.add_dependency 'commander', '>= 4.4.3', '< 4.7.0' s.add_dependency 'faraday', '~> 1.5', '>= 1.5.1' end