openvox 8.30.0 → 8.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf52c4710584e363c52de7ad3edcf6ee510cfc3117fa3bf87aa1e082f33ca56
-  data.tar.gz: 1a2c01a5f3fe5fc187acc86b98638e44ae9840ff8d7f546f2c8ebf3d31739043
+  metadata.gz: ece318da56b45d387a1226f12d25f99701b1aec5c8bd24c14bfe56db28b9e664
+  data.tar.gz: a4b801c632d5c9299c7d292184f184aa153372f5c9e6a8b695a43a56d7affa76
 SHA512:
-  metadata.gz: 34a0255bb2676b55da6ea8a5059074f25b578f2f70d8ed0cbf008e4ab0e30b8826a69a83688c6a8eea52c764b598edb731019eac55cb36b95f42422a40dcd9d7
-  data.tar.gz: 6d7d4d889feb3b7495f2674c8cf1a232e03c6b7b49fde5cde13ab84062378d24069c087b0f1049a405e4551ae6999642c574ea1b55a137262ffe94fdc931bc04
+  metadata.gz: 317ad75eebd895d0f718250404861d3090a32569a73b4ca8afe3f09f1ce3440399d99bf0b36eb4199e364f9ffeb592a82cac37ffae59ec0c21d943eb467fcfab
+  data.tar.gz: 4b968c2474e46628e7e06d9937de4d4e7cb3738436c3353491fd9ba2b2ef2ea6624215a9c6e0bfc0a9e8599f0f486f86cd6729878107b113952adef2e16a2123

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [8.31.0](https://github.com/openvoxproject/openvox/tree/8.31.0) (2026-10-12)
+
+[Full Changelog](https://github.com/openvoxproject/openvox/compare/8.30.0...8.31.0)
+
+**Implemented enhancements:**
+
+- \[Backport 8.x\] Port Puppet::Util::Json to the json 3 API [\#721](https://github.com/OpenVoxProject/openvox/pull/721) ([miharp](https://github.com/miharp))
+
+**Merged pull requests:**
+
+- Promote puppet-runtime 2026.10.12.2 into 8.x [\#723](https://github.com/OpenVoxProject/openvox/pull/723) ([OpenVoxProjectBot](https://github.com/OpenVoxProjectBot))
+
 ## [8.30.0](https://github.com/openvoxproject/openvox/tree/8.30.0) (2026-10-07)
 
 [Full Changelog](https://github.com/openvoxproject/openvox/compare/8.29.0...8.30.0)

data/Gemfile

@@ -77,7 +77,7 @@ group(:packaging) do
     gem 'vanagon', *location_for(ENV['VANAGON_LOCATION'] || 'https://github.com/openvoxproject/vanagon#main')
   end
   gem 'artifactory'
-  gem 'json', '< 3'
+  gem 'json', '< 4'
   gem 'octokit'
 end
 

data/lib/puppet/face/epp.rb

@@ -384,7 +384,7 @@ Puppet::Face.define(:epp, '0.0.1') do
         pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
         case fmt
         when 'json'
-          options[:pretty] ? JSON.pretty_unparse(pn.to_data) : JSON.dump(pn.to_data)
+          options[:pretty] ? JSON.pretty_generate(pn.to_data) : JSON.dump(pn.to_data)
         else
           pn.format(options[:pretty] ? Puppet::Pops::PN::Indent.new('  ') : nil, output)
         end

data/lib/puppet/face/parser.rb

@@ -194,7 +194,7 @@ Puppet::Face.define(:parser, '0.0.1') do
         pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
         case fmt
         when 'json'
-          options[:pretty] ? JSON.pretty_unparse(pn.to_data) : JSON.dump(pn.to_data)
+          options[:pretty] ? JSON.pretty_generate(pn.to_data) : JSON.dump(pn.to_data)
         else
           pn.format(options[:pretty] ? Puppet::Pops::PN::Indent.new('  ') : nil, output)
         end

data/lib/puppet/pal/json_catalog_encoder.rb

@@ -58,7 +58,7 @@ class JsonCatalogEncoder
     r = possibly_filtered_catalog.resource(type, title)
     return nil if r.nil?
 
-    r.to_data_hash.to_json(:pretty => pretty)
+    Puppet::Util::Json.dump(r.to_data_hash, :pretty => pretty)
   end
 
   # Applies a filter for virtual resources and returns filtered catalog

data/lib/puppet/util/json.rb

@@ -18,6 +18,14 @@ module Puppet::Util
 
     require 'json'
 
+    # Generator options equivalent to the `JSON::PRETTY_STATE_PROTOTYPE`
+    # that json 2.x provided and json 3 removed.
+    PRETTY_OPTIONS = { :indent => '  ', :space => ' ', :object_nl => "\n", :array_nl => "\n" }.freeze
+
+    # Generator options that json 3 rejects as unknown. `quirks_mode` has been
+    # a no-op since json 2.0, when quirks mode became the only mode.
+    OBSOLETE_DUMP_OPTIONS = [:quirks_mode].freeze
+
     # Load the content from a file as JSON if
     # contents are in valid format. This method does not
     # raise error but returns `nil` when invalid file is
@@ -41,16 +49,20 @@ module Puppet::Util
     def self.load(string, options = {})
       string = string.read if string.respond_to?(:read)
 
+      options = options.dup
       options[:symbolize_names] = true if options.delete(:symbolize_keys)
-      ::JSON.parse(string, options)
+      # json 3 only accepts parser options as keyword arguments
+      ::JSON.parse(string, **options)
     rescue JSON::ParserError => e
       raise Puppet::Util::Json::ParseError.build(e, string)
     end
 
     def self.dump(object, options = {})
       # Options is a state when we're being called recursively
-      if !options.is_a?(JSON::State) && options.delete(:pretty)
-        options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h)
+      unless options.is_a?(JSON::State)
+        options = options.dup
+        OBSOLETE_DUMP_OPTIONS.each { |key| options.delete(key) }
+        options.merge!(PRETTY_OPTIONS) if options.delete(:pretty)
       end
       object.to_json(options)
     end

data/lib/puppet/version.rb

@@ -8,7 +8,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '8.30.0'
+  PUPPETVERSION = '8.31.0'
   IMPLEMENTATION = 'openvox'
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openvox
 version: !ruby/object:Gem::Version
-  version: 8.30.0
+  version: 8.31.0
 platform: ruby
 authors:
 - OpenVox Project