(#7329) Consistent naming for rendering formats and hooks.

We refer to rendering formats pretty consistently as `json`, `yaml`, `s`, and
so forth; unqualified names.

On the other hand, we refer to the rendering hooks *mostly* as `to_*`, except
the `:for_humans` and `:json` formats.  Which is kind of confusing because of
the internal inconsistency, and because it doesn't match the public name.

Fix the code to resolve both, so the `to_*` format still works, but we mostly
expect to use the `*` version, to match public expectation.

2 files changed, 14 insertions, 0 deletions

diff --git a/spec/lib/puppet/face/basetest.rb b/spec/lib/puppet/face/basetest.rb
index 41a4ef3f9..9398f5b2d 100755
--- a/spec/lib/puppet/face/basetest.rb
+++ b/spec/lib/puppet/face/basetest.rb
@@ -32,4 +32,10 @@ Puppet::Face.define(:basetest, '0.0.1') do
     summary "just raises an exception"
     when_invoked do |options| raise ArgumentError, "your failure" end
   end
+
+  action :with_s_rendering_hook do
+    summary "has a rendering hook for 's'"
+    when_invoked do |options| "this is not the hook you are looking for" end
+    when_rendering :s do |value| "you invoked the 's' rendering hook" end
+  end
 end
diff --git a/spec/unit/application/face_base_spec.rb b/spec/unit/application/face_base_spec.rb
index d8c970157..133e6b2e9 100755
--- a/spec/unit/application/face_base_spec.rb
+++ b/spec/unit/application/face_base_spec.rb
@@ -319,5 +319,13 @@ EOT
         expect { app.run }.to exit_with 0
       }.to have_printed(/--- 3/)
     end
+
+    it "should invoke when_rendering hook 's' when asked to render-as 's'" do
+      app.command_line.stubs(:args).returns %w{with_s_rendering_hook --render-as s}
+      app.action = app.face.get_action(:with_s_rendering_hook)
+      expect {
+        expect { app.run }.to exit_with 0
+      }.to have_printed(/you invoked the 's' rendering hook/)
+    end
   end
 end