Fixing #432 - you can now manage home dirs with users. You cannot yet purge home directories, because there is still controversy over how that should be done. Also, allowdupe is now handled like a feature, which is, um, better.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2328 980ebf18-57e1-0310-9a29-db15c13687c0

6 files changed, 82 insertions, 47 deletions

diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
index d34bc7a9e..91949e5e3 100644
--- a/lib/puppet/parameter.rb
+++ b/lib/puppet/parameter.rb
@@ -445,6 +445,12 @@ class Puppet::Parameter < Puppet::Element
         end
     end
 
+    # Retrieve the parent's provider.  Some types don't have providers, in which
+    # case we return the parent object itself.
+    def provider
+        @parent.provider || @parent
+    end
+
     # If there's a shadowing metaparam, instantiate it now.
     # This allows us to create a property or parameter with the
     # same name as a metaparameter, and the metaparam will only be
diff --git a/lib/puppet/provider/nameservice.rb b/lib/puppet/provider/nameservice.rb
index 377393973..3af5bfe35 100644
--- a/lib/puppet/provider/nameservice.rb
+++ b/lib/puppet/provider/nameservice.rb
@@ -84,6 +84,19 @@ class Puppet::Provider::NameService < Puppet::Provider
             return names
         end
 
+        def model=(model)
+            super
+            @model.validproperties.each do |prop|
+                next if prop == :ensure
+                unless public_method_defined?(prop)
+                    define_method(prop) { get(prop) || :absent}
+                end
+                unless public_method_defined?(prop.to_s + "+")
+                    define_method(prop.to_s + "=") { |*vals| set(prop, *vals) }
+                end
+            end
+        end
+
         # This is annoying, but there really aren't that many options,
         # and this *is* built into Ruby.
         def section
@@ -309,25 +322,6 @@ class Puppet::Provider::NameService < Puppet::Provider
         @objectinfo = nil
     end
 
-    # 
-    def method_missing(name, *args)
-        name = name.to_s
-
-        # Make sure it's a valid property.  We go up our class structure instead of
-        # our model's because the model is fake during testing.
-        unless self.class.model.validproperty?(name.sub("=",''))
-            raise Puppet::DevError, "%s is not a valid %s property" %
-                [name, @model.class.name]
-        end
-
-        # Each class has to override this manually
-        if name =~ /=/
-            set(name.to_s.sub("=", ''), *args)
-        else
-            return get(name.intern) || :absent
-        end
-    end
-
     def set(param, value)
         #self.class.validate(param, value)
         cmd = modifycmd(param, value)
diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb
index 55cc2d5dd..8ed0a9bd1 100644
--- a/lib/puppet/provider/user/useradd.rb
+++ b/lib/puppet/provider/user/useradd.rb
@@ -17,6 +17,8 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
         value !~ /\s/
     end
 
+    has_features :manages_homedir, :allows_duplicates
+
     def addcmd
         cmd = [command(:add)]
         @model.class.validproperties.each do |property|
@@ -33,10 +35,17 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
             cmd << "-M"
         else
         end
-        if @model[:allowdupe]  == :true
+
+        if @model.allowdupe?
             cmd << "-o"
         end
 
+        if @model.managehome?
+            cmd << "-m"
+        elsif %w{Fedora RedHat}.include?(Facter.value("operatingsystem"))
+            cmd << "-M"
+        end
+
         cmd << @model[:name]
 
         cmd
diff --git a/lib/puppet/type/property.rb b/lib/puppet/type/property.rb
index 4d772191d..5c4babf38 100644
--- a/lib/puppet/type/property.rb
+++ b/lib/puppet/type/property.rb
@@ -313,12 +313,6 @@ class Property < Puppet::Parameter
         return tmp
     end
 
-    # Retrieve the parent's provider.  Some types don't have providers, in which
-    # case we return the parent object itself.
-    def provider
-        @parent.provider || @parent
-    end
-
     # By default, call the method associated with the property name on our
     # provider.  In other words, if the property name is 'gid', we'll call
     # 'provider.gid' to retrieve the current value.
diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb
index ae62e577d..c4ca0d18a 100755
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@ -4,6 +4,28 @@ require 'puppet/type/property'
 
 module Puppet
     newtype(:user) do
+        @doc = "Manage users.  This type is mostly built to manage system
+            users, so it is lacking some features useful for managing normal
+            users.
+            
+            This element type uses the prescribed native tools for creating
+            groups and generally uses POSIX APIs for retrieving information
+            about them.  It does not directly modify /etc/passwd or anything.
+            
+            For most platforms, the tools used are ``useradd`` and its ilk;
+            for Mac OS X, NetInfo is used.  This is currently unconfigurable,
+            but if you desperately need it to be so, please contact us."
+
+        feature :allows_duplicates,
+            "The provider supports duplicate users with the same UID."
+
+        feature :manages_homedir,
+            "The provider can create and remove home directories."
+
+        feature :manages_passwords,
+            "The provider can modify user passwords, by accepting a password
+            hash."
+
         newproperty(:ensure) do
             newvalue(:present, :event => :user_created) do
                 provider.create
@@ -77,9 +99,10 @@ module Puppet
                 being created, if no user ID is specified then one will be
                 chosen automatically, which will likely result in the same user
                 having different IDs on different systems, which is not
-                recommended.  This is especially noteworthy if you use Puppet to manage
-                the same user on both Darwin and other platforms, since Puppet does the
-                ID generation for you on Darwin, but the tools do so on other platforms."
+                recommended.  This is especially noteworthy if you use Puppet
+                to manage the same user on both Darwin and other platforms,
+                since Puppet does the ID generation for you on Darwin, but the
+                tools do so on other platforms."
 
             munge do |value|
                 case value
@@ -262,7 +285,7 @@ module Puppet
             defaultto :minimum
         end
 
-        newparam(:allowdupe) do
+        newparam(:allowdupe, :boolean => true) do
             desc "Whether to allow duplicate UIDs."
                 
             newvalues(:true, :false)
@@ -270,19 +293,21 @@ module Puppet
             defaultto false
         end
 
-        @doc = "Manage users.  Currently can create and modify users, but
-            cannot delete them.  Theoretically all of the parameters are
-            optional, but if no parameters are specified the comment will
-            be set to the user name in order to make the internals work out
-            correctly.
-            
-            This element type uses the prescribed native tools for creating
-            groups and generally uses POSIX APIs for retrieving information
-            about them.  It does not directly modify /etc/passwd or anything.
-            
-            For most platforms, the tools used are ``useradd`` and its ilk;
-            for Mac OS X, NetInfo is used.  This is currently unconfigurable,
-            but if you desperately need it to be so, please contact us."
+        newparam(:managehome, :boolean => true) do
+            desc "Whether to manage the home directory when managing the user."
+
+            newvalues(:true, :false)
+
+            defaultto false
+
+            validate do |val|
+                if val.to_s == "true"
+                    unless provider.class.manages_homedir?
+                        raise ArgumentError, "User provider %s can not manage home directories" % provider.class.name
+                    end
+                end
+            end
+        end
 
         # Autorequire the group, if it's around
         autorequire(:group) do
diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb
index fbf2260dd..773f0ec98 100644
--- a/lib/puppet/util/provider_features.rb
+++ b/lib/puppet/util/provider_features.rb
@@ -12,11 +12,18 @@ module Puppet::Util::ProviderFeatures
 
         # Are all of the requirements met?
         def available?(obj)
-            if self.methods and ! methods_available?(obj)
+            if self.methods 
+                if methods_available?(obj)
+                    return true
+                else
+                    return false
+                end
+            else
+                # In this case, the provider has to declare support for this
+                # feature, and that's been checked before we ever get to the
+                # method checks.
                 return false
             end
-
-            true
         end
 
         def initialize(name, docs, hash)
@@ -44,7 +51,7 @@ module Puppet::Util::ProviderFeatures
     # Define one or more features.  At a minimum, features require a name
     # and docs, and at this point they should also specify a list of methods
     # required to determine if the feature is present.
-    def feature(name, docs, hash)
+    def feature(name, docs, hash = {})
         @features ||= {}
         if @features.include?(name)
             raise Puppet::DevError, "Feature %s is already defined" % name