openvox 9.0.0.pre.beta2 → 9.0.0.pre.rc1

data/lib/puppet/util/ldap/generator.rb

@@ -31,8 +31,6 @@ class Puppet::Util::Ldap::Generator
   def source
     if @source
       @source.to_s
-    else
-      nil
     end
   end
 

data/lib/puppet/util/network_device/transport/base.rb

@@ -11,11 +11,9 @@ class Puppet::Util::NetworkDevice::Transport::Base
     @timeout = 10
   end
 
-  def send(cmd)
-  end
+  def send(cmd); end
 
-  def expect(prompt)
-  end
+  def expect(prompt); end
 
   def command(cmd, options = {})
     send(cmd)

data/lib/puppet/util/rdoc/code_objects.rb

@@ -40,7 +40,7 @@ module RDoc
     def add_plugin(plugin)
       name = plugin.name
       type = plugin.type
-      meth = AnyMethod.new("*args", name)
+      meth = AnyMethod.new(name)
       meth.params = "(*args)"
       meth.visibility = :public
       meth.document_self = true

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -13,8 +13,9 @@ module RDoc::PuppetParserCore
     end
   end
 
-  # called with the top level file
-  def initialize(top_level, file_name, body, options, stats)
+  # RDoc 8 passes (top_level, content, options, stats).
+  def initialize(top_level, _body, options, stats)
+    file_name = top_level.absolute_name
     @options = options
     @stats   = stats
     @input_file_name = file_name

data/lib/puppet/util/selinux.rb

@@ -18,6 +18,9 @@ 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
@@ -259,6 +262,16 @@ 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"
@@ -292,7 +305,9 @@ module Puppet::Util::SELinux
 
       mntpoint[params[1]] = params[2]
     end
-    mntpoint
+
+    @@mounts_mtime = current_mtime
+    @@mounts_cache = mntpoint
   end
 
   # Internal helper function to return which type of filesystem a given file

data/lib/puppet/util/symbolic_file_mode.rb

@@ -5,9 +5,9 @@ require_relative '../../puppet/util'
 module Puppet
 module Util
 module SymbolicFileMode
-  SetUIDBit = ReadBit  = 4
+  SetUIDBit = ReadBit = 4
   SetGIDBit = WriteBit = 2
-  StickyBit = ExecBit  = 1
+  StickyBit = ExecBit = 1
   SymbolicMode = { 'x' => ExecBit, 'w' => WriteBit, 'r' => ReadBit }
   SymbolicSpecialToBit = {
     't' => { 'u' => StickyBit, 'g' => StickyBit, 'o' => StickyBit },

data/lib/puppet/util/windows/file.rb

@@ -127,7 +127,6 @@ module Puppet::Util::Windows::File
   INVALID_HANDLE_VALUE = FFI::Pointer.new(-1).address
   def self.create_file(file_name, desired_access, share_mode, security_attributes,
                        creation_disposition, flags_and_attributes, template_file_handle)
-
     result = CreateFileW(wide_string(file_name.to_s),
                          desired_access, share_mode, security_attributes, creation_disposition,
                          flags_and_attributes, template_file_handle)

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 = '9.0.0-beta2'
+  PUPPETVERSION = '9.0.0-rc1'
   IMPLEMENTATION = 'openvox'
 
   ##

data/tasks/vox.rake

@@ -9,8 +9,8 @@ namespace :vox do
     puts "Setting version to #{version}"
 
     data = File.read('lib/puppet/version.rb')
-    new_data = data.sub(/PUPPETVERSION = '\d+\.\d+\.\d+(\.rc\d+)?'/, "PUPPETVERSION = '#{version}'")
-    warn 'Failed to update version in lib/puppet/version.rb' if data == new_data
+    new_data = data.sub(/PUPPETVERSION = '\d+\.\d+\.\d+(-(alpha|beta|rc)\d+)?'/, "PUPPETVERSION = '#{version}'")
+    fail 'Failed to update version in lib/puppet/version.rb' if data == new_data
 
     File.write('lib/puppet/version.rb', new_data)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openvox
 version: !ruby/object:Gem::Version
-  version: 9.0.0.pre.beta2
+  version: 9.0.0.pre.rc1
 platform: ruby
 authors:
 - OpenVox Project
@@ -241,6 +241,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - Guardfile.example
 - LICENSE
 - README.md