Merge branch 'feature/2.7.x/7160-support-json-externally' into 2.7.x

2 files changed, 32 insertions, 8 deletions

diff --git a/lib/puppet/application/face_base.rb b/lib/puppet/application/face_base.rb
index 257d51f75..d28a8af3b 100644
--- a/lib/puppet/application/face_base.rb
+++ b/lib/puppet/application/face_base.rb
@@ -15,8 +15,14 @@ class Puppet::Application::FaceBase < Puppet::Application
     Puppet::Util::Log.level = :info
   end
 
-  option("--render-as FORMAT") do |arg|
-    @render_as = arg.to_sym
+  option("--render-as FORMAT") do |_arg|
+    format = _arg.to_sym
+    unless @render_method = Puppet::Network::FormatHandler.format(format)
+      unless format == :for_humans or format == :json
+        raise ArgumentError, "I don't know how to render '#{format}'"
+      end
+    end
+    @render_as = format
   end
 
   option("--mode RUNMODE", "-r") do |arg|
@@ -38,13 +44,10 @@ class Puppet::Application::FaceBase < Puppet::Application
 
     if format == :for_humans then
       render_for_humans(result)
+    elsif format == :json or @render_method == "to_pson"
+      PSON::pretty_generate(result, :allow_nan => true, :max_nesting => false)
     else
-      render_method = Puppet::Network::FormatHandler.format(format).render_method
-      if render_method == "to_pson"
-        PSON::pretty_generate(result, :allow_nan => true, :max_nesting => false)
-      else
-        result.send(render_method)
-      end
+      result.send(@render_method)
     end
   end
 
diff --git a/spec/unit/application/face_base_spec.rb b/spec/unit/application/face_base_spec.rb
index 7b3a69f61..0c75236f8 100755
--- a/spec/unit/application/face_base_spec.rb
+++ b/spec/unit/application/face_base_spec.rb
@@ -296,5 +296,26 @@ EOT
       app.action.render_as = :for_humans
       app.render("bi-polar?").should == "bi-winning!"
     end
+
+    it "should render JSON when asked for json" do
+      app.action.render_as = :json
+      json = app.render({ :one => 1, :two => 2 })
+      json.should =~ /"one":\s*1\b/
+      json.should =~ /"two":\s*2\b/
+      PSON.parse(json).should == { "one" => 1, "two" => 2 }
+    end
+
+    it "should fail early if asked to render an invalid format" do
+      app.command_line.stubs(:args).returns %w{--render-as interpretive-dance help help}
+      # We shouldn't get here, thanks to the exception, and our expectation on
+      # it, but this helps us fail if that slips up and all. --daniel 2011-04-27
+      Puppet::Face[:help, :current].expects(:help).never
+
+      # ...and this is just annoying.  Thanks, puppet/application.rb.
+      $stderr.expects(:puts).
+        with "Could not parse options: I don't know how to render 'interpretive-dance'"
+
+      expect { app.run }.to exit_with 1
+    end
   end
 end