lib/chef/knife/topo_bootstrap.rb in knife-topo-2.0.3 vs lib/chef/knife/topo_bootstrap.rb in knife-topo-2.0.4
- old
+ new
@@ -45,11 +45,11 @@
description: 'Whether to overwrite existing nodes',
boolean: true
)
# Make the base bootstrap options available on topo bootstrap
- self.options = (Chef::Knife::Bootstrap.options).merge(TopoBootstrap.options)
+ self.options = Chef::Knife::Bootstrap.options.merge(TopoBootstrap.options)
attr_accessor :msgs, :results
def bootstrap_msgs
{
@@ -118,24 +118,24 @@
end
# rubocop:enable Metrics/MethodLength
# Report is used by create, update and bootstrap commands
def report
- if @topo['nodes'].length > 0
+ if @topo['nodes'].empty?
+ ui.info 'No nodes found'
+ else
report_msg(:bootstrapped, :info, false) if @bootstrap
report_msg(:skipped, :info, true)
report_msg(:skipped_ssh, :info, true)
report_msg(:existed, :info, true)
report_msg(:failed, :warn, true) if @bootstrap
- else
- ui.info 'No nodes found'
end
ui.info("Topology: #{@topo.display_info}")
end
def report_msg(state, level, only_non_zero = true)
nodes = @results[state]
- return if only_non_zero && nodes.length == 0
+ return if only_non_zero && nodes.empty?
ui.send(level, @msgs[state] %
{ num: nodes.length, list: nodes.join(', ') })
end
end
end