summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-30 20:36:29 +0000
committermpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-30 20:36:29 +0000
commit37a221c32e8107ec4f436b6619a87b868449516f (patch)
treec2072bd2dd86ec54ab576dd73ae44a6aad7b6c39
parent0a605e8e174ba0ee233703f096b48d09a8e38031 (diff)
downloadpuppet-37a221c32e8107ec4f436b6619a87b868449516f.tar.gz
puppet-37a221c32e8107ec4f436b6619a87b868449516f.tar.xz
puppet-37a221c32e8107ec4f436b6619a87b868449516f.zip
Add a grammatically correct 'has_feature' alias, and switch to using it where appropriate in existing code
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2542 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--lib/puppet/provider/user/netinfo.rb2
-rw-r--r--lib/puppet/provider/user/useradd.rb2
-rw-r--r--lib/puppet/util/provider_features.rb2
-rwxr-xr-xtest/ral/manager/attributes.rb2
-rwxr-xr-xtest/ral/providers/provider.rb10
5 files changed, 11 insertions, 7 deletions
diff --git a/lib/puppet/provider/user/netinfo.rb b/lib/puppet/provider/user/netinfo.rb
index 01d1dc275..35c1c6cd9 100644
--- a/lib/puppet/provider/user/netinfo.rb
+++ b/lib/puppet/provider/user/netinfo.rb
@@ -19,7 +19,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
autogen_defaults :home => "/var/empty", :shell => "/usr/bin/false", :password => '********'
- has_features :manages_passwords
+ has_feature :manages_passwords
verify :gid, "GID must be an integer" do |value|
value.is_a? Integer
diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb
index 3cee99648..dd05952f5 100644
--- a/lib/puppet/provider/user/useradd.rb
+++ b/lib/puppet/provider/user/useradd.rb
@@ -20,7 +20,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
has_features :manages_homedir, :allows_duplicates
if Puppet.features.libshadow? and (Facter.value(:kernel) == "Linux")
- has_features :manages_passwords
+ has_feature :manages_passwords
end
def addcmd
diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb
index c8edd52ec..4cc74f449 100644
--- a/lib/puppet/util/provider_features.rb
+++ b/lib/puppet/util/provider_features.rb
@@ -168,6 +168,8 @@ module Puppet::Util::ProviderFeatures
@declared_features << name
end
end
+ # Aaah, grammatical correctness
+ @feature_module.send(:alias_method, :has_feature, :has_features)
end
@feature_module
end
diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb
index 9826638ee..5a5064129 100755
--- a/test/ral/manager/attributes.rb
+++ b/test/ral/manager/attributes.rb
@@ -254,7 +254,7 @@ class TestTypeAttributes < Test::Unit::TestCase
# Now make similar providers
nope = type.provide(:nope) {}
- maybe = type.provide(:maybe) { has_features :fone}
+ maybe = type.provide(:maybe) { has_feature :fone}
yep = type.provide(:yep) { has_features :fone, :ftwo}
attrs = [:none, :one, :two]
diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb
index 8aa560e61..fcc6aaa09 100755
--- a/test/ral/providers/provider.rb
+++ b/test/ral/providers/provider.rb
@@ -346,6 +346,8 @@ class TestProviderFeatures < Test::Unit::TestCase
assert(provider.respond_to?(:has_features),
"Provider did not get 'has_features' method added")
+ assert(provider.respond_to?(:has_feature),
+ "Provider did not get the 'has_feature' alias method")
# One with the numeric methods and nothing else
@type.provide(:numbers) do
@@ -358,17 +360,17 @@ class TestProviderFeatures < Test::Unit::TestCase
define_method(:one) {}
define_method(:two) {}
- has_features :alpha
+ has_feature :alpha
end
# And just the declaration
@type.provide(:letters) do
- has_features :alpha
+ has_feature :alpha
end
# And a provider that declares it has our methodless feature.
@type.provide(:none) do
- has_features :nomeths
+ has_feature :nomeths
end
should = {:nothing => [], :both => [:numeric, :alpha],
@@ -392,7 +394,7 @@ class TestProviderFeatures < Test::Unit::TestCase
# and appropriate providers
nope = @type.provide(:nope) {}
- maybe = @type.provide(:maybe) { has_features(:alpha) }
+ maybe = @type.provide(:maybe) { has_feature(:alpha) }
yep = @type.provide(:yep) { has_features(:alpha, :numeric) }
# Now make sure our providers answer correctly.