vendored/puppet/lib/puppet/face/module/uninstall.rb in bolt-0.8.0 vs vendored/puppet/lib/puppet/face/module/uninstall.rb in bolt-0.9.0

@@ -61,21 +61,32 @@
 
     when_invoked do |name, options|
       name = name.gsub('/', '-')
 
       Puppet::ModuleTool.set_option_defaults options
-      Puppet.notice _("Preparing to uninstall '%{name}'") % { name: name } << (options[:version] ? " (#{colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))})" : '') << " ..."
+      message = if options[:version]
+                  module_version = colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))
+                  _("Preparing to uninstall '%{name}' (%{module_version}) ...") % { name: name, module_version: module_version }
+                else
+                  _("Preparing to uninstall '%{name}' ...") % { name: name }
+                end
+      Puppet.notice message
       Puppet::ModuleTool::Applications::Uninstaller.run(name, options)
     end
 
     when_rendering :console do |return_value|
       if return_value[:result] == :failure
         Puppet.err(return_value[:error][:multiline])
         exit 1
       else
         mod = return_value[:affected_modules].first
-        module_version = mod.version ? " (#{colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))})" : ''
-        _("Removed '%{name}'%{module_version} from %{path}") % { name: return_value[:module_name], module_version: module_version, path: mod.modulepath }
+        message = if mod.version
+                    module_version = colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))
+                    _("Removed '%{name}' (%{module_version}) from %{path}") % { name: return_value[:module_name], module_version: module_version, path: mod.modulepath }
+                  else
+                    _("Removed '%{name}' from %{path}") % { name: return_value[:module_name], path: mod.modulepath }
+                  end
+        message
       end
     end
   end
 end