openvox 8.29.0 → 9.0.0.pre.alpha2

data/lib/puppet/util/rdoc.rb

@@ -16,12 +16,9 @@ module Puppet::Util::RDoc
 
     r = RDoc::RDoc.new
 
-    # Documentation is rendered by RDoc's default generator using our custom
-    # parser. The historical custom "puppet" generator and its HTML template
-    # targeted RDoc 1.x and could not be loaded under any supported RDoc; the
-    # template also carried a CC-BY-1.0 license, which is incompatible with
-    # the Debian Free Software Guidelines. Both were removed.
-    options = ["--quiet",
+    # specify our own format & where to output
+    options = ["--fmt", "puppet",
+               "--quiet",
                "--exclude", "/modules/[^/]*/spec/.*$",
                "--exclude", "/modules/[^/]*/files/.*$",
                "--exclude", "/modules/[^/]*/tests/.*$",

data/lib/puppet/util/selinux.rb

@@ -18,9 +18,6 @@ module Puppet::Util::SELinux
   S_IFDIR = 0o040000
   S_IFLNK = 0o120000
 
-  @@mounts_cache = nil
-  @@mounts_mtime = nil
-
   def self.selinux_support?
     return false unless defined?(Selinux)
     if Selinux.is_selinux_enabled == 1
@@ -262,16 +259,6 @@ module Puppet::Util::SELinux
 
   # Internal helper function to read and parse /proc/mounts
   def read_mounts
-    current_mtime = begin
-      File.mtime('/proc/mounts')
-    rescue Errno::ENOENT, Errno::ENOTDIR
-      nil
-    end
-
-    if @@mounts_cache && current_mtime && @@mounts_mtime == current_mtime
-      return @@mounts_cache
-    end
-
     mounts = ''.dup
     begin
       if File.method_defined? "read_nonblock"
@@ -305,9 +292,7 @@ module Puppet::Util::SELinux
 
       mntpoint[params[1]] = params[2]
     end
-
-    @@mounts_mtime = current_mtime
-    @@mounts_cache = mntpoint
+    mntpoint
   end
 
   # Internal helper function to return which type of filesystem a given file

data/lib/puppet/util.rb

@@ -523,11 +523,12 @@ module Util
 
   module_function :thinmark
 
-  PUPPET_STACK_INSERTION_FRAME = if RUBY_VERSION >= '3.4'
-                                   /.*puppet_stack\.rb.*in.*'Puppet::Pops::PuppetStack\.stack'/
-                                 else
-                                   /.*puppet_stack\.rb.*in.*`stack'/
-                                 end
+  # Matches the frame where Puppet::Pops::PuppetStack.stack appears in a Ruby
+  # backtrace. The format varies by Ruby version and implementation:
+  #   Ruby 3.3:  in `stack'
+  #   Ruby 3.4+: in 'Puppet::Pops::PuppetStack.stack'  (qualified for module method)
+  #   JRuby 10+: in 'stack'                            (unqualified)
+  PUPPET_STACK_INSERTION_FRAME = /puppet_stack\.rb.*in ['`](?:Puppet::Pops::PuppetStack\.)?stack'/
 
   # utility method to get the current call stack and format it to a human-readable string (which some IDEs/editors
   # will recognize as links to the line numbers in the trace)

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.29.0'
+  PUPPETVERSION = '9.0.0-alpha2'
   IMPLEMENTATION = 'openvox'
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openvox
 version: !ruby/object:Gem::Version
-  version: 8.29.0
+  version: 9.0.0.pre.alpha2
 platform: ruby
 authors:
 - OpenVox Project
@@ -143,22 +143,16 @@ dependencies:
   name: openfact
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -1263,6 +1257,8 @@ files:
 - lib/puppet/util/psych_support.rb
 - lib/puppet/util/rdoc.rb
 - lib/puppet/util/rdoc/code_objects.rb
+- lib/puppet/util/rdoc/generators/puppet_generator.rb
+- lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
 - lib/puppet/util/rdoc/parser.rb
 - lib/puppet/util/rdoc/parser/puppet_parser_core.rb
 - lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb
@@ -1370,7 +1366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.10
 specification_version: 4
 summary: OpenVox, a community implementation of Puppet -- an automated configuration
   management tool