This method has been superceded by Puppet::Type.parameter_names
Signed-off-by: Luke Kanies <[email protected]>
---
Local-branch: refactor/master/8233-refactor_parameter_management
lib/puppet/application/describe.rb | 12 ++++++------
lib/puppet/type.rb | 6 +-----
lib/puppet/type/schedule.rb | 2 +-
spec/unit/type_spec.rb | 6 +++---
test/ral/manager/provider.rb | 11 -----------
5 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/lib/puppet/application/describe.rb
b/lib/puppet/application/describe.rb
index 8ce20b6..2eab0c8 100644
--- a/lib/puppet/application/describe.rb
+++ b/lib/puppet/application/describe.rb
@@ -121,9 +121,9 @@ class TypeDoc
# List details about attributes
def format_attrs(type, attrs)
docs = {}
- type.allattrs.each do |name|
- kind = type.attrtype(name)
- docs[name] = type.attrclass(name).doc if attrs.include?(kind) && name !=
:provider
+ type.parameters.each do |param|
+ kind = param.parameter_type
+ docs[param.name] = param.doc if attrs.include?(kind) && param.name !=
:provider
end
docs.sort { |a,b|
@@ -142,9 +142,9 @@ class TypeDoc
# List the names of attributes
def list_attrs(type, attrs)
params = []
- type.allattrs.each do |name|
- kind = type.attrtype(name)
- params << name.to_s if attrs.include?(kind) && name != :provider
+ type.parameters.each do |param|
+ kind = param.parameter_type
+ params << param.name.to_s if attrs.include?(kind) && param.name !=
:provider
end
puts @format.wrap(params.sort.join(", "), :indent => 4)
end
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 77195a2..a399ad6 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -266,10 +266,6 @@ class Type
# All parameters, in the appropriate order. The key_attributes come first,
then
# the provider, then the properties, and finally the params and metaparams
# in the order they were specified in the files.
- def self.allattrs
- parameter_names
- end
-
def self.metaparams
metaparameters
end
@@ -1779,7 +1775,7 @@ class Type
# extra attributes from the resource so we get failures
# on invalid attributes.
no_values = []
- order = (self.class.allattrs + hash.keys).uniq
+ order = (self.class.parameter_names + hash.keys).uniq
order.uniq.each do |attr|
begin
# Set any defaults immediately. This is mostly done so
diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb
index f60f96f..494d59d 100755
--- a/lib/puppet/type/schedule.rb
+++ b/lib/puppet/type/schedule.rb
@@ -336,7 +336,7 @@ module Puppet
now ||= Time.now
# Pull them in order
- self.class.allattrs.each { |param|
+ self.class.parameter_names.each { |param|
if @parameters.include?(param) and
@parameters[param].respond_to?(:match?)
return false unless @parameters[param].match?(previous, now)
diff --git a/spec/unit/type_spec.rb b/spec/unit/type_spec.rb
index a39dec1..4997a89 100755
--- a/spec/unit/type_spec.rb
+++ b/spec/unit/type_spec.rb
@@ -464,8 +464,8 @@ describe Puppet::Type do
lambda { Puppet::Type.type(:file).new(:atboot => true) }.should
raise_error(Puppet::Error)
end
- it "should set the attributes in the order returned by the class's
:allattrs method" do
- Puppet::Type.type(:mount).stubs(:allattrs).returns([:name, :atboot,
:noop])
+ it "should set the attributes in the order returned by the class's
:parameter_names method" do
+ Puppet::Type.type(:mount).stubs(:parameter_names).returns([:name,
:atboot, :noop])
resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name =>
"myname", :atboot => "myboot", :noop => "whatever"})
set = []
@@ -482,7 +482,7 @@ describe Puppet::Type do
end
it "should always set the name and then default provider before anything
else" do
- Puppet::Type.type(:mount).stubs(:allattrs).returns([:provider, :name,
:atboot])
+ Puppet::Type.type(:mount).stubs(:parameter_names).returns([:provider,
:name, :atboot])
resource = Puppet::Resource.new(:mount, "/foo", :parameters => {:name =>
"myname", :atboot => "myboot"})
set = []
diff --git a/test/ral/manager/provider.rb b/test/ral/manager/provider.rb
index 1d7265b..190bdac 100755
--- a/test/ral/manager/provider.rb
+++ b/test/ral/manager/provider.rb
@@ -34,17 +34,6 @@ class TestTypeProviders < Test::Unit::TestCase
assert_equal(greater, @type.defaultprovider)
end
- # Make sure the provider is always the first parameter created.
- def test_provider_sorting
- should = [:name, :ensure]
- assert_equal(should, @type.allattrs.reject { |p| ! should.include?(p) },
"Got wrong order of parameters")
-
- @type.provide(:yay) { }
- should = [:name, :provider, :ensure]
- assert_equal(should, @type.allattrs.reject { |p| ! should.include?(p) },
- "Providify did not reorder parameters")
- end
-
# Make sure that provider instances can be passed in directly.
def test_name_or_provider
provider = @type.provide(:testing) do
--
1.7.3.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
