openvox 9.0.0.pre.beta2 → 9.0.0.pre.rc2

data/lib/puppet/pops/types/iterable.rb

@@ -100,8 +100,6 @@ module Puppet::Pops::Types
           Iterator.new(PUnitType::DEFAULT, o.times)
         elsif o > 0
           IntegerRangeIterator.new(PIntegerType.new(0, o - 1))
-        else
-          nil
         end
       when PIntegerType
         # a finite range will always produce at least one element since it's inclusive

data/lib/puppet/pops/types/p_runtime_type.rb

@@ -81,8 +81,6 @@ class PRuntimeType < PAnyType
     if @name_or_pattern.is_a?(Array)
       substituted = puppet_name.sub(*@name_or_pattern)
       substituted == puppet_name ? nil : PRuntimeType.new(@runtime, substituted)
-    else
-      nil
     end
   end
 

data/lib/puppet/pops/types/p_timespan_type.rb

@@ -88,8 +88,6 @@ module Types
         new_min = numeric_from <= o.numeric_from ? numeric_from : o.numeric_from
         new_max = numeric_to >= o.numeric_to ? numeric_to : o.numeric_to
         self.class.new(new_min, new_max)
-      else
-        nil
       end
     end
 
@@ -112,7 +110,7 @@ module Types
         end
 
         dispatch :from_seconds do
-          param           'Variant[Integer,Float]', :seconds
+          param 'Variant[Integer,Float]', :seconds
         end
 
         dispatch :from_string do

data/lib/puppet/pops/types/puppet_object.rb

@@ -23,11 +23,9 @@ module PuppetObject
     t
   end
 
-  def _pcore_all_contents(path, &block)
-  end
+  def _pcore_all_contents(path, &block); end
 
-  def _pcore_contents
-  end
+  def _pcore_contents; end
 
   def _pcore_init_hash
     {}

data/lib/puppet/pops/types/type_acceptor.rb

@@ -13,8 +13,7 @@ module Types
 module TypeAcceptor
   # @param type [PAnyType] the type that we accept a visit from
   # @param guard [RecursionGuard] the guard against self recursion
-  def visit(type, guard)
-  end
+  def visit(type, guard); end
 end
 
 # An acceptor that does nothing

data/lib/puppet/pops/types/type_factory.rb

@@ -268,7 +268,7 @@ module TypeFactory
   # @api public
   #
   def self.regexp(pattern = nil)
-    pattern ?  PRegexpType.new(pattern) : PRegexpType::DEFAULT
+    pattern ? PRegexpType.new(pattern) : PRegexpType::DEFAULT
   end
 
   def self.pattern(*regular_expressions)

data/lib/puppet/pops/types/types.rb

@@ -182,8 +182,7 @@ class PAnyType < TypedModelObject
   # @param originator [PTypeAliasType] the starting point for the check
   # @raise Puppet::Error if an illegal self recursion is detected
   # @api private
-  def check_self_recursion(originator)
-  end
+  def check_self_recursion(originator); end
 
   # Generalizes value specific types. Types that are not value specific will return `self` otherwise
   # the generalized type is returned.
@@ -521,8 +520,6 @@ class PTypeType < PTypeWithContainedType
       # @type describes the element type perfectly since the iteration is made over the
       # specified range.
       @type.finite_range? ? PIterableType.new(@type) : nil
-    else
-      nil
     end
   end
 
@@ -1050,8 +1047,6 @@ class PIntegerType < PNumericType
       min = @from <= o.numeric_from ? @from : o.numeric_from
       max = @to >= o.numeric_to ? @to : o.numeric_to
       PIntegerType.new(min, max)
-    else
-      nil
     end
   end
 
@@ -1224,8 +1219,6 @@ class PFloatType < PNumericType
       min = @from <= o.from ? @from : o.from
       max = @to >= o.to ? @to : o.to
       PFloatType.new(min, max)
-    else
-      nil
     end
   end
 

data/lib/puppet/pops/utils.rb

@@ -30,8 +30,6 @@ module Utils
         fp_value = Float(match[2])
         if fp_value != Float::INFINITY
           match[1] == '-' ? -fp_value : fp_value
-        else
-          nil
         end
       end
     end
@@ -69,8 +67,6 @@ module Utils
     when Numeric
       # Impossible to calculate radix, assume decimal
       [o, 10]
-    else
-      nil
     end
   rescue ArgumentError
     nil
@@ -94,8 +90,6 @@ module Utils
       end
     when Numeric
       o
-    else
-      nil
     end
   rescue ArgumentError
     nil

data/lib/puppet/pops/validation/checker4_0.rb

@@ -185,8 +185,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   #---CHECKS
 
-  def check_Object(o)
-  end
+  def check_Object(o); end
 
   def check_Factory(o)
     check(o.model)
@@ -753,8 +752,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   # other names). This means that (if the lexer/parser so chooses) a QualifiedName
   # can be anything when it represents a Bare Word and evaluates to a String.
   #
-  def check_QualifiedName(o)
-  end
+  def check_QualifiedName(o); end
 
   # Checks that the value is a valid UpperCaseWord (a CLASSREF), and optionally if it contains a hypen.
   # DOH: QualifiedReferences are created with LOWER CASE NAMES at parse time
@@ -1146,8 +1144,6 @@ class Checker4_0 < Evaluator::LiteralEvaluator
       o.value
     when Model::QualifiedReference
       o.value
-    else
-      nil
     end
   end
 end

data/lib/puppet/pops/visitor.rb

@@ -23,7 +23,7 @@ class Visitor
     @message = message
     @min_args = min_args
     @max_args = max_args
-    @cache = Hash.new
+    @cache = {}
   end
 
   # Visit the configured receiver

data/lib/puppet/property/ensure.rb

@@ -34,8 +34,6 @@ class Puppet::Property::Ensure < Puppet::Property
     defaultto do
       if @resource.managed?
         :present
-      else
-        nil
       end
     end
 
@@ -100,8 +98,6 @@ class Puppet::Property::Ensure < Puppet::Property
   defaultto do
     if @resource.managed?
       :present
-    else
-      nil
     end
   end
 end

data/lib/puppet/provider/nameservice.rb

@@ -115,8 +115,6 @@ class Puppet::Provider::NameService < Puppet::Provider
         value
       elsif respond_to?("autogen_#{field}")
         send("autogen_#{field}")
-      else
-        nil
       end
     end
   end

data/lib/puppet/provider/network_device.rb

@@ -61,8 +61,7 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
     @property_hash.clear
   end
 
-  def self.instances
-  end
+  def self.instances; end
 
   def former_properties
     @properties.dup

data/lib/puppet/provider/package/pkgdmg.rb

@@ -138,8 +138,6 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     if Puppet::FileSystem.exist?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
       Puppet.debug "/var/db/.puppet_pkgdmg_installed_#{@resource[:name]} found"
       { :name => @resource[:name], :ensure => :present }
-    else
-      nil
     end
   end
 

data/lib/puppet/provider/package/portage.rb

@@ -179,7 +179,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
       if @resource[:name] =~ /^@/
         if package_sets.include?(@resource[:name][1..].to_s)
-          return({ :name => (@resource[:name]).to_s, :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999," })
+          return ({ :name => (@resource[:name]).to_s, :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999," })
         end
       end
 

data/lib/puppet/provider/package/portupgrade.rb

@@ -39,7 +39,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     # Corresponding field names
     fields = [:portname, :ensure, :portorigin]
     # define Temporary hash used, packages array of hashes
-    hash = Hash.new
+    hash = {}
     packages = []
 
     # exec command
@@ -173,7 +173,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     # Check: if output isn't in the right format, return nil
     if output =~ /^(\S+)-([^-\s]+)/
       # Fill in the details
-      hash = Hash.new
+      hash = {}
       hash[:portorigin] = name
       hash[:portname]   = Regexp.last_match(1)
       hash[:ensure]     = Regexp.last_match(2)

data/lib/puppet/provider/parsedfile.rb

@@ -189,8 +189,6 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
           @property_hash[attr] || :absent
         elsif defined?(@resource)
           @resource.should(attr)
-        else
-          nil
         end
       end
 

data/lib/puppet/provider/service/base.rb

@@ -90,8 +90,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   end
 
   # There is no default command, which causes other methods to be used
-  def statuscmd
-  end
+  def statuscmd; end
 
   # Run the 'start' parameter command, or the specified 'startcmd'.
   def start
@@ -130,6 +129,5 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   end
 
   # There is no default command, which causes other methods to be used
-  def stopcmd
-  end
+  def stopcmd; end
 end

data/lib/puppet/provider/service/launchd.rb

@@ -184,7 +184,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # This status method lists out all currently running services.
   # This hash is returned at the end of the method.
   def self.job_list
-    @job_list = Hash.new
+    @job_list = {}
     begin
       output = launchctl :list
       raise Puppet::Error, "launchctl list failed to return any data." if output.nil?

data/lib/puppet/provider/service/openwrt.rb

@@ -32,6 +32,5 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
 
   # Purposely leave blank so we fail back to ps based status detection
   # As OpenWrt init script do not have status commands
-  def statuscmd
-  end
+  def statuscmd; end
 end

data/lib/puppet/provider/service/service.rb

@@ -19,8 +19,7 @@ Puppet::Type.type(:service).provide :service do
   end
 
   # There is no default command, which causes other methods to be used
-  def restartcmd
-  end
+  def restartcmd; end
 
   # @deprecated because the exit status is not returned, use service_execute instead
   def texecute(type, command, fof = true, squelch = false, combine = true)

data/lib/puppet/provider/service/smf.rb

@@ -39,12 +39,12 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     service_instances.collect! do |line|
       state, fmri = line.split(/\s+/)
 
-      status =  case state
-                when /online/; :running
-                when /maintenance/; :maintenance
-                when /degraded/; :degraded
-                else :stopped
-                end
+      status = case state
+               when /online/; :running
+               when /maintenance/; :maintenance
+               when /degraded/; :degraded
+               else :stopped
+               end
       new({ :name => fmri, :ensure => status })
     end
 

data/lib/puppet/provider/service/systemd.rb

@@ -83,17 +83,6 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     systemctl_change_enable(:disable)
   end
 
-  def get_start_link_count
-    # Start links don't include '.service'. Just search for the service name.
-    if @resource[:name] =~ /\.service/
-      link_name = @resource[:name].split('.')[0]
-    else
-      link_name = @resource[:name]
-    end
-
-    Dir.glob("/etc/rc*.d/S??#{link_name}").length
-  end
-
   def cached_enabled?
     return @cached_enabled if @cached_enabled
 
@@ -118,39 +107,9 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     return :false if output == 'indirect'
     return :true if code == 0
 
-    if output.empty? && (code > 0) && Puppet.runtime[:facter].value('os.family').casecmp('debian').zero?
-      ret = debian_enabled?
-      return ret if ret
-    end
-
     :false
   end
 
-  # This method is required for Debian systems due to the way the SysVInit-Systemd
-  # compatibility layer works. When we are trying to manage a service which does not
-  # have a Systemd unit file, we need to go through the old init script to determine
-  # whether it is enabled or not. See PUP-5016 for more details.
-  #
-  def debian_enabled?
-    status = execute(["/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start"], :failonfail => false)
-    if [104, 106].include?(status.exitstatus)
-      :true
-    elsif [101, 105].include?(status.exitstatus)
-      # 101 is action not allowed, which means we have to do the check manually.
-      # 105 is unknown, which generally means the initscript does not support query
-      # The debian policy states that the initscript should support methods of query
-      # For those that do not, perform the checks manually
-      # http://www.debian.org/doc/debian-policy/ch-opersys.html
-      if get_start_link_count >= 4
-        :true
-      else
-        :false
-      end
-    else
-      :false
-    end
-  end
-
   # Define the daemon_reload? function to check if the unit is requiring to trigger a "systemctl daemon-reload"
   # If the unit file is flagged with NeedDaemonReload=yes, then a systemd daemon-reload will be run.
   # If multiple unit files have been updated, the first one flagged will trigger the daemon-reload for all of them.

data/lib/puppet/provider/service/upstart.rb

@@ -166,7 +166,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def stopcmd
-    is_upstart? ? [command(:stop),  @resource[:name]] : super
+    is_upstart? ? [command(:stop), @resource[:name]] : super
   end
 
   def restartcmd

data/lib/puppet/provider/user/directoryservice.rb

@@ -288,8 +288,6 @@ Puppet::Type.type(:user).provide :directoryservice do
                   '/bin/bash'
                 when :home
                   "/Users/#{@resource.name}"
-                else
-                  nil
                 end
       end
 
@@ -642,7 +640,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   # set_shadow_hash_data method to serialize and write the plist to disk.
   def set_salted_sha512(users_plist, shadow_hash_data, value)
     unless shadow_hash_data
-      shadow_hash_data = Hash.new
+      shadow_hash_data = {}
       shadow_hash_data['SALTED-SHA512'] = ''.dup
     end
     shadow_hash_data['SALTED-SHA512'] = base64_decode_string(value)
@@ -659,8 +657,8 @@ Puppet::Type.type(:user).provide :directoryservice do
   # the user's plist itself, and the shadow_hash_data hash containing the
   # existing PBKDF2 values.
   def set_salted_pbkdf2(users_plist, shadow_hash_data, field, value)
-    shadow_hash_data ||= Hash.new
-    shadow_hash_data['SALTED-SHA512-PBKDF2'] = Hash.new unless shadow_hash_data['SALTED-SHA512-PBKDF2']
+    shadow_hash_data ||= {}
+    shadow_hash_data['SALTED-SHA512-PBKDF2'] = {} unless shadow_hash_data['SALTED-SHA512-PBKDF2']
     case field
     when 'salt', 'entropy'
       shadow_hash_data['SALTED-SHA512-PBKDF2'][field] = Puppet::Util::Plist.string_to_blob(base64_decode_string(value))

data/lib/puppet/reference/metaparameter.rb

@@ -14,7 +14,7 @@ etc.), prevent OpenVox from making changes (`noop`), and change logging verbosit
 
 ## Available Metaparameters
 
-  }.dup
+  }.dup.strip + "\n"
   begin
     params = []
     Puppet::Type.eachmetaparam { |param|

data/lib/puppet/settings.rb

@@ -443,8 +443,6 @@ class Puppet::Settings
     obj = @config[name.to_sym]
     if obj
       obj.desc
-    else
-      nil
     end
   end
 

data/lib/puppet/test/test_helper.rb

@@ -77,8 +77,7 @@ module Puppet::Test
     # Call this method once, at the end of a test run, when no more tests
     #  will be run.
     # @return nil
-    def self.after_all_tests
-    end
+    def self.after_all_tests; end
 
     # The name of the rollback mark used in the Puppet.context. This is what
     # the test infrastructure returns to for each test.

data/lib/puppet/transaction/event.rb

@@ -40,7 +40,6 @@ class Puppet::Transaction::Event
                  source_description: nil,
                  status: nil,
                  tags: nil)
-
     @audited = audited
     @corrective_change = corrective_change
     @desired_value = desired_value

data/lib/puppet/transaction/persistence.rb

@@ -48,8 +48,6 @@ class Puppet::Transaction::Persistence
        !@old_data["resources"][resource_name]["parameters"].nil? &&
        !@old_data["resources"][resource_name]["parameters"][param_name].nil?
       @old_data["resources"][resource_name]["parameters"][param_name]["system_value"]
-    else
-      nil
     end
   end
 

data/lib/puppet/type/component.rb

@@ -87,8 +87,7 @@ Puppet::Type.newtype(:component) do
   # is no risk of this information leaking into reports, since no
   # Component instances survive the graph transmutation.
   #
-  def set_sensitive_parameters(sensitive_parameters)
-  end
+  def set_sensitive_parameters(sensitive_parameters); end
 
   private
 

data/lib/puppet/type/file.rb

@@ -881,7 +881,7 @@ Puppet::Type.newtype(:file) do
     if self[:ensure] == :present
       return true unless stat
 
-      return(stat.ftype == "file")
+      return stat.ftype == "file"
     end
 
     # If we've gotten here, then :ensure isn't set
@@ -1019,8 +1019,6 @@ Puppet::Type.newtype(:file) do
     stat_info = stat
     if stat_info
       stat_info.ftype.to_s
-    else
-      nil
     end
   end
 

data/lib/puppet/type/resources.rb

@@ -64,8 +64,6 @@ Puppet::Type.newtype(:resources) do
     defaultto {
       if @resource[:name] == "user"
         @resource.class.system_users_max_uid
-      else
-        nil
       end
     }
   end

data/lib/puppet/type/user.rb

@@ -85,8 +85,6 @@ module Puppet
       defaultto do
         if @resource.managed?
           :present
-        else
-          nil
         end
       end
 

data/lib/puppet/type.rb

@@ -659,8 +659,6 @@ class Type
       # Note that if this is a property, then the value is the "should" value,
       # not the current value.
       obj.value
-    else
-      nil
     end
   end
 
@@ -754,8 +752,6 @@ class Type
     prop = @parameters[name.intern]
     if prop && prop.is_a?(Puppet::Property)
       prop.should
-    else
-      nil
     end
   end
 
@@ -833,8 +829,6 @@ class Type
     obj = @parameters[name.intern]
     if obj && obj.is_a?(Puppet::Property)
       obj
-    else
-      nil
     end
   end
 
@@ -902,8 +896,6 @@ class Type
     obj = @parameters[name]
     if obj && obj.respond_to?(:value)
       obj.value
-    else
-      nil
     end
   end
 
@@ -1023,8 +1015,7 @@ class Type
   # @return [void]
   # @abstract a resource type may implement this method to perform
   #   validation checks that can query the complete catalog
-  def pre_run_check
-  end
+  def pre_run_check; end
 
   # Flushes the provider if supported by the provider, else no action.
   # This is called by the transaction.
@@ -2197,8 +2188,8 @@ class Type
   # @return [void]
   def self.initvars
     # all of the instances of this class
-    @objects = Hash.new
-    @aliases = Hash.new
+    @objects = {}
+    @aliases = {}
 
     @defaults = {}
 
@@ -2511,8 +2502,6 @@ class Type
     parents = catalog.adjacent(self, :direction => :in)
     @parent = if parents
                 parents.shift
-              else
-                nil
               end
   end
 
@@ -2605,7 +2594,7 @@ class Type
   end
 
   # @return [Boolean] Returns whether the resource is virtual or not
-  def virtual?;  !!@virtual;  end
+  def virtual?; !!@virtual; end
   # @return [Boolean] Returns whether the resource is exported or not
   def exported?; !!@exported; end
 

data/lib/puppet/util/at_fork/noop.rb

@@ -8,13 +8,10 @@ class Puppet::Util::AtFork::Noop
       self
     end
 
-    def prepare
-    end
+    def prepare; end
 
-    def parent
-    end
+    def parent; end
 
-    def child
-    end
+    def child; end
   end
 end

data/lib/puppet/util/fileparsing.rb

@@ -154,8 +154,6 @@ module Puppet::Util::FileParsing
     record = record_type(type)
     if record
       record.fields.dup
-    else
-      nil
     end
   end
 
@@ -196,8 +194,6 @@ module Puppet::Util::FileParsing
               ret[field] = value
             end
           end
-        else
-          nil
         end
       else
         ret = {}
@@ -229,8 +225,6 @@ module Puppet::Util::FileParsing
     if ret
       ret[:record_type] = record.name
       ret
-    else
-      nil
     end
   end
 

data/lib/puppet/util/filetype.rb

@@ -109,8 +109,6 @@ class Puppet::Util::FileType
         # this code path is used by many callers so the original default is
         # being explicitly preserved
         Puppet::FileSystem.read(@path, :encoding => Encoding.default_external)
-      else
-        nil
       end
     end