From 4c93090e1aad8dfdaa39b4f304d3c87704408b13 Mon Sep 17 00:00:00 2001
From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 4 Aug 2011 19:17:48 -0700
Subject: (#8792) Rename whole_line type to file_line

Without this patch the resource whole_line would be included in the
stable stdlib module shipping in PE 1.2.  Ideally the name will be
stable and unchanging in the future.

There was quite a bit of concern over whole_line being an unwise name.
file_line appears to be the most suitable name and least likely to need
another rename in the future.
---
 lib/puppet/provider/file_line/ruby.rb  | 15 ++++++++++++
 lib/puppet/provider/whole_line/ruby.rb | 15 ------------
 lib/puppet/type/file_line.rb           | 44 ++++++++++++++++++++++++++++++++++
 lib/puppet/type/whole_line.rb          | 44 ----------------------------------
 4 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 lib/puppet/provider/file_line/ruby.rb
 delete mode 100644 lib/puppet/provider/whole_line/ruby.rb
 create mode 100644 lib/puppet/type/file_line.rb
 delete mode 100644 lib/puppet/type/whole_line.rb

(limited to 'lib/puppet')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
new file mode 100644
index 0000000..63bbd8e
--- /dev/null
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -0,0 +1,15 @@
+Puppet::Type.type(:file_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
deleted file mode 100644
index 156f255..0000000
--- a/lib/puppet/provider/whole_line/ruby.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-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/file_line.rb b/lib/puppet/type/file_line.rb
new file mode 100644
index 0000000..aacd6d9
--- /dev/null
+++ b/lib/puppet/type/file_line.rb
@@ -0,0 +1,44 @@
+Puppet::Type.newtype(:file_line) do
+
+  desc <<-EOT
+  Type that can append whole a line to a file if it does not already contain it.
+
+  Example:
+
+  file_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
deleted file mode 100644
index f231602..0000000
--- a/lib/puppet/type/whole_line.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-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