Significantly reworking the internals of the fileparsing code. It now

passes around an instance of a FileRecord, rather than just a hash, which I
think makes it much easier to understand.

Moved the sshkey parsed provider test to its own directory and made it better.

This work is all being done so I can move cron jobs to using providers
instead of the current unmaintainable state of affairs.



git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2281 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 17 insertions, 25 deletions

diff --git a/lib/puppet/provider/sshkey/parsed.rb b/lib/puppet/provider/sshkey/parsed.rb
index e247502ff..d6e175cf8 100755
--- a/lib/puppet/provider/sshkey/parsed.rb
+++ b/lib/puppet/provider/sshkey/parsed.rb
@@ -1,6 +1,5 @@
 require 'puppet/provider/parsedfile'
 
-
 known = nil
 case Facter.value(:operatingsystem)
 when "Darwin": known = "/etc/ssh_known_hosts"
@@ -15,30 +14,23 @@ Puppet::Type.type(:sshkey).provide(:parsed,
 ) do
     text_line :comment, :match => /^#/
     text_line :blank, :match => /^\s+/
-    record_line :parsed, :fields => %w{name type key}
-    
-    # Override the line parsing a bit, so we can split the aliases out.
-    def self.parse_line(line)
-        hash = super
-        if hash[:name] =~ /,/
-            names = hash[:name].split(",")
-            hash[:name] = names.shift
-            hash[:alias] = names
-        end
-        hash
-    end
-        
-    
-    def self.to_line(hash)
-        if hash[:alias]
-            hash = hash.dup
-            names = [hash[:name], hash[:alias]].flatten
-            
-            hash[:name] = [hash[:name], hash[:alias]].flatten.join(",")
-            hash.delete(:alias)
-        end
-        super(hash)
-    end
+
+    record_line :parsed, :fields => %w{name type key},
+        :post_parse => proc { |hash|
+            if hash[:name] =~ /,/
+                names = hash[:name].split(",")
+                hash[:name] = names.shift
+                hash[:alias] = names
+            end
+        },
+        :pre_gen => proc { |hash|
+            if hash[:alias]
+                names = [hash[:name], hash[:alias]].flatten
+                
+                hash[:name] = [hash[:name], hash[:alias]].flatten.join(",")
+                hash.delete(:alias)
+            end
+        }
 end
 
 # $Id$