Merge pull request #3672 from joshcooper/maint/master/PUP-3706-consol…

…e-rendering

(PUP-3706) Render console output using PSON

lib/puppet/network/formats.rb

@@ -151,7 +151,7 @@ def render(datum)
     end
 
     # ...or pretty-print the inspect outcome.
-    return JSON.pretty_generate(datum)
+    return PSON.pretty_generate(datum)
   end
 
   def render_multiple(data)

spec/unit/application/face_base_spec.rb

@@ -325,9 +325,9 @@ class Puppet::Application::FaceBase::Basetest < Puppet::Application::FaceBase
         end
       end
 
-      it "should render a non-trivially-keyed Hash with using pretty printed JSON" do
+      it "should render a non-trivially-keyed Hash with using pretty printed PSON" do
         hash = { [1,2] => 3, [2,3] => 5, [3,4] => 7 }
-        expect(app.render(hash, {})).to eq(JSON.pretty_generate(hash).chomp)
+        expect(app.render(hash, {})).to eq(PSON.pretty_generate(hash).chomp)
       end
 
       it "should render a {String,Numeric}-keyed Hash into a table" do

spec/unit/network/formats_spec.rb

@@ -279,6 +279,12 @@ def to_pson(*args)
       end
     end
 
+    [true, false, nil, Object.new].each do |input|
+      it "renders #{input.class} using PSON" do
+        expect(subject.render(input)).to eq(input.to_pson)
+      end
+    end
+
     [[1, 2], ["one"], [{ 1 => 1 }]].each do |input|
       it "should render #{input.inspect} as one item per line" do
         expect(subject.render(input)).to eq(input.collect { |item| item.to_s + "\n" }.join(''))
@@ -289,9 +295,9 @@ def to_pson(*args)
       expect(subject.render({})).to eq('')
     end
 
-    it "should render a non-trivially-keyed Hash as pretty printed JSON" do
+    it "should render a non-trivially-keyed Hash as pretty printed PSON" do
       hash = { [1,2] => 3, [2,3] => 5, [3,4] => 7 }
-      expect(subject.render(hash)).to eq(JSON.pretty_generate(hash).chomp)
+      expect(subject.render(hash)).to eq(PSON.pretty_generate(hash).chomp)
     end
 
     it "should render a {String,Numeric}-keyed Hash into a table" do