puppet 0.25.5 → 2.6.0

data/lib/puppet/type/augeas.rb

@@ -18,147 +18,166 @@
 # Author: Bryan Kearney <bkearney@redhat.com>
 
 Puppet::Type.newtype(:augeas) do
-    include Puppet::Util
-
-    feature :parse_commands, "Parse the command string"
-    feature :need_to_run?, "If the command should run"
-    feature :execute_changes, "Actually make the changes"
-
-    @doc = "Apply the changes (single or array of changes) to the filesystem
-        via the augeas tool.
-
-         Requires:
-           - augeas to be installed (http://www.augeas.net)
-           - ruby-augeas bindings
-
-         Sample usage with a string::
-
-            augeas{\"test1\" :
-                   context => \"/files/etc/sysconfig/firstboot\",
-                   changes => \"set RUN_FIRSTBOOT YES\",
-                   onlyif  => \"match other_value size > 0\",
-             }
-
-         Sample usage with an array and custom lenses::
-
-            augeas{\"jboss_conf\":
-                context => \"/files\",
-                changes => [
-                    \"set /etc/jbossas/jbossas.conf/JBOSS_IP $ipaddress\",
-                    \"set /etc/jbossas/jbossas.conf/JAVA_HOME /usr\"
-                ],
-                load_path => \"$/usr/share/jbossas/lenses\",
-            }
-
-         "
-
-    newparam (:name) do
-        desc "The name of this task. Used for uniqueness"
-        isnamevar
-    end
-
-    newparam (:context) do
-        desc "Optional context path. This value is pre-pended to the paths of all changes if the
-              path is relative. So a path specified as /files/foo will not be prepended with the
-              context whild files/foo will be prepended"
-        defaultto ""
-    end
-
-    newparam (:onlyif) do
-        desc "Optional augeas command and comparisons to control the execution of this type.
-             Supported onlyif syntax::
-
-               get [AUGEAS_PATH] [COMPARATOR] [STRING]
-               match [MATCH_PATH] size [COMPARATOR] [INT]
-               match [MATCH_PATH] include [STRING]
-               match [MATCH_PATH] not_include [STRING]
-               match [MATCH_PATH] == [AN_ARRAY]
-               match [MATCH_PATH] != [AN_ARRAY]
-
-             where::
-
-               AUGEAS_PATH is a valid path scoped by the context
-               MATCH_PATH is a valid match synatx scoped by the context
-               COMPARATOR is in the set [> >= != == <= <]
-               STRING is a string
-               INT is a number
-               AN_ARRAY is in the form ['a string', 'another']"
-        defaultto ""
-    end
-
-
-    newparam(:changes) do
-        desc "The changes which should be applied to the filesystem. This
-        can be either a string which contains a command or an array of commands.
-        Commands supported are::
-
-          set [PATH] [VALUE]     Sets the value VALUE at loction PATH
-          rm [PATH]              Removes the node at location PATH
-          remove [PATH]          Synonym for rm
-          clear [PATH]           Keeps the node at PATH, but removes the value.
-          ins [LABEL] [WHERE] [PATH]
-                                 Inserts an empty node LABEL either [WHERE={before|after}] PATH.
-          insert [LABEL] [WHERE] [PATH]
-                                 Synonym for ins
-
-        If the parameter 'context' is set that value is prepended to PATH"
-    end
-
-
-    newparam(:root) do
-        desc "A file system path; all files loaded by Augeas are loaded underneath ROOT"
-        defaultto "/"
-    end
-
-    newparam(:load_path) do
-        desc "Optional colon separated list of directories; these directories are searched for schema definitions"
-        defaultto ""
+  include Puppet::Util
+
+  feature :parse_commands, "Parse the command string"
+  feature :need_to_run?, "If the command should run"
+  feature :execute_changes, "Actually make the changes"
+
+  @doc = "Apply the changes (single or array of changes) to the filesystem
+    via the augeas tool.
+
+    Requires:
+      - augeas to be installed (http://www.augeas.net)
+      - ruby-augeas bindings
+
+    Sample usage with a string::
+
+      augeas{\"test1\" :
+        context => \"/files/etc/sysconfig/firstboot\",
+        changes => \"set RUN_FIRSTBOOT YES\",
+        onlyif  => \"match other_value size > 0\",
+      }
+
+    Sample usage with an array and custom lenses::
+
+      augeas{\"jboss_conf\":
+        context => \"/files\",
+        changes => [
+          \"set /etc/jbossas/jbossas.conf/JBOSS_IP $ipaddress\",
+          \"set /etc/jbossas/jbossas.conf/JAVA_HOME /usr\"
+        ],
+        load_path => \"$/usr/share/jbossas/lenses\",
+      }
+
+    "
+
+  newparam (:name) do
+    desc "The name of this task. Used for uniqueness"
+    isnamevar
+  end
+
+  newparam (:context) do
+    desc "Optional context path. This value is prepended to the paths of all changes if the path is relative. If INCL is set, defaults to '/files' + INCL, otherwise the empty string"
+    defaultto ""
+    munge do |value|
+      if value.empty? and resource[:incl]
+        "/files" + resource[:incl]
+      else
+        value
+      end
     end
+  end
+
+  newparam (:onlyif) do
+    desc "Optional augeas command and comparisons to control the execution of this type.
+      Supported onlyif syntax::
+
+        get [AUGEAS_PATH] [COMPARATOR] [STRING]
+        match [MATCH_PATH] size [COMPARATOR] [INT]
+        match [MATCH_PATH] include [STRING]
+        match [MATCH_PATH] not_include [STRING]
+        match [MATCH_PATH] == [AN_ARRAY]
+        match [MATCH_PATH] != [AN_ARRAY]
+
+      where::
+
+        AUGEAS_PATH is a valid path scoped by the context
+        MATCH_PATH is a valid match synatx scoped by the context
+        COMPARATOR is in the set [> >= != == <= <]
+        STRING is a string
+        INT is a number
+        AN_ARRAY is in the form ['a string', 'another']"
+    defaultto ""
+  end
+
+
+  newparam(:changes) do
+    desc "The changes which should be applied to the filesystem. This
+    can be either a string which contains a command or an array of commands.
+    Commands supported are::
+
+      set [PATH] [VALUE]     Sets the value VALUE at loction PATH
+      rm [PATH]              Removes the node at location PATH
+      remove [PATH]          Synonym for rm
+      clear [PATH]           Keeps the node at PATH, but removes the value.
+      ins [LABEL] [WHERE] [PATH]
+        Inserts an empty node LABEL either [WHERE={before|after}] PATH.
+      insert [LABEL] [WHERE] [PATH]
+        Synonym for ins
+
+    If the parameter 'context' is set that value is prepended to PATH"
+  end
+
+
+  newparam(:root) do
+    desc "A file system path; all files loaded by Augeas are loaded underneath ROOT"
+    defaultto "/"
+  end
+
+  newparam(:load_path) do
+    desc "Optional colon separated list of directories; these directories are searched for schema definitions"
+    defaultto ""
+  end
+
+  newparam(:force) do
+    desc "Optional command to force the augeas type to execute even if it thinks changes
+    will not be made. This does not overide the only setting. If onlyif is set, then the
+    foce setting will not override that result"
+
+    defaultto false
+  end
+
+  newparam(:type_check) do
+    desc "Set to true if augeas should perform typechecking. Optional, defaults to false"
+    newvalues(:true, :false)
+
+    defaultto :false
+  end
+
+  newparam(:lens) do
+    desc "Use a specific lens, e.g. 'Hosts.lns'. When this parameter is set, you must also set the incl parameter to indicate which file to load. Only that file will be loaded, which greatly speeds up execution of the type"
+  end
+
+  newparam(:incl) do
+    desc "Load only a specific file, e.g. '/etc/hosts'.  When this parameter is set, you must also set the lens parameter to indicate which lens to use."
+  end
+
+  validate do
+    has_lens = !self[:lens].nil?
+    has_incl = !self[:incl].nil?
+    self.fail "You must specify both the lens and incl parameters, or neither" if has_lens != has_incl
+  end
+
+  # This is the acutal meat of the code. It forces
+  # augeas to be run and fails or not based on the augeas return
+  # code.
+  newproperty(:returns) do |property|
+    include Puppet::Util
+    desc "The expected return code from the augeas command. Should not be set"
 
-    newparam(:force) do
-        desc "Optional command to force the augeas type to execute even if it thinks changes
-        will not be made. This does not overide the only setting. If onlyif is set, then the
-        foce setting will not override that result"
+    defaultto 0
 
-        defaultto false
+    # Make output a bit prettier
+    def change_to_s(currentvalue, newvalue)
+      "executed successfully"
     end
 
-    newparam(:type_check) do
-        desc "Set to true if augeas should perform typechecking. Optional, defaults to false"
-        newvalues(:true, :false)
-
-        defaultto :false
+    # if the onlyif resource is provided, then the value is parsed.
+    # a return value of 0 will stop exection because it matches the
+    # default value.
+    def retrieve
+      if @resource.provider.need_to_run?()
+        :need_to_run
+      else
+        0
+      end
     end
 
-    # This is the acutal meat of the code. It forces
-    # augeas to be run and fails or not based on the augeas return
-    # code.
-    newproperty(:returns) do |property|
-        include Puppet::Util
-        desc "The expected return code from the augeas command. Should not be set"
-
-        defaultto 0
-
-        # Make output a bit prettier
-        def change_to_s(currentvalue, newvalue)
-            return "executed successfully"
-        end
-
-        # if the onlyif resource is provided, then the value is parsed.
-        # a return value of 0 will stop exection because it matches the
-        # default value.
-        def retrieve
-            if @resource.provider.need_to_run?()
-                :need_to_run
-            else
-                0
-            end
-        end
-
-        # Actually execute the command.
-        def sync
-            @resource.provider.execute_changes()
-        end
+    # Actually execute the command.
+    def sync
+      @resource.provider.execute_changes
     end
+  end
 
 end

data/lib/puppet/type/component.rb

@@ -4,84 +4,82 @@ require 'puppet/type'
 require 'puppet/transaction'
 
 Puppet::Type.newtype(:component) do
-    include Enumerable
+  include Enumerable
 
-    newparam(:name) do
-        desc "The name of the component.  Generally optional."
-        isnamevar
-    end
+  newparam(:name) do
+    desc "The name of the component.  Generally optional."
+    isnamevar
+  end
 
-    # Override how parameters are handled so that we support the extra
-    # parameters that are used with defined resource types.
-    def [](param)
-        return super if self.class.validattr?(param)
-        @extra_parameters[param.to_sym]
-    end
+  # Override how parameters are handled so that we support the extra
+  # parameters that are used with defined resource types.
+  def [](param)
+    return super if self.class.valid_parameter?(param)
+    @extra_parameters[param.to_sym]
+  end
 
-    # Override how parameters are handled so that we support the extra
-    # parameters that are used with defined resource types.
-    def []=(param, value)
-        return super if self.class.validattr?(param)
-        @extra_parameters[param.to_sym] = value
-    end
+  # Override how parameters are handled so that we support the extra
+  # parameters that are used with defined resource types.
+  def []=(param, value)
+    return super if self.class.valid_parameter?(param)
+    @extra_parameters[param.to_sym] = value
+  end
 
-    # Initialize a new component
-    def initialize(*args)
-        @extra_parameters = {}
-        super
+  # Initialize a new component
+  def initialize(*args)
+    @extra_parameters = {}
+    super
 
-        if catalog and ! catalog.resource(ref)
-            catalog.alias(self, ref)
-        end
-    end
+    catalog.alias(self, ref) if catalog and ! catalog.resource(ref)
+  end
 
-    # Component paths are special because they function as containers.
-    def pathbuilder
-        if reference.type == "Class"
-            # 'main' is the top class, so we want to see '//' instead of
-            # its name.
-            if reference.title == "main"
-                myname = ""
-            else
-                myname = reference.title
-            end
-        else
-            myname = reference.to_s
-        end
-        if p = self.parent
-            return [p.pathbuilder, myname]
-        else
-            return [myname]
-        end
+  # Component paths are special because they function as containers.
+  def pathbuilder
+    if reference.type == "Class"
+      # 'main' is the top class, so we want to see '//' instead of
+      # its name.
+      if reference.title.to_s.downcase == "main"
+        myname = ""
+      else
+        myname = reference.title
+      end
+    else
+      myname = reference.to_s
     end
-
-    def ref
-        reference.to_s
+    if p = self.parent
+      return [p.pathbuilder, myname]
+    else
+      return [myname]
     end
+  end
 
-    # We want our title to just be the whole reference, rather than @title.
-    def title
-        ref
-    end
+  def ref
+    reference.to_s
+  end
 
-    def title=(str)
-        @reference = Puppet::Resource::Reference.new(str)
-    end
+  # We want our title to just be the whole reference, rather than @title.
+  def title
+    ref
+  end
 
-    def refresh
-        catalog.adjacent(self).each do |child|
-            if child.respond_to?(:refresh)
-                child.refresh
-                child.log "triggering %s" % :refresh
-            end
-        end
-    end
+  def title=(str)
+    @reference = Puppet::Resource.new(str)
+  end
 
-    def to_s
-        reference.to_s
+  def refresh
+    catalog.adjacent(self).each do |child|
+      if child.respond_to?(:refresh)
+        child.refresh
+        child.log "triggering #{:refresh}"
+      end
     end
+  end
+
+  def to_s
+    reference.to_s
+  end
 
-    private
+  private
 
-    attr_reader :reference
+  attr_reader :reference
 end

data/lib/puppet/type/computer.rb

@@ -1,62 +1,62 @@
 Puppet::Type.newtype(:computer) do
 
-    @doc = "Computer object management using DirectoryService
-      on OS X.
+  @doc = "Computer object management using DirectoryService
+    on OS X.
 
-      Note that these are distinctly different kinds of objects to 'hosts',
-      as they require a MAC address and can have all sorts of policy attached to
-      them.
+    Note that these are distinctly different kinds of objects to 'hosts',
+    as they require a MAC address and can have all sorts of policy attached to
+    them.
 
-      This provider only manages Computer objects in the local directory service
-      domain, not in remote directories.
+    This provider only manages Computer objects in the local directory service
+    domain, not in remote directories.
 
-      If you wish to manage /etc/hosts on Mac OS X, then simply use the host
-      type as per other platforms.
+    If you wish to manage /etc/hosts on Mac OS X, then simply use the host
+    type as per other platforms.
 
-      This type primarily exists to create localhost Computer objects that MCX
-      policy can then be attached to."
+    This type primarily exists to create localhost Computer objects that MCX
+    policy can then be attached to."
 
-    # ensurable
+  # ensurable
 
-    # We autorequire the computer object in case it is being managed at the
-    # file level by Puppet.
+  # We autorequire the computer object in case it is being managed at the
+  # file level by Puppet.
 
-    autorequire(:file) do
-        if self[:name]
-            "/var/db/dslocal/nodes/Default/computers/#{self[:name]}.plist"
-        else
-            nil
-        end
+  autorequire(:file) do
+    if self[:name]
+      "/var/db/dslocal/nodes/Default/computers/#{self[:name]}.plist"
+    else
+      nil
     end
-
-    newproperty(:ensure, :parent => Puppet::Property::Ensure) do
-        desc "Control the existences of this computer record. Set this attribute to
-            ``present`` to ensure the computer record exists.  Set it to ``absent``
-            to delete any computer records with this name"
-        newvalue(:present) do
-            provider.create
-        end
-
-        newvalue(:absent) do
-            provider.delete
-        end
+  end
+
+  newproperty(:ensure, :parent => Puppet::Property::Ensure) do
+    desc "Control the existences of this computer record. Set this attribute to
+      ``present`` to ensure the computer record exists.  Set it to ``absent``
+      to delete any computer records with this name"
+    newvalue(:present) do
+      provider.create
     end
 
-    newparam(:name) do
-        desc "The authoritative 'short' name of the computer record."
-        isnamevar
+    newvalue(:absent) do
+      provider.delete
     end
+  end
 
-    newparam(:realname) do
-        desc "The 'long' name of the computer record."
-    end
+  newparam(:name) do
+    desc "The authoritative 'short' name of the computer record."
+    isnamevar
+  end
 
-    newproperty(:en_address) do
-        desc "The MAC address of the primary network interface. Must match en0."
-    end
+  newparam(:realname) do
+    desc "The 'long' name of the computer record."
+  end
 
-    newproperty(:ip_address) do
-        desc "The IP Address of the Computer object."
-    end
+  newproperty(:en_address) do
+    desc "The MAC address of the primary network interface. Must match en0."
+  end
+
+  newproperty(:ip_address) do
+    desc "The IP Address of the Computer object."
+  end
 
 end