puppet 0.25.5 → 2.6.0

data/lib/puppet/provider/port/parsed.rb

@@ -27,7 +27,7 @@ require 'puppet/provider/parsedfile'
 #    record_line :parsed, :fields => %w{name port protocols alias description},
 #        :optional => %w{alias description} do |line|
 #        if line =~ /\/ddp/
-#            raise "missed ddp in %s" % line
+#            raise "missed ddp in #{line}"
 #        end
 #        # The record might contain multiple port lines separated by \n.
 #        hashes = line.split("\n").collect { |l| parse_port(l) }
@@ -113,7 +113,7 @@ require 'puppet/provider/parsedfile'
 #                    #    line.inspect
 #                    next
 #            end
-#            Puppet.notice "Ignoring unparseable line '%s' in %s" % [line, self.target]
+#            Puppet.notice "Ignoring unparseable line '#{line}' in #{self.target}"
 #        end
 #
 #        if hash.empty?
@@ -157,14 +157,14 @@ require 'puppet/provider/parsedfile'
 #
 #        # Strangely, most sites seem to use tabs as separators.
 #        hash[:protocols].collect { |proto|
-#            str = "%s\t\t%s/%s" % [hash[:name], hash[:number], proto]
+#            str = "#{hash[:name]}\t\t#{hash[:number]}/#{proto}"
 #
 #            if value = hash[:alias] and value != :absent
-#                str += "\t\t%s" % value.join(" ")
+#                str += "\t\t#{value.join(" ")}"
 #            end
 #
 #            if value = hash[:description] and value != :absent
-#                str += "\t# %s" % value
+#                str += "\t# #{value}"
 #            end
 #            str
 #        }.join("\n")

data/lib/puppet/provider/selboolean/getsetsebool.rb

@@ -1,47 +1,47 @@
 Puppet::Type.type(:selboolean).provide(:getsetsebool) do
-    desc "Manage SELinux booleans using the getsebool and setsebool binaries."
+  desc "Manage SELinux booleans using the getsebool and setsebool binaries."
 
-    commands :getsebool => "/usr/sbin/getsebool"
-    commands :setsebool => "/usr/sbin/setsebool"
+  commands :getsebool => "/usr/sbin/getsebool"
+  commands :setsebool => "/usr/sbin/setsebool"
 
-    def value
-        self.debug "Retrieving value of selboolean #{@resource[:name]}"
+  def value
+    self.debug "Retrieving value of selboolean #{@resource[:name]}"
 
-        status = getsebool(@resource[:name])
+    status = getsebool(@resource[:name])
 
-        if status =~ / off$/ then
-            return :off
-        elsif status =~ / on$/ then
-            return :on
-        else
-            status.chomp!
-            raise Puppet::Error, "Invalid response '%s' returned from getsebool" % [status]
-        end
+    if status =~ / off$/
+      return :off
+    elsif status =~ / on$/ then
+      return :on
+    else
+      status.chomp!
+      raise Puppet::Error, "Invalid response '#{status}' returned from getsebool"
     end
+  end
 
-    def value=(new)
-        persist = ""
-        if @resource[:persistent] == :true
-            self.debug "Enabling persistence"
-            persist = "-P"
-        end
-        execoutput("#{command(:setsebool)} #{persist} #{@resource[:name]} #{new}")
-        return :file_changed
+  def value=(new)
+    persist = ""
+    if @resource[:persistent] == :true
+      self.debug "Enabling persistence"
+      persist = "-P"
     end
+    execoutput("#{command(:setsebool)} #{persist} #{@resource[:name]} #{new}")
+    :file_changed
+  end
 
-    # Required workaround, since SELinux policy prevents setsebool
-    # from writing to any files, even tmp, preventing the standard
-    # 'setsebool("...")' construct from working.
+  # Required workaround, since SELinux policy prevents setsebool
+  # from writing to any files, even tmp, preventing the standard
+  # 'setsebool("...")' construct from working.
 
-    def execoutput (cmd)
-      output = ''
-      begin
-        execpipe(cmd) do |out|
-          output = out.readlines.join('').chomp!
-        end
-      rescue Puppet::ExecutionFailure
-        raise Puppet::ExecutionFailure, output.split("\n")[0]
+  def execoutput (cmd)
+    output = ''
+    begin
+      execpipe(cmd) do |out|
+        output = out.readlines.join('').chomp!
       end
-      return output
+    rescue Puppet::ExecutionFailure
+      raise Puppet::ExecutionFailure, output.split("\n")[0]
     end
+    output
+  end
 end

data/lib/puppet/provider/selmodule/semodule.rb

@@ -1,143 +1,135 @@
 Puppet::Type.type(:selmodule).provide(:semodule) do
-    desc "Manage SELinux policy modules using the semodule binary."
+  desc "Manage SELinux policy modules using the semodule binary."
 
-    commands :semodule => "/usr/sbin/semodule"
+  commands :semodule => "/usr/sbin/semodule"
 
-    def create
-        begin
-            execoutput("#{command(:semodule)} --install #{selmod_name_to_filename}")
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error, "Could not load policy module: %s" % [detail];
-        end
-        return :true
-    end
-
-    def destroy
-        begin
-            execoutput("#{command(:semodule)} --remove #{@resource[:name]}")
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error, "Could not remove policy module: %s" % [detail];
-        end
+  def create
+    begin
+      execoutput("#{command(:semodule)} --install #{selmod_name_to_filename}")
+    rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error, "Could not load policy module: #{detail}";
     end
-
-    def exists?
-        self.debug "Checking for module #{@resource[:name]}"
-        execpipe("#{command(:semodule)} --list") do |out|
-            out.each do |line|
-                if line =~ /#{@resource[:name]}\b/
-                        return :true
-                end
-            end
+    :true
+  end
+
+  def destroy
+      execoutput("#{command(:semodule)} --remove #{@resource[:name]}")
+  rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error, "Could not remove policy module: #{detail}";
+  end
+
+  def exists?
+    self.debug "Checking for module #{@resource[:name]}"
+    execpipe("#{command(:semodule)} --list") do |out|
+      out.each do |line|
+        if line =~ /#{@resource[:name]}\b/
+          return :true
         end
-        return nil
+      end
     end
+    nil
+  end
 
-    def syncversion
-        self.debug "Checking syncversion on #{@resource[:name]}"
-
-        loadver = selmodversion_loaded
+  def syncversion
+    self.debug "Checking syncversion on #{@resource[:name]}"
 
-        if(loadver) then
-            filever = selmodversion_file
-            if (filever == loadver) then
-                return :true
-            end
-        end
-        return :false
-    end
+    loadver = selmodversion_loaded
 
-    def syncversion= (dosync)
-        begin
-            execoutput("#{command(:semodule)} --upgrade #{selmod_name_to_filename}")
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error, "Could not upgrade policy module: %s" % [detail];
-        end
+    if(loadver) then
+      filever = selmodversion_file
+      if (filever == loadver)
+        return :true
+      end
     end
-
-    # Helper functions
-
-    def execoutput (cmd)
-      output = ''
-      begin
-        execpipe(cmd) do |out|
-          output = out.readlines.join('').chomp!
-        end
-      rescue Puppet::ExecutionFailure
-        raise Puppet::ExecutionFailure, output.split("\n")[0]
+    :false
+  end
+
+  def syncversion= (dosync)
+      execoutput("#{command(:semodule)} --upgrade #{selmod_name_to_filename}")
+  rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error, "Could not upgrade policy module: #{detail}";
+  end
+
+  # Helper functions
+
+  def execoutput (cmd)
+    output = ''
+    begin
+      execpipe(cmd) do |out|
+        output = out.readlines.join('').chomp!
       end
-      return output
+    rescue Puppet::ExecutionFailure
+      raise Puppet::ExecutionFailure, output.split("\n")[0]
     end
-
-    def selmod_name_to_filename
-        if @resource[:selmodulepath]
-            return @resource[:selmodulepath]
-        else
-            return "#{@resource[:selmoduledir]}/#{@resource[:name]}.pp"
-        end
+    output
+  end
+
+  def selmod_name_to_filename
+    if @resource[:selmodulepath]
+      return @resource[:selmodulepath]
+    else
+      return "#{@resource[:selmoduledir]}/#{@resource[:name]}.pp"
     end
+  end
 
-    def selmod_readnext (handle)
-        len = handle.read(4).unpack('L')[0]
-        return handle.read(len)
-    end
+  def selmod_readnext (handle)
+    len = handle.read(4).unpack('L')[0]
+    handle.read(len)
+  end
 
-    def selmodversion_file
-        magic = 0xF97CFF8F
+  def selmodversion_file
+    magic = 0xF97CFF8F
 
-        filename = selmod_name_to_filename
-        mod = File.new(filename, "r")
+    filename = selmod_name_to_filename
+    mod = File.new(filename, "r")
 
-        (hdr, ver, numsec) = mod.read(12).unpack('LLL')
+    (hdr, ver, numsec) = mod.read(12).unpack('LLL')
 
-        if hdr != magic
-            raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}"
-        end
+    raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}" if hdr != magic
 
-        if ver != 1
-            raise Puppet::Error, "Unknown policy file version #{ver} in #{filename}"
-        end
+    raise Puppet::Error, "Unknown policy file version #{ver} in #{filename}" if ver != 1
 
-        # Read through (and throw away) the file section offsets, and also
-        # the magic header for the first section.
+    # Read through (and throw away) the file section offsets, and also
+    # the magic header for the first section.
 
-        mod.read((numsec + 1) * 4)
+    mod.read((numsec + 1) * 4)
 
-        ## Section 1 should be "SE Linux Module"
+    ## Section 1 should be "SE Linux Module"
 
-        selmod_readnext(mod)
-        selmod_readnext(mod)
+    selmod_readnext(mod)
+    selmod_readnext(mod)
 
-        # Skip past the section headers
-        mod.read(14)
+    # Skip past the section headers
+    mod.read(14)
 
-        # Module name
-        selmod_readnext(mod)
+    # Module name
+    selmod_readnext(mod)
 
-        # At last!  the version
+    # At last!  the version
 
-        v = selmod_readnext(mod)
+    v = selmod_readnext(mod)
 
-        self.debug "file version #{v}"
-        return v
-    end
+    self.debug "file version #{v}"
+    v
+  end
 
-    def selmodversion_loaded
-        lines = ()
-        begin
-            execpipe("#{command(:semodule)} --list") do |output|
-                lines = output.readlines
-                lines.each do |line|
-                    line.chomp!
-                    bits = line.split
-                    if bits[0] == @resource[:name] then
-                        self.debug "load version #{bits[1]}"
-                        return bits[1]
-                    end
-                end
-            end
-        rescue Puppet::ExecutionFailure
-            raise Puppet::ExecutionFailure, "Could not list policy modules: %s" % [lines.join(' ').chomp!]
+  def selmodversion_loaded
+    lines = ()
+    begin
+      execpipe("#{command(:semodule)} --list") do |output|
+        lines = output.readlines
+        lines.each do |line|
+          line.chomp!
+          bits = line.split
+          if bits[0] == @resource[:name]
+            self.debug "load version #{bits[1]}"
+            return bits[1]
+          end
         end
-        return nil
+      end
+    rescue Puppet::ExecutionFailure
+      raise Puppet::ExecutionFailure, "Could not list policy modules: #{lines.join(' ').chomp!}"
     end
+    nil
+  end
 end

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

@@ -1,149 +1,144 @@
 Puppet::Type.type(:service).provide :base do
-    desc "The simplest form of service support.
-
-    You have to specify enough about your service for this to work; the
-    minimum you can specify is a binary for starting the process, and this
-    same binary will be searched for in the process table to stop the
-    service.  It is preferable to specify start, stop, and status commands,
-    akin to how you would do so using ``init``.
-
-    "
-
-    commands :kill => "kill"
-
-    def self.instances
-        []
-    end
-
-    # Get the process ID for a running process. Requires the 'pattern'
-    # parameter.
-    def getpid
-        unless @resource[:pattern]
-            @resource.fail "Either stop/status commands or a pattern must be specified"
-        end
-        ps = Facter["ps"].value
-        unless ps and ps != ""
-            @resource.fail "You must upgrade Facter to a version that includes 'ps'"
-        end
-        regex = Regexp.new(@resource[:pattern])
-        self.debug "Executing '#{ps}'"
-        IO.popen(ps) { |table|
-            table.each { |line|
-                if regex.match(line)
-                    ary = line.sub(/^\s+/, '').split(/\s+/)
-                    return ary[1]
-                end
-            }
-        }
-
-        return nil
-    end
-
-    # How to restart the process.
-    def restart
-        if @resource[:restart] or restartcmd
-            ucommand(:restart)
-        else
-            self.stop
-            self.start
-        end
-    end
-
-    # There is no default command, which causes other methods to be used  
-    def restartcmd
-    end
-
-    # Check if the process is running.  Prefer the 'status' parameter,
-    # then 'statuscmd' method, then look in the process table.  We give
-    # the object the option to not return a status command, which might
-    # happen if, for instance, it has an init script (and thus responds to
-    # 'statuscmd') but does not have 'hasstatus' enabled.
-    def status
-        if @resource[:status] or statuscmd
-            # Don't fail when the exit status is not 0.
-            ucommand(:status, false)
-
-            # Expicitly calling exitstatus to facilitate testing
-            if $?.exitstatus == 0
-                return :running
-            else
-                return :stopped
-            end
-        elsif pid = self.getpid
-            self.debug "PID is %s" % pid
-            return :running
-        else
-            return :stopped
+  desc "The simplest form of service support.
+
+  You have to specify enough about your service for this to work; the
+  minimum you can specify is a binary for starting the process, and this
+  same binary will be searched for in the process table to stop the
+  service.  It is preferable to specify start, stop, and status commands,
+  akin to how you would do so using ``init``.
+
+  "
+
+  commands :kill => "kill"
+
+  def self.instances
+    []
+  end
+
+  # Get the process ID for a running process. Requires the 'pattern'
+  # parameter.
+  def getpid
+    @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
+    ps = Facter["ps"].value
+    @resource.fail "You must upgrade Facter to a version that includes 'ps'" unless ps and ps != ""
+    regex = Regexp.new(@resource[:pattern])
+    self.debug "Executing '#{ps}'"
+    IO.popen(ps) { |table|
+      table.each { |line|
+        if regex.match(line)
+          ary = line.sub(/^\s+/, '').split(/\s+/)
+          return ary[1]
         end
+      }
+    }
+
+    nil
+  end
+
+  # How to restart the process.
+  def restart
+    if @resource[:restart] or restartcmd
+      ucommand(:restart)
+    else
+      self.stop
+      self.start
     end
-
-    # There is no default command, which causes other methods to be used  
-    def statuscmd
+  end
+
+  # There is no default command, which causes other methods to be used
+  def restartcmd
+  end
+
+  # Check if the process is running.  Prefer the 'status' parameter,
+  # then 'statuscmd' method, then look in the process table.  We give
+  # the object the option to not return a status command, which might
+  # happen if, for instance, it has an init script (and thus responds to
+  # 'statuscmd') but does not have 'hasstatus' enabled.
+  def status
+    if @resource[:status] or statuscmd
+      # Don't fail when the exit status is not 0.
+      ucommand(:status, false)
+
+      # Expicitly calling exitstatus to facilitate testing
+      if $CHILD_STATUS.exitstatus == 0
+        return :running
+      else
+        return :stopped
+      end
+    elsif pid = self.getpid
+      self.debug "PID is #{pid}"
+      return :running
+    else
+      return :stopped
     end
-    
-    # Run the 'start' parameter command, or the specified 'startcmd'.
-    def start
-        ucommand(:start)
+  end
+
+  # There is no default command, which causes other methods to be used
+  def statuscmd
+  end
+
+  # Run the 'start' parameter command, or the specified 'startcmd'.
+  def start
+    ucommand(:start)
+  end
+
+  # The command used to start.  Generated if the 'binary' argument
+  # is passed.
+  def startcmd
+    if @resource[:binary]
+      return @resource[:binary]
+    else
+      raise Puppet::Error,
+        "Services must specify a start command or a binary"
     end
-
-    # The command used to start.  Generated if the 'binary' argument
-    # is passed.
-    def startcmd
-        if @resource[:binary]
-            return @resource[:binary]
-        else
-            raise Puppet::Error,
-                "Services must specify a start command or a binary"
-        end
+  end
+
+  # Stop the service.  If a 'stop' parameter is specified, it
+  # takes precedence; otherwise checks if the object responds to
+  # a 'stopcmd' method, and if so runs that; otherwise, looks
+  # for the process in the process table.
+  # This method will generally not be overridden by submodules.
+  def stop
+    if @resource[:stop] or stopcmd
+      ucommand(:stop)
+    else
+      pid = getpid
+      unless pid
+        self.info "#{self.name} is not running"
+        return false
+      end
+      begin
+        output = kill pid
+      rescue Puppet::ExecutionFailure => detail
+        @resource.fail "Could not kill #{self.name}, PID #{pid}: #{output}"
+      end
+      return true
     end
-
-    # Stop the service.  If a 'stop' parameter is specified, it
-    # takes precedence; otherwise checks if the object responds to
-    # a 'stopcmd' method, and if so runs that; otherwise, looks
-    # for the process in the process table.
-    # This method will generally not be overridden by submodules.
-    def stop
-        if @resource[:stop] or stopcmd
-            ucommand(:stop)
-        else
-            pid = getpid
-            unless pid
-                self.info "%s is not running" % self.name
-                return false
-            end
-            begin
-                output = kill pid
-            rescue Puppet::ExecutionFailure => detail
-                @resource.fail "Could not kill %s, PID %s: %s" %
-                        [self.name, pid, output]
-            end
-            return true
-        end
+  end
+
+  # There is no default command, which causes other methods to be used
+  def stopcmd
+  end
+
+  # A simple wrapper so execution failures are a bit more informative.
+  def texecute(type, command, fof = true)
+    begin
+      # #565: Services generally produce no output, so squelch them.
+      execute(command, :failonfail => fof, :squelch => true)
+    rescue Puppet::ExecutionFailure => detail
+      @resource.fail "Could not #{type} #{@resource.ref}: #{detail}"
     end
-    
-    # There is no default command, which causes other methods to be used  
-    def stopcmd
-    end
-
-    # A simple wrapper so execution failures are a bit more informative.
-    def texecute(type, command, fof = true)
-        begin
-            # #565: Services generally produce no output, so squelch them.
-            execute(command, :failonfail => fof, :squelch => true)
-        rescue Puppet::ExecutionFailure => detail
-            @resource.fail "Could not %s %s: %s" % [type, @resource.ref, detail]
-        end
-        return nil
-    end
-
-    # Use either a specified command or the default for our provider.
-    def ucommand(type, fof = true)
-        if c = @resource[type]
-            cmd = [c]
-        else
-            cmd = self.send("%scmd" % type)
-        end
-        return texecute(type, cmd, fof)
+    nil
+  end
+
+  # Use either a specified command or the default for our provider.
+  def ucommand(type, fof = true)
+    if c = @resource[type]
+      cmd = [c]
+    else
+      cmd = [send("#{type}cmd")].flatten
     end
+    texecute(type, cmd, fof)
+  end
 end