puppet 0.22.4 → 0.23.0

data/lib/puppet/type/user.rb

@@ -22,7 +22,7 @@ module Puppet
             "The provider can modify user passwords, by accepting a password
             hash."
 
-        newproperty(:ensure) do
+        newproperty(:ensure, :parent => Puppet::Property::Ensure) do
             newvalue(:present, :event => :user_created) do
                 provider.create
             end
@@ -36,49 +36,30 @@ module Puppet
             # If they're talking about the thing at all, they generally want to
             # say it should exist.
             defaultto do
-                if @parent.managed?
+                if @resource.managed?
                     :present
                 else
                     nil
                 end
             end
 
-            def change_to_s
-                begin
-                    if @is == :absent
-                        return "created"
-                    elsif self.should == :absent
-                        return "removed"
-                    else
-                        return "%s changed '%s' to '%s'" %
-                            [self.name, self.is_to_s, self.should_to_s]
-                    end
-                rescue Puppet::Error, Puppet::DevError
-                    raise
-                rescue => detail
-                    raise Puppet::DevError,
-                        "Could not convert change %s to string: %s" %
-                        [self.name, detail]
-                end
-            end
-
             def retrieve
                 if provider.exists?
-                    @is = :present
+                    return :present
                 else
-                    @is = :absent
+                    return :absent
                 end
             end
 
             # The default 'sync' method only selects among a list of registered
             # values.
             def sync
-                if self.insync?
-                    self.info "already in sync"
-                    return nil
+#                if self.insync?
+#                    self.info "already in sync"
+#                    return nil
                 #else
                     #self.info "%s vs %s" % [self.is.inspect, self.should.inspect]
-                end
+#               end
                 unless self.class.values
                     self.devfail "No values defined for %s" %
                         self.class.name
@@ -177,7 +158,7 @@ module Puppet
         end
 
         newproperty(:password, :required_features => :manages_passwords) do
-            desc "The user's password, in whatever encrypted format the local machine requires."
+            desc "The user's password, in whatever encrypted format the local machine requires. Be sure to enclose any value that includes a dollar sign ($) in single quotes (\')."
         end
 
         newproperty(:groups) do
@@ -185,54 +166,52 @@ module Puppet
                 group should not be listed.  Multiple groups should be
                 specified as an array."
 
-            def should_to_s
+            def should_to_s(newvalue)
                 self.should
             end
 
-            def is_to_s
-                @is.join(",")
+            def is_to_s(currentvalue)
+                currentvalue.join(",")
             end
 
             # We need to override this because the groups need to
             # be joined with commas
             def should
-                unless defined? @is
-                    retrieve
-                end
+                current_value = retrieve
 
                 unless defined? @should and @should
                     return nil
                 end
 
-                if @parent[:membership] == :inclusive
+                if @resource[:membership] == :inclusive
                     return @should.sort.join(",")
                 else
                     members = @should
-                    if @is.is_a?(Array)
-                        members += @is
+                    if current_value.is_a?(Array)
+                        members += current_value
                     end
                     return members.uniq.sort.join(",")
                 end
             end
 
             def retrieve
-                if tmp = provider.groups
-                    @is = tmp.split(",")
+                if tmp = provider.groups and tmp != :absent
+                    return tmp.split(",")
                 else
-                    @is = :absent
+                    return :absent
                 end
             end
 
-            def insync?
+            def insync?(is)
                 unless defined? @should and @should
                     return true
                 end
-                unless defined? @is and @is
+                unless defined? is and is
                     return true
                 end
-                tmp = @is
-                if @is.is_a? Array
-                    tmp = @is.sort.join(",")
+                tmp = is
+                if is.is_a? Array
+                    tmp = is.sort.join(",")
                 end
 
                 return tmp == self.should
@@ -343,38 +322,26 @@ module Puppet
             autos
         end
 
-        def self.list_by_name
-            users = []
-            defaultprovider.listbyname do |user|
-                users << user
-            end
-            return users
-        end
-
-        def self.list
-            defaultprovider.list
-
-            self.collect do |user|
-                user
-            end
-        end
-
         def retrieve
             absent = false
-            properties().each { |property|
+            properties().inject({}) { |prophash, property|
+                current_value = :absent
+
                 if absent
-                    property.is = :absent
+                   prophash[property] = :absent
                 else
-                    property.retrieve
+                    current_value = property.retrieve
+                    prophash[property] = current_value
                 end
 
-                if property.name == :ensure and property.is == :absent
+                if property.name == :ensure and current_value == :absent
                     absent = true
-                    next
+#                    next
                 end
+                prophash
             }
         end
     end
 end
 
-# $Id: user.rb 2414 2007-04-25 20:59:00Z luke $
+# $Id: user.rb 2571 2007-06-13 20:01:34Z ajax $

data/lib/puppet/type/yumrepo.rb

@@ -2,35 +2,34 @@
 
 require 'puppet/propertychange'
 require 'puppet/util/inifile'
-require 'puppet/type/parsedtype'
 
 module Puppet
     # A property for one entry in a .ini-style file
     class IniProperty < Puppet::Property
-        def insync?
+        def insync?(is)
             # A should property of :absent is the same as nil
             if is.nil? && (should.nil? || should == :absent)
                 return true
             end
-            return super
+            return super(is)
         end
 
         def sync
-            if insync?
+            if insync?(retrieve)
                 result = nil
             else
                 result = set(self.should)
                 if should == :absent
-                    parent.section[inikey] = nil
+                    resource.section[inikey] = nil
                 else
-                    parent.section[inikey] = should
+                    resource.section[inikey] = should
                 end
             end
             return result
         end
 
         def retrieve
-            @is = parent.section[inikey]
+            return resource.section[inikey]
         end
         
         def inikey
@@ -81,19 +80,19 @@ module Puppet
         # Where to put files for brand new sections
         @defaultrepodir = nil
 
-        def self.list
+        def self.instances
             l = []
             check = validproperties
             clear
             inifile.each_section do |s|
                 next if s.name == "main"
                 obj = create(:name => s.name, :check => check)
-                obj.retrieve
+                current_values = obj.retrieve
                 obj.eachproperty do |property|
-                    if property.is.nil?
+                    if current_values[property].nil?
                         obj.delete(property.name)
                     else
-                        property.should = property.is
+                        property.should = current_values[property]
                     end
                 end
                 obj.delete(:check)
@@ -210,7 +209,7 @@ module Puppet
                 class << changes[-1]
                     def go
                         result = super
-                        self.property.parent.store
+                        self.property.resource.store
                         return result
                     end
                 end
@@ -332,6 +331,22 @@ module Puppet
             newvalue(%r{[0-9]+}) { }
         end
 
+        newproperty(:protect, :parent => Puppet::IniProperty) do
+            desc "Enable or disable protection for this repository. Requires 
+                  that the protectbase plugin is installed and enabled.
+                  #{ABSENT_DOC}"
+            newvalue(:absent) { self.should = :absent }
+            newvalue(%r{(0|1)}) { }
+        end
+
+        newproperty(:priority, :parent => Puppet::IniProperty) do
+            desc "Priority of this repository from 1-99. Requires that
+                  the priorities plugin is installed and enabled.
+                  #{ABSENT_DOC}"
+            newvalue(:absent) { self.should = :absent }
+            newvalue(%r{[1-9][0-9]?}) { }
+        end
+
         
         
     end

data/lib/puppet/type/zone.rb

@@ -15,23 +15,25 @@ Puppet::Type.newtype(:zone) do
     class ZoneMultiConfigProperty < ZoneConfigProperty
         def configtext
             list = @should
+            
+            current_value = self.retrieve
 
-            unless @is.is_a? Symbol
-                if @is.is_a? Array
-                    list += @is
+            unless current_value.is_a? Symbol
+                if current_value.is_a? Array
+                    list += current_value
                 else
-                    if @is
-                        list << @is
+                    if current_value
+                        list << current_value
                     end
                 end
             end
 
-            # Some hackery so we can test whether @is is an array or a symbol
-            if @is.is_a? Array
-                tmpis = @is
+            # Some hackery so we can test whether current_value is an array or a symbol
+            if current_value.is_a? Array
+                tmpis = current_value
             else
-                if @is
-                    tmpis = [@is]
+                if current_value
+                    tmpis = [current_value]
                 else
                     tmpis = []
                 end
@@ -39,6 +41,7 @@ Puppet::Type.newtype(:zone) do
 
             rms = []
             adds = []
+
             # Collect the modifications to make
             list.sort.uniq.collect do |obj|
                 # Skip objectories that are configured and should be
@@ -51,16 +54,17 @@ Puppet::Type.newtype(:zone) do
                 end
             end
 
+
             # And then perform all of the removals before any of the adds.
             (rms.collect { |o| rm(o) } + adds.collect { |o| add(o) }).join("\n")
         end
 
         # We want all specified directories to be included.
-        def insync?
-            if @is.is_a? Array and @should.is_a? Array
-                @is.sort == @should.sort
+        def insync?(current_value)
+            if current_value.is_a? Array and @should.is_a? Array
+                current_value.sort == @should.sort
             else
-                @is == @should
+                current_value == @should
             end
         end
     end
@@ -72,7 +76,14 @@ Puppet::Type.newtype(:zone) do
             only then can be ``running``.  Note also that ``halt`` is currently
             used to stop zones."
 
-        @properties = {}
+        @states = {}
+
+        def self.alias_state(values)
+            @state_aliases ||= {}
+            values.each do |nick, name|
+                @state_aliases[nick] = name
+            end
+        end
 
         def self.newvalue(name, hash)
             if @parametervalues.is_a? Hash
@@ -81,29 +92,39 @@ Puppet::Type.newtype(:zone) do
 
             @parametervalues << name
 
-            @properties[name] = hash
+            @states[name] = hash
             hash[:name] = name
         end
 
+        def self.state_name(name)
+            if other = @state_aliases[name]
+                other
+            else
+                name
+            end
+        end
+
         newvalue :absent, :down => :destroy
         newvalue :configured, :up => :configure, :down => :uninstall
         newvalue :installed, :up => :install, :down => :stop
         newvalue :running, :up => :start
 
+        alias_state :incomplete => :installed, :ready => :installed, :shutting_down => :running
+
         defaultto :running
 
-        def self.valueindex(value)
-            @parametervalues.index(value)
+        def self.state_index(value)
+            @parametervalues.index(state_name(value))
         end
 
         # Return all of the states between two listed values, exclusive
         # of the first item.
-        def self.valueslice(first, second)
+        def self.state_sequence(first, second)
             findex = sindex = nil
-            unless findex = @parametervalues.index(first)
+            unless findex = @parametervalues.index(state_name(first))
                 raise ArgumentError, "'%s' is not a valid zone state" % first
             end
-            unless sindex = @parametervalues.index(second)
+            unless sindex = @parametervalues.index(state_name(second))
                 raise ArgumentError, "'%s' is not a valid zone state" % first
             end
             list = nil
@@ -112,11 +133,11 @@ Puppet::Type.newtype(:zone) do
             # the range op twice.
             if findex > sindex
                 list = @parametervalues[sindex..findex].collect do |name|
-                    @properties[name]
+                    @states[name]
                 end.reverse
             else
                 list = @parametervalues[findex..sindex].collect do |name|
-                    @properties[name]
+                    @states[name]
                 end
             end
 
@@ -124,27 +145,24 @@ Puppet::Type.newtype(:zone) do
             list[1..-1]
         end
 
-        def is=(value)
-            value = value.intern if value.is_a? String
-            @is = value
+        def retrieve
+            provider.properties[:ensure]
         end
 
         def sync
             method = nil
             if up?
-                dir = :up
+                direction = :up
             else
-                dir = :down
+                direction = :down
             end
 
             # We need to get the state we're currently in and just call
             # everything between it and us.
-            states = self.class.valueslice(self.is, self.should)
-
-            properties.each do |prop|
-                if method = prop[dir]
+            self.class.state_sequence(self.retrieve, self.should).each do |state|
+                if method = state[direction]
                     warned = false
-                    while @parent.processing?
+                    while provider.processing?
                         unless warned
                             info "Waiting for zone to finish processing"
                             warned = true
@@ -154,7 +172,7 @@ Puppet::Type.newtype(:zone) do
                     provider.send(method)
                 else
                     raise Puppet::DevError, "Cannot move %s from %s" %
-                        [dir, st[:name]]
+                        [direction, st[:name]]
                 end
             end
 
@@ -163,7 +181,8 @@ Puppet::Type.newtype(:zone) do
 
         # Are we moving up the property tree?
         def up?
-            self.class.valueindex(self.is) < self.class.valueindex(self.should)
+            current_value = self.retrieve
+            self.class.state_index(current_value) < self.class.state_index(self.should)
         end
     end
 
@@ -200,7 +219,7 @@ Puppet::Type.newtype(:zone) do
             end
         end
 
-        # Add a directory to our list of inherited directories.
+        # Add an interface.
         def add(str)
             interface, ip = ipsplit(str)
             "add net
@@ -216,6 +235,7 @@ end
             return interface, address
         end
 
+        # Remove an interface.
         def rm(str)
             interface, ip = ipsplit(str)
             # Reality seems to disagree with the documentation here; the docs
@@ -260,7 +280,7 @@ end
 
         validate do |value|
             unless value =~ /^\//
-                raise ArgumentError, "The zone base must be fully qualified"
+                raise ArgumentError, "Inherited filesystems must be fully qualified"
             end
         end
 
@@ -330,7 +350,7 @@ end
 
         munge do |value|
             if value =~ /%s/
-                value % @parent[:name]
+                value % @resource[:name]
             else
                 value
             end
@@ -351,92 +371,33 @@ end
         end
     end
 
-    # Perform all of our configuration steps.
-    def configure
-        # If the thing is entirely absent, then we need to create the config.
-        str = %{create -b
-set zonepath=%s
-} % self[:path]
-
-        # Then perform all of our configuration steps.
-        properties().each do |property|
-            if property.is_a? ZoneConfigProperty and ! property.insync?
-                str += property.configtext + "\n"
-            end
-        end
-
-        str += "commit\n"
-        provider.setconfig(str)
-    end
-
-    # We need a way to test whether a zone is in process.  Our 'ensure'
-    # property models the static states, but we need to handle the temporary ones.
-    def processing?
-        if hash = provider.statushash()
-            case hash[:ensure]
-            when "incomplete", "ready", "shutting_down"
-                true
-            else
-                false
-            end
-        else
-            false
-        end
-    end
-
     def retrieve
-        if hash = provider.statushash()
-            setstatus(hash)
-
-            # Now retrieve the configuration itself and set appropriately.
-            config2status(provider.getconfig())
+        provider.flush
+        if hash = provider.properties() and hash[:ensure] != :absent
+            result = setstatus(hash)
+            result
         else
-            properties().each do |pr|
-                pr.is = :absent
-            end
+            return currentpropvalues(:absent)
         end
     end
 
     # Take the results of a listing and set everything appropriately.
     def setstatus(hash)
+        prophash = {}
         hash.each do |param, value|
             next if param == :name
             case self.class.attrtype(param)
-            when :pr:
-                self.is = [param, value]
+            when :property:
+                # Only try to provide values for the properties we're managing
+                if prop = self.property(param)
+                    prophash[prop] = value
+                end
             else
                 self[param] = value
             end
         end
-    end
-
-    private
-    # Turn the results of getconfig into status information.
-    def config2status(config)
-        config.each do |name, value|
-            case name
-            when :autoboot:
-                self.is = [:autoboot, value.intern]
-            when :zonepath:
-                # Nothing; this is set in the zoneadm list command
-            when :pool:
-                self.is = [:pool, value]
-            when :shares:
-                self.is = [:shares, value]
-            when "inherit-pkg-dir":
-                dirs = value.collect do |hash|
-                    hash[:dir]
-                end
-
-                self.is = [:inherit, dirs]
-            when "net":
-                vals = value.collect do |hash|
-                    "%s:%s" % [hash[:physical], hash[:address]]
-                end
-                self.is = [:ip, vals]
-            end
-        end
+        return prophash
     end
 end
 
-# $Id: zone.rb 2408 2007-04-24 02:41:16Z luke $
+# $Id: zone.rb 2576 2007-06-14 03:39:00Z luke $