puppet 0.25.5 → 2.6.0

data/lib/puppet/util/settings/boolean_setting.rb

@@ -2,32 +2,29 @@ require 'puppet/util/settings/setting'
 
 # A simple boolean.
 class Puppet::Util::Settings::BooleanSetting < Puppet::Util::Settings::Setting
-    # get the arguments in getopt format
-    def getopt_args
-        if short
-            [["--#{name}", "-#{short}", GetoptLong::NO_ARGUMENT],
-             ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
-        else
-            [["--#{name}", GetoptLong::NO_ARGUMENT],
-             ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
-        end
+  # get the arguments in getopt format
+  def getopt_args
+    if short
+      [["--#{name}", "-#{short}", GetoptLong::NO_ARGUMENT], ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
+    else
+      [["--#{name}", GetoptLong::NO_ARGUMENT], ["--no-#{name}", GetoptLong::NO_ARGUMENT]]
     end
+  end
 
-    def optparse_args
-        if short
-            ["--[no-]#{name}", "-#{short}", desc, :NONE ]
-        else
-            ["--[no-]#{name}", desc, :NONE]
-        end
+  def optparse_args
+    if short
+      ["--[no-]#{name}", "-#{short}", desc, :NONE ]
+    else
+      ["--[no-]#{name}", desc, :NONE]
     end
+  end
 
-    def munge(value)
-        case value
-        when true, "true"; return true
-        when false, "false"; return false
-        else
-            raise ArgumentError, "Invalid value '%s' for %s" %
-                [value.inspect, @name]
-        end
+  def munge(value)
+    case value
+    when true, "true"; return true
+    when false, "false"; return false
+    else
+      raise ArgumentError, "Invalid value '#{value.inspect}' for #{@name}"
     end
+  end
 end

data/lib/puppet/util/settings/file_setting.rb

@@ -2,123 +2,122 @@ require 'puppet/util/settings/setting'
 
 # A file.
 class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
-    AllowedOwners = %w{root service}
-    AllowedGroups = %w{service}
+  AllowedOwners = %w{root service}
+  AllowedGroups = %w{root service}
 
-    class SettingError < StandardError; end
+  class SettingError < StandardError; end
 
-    attr_accessor :mode, :create
+  attr_accessor :mode, :create
 
-    # Should we create files, rather than just directories?
-    def create_files?
-        create
-    end
+  # Should we create files, rather than just directories?
+  def create_files?
+    create
+  end
 
-    def group=(value)
-        unless AllowedGroups.include?(value)
-            identifying_fields = [desc,name,default].compact.join(': ') 
-            raise SettingError, "Internal error: The :group setting for %s must be 'service', not '%s'" % [identifying_fields,value]
-        end
-        @group = value
+  def group=(value)
+    unless AllowedGroups.include?(value)
+      identifying_fields = [desc,name,default].compact.join(': ')
+      raise SettingError, "Internal error: The :group setting for #{identifying_fields} must be 'service', not '#{value}'"
     end
-
-    def group
-        return unless defined?(@group) && @group
-        @settings[:group]
+    @group = value
+  end
+
+  def group
+    return unless @group
+    @settings[:group]
+  end
+
+  def owner=(value)
+    unless AllowedOwners.include?(value)
+      identifying_fields = [desc,name,default].compact.join(': ')
+      raise SettingError, "Internal error: The :owner setting for #{identifying_fields} must be either 'root' or 'service', not '#{value}'"
     end
-
-    def owner=(value)
-        unless AllowedOwners.include?(value)
-            identifying_fields = [desc,name,default].compact.join(': ') 
-            raise SettingError, "Internal error: The :owner setting for %s must be either 'root' or 'service', not '%s'" % [identifying_fields,value]
-        end
-        @owner = value
+    @owner = value
+  end
+
+  def owner
+    return unless @owner
+    return "root" if @owner == "root" or ! use_service_user?
+    @settings[:user]
+  end
+
+  def use_service_user?
+    @settings[:mkusers] or @settings.service_user_available?
+  end
+
+  # Set the type appropriately.  Yep, a hack.  This supports either naming
+  # the variable 'dir', or adding a slash at the end.
+  def munge(value)
+    # If it's not a fully qualified path...
+    if value.is_a?(String) and value !~ /^\$/ and value != 'false'
+      # Make it one
+      value = File.expand_path(value)
     end
-
-    def owner
-        return unless defined?(@owner) && @owner
-        return "root" if @owner == "root" or ! use_service_user?
-        @settings[:user]
+    if value.to_s =~ /\/$/
+      @type = :directory
+      return value.sub(/\/$/, '')
     end
-
-    def use_service_user?
-        @settings[:mkusers] or @settings.service_user_available?
+    value
+  end
+
+  # Return the appropriate type.
+  def type
+    value = @settings.value(self.name)
+    if @name.to_s =~ /dir/
+      return :directory
+    elsif value.to_s =~ /\/$/
+      return :directory
+    elsif value.is_a? String
+      return :file
+    else
+      return nil
     end
+  end
 
-    # Set the type appropriately.  Yep, a hack.  This supports either naming
-    # the variable 'dir', or adding a slash at the end.
-    def munge(value)
-        # If it's not a fully qualified path...
-        if value.is_a?(String) and value !~ /^\$/ and value !~ /^\// and value != 'false'
-            # Make it one
-            value = File.join(Dir.getwd, value)
-        end
-        if value.to_s =~ /\/$/
-            @type = :directory
-            return value.sub(/\/$/, '')
-        end
-        return value
-    end
+  # Turn our setting thing into a Puppet::Resource instance.
+  def to_resource
+    return nil unless type = self.type
 
-    # Return the appropriate type.
-    def type
-        value = @settings.value(self.name)
-        if @name.to_s =~ /dir/
-            return :directory
-        elsif value.to_s =~ /\/$/
-            return :directory
-        elsif value.is_a? String
-            return :file
-        else
-            return nil
-        end
-    end
+    path = self.value
 
-    # Turn our setting thing into a Puppet::Resource instance.
-    def to_resource
-        return nil unless type = self.type
+    return nil unless path.is_a?(String)
 
-        path = self.value
+    # Make sure the paths are fully qualified.
+    path = File.expand_path(path)
 
-        return nil unless path.is_a?(String)
+    return nil unless type == :directory or create_files? or File.exist?(path)
+    return nil if path =~ /^\/dev/
 
-        # Make sure the paths are fully qualified.
-        path = File.join(Dir.getwd, path) unless path =~ /^\//
+    resource = Puppet::Resource.new(:file, path)
 
-        return nil unless type == :directory or create_files? or File.exist?(path)
-        return nil if path =~ /^\/dev/
+    if Puppet[:manage_internal_file_permissions]
+      resource[:mode] = self.mode if self.mode
 
-        resource = Puppet::Resource.new(:file, path)
-
-        if Puppet[:manage_internal_file_permissions]
-            resource[:mode] = self.mode if self.mode
-
-            if Puppet.features.root?
-                resource[:owner] = self.owner if self.owner
-                resource[:group] = self.group if self.group
-            end
-        end
-
-        resource[:ensure] = type
-        resource[:loglevel] = :debug
-        resource[:backup] = false
-
-        resource.tag(self.section, self.name, "settings")
-
-        resource
+      if Puppet.features.root?
+        resource[:owner] = self.owner if self.owner
+        resource[:group] = self.group if self.group
+      end
     end
 
-    # Make sure any provided variables look up to something.
-    def validate(value)
-        return true unless value.is_a? String
-        value.scan(/\$(\w+)/) { |name|
-            name = $1
-            unless @settings.include?(name)
-                raise ArgumentError,
-                    "Settings parameter '%s' is undefined" %
-                    name
-            end
-        }
-    end
+    resource[:ensure] = type
+    resource[:loglevel] = :debug
+    resource[:backup] = false
+
+    resource.tag(self.section, self.name, "settings")
+
+    resource
+  end
+
+  # Make sure any provided variables look up to something.
+  def validate(value)
+    return true unless value.is_a? String
+    value.scan(/\$(\w+)/) { |name|
+      name = $1
+      unless @settings.include?(name)
+        raise ArgumentError,
+          "Settings parameter '#{name}' is undefined"
+      end
+    }
+  end
 end
 

data/lib/puppet/util/settings/setting.rb

@@ -1,110 +1,94 @@
 # The base element type.
 class Puppet::Util::Settings::Setting
-    attr_accessor :name, :section, :default, :setbycli, :call_on_define
-    attr_reader :desc, :short
-
-    def desc=(value)
-        @desc = value.gsub(/^\s*/, '')
+  attr_accessor :name, :section, :default, :setbycli, :call_on_define
+  attr_reader :desc, :short
+
+  def desc=(value)
+    @desc = value.gsub(/^\s*/, '')
+  end
+
+  # get the arguments in getopt format
+  def getopt_args
+    if short
+      [["--#{name}", "-#{short}", GetoptLong::REQUIRED_ARGUMENT]]
+    else
+      [["--#{name}", GetoptLong::REQUIRED_ARGUMENT]]
     end
-
-    # get the arguments in getopt format
-    def getopt_args
-        if short
-            [["--#{name}", "-#{short}", GetoptLong::REQUIRED_ARGUMENT]]
-        else
-            [["--#{name}", GetoptLong::REQUIRED_ARGUMENT]]
-        end
+  end
+
+  # get the arguments in OptionParser format
+  def optparse_args
+    if short
+      ["--#{name}", "-#{short}", desc, :REQUIRED]
+    else
+      ["--#{name}", desc, :REQUIRED]
     end
+  end
 
-    # get the arguments in OptionParser format
-    def optparse_args
-        if short
-            ["--#{name}", "-#{short}", desc, :REQUIRED]
-        else
-            ["--#{name}", desc, :REQUIRED]
-        end
-    end
+  def hook=(block)
+    meta_def :handle, &block
+  end
 
-    def hook=(block)
-        meta_def :handle, &block
+  # Create the new element.  Pretty much just sets the name.
+  def initialize(args = {})
+    unless @settings = args.delete(:settings)
+      raise ArgumentError.new("You must refer to a settings object")
     end
 
-    # Create the new element.  Pretty much just sets the name.
-    def initialize(args = {})
-        unless @settings = args.delete(:settings)
-            raise ArgumentError.new("You must refer to a settings object")
-        end
-
-        args.each do |param, value|
-            method = param.to_s + "="
-            unless self.respond_to? method
-                raise ArgumentError, "%s does not accept %s" % [self.class, param]
-            end
+    args.each do |param, value|
+      method = param.to_s + "="
+      raise ArgumentError, "#{self.class} does not accept #{param}" unless self.respond_to? method
 
-            self.send(method, value)
-        end
-
-        unless self.desc
-            raise ArgumentError, "You must provide a description for the %s config option" % self.name
-        end
+      self.send(method, value)
     end
 
-    def iscreated
-        @iscreated = true
-    end
+    raise ArgumentError, "You must provide a description for the #{self.name} config option" unless self.desc
+  end
 
-    def iscreated?
-        if defined? @iscreated
-            return @iscreated
-        else
-            return false
-        end
-    end
+  def iscreated
+    @iscreated = true
+  end
 
-    def set?
-        if defined? @value and ! @value.nil?
-            return true
-        else
-            return false
-        end
-    end
-
-    # short name for the celement
-    def short=(value)
-        if value.to_s.length != 1
-            raise ArgumentError, "Short names can only be one character."
-        end
-        @short = value.to_s
-    end
+  def iscreated?
+    @iscreated
+  end
 
-    # Convert the object to a config statement.
-    def to_config
-        str = @desc.gsub(/^/, "# ") + "\n"
+  def set?
+    !!(!@value.nil?)
+  end
 
-        # Add in a statement about the default.
-        if defined? @default and @default
-            str += "# The default value is '%s'.\n" % @default
-        end
+  # short name for the celement
+  def short=(value)
+    raise ArgumentError, "Short names can only be one character." if value.to_s.length != 1
+    @short = value.to_s
+  end
 
-        # If the value has not been overridden, then print it out commented
-        # and unconverted, so it's clear that that's the default and how it
-        # works.
-        value = @settings.value(self.name)
+  # Convert the object to a config statement.
+  def to_config
+    str = @desc.gsub(/^/, "# ") + "\n"
 
-        if value != @default
-            line = "%s = %s" % [@name, value]
-        else
-            line = "# %s = %s" % [@name, @default]
-        end
+    # Add in a statement about the default.
+    str += "# The default value is '#{@default}'.\n" if @default
 
-        str += line + "\n"
+    # If the value has not been overridden, then print it out commented
+    # and unconverted, so it's clear that that's the default and how it
+    # works.
+    value = @settings.value(self.name)
 
-        str.gsub(/^/, "    ")
+    if value != @default
+      line = "#{@name} = #{value}"
+    else
+      line = "# #{@name} = #{@default}"
     end
 
-    # Retrieves the value, or if it's not set, retrieves the default.
-    def value
-        @settings.value(self.name)
-    end
+    str += line + "\n"
+
+    str.gsub(/^/, "    ")
+  end
+
+  # Retrieves the value, or if it's not set, retrieves the default.
+  def value
+    @settings.value(self.name)
+  end
 end