puppet 8.5.1-universal-darwin → 8.6.0-universal-darwin

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

@@ -21,7 +21,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   # Executing an init script with the 'rcvar' argument returns
   # the service name, rcvar name and whether it's enabled/disabled
   def rcvar
-    rcvar = execute([self.initscript, :rcvar], :failonfail => true, :combine => false, :squelch => false)
+    rcvar = execute([initscript, :rcvar], :failonfail => true, :combine => false, :squelch => false)
     rcvar = rcvar.split("\n")
     rcvar.delete_if { |str| str =~ /^#\s*$/ }
     rcvar[1] = rcvar[1].gsub(/^\$/, '')
@@ -30,11 +30,11 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
   # Extract value name from service or rcvar
   def extract_value_name(name, rc_index, regex, regex_index)
-    value_name = self.rcvar[rc_index]
-    self.error("No #{name} name found in rcvar") if value_name.nil?
+    value_name = rcvar[rc_index]
+    error("No #{name} name found in rcvar") if value_name.nil?
     value_name = value_name.gsub!(regex, regex_index)
-    self.error("#{name} name is empty") if value_name.nil?
-    self.debug("#{name} name is #{value_name}")
+    error("#{name} name is empty") if value_name.nil?
+    debug("#{name} name is #{value_name}")
     value_name
   end
 
@@ -50,20 +50,20 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
   # Extract rcvar value
   def rcvar_value
-    value = self.rcvar[1]
-    self.error("No rcvar value found in rcvar") if value.nil?
+    value = rcvar[1]
+    error("No rcvar value found in rcvar") if value.nil?
     value = value.gsub!(/(.*)(_enable)?="?(\w+)"?/, '\3')
-    self.error("rcvar value is empty") if value.nil?
-    self.debug("rcvar value is #{value}")
+    error("rcvar value is empty") if value.nil?
+    debug("rcvar value is #{value}")
     value
   end
 
   # Edit rc files and set the service to yes/no
   def rc_edit(yesno)
-    service = self.service_name
-    rcvar = self.rcvar_name
-    self.debug("Editing rc files: setting #{rcvar} to #{yesno} for #{service}")
-    self.rc_add(service, rcvar, yesno) if not self.rc_replace(service, rcvar, yesno)
+    service = service_name
+    rcvar = rcvar_name
+    debug("Editing rc files: setting #{rcvar} to #{yesno} for #{service}")
+    rc_add(service, rcvar, yesno) unless rc_replace(service, rcvar, yesno)
   end
 
   # Try to find an existing setting in the rc files
@@ -72,14 +72,14 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     success = false
     # Replace in all files, not just in the first found with a match
     [rcconf, rcconf_local, rcconf_dir + "/#{service}"].each do |filename|
-      if Puppet::FileSystem.exist?(filename)
-        s = File.read(filename)
-        if s.gsub!(/^(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
-          Puppet::FileSystem.replace_file(filename) { |f| f << s }
-          self.debug("Replaced in #{filename}")
-          success = true
-        end
-      end
+      next unless Puppet::FileSystem.exist?(filename)
+
+      s = File.read(filename)
+      next unless s.gsub!(/^(#{rcvar}(_enable)?)="?(YES|NO)"?/, "\\1=\"#{yesno}\"")
+
+      Puppet::FileSystem.replace_file(filename) { |f| f << s }
+      debug("Replaced in #{filename}")
+      success = true
     end
     success
   end
@@ -89,53 +89,53 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     append = "\# Added by Puppet\n#{rcvar}_enable=\"#{yesno}\"\n"
     # First, try the one-file-per-service style
     if Puppet::FileSystem.exist?(rcconf_dir)
-      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+      File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0o644) { |f|
         f << append
-        self.debug("Appended to #{f.path}")
+        debug("Appended to #{f.path}")
       }
     elsif Puppet::FileSystem.exist?(rcconf_local)
       # Else, check the local rc file first, but don't create it
       File.open(rcconf_local, File::WRONLY | File::APPEND) { |f|
         f << append
-        self.debug("Appended to #{f.path}")
+        debug("Appended to #{f.path}")
       }
     else
       # At last use the standard rc.conf file
-      File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
+      File.open(rcconf, File::WRONLY | File::APPEND | File::CREAT, 0o644) { |f|
         f << append
-        self.debug("Appended to #{f.path}")
+        debug("Appended to #{f.path}")
       }
     end
   end
 
   def enabled?
-    if /YES$/ =~ self.rcvar_value
-      self.debug("Is enabled")
+    if /YES$/ =~ rcvar_value
+      debug("Is enabled")
       return :true
     end
-    self.debug("Is disabled")
+    debug("Is disabled")
     :false
   end
 
   def enable
-    self.debug("Enabling")
-    self.rc_edit("YES")
+    debug("Enabling")
+    rc_edit("YES")
   end
 
   def disable
-    self.debug("Disabling")
-    self.rc_edit("NO")
+    debug("Disabling")
+    rc_edit("NO")
   end
 
   def startcmd
-    [self.initscript, :onestart]
+    [initscript, :onestart]
   end
 
   def stopcmd
-    [self.initscript, :onestop]
+    [initscript, :onestop]
   end
 
   def statuscmd
-    [self.initscript, :onestatus]
+    [initscript, :onestatus]
   end
 end

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

@@ -16,8 +16,8 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
   def disable
     output = update :del, @resource[:name], :default
-  rescue Puppet::ExecutionFailure
-    raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
+  rescue Puppet::ExecutionFailure => e
+    raise Puppet::Error, "Could not disable #{name}: #{output}", e.backtrace
   end
 
   def enabled?
@@ -33,15 +33,15 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
     # If it's enabled then it will print output showing service | runlevel
     if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
-      return :true
+      :true
     else
-      return :false
+      :false
     end
   end
 
   def enable
     output = update :add, @resource[:name], :default
-  rescue Puppet::ExecutionFailure
-    raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
+  rescue Puppet::ExecutionFailure => e
+    raise Puppet::Error, "Could not enable #{name}: #{output}", e.backtrace
   end
 end

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

@@ -21,7 +21,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   # Debian and Ubuntu should use the Debian provider.
-  confine :false => ['Debian', 'Ubuntu'].include?(Puppet.runtime[:facter].value('os.name'))
+  confine :false => %w[Debian Ubuntu].include?(Puppet.runtime[:facter].value('os.name'))
   # RedHat systems should use the RedHat provider.
   confine :false => Puppet.runtime[:facter].value('os.family') == 'RedHat'
 
@@ -35,9 +35,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   def self.excludes
     excludes = []
     # these exclude list was found with grep -L '\/sbin\/runscript' /etc/init.d/* on gentoo
-    excludes += %w{functions.sh reboot.sh shutdown.sh}
+    excludes += %w[functions.sh reboot.sh shutdown.sh]
     # this exclude list is all from /sbin/service (5.x), but I did not exclude kudzu
-    excludes += %w{functions halt killall single linuxconf reboot boot}
+    excludes += %w[functions halt killall single linuxconf reboot boot]
     # 'wait-for-state' and 'portmap-wait' are excluded from instances here
     # because they take parameters that have unclear meaning. It looks like
     # 'wait-for-state' is a generic waiter mainly used internally for other
@@ -49,37 +49,37 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # eventually explain how to use the wait-for-state service or perhaps why
     # it should remain excluded. When that bug is addressed this should be
     # reexamined.
-    excludes += %w{wait-for-state portmap-wait}
+    excludes += %w[wait-for-state portmap-wait]
     # these excludes were found with grep -r -L start /etc/init.d
-    excludes += %w{rcS module-init-tools}
+    excludes += %w[rcS module-init-tools]
     # Prevent puppet failing on unsafe scripts from Yocto Linux
     if Puppet.runtime[:facter].value('os.family') == "cisco-wrlinux"
-      excludes += %w{banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
+      excludes += %w[banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
                      hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
                      rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
-                     umountnfs.sh}
+                     umountnfs.sh]
     end
     # Prevent puppet failing to get status of the new service introduced
     # by the fix for this (bug https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/982889)
     # due to puppet's inability to deal with upstart services with instances.
-    excludes += %w{plymouth-ready}
+    excludes += %w[plymouth-ready]
     # Prevent puppet failing to get status of these services, which need parameters
     # passed in (see https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1276766).
-    excludes += %w{idmapd-mounting startpar-bridge}
+    excludes += %w[idmapd-mounting startpar-bridge]
     # Prevent puppet failing to get status of these services, additional upstart
     # service with instances
-    excludes += %w{cryptdisks-udev}
-    excludes += %w{statd-mounting}
-    excludes += %w{gssd-mounting}
+    excludes += %w[cryptdisks-udev]
+    excludes += %w[statd-mounting]
+    excludes += %w[gssd-mounting]
     excludes
   end
 
   # List all services of this type.
   def self.instances
-    get_services(self.defpath)
+    get_services(defpath)
   end
 
-  def self.get_services(defpath, exclude = self.excludes)
+  def self.get_services(defpath, exclude = excludes)
     defpath = [defpath] unless defpath.is_a? Array
     instances = []
     defpath.each do |path|
@@ -118,7 +118,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   # Where is our init script?
   def initscript
-    @initscript ||= self.search(@resource[:name])
+    @initscript ||= search(@resource[:name])
   end
 
   def paths
@@ -127,9 +127,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         true
       else
         if Puppet::FileSystem.exist?(path)
-          self.debug "Search path #{path} is not a directory"
+          debug "Search path #{path} is not a directory"
         else
-          self.debug "Search path #{path} does not exist"
+          debug "Search path #{path} does not exist"
         end
         false
       end
@@ -142,7 +142,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       if Puppet::FileSystem.exist? fqname
         return fqname
       else
-        self.debug("Could not find #{name} in #{path}")
+        debug("Could not find #{name} in #{path}")
       end
     end
 
@@ -151,7 +151,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       if Puppet::FileSystem.exist? fqname_sh
         return fqname_sh
       else
-        self.debug("Could not find #{name}.sh in #{path}")
+        debug("Could not find #{name}.sh in #{path}")
       end
     end
     raise Puppet::Error, "Could not find init script for '#{name}'"

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

@@ -84,7 +84,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.launchd_overrides
-    if self.get_os_version < 14
+    if get_os_version < 14
       "/var/db/launchd.db/com.apple.launchd/overrides.plist"
     else
       "/var/db/com.apple.xpc.launchd/disabled.plist"
@@ -107,8 +107,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # containing the name, provider, path, and status of each service on the
   # system.
   def self.instances
-    jobs = self.jobsearch
-    @job_list ||= self.job_list
+    jobs = jobsearch
+    @job_list ||= job_list
     jobs.keys.collect do |job|
       job_status = @job_list.has_key?(job) ? :running : :stopped
       new(:name => job, :provider => :launchd, :path => jobs[job], :status => job_status)
@@ -135,7 +135,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.make_label_to_path_map(refresh = false)
-    return @label_to_path_map if @label_to_path_map and not refresh
+    return @label_to_path_map if @label_to_path_map and !refresh
 
     @label_to_path_map = {}
     launchd_paths.each do |path|
@@ -165,12 +165,12 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
     if label
       if by_label.has_key? label
-        return { label => by_label[label] }
+        { label => by_label[label] }
       else
         # try refreshing the map, in case a plist has been added in the interim
         by_label = make_label_to_path_map(true)
         if by_label.has_key? label
-          return { label => by_label[label] }
+          { label => by_label[label] }
         else
           raise Puppet::Error, "Unable to find launchd plist for job: #{label}"
         end
@@ -187,13 +187,13 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     @job_list = Hash.new
     begin
       output = launchctl :list
-      raise Puppet::Error.new("launchctl list failed to return any data.") if output.nil?
+      raise Puppet::Error, "launchctl list failed to return any data." if output.nil?
 
       output.split("\n").each do |line|
         @job_list[line.split(/\s/).last] = :running
       end
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to determine status of #{resource[:name]}", $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new("Unable to determine status of #{resource[:name]}", e)
     end
     @job_list
   end
@@ -212,7 +212,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
       Puppet.debug(_("Reading overrides plist, attempt %{i}") % { i: i }) if i > 1
       overrides = read_plist(launchd_overrides)
       break unless overrides.nil?
-      raise Puppet::Error.new(_('Unable to read overrides plist, too many attempts')) if i == 20
+      raise Puppet::Error, _('Unable to read overrides plist, too many attempts') if i == 20
 
       Puppet.info(_('Overrides file could not be read, trying again.'))
       Kernel.sleep(0.1)
@@ -239,7 +239,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     if FileTest.file?(job_path)
       job_plist = self.class.read_plist(job_path)
     else
-      raise Puppet::Error.new("Unable to parse launchd plist at path: #{job_path}")
+      raise Puppet::Error, "Unable to parse launchd plist at path: #{job_path}"
     end
     [job_path, job_plist]
   end
@@ -248,7 +248,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # status mechanism and fall back to the base provider status method.
   def status
     if @resource && ((@resource[:hasstatus] == :false) || (@resource[:status]))
-      return super
+      super
     elsif @property_hash[:status].nil?
       # property_hash was flushed so the service changed status
       service_name = @resource[:name]
@@ -281,17 +281,17 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     # always add -w so it always starts the job, it is a noop if it is not needed, this means we do
     # not have to rescan all launchd plists.
     cmds << "-w"
-    if self.enabled? == :false || self.status == :stopped # launchctl won't load disabled jobs
+    if enabled? == :false || status == :stopped # launchctl won't load disabled jobs
       did_enable_job = true
     end
     cmds << job_path
     begin
       execute(cmds)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to start service: #{resource[:name]} at path: #{job_path}", $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new("Unable to start service: #{resource[:name]} at path: #{job_path}", e)
     end
     # As load -w clears the Disabled flag, we need to add it in after
-    self.disable if did_enable_job and resource[:enable] == :false
+    disable if did_enable_job and resource[:enable] == :false
   end
 
   def stop
@@ -303,26 +303,26 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     did_disable_job = false
     cmds = []
     cmds << :launchctl << :unload
-    if self.enabled? == :true # keepalive jobs can't be stopped without disabling
+    if enabled? == :true # keepalive jobs can't be stopped without disabling
       cmds << "-w"
       did_disable_job = true
     end
     cmds << job_path
     begin
       execute(cmds)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to stop service: #{resource[:name]} at path: #{job_path}", $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new("Unable to stop service: #{resource[:name]} at path: #{job_path}", e)
     end
     # As unload -w sets the Disabled flag, we need to add it in after
-    self.enable if did_disable_job and resource[:enable] == :true
+    enable if did_disable_job and resource[:enable] == :true
   end
 
   def restart
     Puppet.debug("A restart has been triggered for the #{resource[:name]} service")
     Puppet.debug("Stopping the #{resource[:name]} service")
-    self.stop
+    stop
     Puppet.debug("Starting the #{resource[:name]} service")
-    self.start
+    start
   end
 
   # launchd jobs are enabled by default. They are only disabled if the key

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

@@ -47,7 +47,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
       end
       instances
     rescue Puppet::ExecutionFailure
-      return nil
+      nil
     end
   end
 
@@ -56,16 +56,16 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
                      :failonfail => false, :combine => false, :squelch => false)
 
     if output.exitstatus == 1
-      self.debug("Is disabled")
-      return :false
+      debug("Is disabled")
+      :false
     else
-      self.debug("Is enabled")
-      return :true
+      debug("Is enabled")
+      :true
     end
   end
 
   def enable
-    self.debug("Enabling")
+    debug("Enabling")
     rcctl(:enable, @resource[:name])
     if @resource[:flags]
       rcctl(:set, @resource[:name], :flags, @resource[:flags])
@@ -73,14 +73,14 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   end
 
   def disable
-    self.debug("Disabling")
+    debug("Disabling")
     rcctl(:disable, @resource[:name])
   end
 
   def running?
     output = execute([command(:rcctl), "check", @resource[:name]],
                      :failonfail => false, :combine => false, :squelch => false).chomp
-    return true if output =~ /\(ok\)/
+    true if output =~ /\(ok\)/
   end
 
   # Uses the wrapper to prevent failure when the service is not running;
@@ -88,12 +88,12 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   def flags
     output = execute([command(:rcctl), "get", @resource[:name], "flags"],
                      :failonfail => false, :combine => false, :squelch => false).chomp
-    self.debug("Flags are: \"#{output}\"")
+    debug("Flags are: \"#{output}\"")
     output
   end
 
   def flags=(value)
-    self.debug("Changing flags from #{flags} to #{value}")
+    debug("Changing flags from #{flags} to #{value}")
     rcctl(:set, @resource[:name], :flags, value)
     # If the service is already running, force a restart as the flags have been changed.
     rcctl(:restart, @resource[:name]) if running?

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

@@ -40,7 +40,7 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
       when /^\S+/ # caption of a dynamic runlevel
         enabled = :false
       when self.class::STATUSLINE
-        return enabled if @resource[:name] == $1
+        return enabled if @resource[:name] == Regexp.last_match(1)
       end
     end
     :false

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

@@ -18,16 +18,16 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
   end
 
   def enable
-    system(self.initscript, 'enable')
+    system(initscript, 'enable')
   end
 
   def disable
-    system(self.initscript, 'disable')
+    system(initscript, 'disable')
   end
 
   def enabled?
     # We can't define the "command" for the init script, so we call system?
-    if system(self.initscript, 'enabled') then return :true else return :false end
+    system(initscript, 'enabled') ? (return :true) : (return :false)
   end
 
   # Purposely leave blank so we fail back to ps based status detection

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

@@ -31,7 +31,7 @@ Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
   # enable service by creating a service file under rc.conf.d with the
   # proper contents, or by modifying it's contents to to enable the service.
   def enable
-    Dir.mkdir(rcconf_dir) if not Puppet::FileSystem.exist?(rcconf_dir)
+    Dir.mkdir(rcconf_dir) unless Puppet::FileSystem.exist?(rcconf_dir)
     rcfile = File.join(rcconf_dir, @resource[:name])
     if Puppet::FileSystem.exist?(rcfile)
       newcontents = []
@@ -41,11 +41,11 @@ Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
         end
         newcontents.push(line)
       end
-      Puppet::Util.replace_file(rcfile, 0644) do |f|
+      Puppet::Util.replace_file(rcfile, 0o644) do |f|
         f.puts newcontents
       end
     else
-      Puppet::Util.replace_file(rcfile, 0644) do |f|
+      Puppet::Util.replace_file(rcfile, 0o644) do |f|
         f.puts "%s=${%s:=YES}\n" % [@resource[:name], @resource[:name]]
       end
     end

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

@@ -10,9 +10,9 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
 
   commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
 
-  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2017", "2018"]
+  defaultfor 'os.name' => :amazon, 'os.release.major' => %w[2017 2018]
   defaultfor 'os.name' => :redhat, 'os.release.major' => (4..6).to_a
-  defaultfor 'os.family' => :suse, 'os.release.major' => ["10", "11"]
+  defaultfor 'os.family' => :suse, 'os.release.major' => %w[10 11]
 
   # Remove the symlinks
   def disable
@@ -23,7 +23,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
     # and --del removes the service from chkconfig management
     chkconfig("--level", "0123456", @resource[:name], :off)
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error, "Could not disable #{self.name}: #{detail}", detail.backtrace
+    raise Puppet::Error, "Could not disable #{name}: #{detail}", detail.backtrace
   end
 
   def enabled?
@@ -49,7 +49,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
     chkconfig("--add", @resource[:name])
     chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error, "Could not enable #{self.name}: #{detail}", detail.backtrace
+    raise Puppet::Error, "Could not enable #{name}: #{detail}", detail.backtrace
   end
 
   def initscript

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

@@ -65,7 +65,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
 
   def status
     begin
-      output = sv "status", self.daemon
+      output = sv "status", daemon
       return :running if output =~ /^run: /
     rescue Puppet::ExecutionFailure => detail
       unless detail.message =~ /(warning: |runsv not running$)/
@@ -76,7 +76,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
   end
 
   def stop
-    sv "stop", self.service
+    sv "stop", service
   end
 
   def start
@@ -86,14 +86,14 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
       # runsvdir takes up to 5 seconds to recognize
       # the symlink created by this call to enable
       # TRANSLATORS 'runsvdir' is a linux service name and should not be translated
-      Puppet.info _("Waiting 5 seconds for runsvdir to discover service %{service}") % { service: self.service }
+      Puppet.info _("Waiting 5 seconds for runsvdir to discover service %{service}") % { service: service }
       sleep 5
     end
-    sv "start", self.service
+    sv "start", service
   end
 
   def restart
-    sv "restart", self.service
+    sv "restart", service
   end
 
   # disable by removing the symlink so that runit
@@ -102,6 +102,6 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
   # before a disable
   def disable
     # unlink the daemon symlink to disable it
-    Puppet::FileSystem.unlink(self.service) if Puppet::FileSystem.symlink?(self.service)
+    Puppet::FileSystem.unlink(service) if Puppet::FileSystem.symlink?(service)
   end
 end

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

@@ -13,8 +13,8 @@ Puppet::Type.type(:service).provide :service do
       service_command(:restart)
       nil
     else
-      self.stop
-      self.start
+      stop
+      start
     end
   end
 
@@ -47,11 +47,9 @@ Puppet::Type.type(:service).provide :service do
   #
   # @return [Puppet::Util::Execution::ProcessOutput]
   def service_execute(type, command, fof = true, squelch = false, combine = true)
-    begin
-      execute(command, :failonfail => fof, :override_locale => false, :squelch => squelch, :combine => combine)
-    rescue Puppet::ExecutionFailure => detail
-      @resource.fail Puppet::Error, "Could not #{type} #{@resource.ref}: #{detail}", detail
-    end
+    execute(command, :failonfail => fof, :override_locale => false, :squelch => squelch, :combine => combine)
+  rescue Puppet::ExecutionFailure => detail
+    @resource.fail Puppet::Error, "Could not #{type} #{@resource.ref}: #{detail}", detail
   end
 
   # Use either a specified command or the default for our provider.