Signed-off-by: Luke Kanies <[email protected]>
---
Local-branch: refactor/master/8233-refactor_parameter_management
lib/puppet/parameter.rb | 8 ++++----
lib/puppet/property.rb | 2 +-
lib/puppet/resource/type.rb | 2 +-
lib/puppet/type.rb | 2 +-
lib/puppet/type/resources.rb | 2 +-
spec/unit/parameter_spec.rb | 6 +++---
spec/unit/type_spec.rb | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
index da9c00b..c617aff 100644
--- a/lib/puppet/parameter.rb
+++ b/lib/puppet/parameter.rb
@@ -128,7 +128,7 @@ class Puppet::Parameter
end
def self.metaparameter?
- Puppet::Type.metaparam?(name)
+ Puppet::Type.metaparameter?(name)
end
def self.parameter?
@@ -206,9 +206,9 @@ class Puppet::Parameter
send_log(resource[:loglevel], msg)
end
- # Is this parameter a metaparam?
- def metaparam?
- self.class.metaparam
+ # Is this parameter a metaparameter?
+ def metaparameter?
+ self.class.metaparameter?
end
# each parameter class must define the name method, and parameter
diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb
index ef1b194..2bc078f 100644
--- a/lib/puppet/property.rb
+++ b/lib/puppet/property.rb
@@ -141,7 +141,7 @@ class Puppet::Property < Puppet::Parameter
def initialize(hash = {})
super
- if ! self.metaparam? and klass =
Puppet::Type.metaparameter(self.class.name)
+ if ! self.metaparameter? and klass =
Puppet::Type.metaparameter(self.class.name)
setup_shadow(klass)
end
end
diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb
index 8d7f51a..2f0e9cf 100644
--- a/lib/puppet/resource/type.rb
+++ b/lib/puppet/resource/type.rb
@@ -266,7 +266,7 @@ class Puppet::Resource::Type
param = param.to_s
return true if param == "name"
- return true if Puppet::Type.metaparam?(param)
+ return true if Puppet::Type.metaparameter?(param)
return false unless defined?(@arguments)
return(arguments.include?(param) ? true : false)
end
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 15bb6e2..819c89d 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -250,7 +250,7 @@ class Type
end
# Is the parameter in question a meta-parameter?
- def self.metaparam?(param)
+ def self.metaparameter?(param)
Puppet::Type.valid_parameter?(param)
end
diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb
index ae41b88..ff3c07f 100644
--- a/lib/puppet/type/resources.rb
+++ b/lib/puppet/type/resources.rb
@@ -92,7 +92,7 @@ Puppet::Type.newtype(:resources) do
select { |r| able_to_ensure_absent?(r) }.
each { |resource|
@parameters.each do |name, param|
- resource[name] = param.value if param.metaparam?
+ resource[name] = param.value if param.metaparameter?
end
# Mark that we're purging, so transactions can handle relationships
diff --git a/spec/unit/parameter_spec.rb b/spec/unit/parameter_spec.rb
index 49dfdf1..d489827 100755
--- a/spec/unit/parameter_spec.rb
+++ b/spec/unit/parameter_spec.rb
@@ -22,13 +22,13 @@ describe Puppet::Parameter do
end
it "should default to being a 'parameter'" do
- @class = Class.new(Puppet::Parameter)
+ @class = Class.new(Puppet::Parameter) { @name = :foo }
@class.should be_parameter
@class.parameter_type.should == :parameter
end
it "should be a property when it is a subclass of Property" do
- @class = Class.new(Puppet::Property)
+ @class = Class.new(Puppet::Property) { @name = :foo }
@class.should be_property
@class.parameter_type.should == :property
end
@@ -37,7 +37,7 @@ describe Puppet::Parameter do
@class = Class.new(Puppet::Parameter) do
@name = :foo
end
- Puppet::Type.stubs(:metaparam?).with(:foo).returns true
+ Puppet::Type.stubs(:metaparameter?).with(:foo).returns true
@class.should be_metaparameter
@class.parameter_type.should == :metaparameter
end
diff --git a/spec/unit/type_spec.rb b/spec/unit/type_spec.rb
index 7dd091d..e0897f0 100755
--- a/spec/unit/type_spec.rb
+++ b/spec/unit/type_spec.rb
@@ -267,7 +267,7 @@ describe Puppet::Type do
end
it "should not consider :name to be a valid metaparameter" do
- Puppet::Type.should_not be_metaparam(:name)
+ Puppet::Type.should_not be_metaparameter(:name)
end
end
--
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.
