diff options
author | Luke Kanies <luke@madstop.com> | 2008-12-17 18:29:58 -0600 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-12-18 11:10:25 -0600 |
commit | e4ba3db1963081eacc2aef3d865f777b427ef23c (patch) | |
tree | 55a4aa8cdde262880a8affb6cbd4470d49c10c55 /lib/puppet | |
parent | b6db54585177f277b1e06bebd4d925d5c272b610 (diff) | |
download | puppet-e4ba3db1963081eacc2aef3d865f777b427ef23c.tar.gz puppet-e4ba3db1963081eacc2aef3d865f777b427ef23c.tar.xz puppet-e4ba3db1963081eacc2aef3d865f777b427ef23c.zip |
Deprecating the Puppet::Type.create.
This method is no longer necessary; you can use the
normal 'new' class method.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/network/client/master.rb | 2 | ||||
-rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 2 | ||||
-rw-r--r-- | lib/puppet/resource.rb | 4 | ||||
-rw-r--r-- | lib/puppet/resource/catalog.rb | 2 | ||||
-rw-r--r-- | lib/puppet/type.rb | 2 | ||||
-rw-r--r-- | lib/puppet/type/file.rb | 4 | ||||
-rwxr-xr-x | lib/puppet/type/filebucket.rb | 2 | ||||
-rwxr-xr-x | lib/puppet/type/maillist.rb | 2 | ||||
-rwxr-xr-x | lib/puppet/type/schedule.rb | 4 | ||||
-rwxr-xr-x | lib/puppet/type/tidy.rb | 2 | ||||
-rw-r--r-- | lib/puppet/util/resource_template.rb | 2 |
11 files changed, 15 insertions, 13 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index f86c9bb01..047f2b82a 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -320,7 +320,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client hash[:ignore] = args[:ignore].split(/\s+/) end downconfig = Puppet::Resource::Catalog.new("downloading") - downconfig.add_resource Puppet::Type.type(:file).create(hash) + downconfig.add_resource Puppet::Type.type(:file).new(hash) Puppet.info "Retrieving #{args[:name]}s" diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index d50ba7eea..4e00b605f 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -512,7 +512,7 @@ class Puppet::Network::Handler # the effort. obj[:check] = CHECKPARAMS else - obj = Puppet::Type.type(:file).create( + obj = Puppet::Type.type(:file).new( :name => file_path(path, client), :check => CHECKPARAMS ) diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb index d82a7f996..b8347f8d7 100644 --- a/lib/puppet/resource.rb +++ b/lib/puppet/resource.rb @@ -99,9 +99,9 @@ class Puppet::Resource # instances for resource types that don't exist. def to_ral if typeklass = Puppet::Type.type(self.type) - return typeklass.create(self) + return typeklass.new(self) else - return Puppet::Type::Component.create(self) + return Puppet::Type::Component.new(self) end end diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index ce54f6d75..0692b5ddd 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -181,7 +181,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph unless klass = Puppet::Type.type(type) raise ArgumentError, "Unknown resource type %s" % type end - return unless resource = klass.create(options) + return unless resource = klass.new(options) add_resource(resource) resource diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index b708cd591..4bf28d97b 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -953,6 +953,8 @@ class Type # Force users to call this, so that we can merge objects if # necessary. def self.create(args) + # LAK:DEP Deprecation notice added 12/17/2008 + Puppet.warning "Puppet::Type.create is deprecated; use Puppet::Type.new" new(args) end diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index ffcd2b0e8..91458934e 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -268,7 +268,7 @@ module Puppet obj[:check] = :all files << obj else - files << self.create( + files << self.new( :name => path, :check => :all ) end @@ -482,7 +482,7 @@ module Puppet options.delete(param) if options.include?(param) end - return self.class.create(options) + return self.class.new(options) end # Files handle paths specially, because they just lengthen their diff --git a/lib/puppet/type/filebucket.rb b/lib/puppet/type/filebucket.rb index 872bded4e..03970aee8 100755 --- a/lib/puppet/type/filebucket.rb +++ b/lib/puppet/type/filebucket.rb @@ -56,7 +56,7 @@ module Puppet # Create a default filebucket. def self.mkdefaultbucket - self.create(:name => "puppet", :path => Puppet[:clientbucketdir]) + new(:name => "puppet", :path => Puppet[:clientbucketdir]) end def self.instances diff --git a/lib/puppet/type/maillist.rb b/lib/puppet/type/maillist.rb index 7273488ee..088004a1c 100755 --- a/lib/puppet/type/maillist.rb +++ b/lib/puppet/type/maillist.rb @@ -46,7 +46,7 @@ module Puppet if atype[name] nil else - malias = Puppet::Type.type(:mailalias).create(:name => name, :recipient => recipient, :ensure => should) + malias = Puppet::Type.type(:mailalias).new(:name => name, :recipient => recipient, :ensure => should) end end.compact end diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb index 620472530..5c9cfd7f4 100755 --- a/lib/puppet/type/schedule.rb +++ b/lib/puppet/type/schedule.rb @@ -318,7 +318,7 @@ module Puppet def self.mkdefaultschedules result = [] Puppet.debug "Creating default schedules" - result << self.create( + result << self.new( :name => "puppet", :period => :hourly, :repeat => "2" @@ -326,7 +326,7 @@ module Puppet # And then one for every period @parameters.find { |p| p.name == :period }.value_collection.values.each { |value| - result << self.create( + result << self.new( :name => value.to_s, :period => value ) diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb index 9280e4a2b..dd593ccfb 100755 --- a/lib/puppet/type/tidy.rb +++ b/lib/puppet/type/tidy.rb @@ -210,7 +210,7 @@ Puppet::Type.newtype(:tidy) do # Make a file resource to remove a given file. def mkfile(path) # Force deletion, so directories actually get deleted. - Puppet::Type.type(:file).create :path => path, :backup => self[:backup], :ensure => :absent, :force => true + Puppet::Type.type(:file).new :path => path, :backup => self[:backup], :ensure => :absent, :force => true end def retrieve diff --git a/lib/puppet/util/resource_template.rb b/lib/puppet/util/resource_template.rb index 53066a192..4e333571f 100644 --- a/lib/puppet/util/resource_template.rb +++ b/lib/puppet/util/resource_template.rb @@ -18,7 +18,7 @@ require 'erb' # def generate # template = Puppet::Util::ResourceTemplate.new("/path/to/template", self) # -# return Puppet::Type.type(:file).create :path => "/my/file", +# return Puppet::Type.type(:file).new :path => "/my/file", # :content => template.evaluate # end # |