puppet 8.5.1 → 8.7.0

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.

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

@@ -63,7 +63,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   end
 
   def service_exists?
-    self.service_fmri
+    service_fmri
     true
   rescue Puppet::ExecutionFailure
     false
@@ -71,7 +71,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
   def setup_service
     return unless @resource[:manifest]
-    return if self.service_exists?
+    return if service_exists?
 
     Puppet.notice("Importing #{@resource[:manifest]} for #{@resource[:name]}")
     svccfg(:import, @resource[:manifest])
@@ -132,7 +132,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   def enabled?
     return :false unless service_exists?
 
-    _property, _type, value = svccfg("-s", self.service_fmri, "listprop", "general/enabled").split(' ')
+    _property, _type, value = svccfg("-s", service_fmri, "listprop", "general/enabled").split(' ')
     value == 'true' ? :true : :false
   end
 
@@ -142,10 +142,10 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
   def restartcmd
     if Puppet::Util::Package.versioncmp(Puppet.runtime[:facter].value('os.release.full'), '11.2') >= 0
-      [command(:adm), :restart, "-s", self.service_fmri]
+      [command(:adm), :restart, "-s", service_fmri]
     else
       # Synchronous restart only supported in Solaris 11.2 and above
-      [command(:adm), :restart, self.service_fmri]
+      [command(:adm), :restart, service_fmri]
     end
   end
 
@@ -153,7 +153,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     # Gets the current and next state of the service. We have a next state because SMF
     # manages services asynchronously. If there is no 'next' state, svcs will put a '-'
     # to indicate as such.
-    current_state, next_state = svcs("-H", "-o", "state,nstate", self.service_fmri).chomp.split(' ')
+    current_state, next_state = svcs("-H", "-o", "state,nstate", service_fmri).chomp.split(' ')
 
     {
       :current => current_state,
@@ -168,14 +168,14 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   def wait(*desired_states)
     Timeout.timeout(60) do
       loop do
-        states = self.service_states
+        states = service_states
         break if desired_states.include?(states[:current]) && states[:next].nil?
 
         Kernel.sleep(1)
       end
     end
   rescue Timeout::Error
-    raise Puppet::Error.new("Timed out waiting for #{@resource[:name]} to transition states")
+    raise Puppet::Error, "Timed out waiting for #{@resource[:name]} to transition states"
   end
 
   def start
@@ -189,7 +189,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   def restart
     # Wait for the service to actually start before returning.
     super
-    self.wait('online')
+    wait('online')
   end
 
   def status
@@ -206,29 +206,29 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
       # Get the current state and the next state. If there is a next state,
       # use that for the state comparison.
-      states = self.service_states
+      states = service_states
       state = states[:next] || states[:current]
-    rescue Puppet::ExecutionFailure
+    rescue Puppet::ExecutionFailure => e
       # TODO (PUP-8957): Should this be set back to INFO ?
-      debug "Could not get status on service #{self.name} #{$!}"
+      debug "Could not get status on service #{name} #{e}"
       return :stopped
     end
 
     case state
     when "online"
-      return :running
+      :running
     when "offline", "disabled", "uninitialized"
-      return :stopped
+      :stopped
     when "maintenance"
-      return :maintenance
+      :maintenance
     when "degraded"
-      return :degraded
+      :degraded
     when "legacy_run"
       raise Puppet::Error,
             "Cannot manage legacy services through SMF"
     else
       raise Puppet::Error,
-            "Unmanageable state '#{state}' on service #{self.name}"
+            "Unmanageable state '#{state}' on service #{name}"
     end
   end
 
@@ -238,8 +238,8 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   def maybe_clear_service_then_svcadm(cur_state, subcmd, flags)
     # If the cur_state is maint or degraded, then we need to clear the service
     # before we enable or disable it.
-    adm('clear', self.service_fmri) if [:maintenance, :degraded].include?(cur_state)
-    adm(subcmd, flags, self.service_fmri)
+    adm('clear', service_fmri) if [:maintenance, :degraded].include?(cur_state)
+    adm(subcmd, flags, service_fmri)
   end
 
   # The flush method is necessary for the SMF provider because syncing the enable and ensure
@@ -248,7 +248,8 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   def flush
     # We append the "_" because ensure is a Ruby keyword, and it is good to keep property
     # variable names consistent with each other.
-    enable_, ensure_ = @properties_to_sync[:enable], @properties_to_sync[:ensure]
+    enable_ = @properties_to_sync[:enable]
+    ensure_ = @properties_to_sync[:ensure]
 
     # All of the relevant properties are in sync., so we do not need to do
     # anything here.
@@ -258,13 +259,13 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     # simplifies the code. For a nonexistent service, one of enable or ensure will be true
     # here (since we're syncing them), so we can fail early if setup_service fails.
     setup_service
-    fmri = self.service_fmri
+    fmri = service_fmri
 
     # Useful constants for operations involving multiple states
-    stopped = ['offline', 'disabled', 'uninitialized']
+    stopped = %w[offline disabled uninitialized]
 
     # Get the current state of the service.
-    cur_state = self.status
+    cur_state = status
 
     if enable_.nil?
       # Only ensure needs to be syncd. The -t flag tells svcadm to temporarily
@@ -272,10 +273,10 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
       # reboot. This is exactly what we want, because we do not want to touch
       # the enable property.
       if ensure_ == :stopped
-        self.maybe_clear_service_then_svcadm(cur_state, 'disable', '-st')
+        maybe_clear_service_then_svcadm(cur_state, 'disable', '-st')
         wait(*stopped)
       else # ensure == :running
-        self.maybe_clear_service_then_svcadm(cur_state, 'enable', '-rst')
+        maybe_clear_service_then_svcadm(cur_state, 'enable', '-rst')
         wait('online')
       end
 
@@ -299,9 +300,9 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     final_state = :running if final_state == :degraded
 
     if enable_
-      self.maybe_clear_service_then_svcadm(cur_state, 'enable', '-rs')
+      maybe_clear_service_then_svcadm(cur_state, 'enable', '-rs')
     else
-      self.maybe_clear_service_then_svcadm(cur_state, 'disable', '-s')
+      maybe_clear_service_then_svcadm(cur_state, 'disable', '-s')
     end
 
     # We're safe with 'whens' here since self.status already errors on any

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

@@ -79,17 +79,17 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
       end
     end
   rescue Timeout::Error
-    raise Puppet::Error.new("Timed out waiting for #{@resource[:name]} to transition states")
+    raise Puppet::Error, "Timed out waiting for #{@resource[:name]} to transition states"
   end
 
   def start
     super
-    self.wait(:running)
+    wait(:running)
   end
 
   def stop
     super
-    self.wait(:stopped)
+    wait(:stopped)
   end
 
   def restart
@@ -111,8 +111,8 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
         if do_refresh == :true
           execute([command(:refresh), "-s", @resource[:name]])
         else
-          self.stop
-          self.start
+          stop
+          start
         end
         return :true
       rescue Puppet::ExecutionFailure => detail
@@ -141,7 +141,7 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
       return state
     end
   rescue Puppet::ExecutionFailure => detail
-    self.debug(detail.message)
-    return :stopped
+    debug(detail.message)
+    :stopped
   end
 end

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

@@ -22,15 +22,15 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   defaultfor 'os.family' => :suse
   defaultfor 'os.family' => :coreos
   defaultfor 'os.family' => :gentoo
-  notdefaultfor 'os.name' => :amazon, 'os.release.major' => ["2017", "2018"]
-  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2", "2023"]
+  notdefaultfor 'os.name' => :amazon, 'os.release.major' => %w[2017 2018]
+  defaultfor 'os.name' => :amazon, 'os.release.major' => %w[2 2023]
   defaultfor 'os.name' => :debian
-  notdefaultfor 'os.name' => :debian, 'os.release.major' => ["5", "6", "7"] # These are using the "debian" method
+  notdefaultfor 'os.name' => :debian, 'os.release.major' => %w[5 6 7] # These are using the "debian" method
   defaultfor 'os.name' => :LinuxMint
-  notdefaultfor 'os.name' => :LinuxMint, 'os.release.major' => ["10", "11", "12", "13", "14", "15", "16", "17"] # These are using upstart
+  notdefaultfor 'os.name' => :LinuxMint, 'os.release.major' => %w[10 11 12 13 14 15 16 17] # These are using upstart
   defaultfor 'os.name' => :ubuntu
   notdefaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"] # These are using upstart
-  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ["3", "4"]
+  defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => %w[3 4]
 
   def self.instances
     i = []
@@ -39,9 +39,9 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
       Puppet.debug("#{m[0]} marked as bad by `systemctl`. It is recommended to be further checked.") if m[1] == "bad"
       i << new(:name => m[0])
     end
-    return i
+    i
   rescue Puppet::ExecutionFailure
-    return []
+    []
   end
 
   # Static services cannot be enabled or disabled manually. Indirect services
@@ -55,11 +55,11 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
         current == @resource[:enable]
       else
         Puppet.debug("Unable to enable or disable static service #{@resource[:name]}")
-        return true
+        true
       end
     when 'indirect'
       Puppet.debug("Service #{@resource[:name]} is in 'indirect' state and cannot be enabled/disabled")
-      return true
+      true
     else
       current == @resource[:enable]
     end
@@ -72,8 +72,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   # @param action [String,Symbol] One of 'enable', 'disable', 'mask' or 'unmask'
   def systemctl_change_enable(action)
     output = systemctl(action, '--', @resource[:name])
-  rescue
-    raise Puppet::Error, "Could not #{action} #{self.name}: #{output}", $!.backtrace
+  rescue => e
+    raise Puppet::Error, "Could not #{action} #{name}: #{output}", e.backtrace
   ensure
     @cached_enabled = nil
   end
@@ -115,14 +115,14 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
     # The indirect state indicates that the unit is not enabled.
     return :false if output == 'indirect'
-    return :true if (code == 0)
+    return :true if code == 0
 
-    if (output.empty?) && (code > 0) && (Puppet.runtime[:facter].value('os.family').casecmp('debian').zero?)
+    if output.empty? && (code > 0) && Puppet.runtime[:facter].value('os.family').casecmp('debian').zero?
       ret = debian_enabled?
       return ret if ret
     end
 
-    return :false
+    :false
   end
 
   # This method is required for Debian systems due to the way the SysVInit-Systemd
@@ -133,7 +133,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   def debian_enabled?
     status = execute(["/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start"], :failonfail => false)
     if [104, 106].include?(status.exitstatus)
-      return :true
+      :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
@@ -141,12 +141,12 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
       # 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
-        return :true
+        :true
       else
-        return :false
+        :false
       end
     else
-      return :false
+      :false
     end
   end
 
@@ -166,7 +166,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   end
 
   def enable
-    self.unmask
+    unmask
     systemctl_change_enable(:enable)
   end
 
@@ -189,7 +189,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   end
 
   def startcmd
-    self.unmask
+    unmask
     [command(:systemctl), "start", '--', @resource[:name]]
   end
 
@@ -202,29 +202,23 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   end
 
   def restart
-    begin
-      daemon_reload?
-      super
-    rescue Puppet::Error => e
-      raise Puppet::Error.new(prepare_error_message(@resource[:name], 'restart', e))
-    end
+    daemon_reload?
+    super
+  rescue Puppet::Error => e
+    raise Puppet::Error, prepare_error_message(@resource[:name], 'restart', e)
   end
 
   def start
-    begin
-      daemon_reload?
-      super
-    rescue Puppet::Error => e
-      raise Puppet::Error.new(prepare_error_message(@resource[:name], 'start', e))
-    end
+    daemon_reload?
+    super
+  rescue Puppet::Error => e
+    raise Puppet::Error, prepare_error_message(@resource[:name], 'start', e)
   end
 
   def stop
-    begin
-      super
-    rescue Puppet::Error => e
-      raise Puppet::Error.new(prepare_error_message(@resource[:name], 'stop', e))
-    end
+    super
+  rescue Puppet::Error => e
+    raise Puppet::Error, prepare_error_message(@resource[:name], 'stop', e)
   end
 
   def prepare_error_message(name, action, exception)

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

@@ -15,11 +15,11 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     Puppet.runtime[:facter].value('os.name') == 'Ubuntu',
     (Puppet.runtime[:facter].value('os.family') == 'RedHat' and Puppet.runtime[:facter].value('os.release.full') =~ /^6\./),
     (Puppet.runtime[:facter].value('os.name') == 'Amazon' and Puppet.runtime[:facter].value('os.release.major') =~ /\d{4}/),
-    Puppet.runtime[:facter].value('os.name') == 'LinuxMint',
+    Puppet.runtime[:facter].value('os.name') == 'LinuxMint'
   ]
 
   defaultfor 'os.name' => :ubuntu, 'os.release.major' => ["10.04", "12.04", "14.04", "14.10"]
-  defaultfor 'os.name' => :LinuxMint, 'os.release.major' => ["10", "11", "12", "13", "14", "15", "16", "17"]
+  defaultfor 'os.name' => :LinuxMint, 'os.release.major' => %w[10 11 12 13 14 15 16 17]
 
   commands :start => "/sbin/start",
            :stop => "/sbin/stop",
@@ -54,7 +54,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   has_feature :enableable
 
   def self.instances
-    self.get_services(self.excludes) # Take exclude list from init provider
+    get_services(excludes) # Take exclude list from init provider
   end
 
   def self.excludes
@@ -77,11 +77,11 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
         # network-interface (lo) start/running
         # network-interface (eth0) start/running
         # network-interface-security start/running
-        matcher = line.match(/^(network-interface)\s\(([^\)]+)\)/)
+        matcher = line.match(/^(network-interface)\s\(([^)]+)\)/)
         name = if matcher
                  "#{matcher[1]} INTERFACE=#{matcher[2]}"
                else
-                 matcher = line.match(/^(network-interface-security)\s\(([^\)]+)\)/)
+                 matcher = line.match(/^(network-interface-security)\s\(([^)]+)\)/)
                  if matcher
                    "#{matcher[1]} JOB=#{matcher[2]}"
                  else
@@ -99,7 +99,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def upstart_version
-    @upstart_version ||= initctl("--version").match(/initctl \(upstart ([^\)]*)\)/)[1]
+    @upstart_version ||= initctl("--version").match(/initctl \(upstart ([^)]*)\)/)[1]
   end
 
   # Where is our override script?
@@ -117,7 +117,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
           return fqname
         end
 
-        self.debug("Could not find #{name}#{suffix} in #{path}")
+        debug("Could not find #{name}#{suffix} in #{path}")
       end
     end
 
@@ -125,7 +125,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def enabled?
-    return super if not is_upstart?
+    return super unless is_upstart?
 
     script_contents = read_script_from(initscript)
     if version_is_pre_0_6_7
@@ -138,7 +138,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def enable
-    return super if not is_upstart?
+    return super unless is_upstart?
 
     script_text = read_script_from(initscript)
     if version_is_pre_0_9_0
@@ -149,7 +149,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def disable
-    return super if not is_upstart?
+    return super unless is_upstart?
 
     script_text = read_script_from(initscript)
     if version_is_pre_0_6_7
@@ -185,17 +185,17 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     end
 
     output = status_exec(@resource[:name].split)
-    if output =~ /start\//
-      return :running
+    if output =~ %r{start/}
+      :running
     else
-      return :stopped
+      :stopped
     end
   end
 
   private
 
   def is_upstart?(script = initscript)
-    Puppet::FileSystem.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/)
+    Puppet::FileSystem.exist?(script) && script.match(%r{/etc/init/\S+\.conf})
   end
 
   def version_is_pre_0_6_7
@@ -213,9 +213,9 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   def enabled_pre_0_6_7?(script_text)
     # Upstart version < 0.6.7 means no manual stanza.
     if script_text.match(START_ON)
-      return :true
+      :true
     else
-      return :false
+      :false
     end
   end
 
@@ -378,7 +378,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def write_script_to(file, text)
-    Puppet::Util.replace_file(file, 0644) do |f|
+    Puppet::Util.replace_file(file, 0o644) do |f|
       f.write(text)
     end
   end