Merge pull request acidprime#14 from raphink/dev/puppet4

Canonicalize Puppet 4 catalogs

Author: acidprime

lib/puppet/catalog-diff/differ.rb

@@ -40,6 +40,12 @@ def diff(options = {})
           tmp = Marshal.load(File.read(r))
         when '.pson'
           tmp = PSON.load(File.read(r))
+          unless tmp.respond_to? :version
+            tmp = PSON.load({
+              'document_type' => 'Catalog',
+              'data' => PSON.load(File.read(r)),
+            }.to_pson)
+          end
         when '.json'
           tmp = PSON.load(File.read(r))
 	else