etch 3.17.0 → 3.19.0

data/Rakefile

@@ -3,7 +3,7 @@ spec = Gem::Specification.new do |s|
   s.name	= 'etch'
   s.summary	= 'Etch system configuration management client'
   s.add_dependency('facter')
-  s.version = '3.17.0'
+  s.version = '3.19.0'
   s.author = 'Jason Heiss'
   s.email = 'etch-users@lists.sourceforge.net'
   s.homepage = 'http://etch.sourceforge.net'

data/bin/etch

@@ -35,6 +35,13 @@ opts.on('--damp-run', "Perform a dry run but run 'setup' entries for files.") do
   # entries.
   options[:dryrun] = 'damp'
 end
+opts.on('--list-files', 'Just list the files that would be configured') do |opt|
+  options[:listfiles] = opt
+  # generate all is implied
+  @generateall = true
+  # Set :dryrun as a extra measure to make sure we don't change anything
+  options[:dryrun] = 'listfiles'
+end
 opts.on('--interactive', 'Prompt for confirmation before each change.') do |opt|
   options[:interactive] = opt
 end

data/bin/etch_to_trunk

@@ -15,6 +15,9 @@ end
 opts.on('-t', '--timezone TIMEZONE', 'Time zone of etch server.') do |opt|
   options[:timezone] = opt
 end 
+opts.on('--nv SERVER', 'Where nVentory server is running.') do |opt|
+  options[:nv_server] = opt
+end
 opts.on_tail('-h', '--help', 'Show this message.') do
   puts opts
   exit
@@ -37,7 +40,12 @@ else  # if no timezone is specified then just use local time for the tag
 end
 
 # Find the requested clients
-nvclient = NVentory::Client.new
+nv_server = options[:nv_server]
+if nv_server
+  nvclient = NVentory::Client.new(:server=>"http://#{nv_server}")
+else
+  nvclient = NVentory::Client.new
+end
 results = nvclient.get_objects('nodes', {}, { 'name' => nodes }, {}, {})
 nodes.each do |name|
   if results.empty? && results[name].nil?

data/lib/etch.rb

@@ -3,6 +3,19 @@ require 'pathname'    # absolute?
 require 'digest/sha1' # hexdigest
 require 'base64'      # decode64, encode64
 require 'fileutils'   # mkdir_p
+require 'erb'
+require 'versiontype' # Version
+require 'logger'
+
+class Etch
+  def self.xmllib
+    @@xmllib
+  end
+  def self.xmllib=(lib)
+    @@xmllib=lib
+  end
+end
+
 # By default we try to use libxml, falling back to rexml if it is not
 # available.  The xmllib environment variable can be used to force one library
 # or the other, mostly for testing purposes.
@@ -10,24 +23,24 @@ begin
   if !ENV['xmllib'] || ENV['xmllib'] == 'libxml'
     require 'rubygems'  # libxml is a gem
     require 'libxml'
-    @@xmllib = :libxml
+    Etch.xmllib = :libxml
+  elsif ENV['xmllib'] == 'nokogiri'
+    require 'rubygems'  # nokogiri is a gem
+    require 'nokogiri'
+    Etch.xmllib = :nokogiri
   else
     raise LoadError
   end
 rescue LoadError
   if !ENV['xmllib'] || ENV['xmllib'] == 'rexml'
     require 'rexml/document'
-    @@xmllib = :rexml
+    Etch.xmllib = :rexml
   else
     raise
   end
 end
-require 'erb'
-require 'versiontype' # Version
-require 'logger'
 
 class Etch
-  
   # FIXME: I'm not really proud of this, it seems like there ought to be a way
   # to just use one logger.  The problem is that on the server we'd like to
   # use RAILS_DEFAULT_LOGGER for general logging (which is logging to
@@ -122,7 +135,7 @@ class Etch
     Etch.xmleach(@nodegroups_xml, '/nodegroups/nodegroup') do |parent|
       Etch.xmleach(parent, 'child') do |child|
         @group_hierarchy[Etch.xmltext(child)] = [] if !@group_hierarchy[Etch.xmltext(child)]
-        @group_hierarchy[Etch.xmltext(child)] << parent.attributes['name']
+        @group_hierarchy[Etch.xmltext(child)] << Etch.xmlattrvalue(parent, 'name')
       end
     end
 
@@ -270,8 +283,10 @@ class Etch
     end
     
     # Validate the filtered file against config.dtd
-    if !Etch.xmlvalidate(config_xml, @config_dtd)
-      raise "Filtered config.xml for #{file} fails validation"
+    begin
+      Etch.xmlvalidate(config_xml, @config_dtd)
+    rescue Exception => e
+      raise Etch.wrap_exception(e, "Filtered config.xml for #{file} fails validation:\n" + e.message)
     end
     
     generation_status = :unknown
@@ -846,8 +861,10 @@ class Etch
     end
     
     # Validate the filtered file against commands.dtd
-    if !Etch.xmlvalidate(commands_xml, @commands_dtd)
-      raise "Filtered commands.xml for #{command} fails validation"
+    begin
+      Etch.xmlvalidate(commands_xml, @commands_dtd)
+    rescue Exception => e
+      raise Etch.wrap_exception(e, "Filtered commands.xml for #{command} fails validation:\n" + e.message)
     end
     
     generation_status = :unknown
@@ -1076,102 +1093,154 @@ class Etch
     end
   end
   
+  # These methods provide an abstraction from the underlying XML library in
+  # use, allowing us to use whatever the user has available and switch between
+  # libraries easily.
+  
   def self.xmlnewdoc
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       LibXML::XML::Document.new
+    when :nokogiri
+      Nokogiri::XML::Document.new
     when :rexml
       REXML::Document.new
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlroot(doc)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       doc.root
+    when :nokogiri
+      doc.root
     when :rexml
       doc.root
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlsetroot(doc, root)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       doc.root = root
+    when :nokogiri
+      doc.root = root
     when :rexml
       doc << root
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlload(file)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       LibXML::XML::Document.file(file)
+    when :nokogiri
+      Nokogiri::XML(File.open(file)) do |config|
+        # Nokogiri is tolerant of malformed documents by default.  Good when
+        # parsing HTML, but there's no reason for us to tolerate errors.  We
+        # want to ensure that the user's instructions to us are clear.
+        config.options = Nokogiri::XML::ParseOptions::STRICT
+      end
     when :rexml
       REXML::Document.new(File.open(file))
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlloaddtd(dtdfile)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       LibXML::XML::Dtd.new(IO.read(dtdfile))
+    when :nokogiri
+      # For some reason there isn't a straightforward way to load a standalone
+      # DTD in Nokogiri
+      dtddoctext = '<!DOCTYPE dtd [' + File.read(dtdfile) + ']'
+      dtddoc = Nokogiri::XML(dtddoctext)
+      dtddoc.children.first
     when :rexml
       nil
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
+  # Returns true if validation is successful, or if validation is not
+  # supported by the XML library in use.  Raises an exception if validation
+  # fails.
   def self.xmlvalidate(xmldoc, dtd)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
-      xmldoc.validate(dtd)
+      result = xmldoc.validate(dtd)
+      # LibXML::XML::Document#validate is documented to return false if
+      # validation fails.  However, as currently implemented it raises an
+      # exception instead.  Just in case that behavior ever changes raise an
+      # exception if a false value is returned.
+      if result
+        true
+      else
+        raise "Validation failed"
+      end
+    when :nokogiri
+      errors = dtd.validate(xmldoc)
+      if errors.empty?
+        true
+      else
+        raise errors.join('|')
+      end
     when :rexml
       true
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
-  def self.xmlnewelem(name)
-    case @@xmllib
+  def self.xmlnewelem(name, doc)
+    case Etch.xmllib
     when :libxml
       LibXML::XML::Node.new(name)
+    when :nokogiri
+      Nokogiri::XML::Element.new(name, doc)
     when :rexml
       REXML::Element.new(name)
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmleach(xmldoc, xpath, &block)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       xmldoc.find(xpath).each(&block)
+    when :nokogiri
+      xmldoc.xpath(xpath).each(&block)
     when :rexml
       xmldoc.elements.each(xpath, &block)
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmleachall(xmldoc, &block)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       if xmldoc.kind_of?(LibXML::XML::Document)
         xmldoc.root.each_element(&block)
       else
         xmldoc.each_element(&block)
       end
+    when :nokogiri
+      if xmldoc.kind_of?(Nokogiri::XML::Document)
+        xmldoc.root.element_children.each(&block)
+      else
+        xmldoc.element_children.each(&block)
+      end
     when :rexml
       if xmldoc.node_type == :document
         xmldoc.root.elements.each(&block)
@@ -1179,23 +1248,25 @@ class Etch
         xmldoc.elements.each(&block)
       end
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmleachattrall(elem, &block)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       elem.attributes.each(&block)
+    when :nokogiri
+      elem.attribute_nodes.each(&block)
     when :rexml
       elem.attributes.each_attribute(&block)
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlarray(xmldoc, xpath)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       elements = xmldoc.find(xpath)
       if elements
@@ -1203,28 +1274,34 @@ class Etch
       else
         []
       end
+    when :nokogiri
+      xmldoc.xpath(xpath).to_a
     when :rexml
       xmldoc.elements.to_a(xpath)
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlfindfirst(xmldoc, xpath)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       xmldoc.find_first(xpath)
+    when :nokogiri
+      xmldoc.at_xpath(xpath)
     when :rexml
       xmldoc.elements[xpath]
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmltext(elem)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       elem.content
+    when :nokogiri
+      elem.content
     when :rexml
       text = elem.text
       # REXML returns nil rather than '' if there is no text
@@ -1234,57 +1311,67 @@ class Etch
         ''
       end
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlsettext(elem, text)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       elem.content = text
+    when :nokogiri
+      elem.content = text
     when :rexml
       elem.text = text
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmladd(xmldoc, xpath, name, contents=nil)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       elem = LibXML::XML::Node.new(name)
       if contents
         elem.content = contents
       end
       xmldoc.find_first(xpath) << elem
-      elem
+    when :nokogiri
+      elem = Nokogiri::XML::Node.new(name, xmldoc)
+      if contents
+        elem.content = contents
+      end
+      xmldoc.at_xpath(xpath) << elem
     when :rexml
       elem = REXML::Element.new(name)
       if contents
         elem.text = contents
       end
       xmldoc.elements[xpath].add_element(elem)
-      elem
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlcopyelem(elem, destelem)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       destelem << elem.copy(true)
+    when :nokogiri
+      destelem << elem.dup
     when :rexml
-      destelem.add_element(elem.dup)
+      destelem.add_element(elem.clone)
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlremove(xmldoc, element)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       element.remove!
+    when :nokogiri
+      element.remove
     when :rexml
       if xmldoc.node_type == :document
         xmldoc.root.elements.delete(element)
@@ -1292,40 +1379,64 @@ class Etch
         xmldoc.elements.delete(element)
       end
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlremovepath(xmldoc, xpath)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       xmldoc.find(xpath).each { |elem| elem.remove! }
+    when :nokogiri
+      xmldoc.xpath(xpath).each { |elem| elem.remove }
     when :rexml
-      xmldoc.delete_element(xpath)
+      elem = nil
+      # delete_element only removes the first match, so call it in a loop
+      # until it returns nil to indicate no matching element remain
+      begin
+        elem = xmldoc.delete_element(xpath)
+      end while elem != nil
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlattradd(elem, attrname, attrvalue)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       elem.attributes[attrname] = attrvalue
+    when :nokogiri
+      elem[attrname] = attrvalue
     when :rexml
       elem.add_attribute(attrname, attrvalue)
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
+    end
+  end
+  
+  def self.xmlattrvalue(elem, attrname)
+    case Etch.xmllib
+    when :libxml
+      elem.attributes[attrname]
+    when :nokogiri
+      elem[attrname]
+    when :rexml
+      elem.attributes[attrname]
+    else
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
   def self.xmlattrremove(elem, attribute)
-    case @@xmllib
+    case Etch.xmllib
     when :libxml
       attribute.remove!
+    when :nokogiri
+      attribute.remove
     when :rexml
       elem.attributes.delete(attribute)
     else
-      raise "Unknown @xmllib #{@xmllib}"
+      raise "Unknown XML library #{Etch.xmllib}"
     end
   end
   
@@ -1384,7 +1495,7 @@ class EtchExternalSource
     @dlogger.debug "Processing script #{script} for file #{@file}"
     @contents = ''
     begin
-      eval(IO.read(script))
+      run_script_stage2(script)
     rescue Exception => e
       if e.kind_of?(SystemExit)
         # The user might call exit within a script.  We want the scripts
@@ -1397,5 +1508,13 @@ class EtchExternalSource
     end
     @contents
   end
+  # The user might call return within a script.  We want the scripts to act as
+  # much like a real script as possible.  Wrapping the eval in an extra method
+  # allows us to handle a return within the script seamlessly.  If the user
+  # calls return it triggers a return from this method.  Otherwise this method
+  # returns naturally.  Either works for us.
+  def run_script_stage2(script)
+    eval(IO.read(script))
+  end
 end
 

data/lib/etchclient.rb

@@ -35,7 +35,7 @@ require 'logger'
 require 'etch'
 
 class Etch::Client
-  VERSION = '3.17.0'
+  VERSION = '3.19.0'
   
   CONFIRM_PROCEED = 1
   CONFIRM_SKIP = 2
@@ -43,6 +43,7 @@ class Etch::Client
   PRIVATE_KEY_PATHS = ["/etc/ssh/ssh_host_rsa_key", "/etc/ssh_host_rsa_key"]
   DEFAULT_CONFIGDIR = '/etc'
   DEFAULT_VARBASE = '/var/etch'
+  DEFAULT_DETAILED_RESULTS = ['SERVER']
   
   # We need these in relation to the output capturing
   ORIG_STDOUT = STDOUT.dup
@@ -56,12 +57,15 @@ class Etch::Client
     @local = options[:local] ? File.expand_path(options[:local]) : nil
     @debug = options[:debug]
     @dryrun = options[:dryrun]
+    @listfiles = options[:listfiles]
     @interactive = options[:interactive]
     @filenameonly = options[:filenameonly]
     @fullfile = options[:fullfile]
     @key = options[:key] ? options[:key] : get_private_key_path
     @disableforce = options[:disableforce]
     @lockforce = options[:lockforce]
+
+    @last_response = ""
     
     @configdir = DEFAULT_CONFIGDIR
     @varbase = DEFAULT_VARBASE
@@ -75,6 +79,7 @@ class Etch::Client
     end
     
     @configfile = File.join(@configdir, 'etch.conf')
+    @detailed_results = []
     
     if File.exist?(@configfile)
       IO.foreach(@configfile) do |line|
@@ -119,6 +124,9 @@ class Etch::Client
           end
         elsif key == 'path'
           ENV['PATH'] = value
+        elsif key == 'detailed_results'
+          warn "Adding detailed results destination '#{value}'" if @debug
+          @detailed_results << value
         end
       end
     end
@@ -130,6 +138,10 @@ class Etch::Client
       warn "No readable private key found, messages to server will not be signed and may be rejected depending on server configuration"
     end
     
+    if @detailed_results.empty?
+      @detailed_results = DEFAULT_DETAILED_RESULTS
+    end
+    
     @origbase    = File.join(@varbase, 'orig')
     @historybase = File.join(@varbase, 'history')
     @lockbase    = File.join(@varbase, 'locks')
@@ -197,6 +209,9 @@ class Etch::Client
     status = 0
     message = ''
     
+    # A variable to collect filenames if operating in @listfiles mode
+    files_to_list = {}
+    
     # Prep http instance
     http = nil
     if !@local
@@ -289,6 +304,11 @@ class Etch::Client
           unlock_all_files
         end
         
+        # It usually takes a few back and forth exchanges with the server to
+        # exchange all needed data and get a complete set of configuration. 
+        # The number of iterations is capped at 10 to prevent any unplanned
+        # infinite loops.  The limit of 10 was chosen somewhat arbitrarily but
+        # seems fine in practice.
         10.times do
           #
           # Send request to server
@@ -389,9 +409,13 @@ class Etch::Client
           # needed to create the original files.
           responsedata[:configs].each_key do |file|
             puts "Processing config for #{file}" if (@debug)
-            continue_processing = process_file(file, responsedata)
-            if !continue_processing
-              throw :stop_processing
+            if !@listfiles
+              continue_processing = process_file(file, responsedata)
+              if !continue_processing
+                throw :stop_processing
+              end
+            else
+              files_to_list[file] = true
             end
           end
           responsedata[:need_sums].each_key do |need_sum|
@@ -471,6 +495,11 @@ class Etch::Client
       end  # begin/rescue
     end  # catch
     
+    if @listfiles
+      puts "Files under management:"
+      files_to_list.keys.sort.each {|file| puts file}
+    end
+    
     # Send results to server
     if !@dryrun && !@local
       rails_results = []
@@ -480,13 +509,15 @@ class Etch::Client
       rails_results << "fqdn=#{CGI.escape(@facts['fqdn'])}"
       rails_results << "status=#{CGI.escape(status.to_s)}"
       rails_results << "message=#{CGI.escape(message)}"
-      @results.each do |result|
-        # Strangely enough this works.  Even though the key is not unique to
-        # each result the Rails parameter parsing code keeps track of keys it
-        # has seen, and if it sees a duplicate it starts a new hash.
-        rails_results << "results[][file]=#{CGI.escape(result['file'])}"
-        rails_results << "results[][success]=#{CGI.escape(result['success'].to_s)}"
-        rails_results << "results[][message]=#{CGI.escape(result['message'])}"
+      if @detailed_results.include?('SERVER')
+        @results.each do |result|
+          # Strangely enough this works.  Even though the key is not unique to
+          # each result the Rails parameter parsing code keeps track of keys it
+          # has seen, and if it sees a duplicate it starts a new hash.
+          rails_results << "results[][file]=#{CGI.escape(result['file'])}"
+          rails_results << "results[][success]=#{CGI.escape(result['success'].to_s)}"
+          rails_results << "results[][message]=#{CGI.escape(result['message'])}"
+        end
       end
       puts "Sending results to server #{@resultsuri}" if (@debug)
       resultspost = Net::HTTP::Post.new(@resultsuri.path)
@@ -507,6 +538,29 @@ class Etch::Client
       end
     end
     
+    if !@dryrun
+      @detailed_results.each do |detail_dest|
+        # If any of the destinations look like a file (start with a /) then we
+        # log to that file
+        if detail_dest =~ %r{^/}
+          FileUtils.mkpath(File.dirname(detail_dest))
+          File.open(detail_dest, 'a') do |file|
+            # Add a header for the overall status of the run
+            file.puts "Etch run at #{Time.now}"
+            file.puts "Status: #{status}"
+            if !message.empty?
+              file.puts "Message:\n#{message}\n"
+            end
+            # Then the detailed results
+            @results.each do |result|
+              file.puts "File #{result['file']}, result #{result['success']}:\n"
+              file.puts result['message']
+            end
+          end
+        end
+      end
+    end
+    
     status
   end
 
@@ -1927,8 +1981,9 @@ class Etch::Client
     requests
   end
   
-  # Haven't found a Ruby method for creating temporary directories,
-  # so create a temporary file and replace it with a directory.
+  # Ruby 1.8.7 and later have Dir.mktmpdir, but we support ruby 1.8.5 for
+  # RHEL/CentOS 5.  So this is a basic substitute.
+  # FIXME: consider "backport" for Dir.mktmpdir
   def tempdir(file)
     filebase = File.basename(file)
     filedir = File.dirname(file)
@@ -2240,13 +2295,22 @@ class Etch::Client
 
   def get_user_confirmation
     while true
-      print "Proceed/Skip/Quit? [p|s|q] "
+      print "Proceed/Skip/Quit? "
+      case @last_response
+        when /p|P/ then print "[P|s|q] "
+        when /s|S/ then print "[p|S|q] "
+        when /q|Q/ then print "[p|s|Q] "
+        else print "[p|s|q] "
+      end
       response = $stdin.gets.chomp
-      if response == 'p'
+      if response =~ /p/i || @last_response =~ /p/i
+        @last_response = response if !response.strip.empty?
         return CONFIRM_PROCEED
-      elsif response == 's'
+      elsif response =~ /s/i || @last_response =~ /s/i
+        @last_response = response if !response.strip.empty?
         return CONFIRM_SKIP
-      elsif response == 'q'
+      elsif response =~ /q/i || @last_response =~ /q/i
+        @last_response = response if !response.strip.empty?
         return CONFIRM_QUIT
       end
     end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: etch
 version: !ruby/object:Gem::Version 
-  hash: 67
-  prerelease: false
-  segments: 
-  - 3
-  - 17
-  - 0
-  version: 3.17.0
+  version: 3.19.0
 platform: ruby
 authors: 
 - Jason Heiss
@@ -15,23 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -08:00
+date: 2011-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: 
 email: etch-users@lists.sourceforge.net
 executables: 
@@ -60,28 +50,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 31
-      segments: 
-      - 1
-      - 8
       version: "1.8"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: etchsyscm
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Etch system configuration management client