puppet 8.3.1 → 8.4.0

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11.
 
@@ -38,14 +39,15 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       pkg_ver = line.split(/\s*\|\s*/)
       # ignore zypper headers
       next unless pkg_ver[0] == 'v'
+
       avail_updates[pkg_ver[2]] = pkg_ver[4]
     end
 
     avail_updates
   end
 
-  #on zypper versions <1.0, the version option returns 1
-  #some versions of zypper output on stderr
+  # on zypper versions <1.0, the version option returns 1
+  # some versions of zypper output on stderr
   def zypper_version
     cmd = [self.class.command(:zypper),"--version"]
     execute(cmd, { :failonfail => false, :combine => true})
@@ -70,6 +72,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       output.lines.each do |line|
         pkg_ver = line.split(/\s*\|\s*/)
         next unless pkg_ver[1] == @resource[:name]
+
         begin
           rpm_version = Puppet::Util::Package::Version::Rpm.parse(pkg_ver[3])
 
@@ -102,17 +105,17 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
       wanted = "#{wanted}-#{should}"
     end
 
-    #This has been tested with following zypper versions
-    #SLE 10.4: 0.6.201
-    #SLE 11.3: 1.6.307
-    #SLE 12.0: 1.11.14
-    #Assume that this will work on newer zypper versions
+    # This has been tested with following zypper versions
+    # SLE 10.4: 0.6.201
+    # SLE 11.3: 1.6.307
+    # SLE 12.0: 1.11.14
+    # Assume that this will work on newer zypper versions
 
-    #extract version numbers and convert to integers
+    # extract version numbers and convert to integers
     major, minor, patch = zypper_version.scan(/\d+/).map{ |x| x.to_i }
     self.debug "Detected zypper version #{major}.#{minor}.#{patch}"
 
-    #zypper version < 1.0 does not support --quiet flag
+    # zypper version < 1.0 does not support --quiet flag
     if major < 1
       quiet = '--terse'
     else
@@ -122,14 +125,13 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
     inst_opts = []
     inst_opts = install_options if resource[:install_options]
 
-
     options = []
     options << quiet
     options << '--no-gpg-check' unless inst_opts.delete('--no-gpg-check').nil?
     options << '--no-gpg-checks' unless inst_opts.delete('--no-gpg-checks').nil?
     options << :install
 
-    #zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
+    # zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
     options << '--auto-agree-with-licenses' unless major < 1 and minor <= 6 and patch <= 13
     options << '--no-confirm'
     options += inst_opts unless inst_opts.empty?
@@ -163,7 +165,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   end
 
   def uninstall
-    #extract version numbers and convert to integers
+    # extract version numbers and convert to integers
     major, minor, _ = zypper_version.scan(/\d+/).map{ |x| x.to_i }
 
     if major < 1
@@ -171,14 +173,13 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
     else
       options = [:remove, '--no-confirm']
       if major == 1 && minor < 6
-          options << '--force-resolution'
+        options << '--force-resolution'
       end
 
       options << @resource[:name]
 
       zypper(*options)
     end
-
   end
 
   def insync?(is)

data/lib/puppet/provider/package.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 
 class Puppet::Provider::Package < Puppet::Provider
@@ -48,12 +49,12 @@ class Puppet::Provider::Package < Puppet::Provider
 
     options.collect do |val|
       case val
-        when Hash
-          val.keys.sort.collect do |k|
-            "#{k}=#{val[k]}"
-          end
-        else
-          val
+      when Hash
+        val.keys.sort.collect do |k|
+          "#{k}=#{val[k]}"
+        end
+      else
+        val
       end
     end.flatten
   end

data/lib/puppet/provider/package_targetable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Targetable package providers implement a `command` attribute.
 #
 # The `packages` hash passed to `Puppet::Provider::Package::prefetch` is deduplicated,

data/lib/puppet/provider/parsedfile.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/util/filetype'
 require_relative '../../puppet/util/fileparsing'
@@ -115,7 +116,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Return the header placed at the top of each generated file, warning
   # users that modifying this file manually is probably a bad idea.
   def self.header
-%{# HEADER: This file was autogenerated at #{Time.now}
+    %{# HEADER: This file was autogenerated at #{Time.now}
 # HEADER: by puppet.  While it can still be managed manually, it
 # HEADER: is definitely not recommended.\n}
   end
@@ -236,6 +237,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # @param [Array<Puppet::Resource>] resources A list of resources using this class as a provider
   def self.match_providers_with_resources(resources)
     return unless resources
+
     matchers = resources.dup
     @records.each do |record|
       # Skip things like comments and blank lines
@@ -314,6 +316,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Is there an existing record with this name?
   def self.record?(name)
     return nil unless @records
+
     @records.find { |r| r[:name] == name }
   end
 
@@ -380,6 +383,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     targets = []
     # First get the default target
     raise Puppet::DevError, _("Parsed Providers must define a default target") unless self.default_target
+
     targets << self.default_target
 
     # Then get each of the file objects
@@ -387,7 +391,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
     # Lastly, check the file from any resource instances
     if resources
-      resources.each do |name, resource|
+      resources.each do |_name, resource|
         value = resource.should(:target)
         if value
           targets << value
@@ -471,6 +475,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # Retrieve the current state from disk.
   def prefetch
     raise Puppet::DevError, _("Somehow got told to prefetch with no resource set") unless @resource
+
     self.class.prefetch(@resource[:name] => @resource)
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :base, :parent => :service do
   desc "The simplest form of Unix service support.
 
@@ -105,7 +106,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       return @resource[:binary]
     else
       raise Puppet::Error,
-        "Services must specify a start command or a binary"
+            "Services must specify a start command or a binary"
     end
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :bsd, :parent => :init do
   desc <<-EOT
     Generic BSD form of `init`-style service management with `rc.d`.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Daemontools service management
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
@@ -40,7 +41,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
 
   EOT
 
-  commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
+  commands :svc => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
 
   class << self
     attr_writer :defpath
@@ -110,6 +111,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   def daemon
     path = resource[:path]
     raise Puppet::Error.new("#{self.class.name} must specify a path for daemon directory") unless path
+
     File.join(path, resource[:name])
   end
 
@@ -126,13 +128,13 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   end
 
   def setupservice
-      if resource[:manifest]
-        Puppet.notice "Configuring #{resource[:name]}"
-        command = [ resource[:manifest], resource[:name] ]
-        system("#{command}")
-      end
+    if resource[:manifest]
+      Puppet.notice "Configuring #{resource[:name]}"
+      command = [ resource[:manifest], resource[:name] ]
+      system("#{command}")
+    end
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}", detail)
+    raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}", detail)
   end
 
   def enabled?

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage debian services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :debian, :parent => :init do
@@ -68,9 +69,9 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   end
 
   def statuscmd
-      # /usr/sbin/service provides an abstraction layer which is able to query services
-      # independent of the init system used.
-      # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775795
+    # /usr/sbin/service provides an abstraction layer which is able to query services
+    # independent of the init system used.
+    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775795
     (@resource[:hasstatus] == :true) && [command(:service), @resource[:name], "status"]
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
+Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   desc "Provider for FreeBSD and DragonFly BSD. Uses the `rcvar` argument of init scripts and parses/edits rc files."
 
   confine 'os.name' => [:freebsd, :dragonfly]
@@ -75,7 +75,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
       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  }
+          Puppet::FileSystem.replace_file(filename) { |f| f << s }
           self.debug("Replaced in #{filename}")
           success = true
         end
@@ -91,20 +91,20 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     if Puppet::FileSystem.exist?(rcconf_dir)
       File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) {
         |f| f << append
-        self.debug("Appended to #{f.path}")
+            self.debug("Appended to #{f.path}")
       }
     else
       # Else, check the local rc file first, but don't create it
       if Puppet::FileSystem.exist?(rcconf_local)
         File.open(rcconf_local, File::WRONLY | File::APPEND) {
           |f| f << append
-          self.debug("Appended to #{f.path}")
+              self.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| f << append
-          self.debug("Appended to #{f.path}")
+              self.debug("Appended to #{f.path}")
         }
       end
     end
@@ -140,5 +140,4 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def statuscmd
     [self.initscript, :onestatus]
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage gentoo services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :gentoo, :parent => :init do
@@ -14,9 +15,9 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
   confine 'os.name' => :gentoo
 
   def disable
-      output = update :del, @resource[:name], :default
+    output = update :del, @resource[:name], :default
   rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
+    raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
   end
 
   def enabled?
@@ -39,8 +40,8 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
   end
 
   def enable
-      output = update :add, @resource[:name], :default
+    output = update :add, @resource[:name], :default
   rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
+    raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The standard init-based service type.  Many other service types are
 # customizations of this module.
 Puppet::Type.type(:service).provide :init, :parent => :base do
@@ -20,15 +21,12 @@ 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'))
   # RedHat systems should use the RedHat provider.
-  confine :true => begin
-      os = Puppet.runtime[:facter].value('os.name').downcase
-      family = Puppet.runtime[:facter].value('os.family').downcase
-      !(os == 'debian' || os == 'ubuntu' || family == 'redhat')
-  end
+  confine :false => Puppet.runtime[:facter].value('os.family') == 'RedHat'
 
   # We can't confine this here, because the init path can be overridden.
-  #confine :exists => defpath
+  # confine :exists => defpath
 
   # some init scripts are not safe to execute, e.g. we do not want
   # to suddenly run /etc/init.d/reboot.sh status and reboot our system. The
@@ -57,9 +55,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # 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
-                   hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
-                   rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
-                   umountnfs.sh}
+                     hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
+                     rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
+                     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)
@@ -101,6 +99,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         next if Puppet::FileSystem.directory?(fullpath)
         next unless Puppet::FileSystem.executable?(fullpath)
         next unless is_init?(fullpath)
+
         instances << new(:name => name, :path => path, :hasstatus => true)
       end
     end
@@ -174,7 +173,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   def service_execute(type, command, fof = true, squelch = false, combine = true)
     if type == :start && Puppet.runtime[:facter].value('os.family') == "Solaris"
-        command =  ["/usr/bin/ctrun -l child", command].flatten.join(" ")
+      command = ["/usr/bin/ctrun -l child", command].flatten.join(" ")
     end
     super(type, command, fof, squelch, combine)
   end
@@ -186,7 +185,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     (@resource[:hasstatus] == :true) && [initscript, :status]
   end
 
-private
+  private
 
   def self.is_init?(script = initscript)
     file = Puppet::FileSystem.pathname(script)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
@@ -45,7 +46,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
   defaultfor 'os.name' => :darwin
   confine 'os.name'    => :darwin
-  confine :feature            => :cfpropertylist
+  confine :feature => :cfpropertylist
 
   has_feature :enableable
   has_feature :refreshable
@@ -71,7 +72,9 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.get_os_version
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @os_version ||= Facter.value('os.release.major').to_i
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   # Defines the path to the overrides plist file where service enabling
@@ -133,16 +136,18 @@ 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
+
     @label_to_path_map = {}
     launchd_paths.each do |path|
       return_globbed_list_of_file_paths(path).each do |filepath|
         Puppet.debug("Reading launchd plist #{filepath}")
         job = read_plist(filepath)
         next if job.nil?
+
         if job.respond_to?(:key) && job.key?("Label")
           @label_to_path_map[job["Label"]] = filepath
         else
-          #TRANSLATORS 'plist' and label' should not be translated
+          # TRANSLATORS 'plist' and label' should not be translated
           Puppet.debug(_("The %{file} plist does not contain a 'label' key; Puppet is skipping it") % { file: filepath })
           next
         end
@@ -183,6 +188,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     begin
       output = launchctl :list
       raise Puppet::Error.new("launchctl list failed to return any data.") if output.nil?
+
       output.split("\n").each do |line|
         @job_list[line.split(/\s/).last] = :running
       end
@@ -207,6 +213,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
       overrides = read_plist(launchd_overrides)
       break unless overrides.nil?
       raise Puppet::Error.new(_('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)
       i += 1
@@ -274,7 +281,7 @@ 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 self.enabled? == :false || self.status == :stopped # launchctl won't load disabled jobs
       did_enable_job = true
     end
     cmds << job_path
@@ -287,7 +294,6 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     self.disable if did_enable_job and resource[:enable] == :false
   end
 
-
   def stop
     if resource[:stop]
       service_command(:stop)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-Puppet::Type.type(:service).provide :openbsd, :parent => :init do
 
+Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   desc "Provider for OpenBSD's rc.d daemon control scripts"
 
   commands :rcctl => '/usr/sbin/rcctl'
@@ -36,10 +36,10 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
         process.each_line do |line|
           match = /^(.*?)(?:_flags)?=(.*)$/.match(line)
           attributes_hash = {
-            :name      => match[1],
-            :flags     => match[2],
+            :name => match[1],
+            :flags => match[2],
             :hasstatus => true,
-            :provider  => :openbsd,
+            :provider => :openbsd,
           }
 
           instances << new(attributes_hash);

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Gentoo OpenRC
 Puppet::Type.type(:service).provide :openrc, :parent => :base do
   desc <<-EOT
@@ -68,5 +69,4 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
   def statuscmd
     ((@resource.provider.get(:hasstatus) == true) || (@resource[:hasstatus] == :true)) && [command(:rcservice), @resource[:name], :status]
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init do
   desc <<-EOT
     Support for OpenWrt flavored init scripts.
@@ -33,5 +34,4 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
   # As OpenWrt init script do not have status commands
   def statuscmd
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
   desc <<-EOT
     RCng service management with rc.d

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage Red Hat services.  Start/stop uses /sbin/service and enable/disable uses chkconfig
 
 Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init do
@@ -44,8 +45,8 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   # Don't support them specifying runlevels; always use the runlevels
   # in the init scripts.
   def enable
-      chkconfig("--add", @resource[:name])
-      chkconfig(@resource[:name], :on)
+    chkconfig("--add", @resource[:name])
+    chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
     raise Puppet::Error, "Could not enable #{self.name}: #{detail}", detail.backtrace
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Daemontools service management
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
@@ -80,13 +81,13 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
 
   def start
     if enabled? != :true
-        enable
-        # Work around issue #4480
-        # 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 }
-        sleep 5
+      enable
+      # Work around issue #4480
+      # 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 }
+      sleep 5
     end
     sv "start", self.service
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :service do
   desc "The simplest form of service support."
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'timeout'
 
 # Solaris 10 SMF-style services.
@@ -130,6 +131,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(' ')
     value == 'true' ? :true : :false
   end
@@ -168,6 +170,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
       loop do
         states = self.service_states
         break if desired_states.include?(states[:current]) && states[:next].nil?
+
         Kernel.sleep(1)
       end
     end
@@ -222,10 +225,10 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
       return :degraded
     when "legacy_run"
       raise Puppet::Error,
-        "Cannot manage legacy services through SMF"
+            "Cannot manage legacy services through SMF"
     else
       raise Puppet::Error,
-        "Unmanageable state '#{state}' on service #{self.name}"
+            "Unmanageable state '#{state}' on service #{self.name}"
     end
   end