From 4540949d96608c6ff7eed07d53294337446fbead Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 27 Jul 2011 15:28:44 -0700 Subject: (#8665) Change type from append_line to whole_line Changed the type name from append_line to whole_line. After feedback that having a type with a verb in the name was confusing. --- lib/puppet/provider/append_line/ruby.rb | 15 ----------- lib/puppet/provider/whole_line/ruby.rb | 15 +++++++++++ lib/puppet/type/append_line.rb | 44 --------------------------------- lib/puppet/type/whole_line.rb | 44 +++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 lib/puppet/provider/append_line/ruby.rb create mode 100644 lib/puppet/provider/whole_line/ruby.rb delete mode 100644 lib/puppet/type/append_line.rb create mode 100644 lib/puppet/type/whole_line.rb (limited to 'lib/puppet') diff --git a/lib/puppet/provider/append_line/ruby.rb b/lib/puppet/provider/append_line/ruby.rb deleted file mode 100644 index 5e78659..0000000 --- a/lib/puppet/provider/append_line/ruby.rb +++ /dev/null @@ -1,15 +0,0 @@ -Puppet::Type.type(:append_line).provide(:ruby) do - - def exists? - File.readlines(resource[:path]).find do |line| - line.chomp == resource[:line].chomp - end - end - - def create - File.open(resource[:path], 'a') do |fh| - fh.puts resource[:line] - end - end - -end diff --git a/lib/puppet/provider/whole_line/ruby.rb b/lib/puppet/provider/whole_line/ruby.rb new file mode 100644 index 0000000..156f255 --- /dev/null +++ b/lib/puppet/provider/whole_line/ruby.rb @@ -0,0 +1,15 @@ +Puppet::Type.type(:whole_line).provide(:ruby) do + + def exists? + File.readlines(resource[:path]).find do |line| + line.chomp == resource[:line].chomp + end + end + + def create + File.open(resource[:path], 'a') do |fh| + fh.puts resource[:line] + end + end + +end diff --git a/lib/puppet/type/append_line.rb b/lib/puppet/type/append_line.rb deleted file mode 100644 index b3f926c..0000000 --- a/lib/puppet/type/append_line.rb +++ /dev/null @@ -1,44 +0,0 @@ -Puppet::Type.newtype(:append_line) do - - desc <<-EOT - Type that can append a line to a file if it does not already contain it. - - Example: - - append_line { 'sudo_rule': - path => '/etc/sudoers', - line => '%admin ALL=(ALL) ALL', - } - - EOT - - ensurable do - defaultto :present - newvalue(:present) do - provider.create - end - end - - newparam(:name, :namevar => true) do - desc 'arbitrary name used as identity' - end - - newparam(:line) do - desc 'The line to be appended to the path.' - end - - newparam(:path) do - desc 'File to possibly append a line to.' - validate do |value| - unless (Puppet.features.posix? and value =~ /^\//) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/)) - raise(Puppet::Error, "File paths must be fully qualified, not '#{value}'") - end - end - end - - validate do - unless self[:line] and self[:path] - raise(Puppet::Error, "Both line and path are required attributes") - end - end -end diff --git a/lib/puppet/type/whole_line.rb b/lib/puppet/type/whole_line.rb new file mode 100644 index 0000000..f231602 --- /dev/null +++ b/lib/puppet/type/whole_line.rb @@ -0,0 +1,44 @@ +Puppet::Type.newtype(:whole_line) do + + desc <<-EOT + Type that can append whole a line to a file if it does not already contain it. + + Example: + + whole_line { 'sudo_rule': + path => '/etc/sudoers', + line => '%admin ALL=(ALL) ALL', + } + + EOT + + ensurable do + defaultto :present + newvalue(:present) do + provider.create + end + end + + newparam(:name, :namevar => true) do + desc 'arbitrary name used as identity' + end + + newparam(:line) do + desc 'The line to be appended to the path.' + end + + newparam(:path) do + desc 'File to possibly append a line to.' + validate do |value| + unless (Puppet.features.posix? and value =~ /^\//) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/)) + raise(Puppet::Error, "File paths must be fully qualified, not '#{value}'") + end + end + end + + validate do + unless self[:line] and self[:path] + raise(Puppet::Error, "Both line and path are required attributes") + end + end +end -- cgit v1.2.3