puppet 0.25.5 → 2.6.0

data/lib/puppet/indirector/catalog/rest.rb

@@ -2,5 +2,5 @@ require 'puppet/resource/catalog'
 require 'puppet/indirector/rest'
 
 class Puppet::Resource::Catalog::Rest < Puppet::Indirector::REST
-    desc "Find resource catalogs over HTTP via REST."
+  desc "Find resource catalogs over HTTP via REST."
 end

data/lib/puppet/indirector/catalog/yaml.rb

@@ -2,21 +2,21 @@ require 'puppet/resource/catalog'
 require 'puppet/indirector/yaml'
 
 class Puppet::Resource::Catalog::Yaml < Puppet::Indirector::Yaml
-    desc "Store catalogs as flat files, serialized using YAML."
+  desc "Store catalogs as flat files, serialized using YAML."
 
-    private
+  private
 
-    # Override these, because yaml doesn't want to convert our self-referential
-    # objects.  This is hackish, but eh.
-    def from_yaml(text)
-        if config = YAML.load(text)
-            return config
-        end
+  # Override these, because yaml doesn't want to convert our self-referential
+  # objects.  This is hackish, but eh.
+  def from_yaml(text)
+    if config = YAML.load(text)
+      return config
     end
+  end
 
-    def to_yaml(config)
-        # We can't yaml-dump classes.
-        #config.edgelist_class = nil
-        YAML.dump(config)
-    end
+  def to_yaml(config)
+    # We can't yaml-dump classes.
+    #config.edgelist_class = nil
+    YAML.dump(config)
+  end
 end

data/lib/puppet/indirector/certificate/ca.rb

@@ -2,8 +2,8 @@ require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate'
 
 class Puppet::SSL::Certificate::Ca < Puppet::Indirector::SslFile
-    desc "Manage the CA collection of signed SSL certificates on disk."
+  desc "Manage the CA collection of signed SSL certificates on disk."
 
-    store_in :signeddir
-    store_ca_at :cacert
+  store_in :signeddir
+  store_ca_at :cacert
 end

data/lib/puppet/indirector/certificate/file.rb

@@ -2,8 +2,8 @@ require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate'
 
 class Puppet::SSL::Certificate::File < Puppet::Indirector::SslFile
-    desc "Manage SSL certificates on disk."
+  desc "Manage SSL certificates on disk."
 
-    store_in :certdir
-    store_ca_at :localcacert
+  store_in :certdir
+  store_ca_at :localcacert
 end

data/lib/puppet/indirector/certificate/rest.rb

@@ -2,14 +2,14 @@ require 'puppet/ssl/certificate'
 require 'puppet/indirector/rest'
 
 class Puppet::SSL::Certificate::Rest < Puppet::Indirector::REST
-    desc "Find and save certificates over HTTP via REST."
+  desc "Find and save certificates over HTTP via REST."
 
-    use_server_setting(:ca_server)
-    use_port_setting(:ca_port)
+  use_server_setting(:ca_server)
+  use_port_setting(:ca_port)
 
-    def find(request)
-        return nil unless result = super
-        result.name = request.key unless result.name == request.key
-        result
-    end
+  def find(request)
+    return nil unless result = super
+    result.name = request.key unless result.name == request.key
+    result
+  end
 end

data/lib/puppet/indirector/certificate_request/ca.rb

@@ -2,13 +2,13 @@ require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate_request'
 
 class Puppet::SSL::CertificateRequest::Ca < Puppet::Indirector::SslFile
-    desc "Manage the CA collection of certificate requests on disk."
+  desc "Manage the CA collection of certificate requests on disk."
 
-    store_in :csrdir
+  store_in :csrdir
 
-    def save(request)
-        result = super
-        Puppet.notice "%s has a waiting certificate request" % request.key
-        result
-    end
+  def save(request)
+    result = super
+    Puppet.notice "#{request.key} has a waiting certificate request"
+    result
+  end
 end

data/lib/puppet/indirector/certificate_request/file.rb

@@ -2,7 +2,7 @@ require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate_request'
 
 class Puppet::SSL::CertificateRequest::File < Puppet::Indirector::SslFile
-    desc "Manage the collection of certificate requests on disk."
+  desc "Manage the collection of certificate requests on disk."
 
-    store_in :requestdir
+  store_in :requestdir
 end

data/lib/puppet/indirector/certificate_request/rest.rb

@@ -2,8 +2,8 @@ require 'puppet/ssl/certificate_request'
 require 'puppet/indirector/rest'
 
 class Puppet::SSL::CertificateRequest::Rest < Puppet::Indirector::REST
-    desc "Find and save certificate requests over HTTP via REST."
+  desc "Find and save certificate requests over HTTP via REST."
 
-    use_server_setting(:ca_server)
-    use_port_setting(:ca_port)
+  use_server_setting(:ca_server)
+  use_port_setting(:ca_port)
 end

data/lib/puppet/indirector/certificate_revocation_list/ca.rb

@@ -2,7 +2,7 @@ require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate_revocation_list'
 
 class Puppet::SSL::CertificateRevocationList::Ca < Puppet::Indirector::SslFile
-    desc "Manage the CA collection of certificate requests on disk."
+  desc "Manage the CA collection of certificate requests on disk."
 
-    store_at :cacrl
+  store_at :cacrl
 end

data/lib/puppet/indirector/certificate_revocation_list/file.rb

@@ -2,7 +2,7 @@ require 'puppet/indirector/ssl_file'
 require 'puppet/ssl/certificate_revocation_list'
 
 class Puppet::SSL::CertificateRevocationList::File < Puppet::Indirector::SslFile
-    desc "Manage the global certificate revocation list."
+  desc "Manage the global certificate revocation list."
 
-    store_at :hostcrl
+  store_at :hostcrl
 end

data/lib/puppet/indirector/certificate_revocation_list/rest.rb

@@ -2,8 +2,8 @@ require 'puppet/ssl/certificate_revocation_list'
 require 'puppet/indirector/rest'
 
 class Puppet::SSL::CertificateRevocationList::Rest < Puppet::Indirector::REST
-    desc "Find and save certificate revocation lists over HTTP via REST."
+  desc "Find and save certificate revocation lists over HTTP via REST."
 
-    use_server_setting(:ca_server)
-    use_port_setting(:ca_port)
+  use_server_setting(:ca_server)
+  use_port_setting(:ca_port)
 end

data/lib/puppet/indirector/couch.rb

@@ -0,0 +1,76 @@
+raise "Couch terminus not supported without couchrest gem" unless Puppet.features.couchdb?
+
+require 'couchrest'
+class Puppet::Indirector::Couch < Puppet::Indirector::Terminus
+
+  # The CouchRest database instance. One database instance per Puppet runtime
+  # should be sufficient.
+  #
+  def self.db; @db ||= CouchRest.database! Puppet[:couchdb_url] end
+  def db; self.class.db end
+
+  def find(request)
+    attributes_of get(request)
+  end
+
+  # Create or update the couchdb document with the request's data hash.
+  #
+  def save(request)
+    raise ArgumentError, "PUT does not accept options" unless request.options.empty?
+    update(request) || create(request)
+  end
+
+  private
+
+  # RKH:TODO: Do not depend on error handling, check if the document exists
+  # first. (Does couchrest support this?)
+  #
+  def get(request)
+    db.get(id_for(request))
+  rescue RestClient::ResourceNotFound
+    Puppet.debug "No couchdb document with id: #{id_for(request)}"
+    return nil
+  end
+
+  def update(request)
+    doc = get request
+    return unless doc
+    doc.merge!(hash_from(request))
+    doc.save
+    true
+  end
+
+  def create(request)
+    db.save_doc hash_from(request)
+  end
+
+  # The attributes hash that is serialized to CouchDB as JSON. It includes
+  # metadata that is used to help aggregate data in couchdb. Add
+  # model-specific attributes in subclasses.
+  #
+  def hash_from(request)
+    {
+      "_id"         => id_for(request),
+      "puppet_type" => document_type_for(request)
+    }
+  end
+
+  # The couchdb response stripped of metadata, used to instantiate the model
+  # instance that is returned by save.
+  #
+  def attributes_of(response)
+    response && response.reject{|k,v| k =~ /^(_rev|puppet_)/ }
+  end
+
+  def document_type_for(request)
+    request.indirection_name
+  end
+
+  # The id used to store the object in couchdb. Implemented in subclasses.
+  #
+  def id_for(request)
+    raise NotImplementedError
+  end
+
+end
+

data/lib/puppet/indirector/direct_file_server.rb

@@ -7,17 +7,17 @@ require 'puppet/indirector/terminus'
 
 class Puppet::Indirector::DirectFileServer < Puppet::Indirector::Terminus
 
-    include Puppet::FileServing::TerminusHelper
+  include Puppet::FileServing::TerminusHelper
 
-    def find(request)
-        return nil unless FileTest.exists?(request.key)
-        instance = model.new(request.key)
-        instance.links = request.options[:links] if request.options[:links]
-        return instance
-    end
+  def find(request)
+    return nil unless FileTest.exists?(request.key)
+    instance = model.new(request.key)
+    instance.links = request.options[:links] if request.options[:links]
+    instance
+  end
 
-    def search(request)
-        return nil unless FileTest.exists?(request.key)
-        path2instances(request, request.key)
-    end
+  def search(request)
+    return nil unless FileTest.exists?(request.key)
+    path2instances(request, request.key)
+  end
 end

data/lib/puppet/indirector/envelope.rb

@@ -3,9 +3,9 @@ require 'puppet/indirector'
 # Provide any attributes or functionality needed for indirected
 # instances.
 module Puppet::Indirector::Envelope
-    attr_accessor :expiration
+  attr_accessor :expiration
 
-    def expired?
-        expiration and expiration < Time.now
-    end
+  def expired?
+    expiration and expiration < Time.now
+  end
 end

data/lib/puppet/indirector/exec.rb

@@ -2,52 +2,48 @@ require 'puppet/indirector/terminus'
 require 'puppet/util'
 
 class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
-    # Look for external node definitions.
-    def find(request)
-        # Run the command.
-        unless output = query(request.key)
-            return nil
-        end
-
-        # Translate the output to ruby.
-        return output
+  # Look for external node definitions.
+  def find(request)
+    # Run the command.
+    unless output = query(request.key)
+      return nil
     end
 
-    private
+    # Translate the output to ruby.
+    output
+  end
 
-    # Proxy the execution, so it's easier to test.
-    def execute(command)
-        Puppet::Util.execute(command)
+  private
+
+  # Proxy the execution, so it's easier to test.
+  def execute(command)
+    Puppet::Util.execute(command)
+  end
+
+  # Call the external command and see if it returns our output.
+  def query(name)
+    external_command = command
+
+    # Make sure it's an arry
+    raise Puppet::DevError, "Exec commands must be an array" unless external_command.is_a?(Array)
+
+    # Make sure it's fully qualified.
+    raise ArgumentError, "You must set the exec parameter to a fully qualified command" unless external_command[0][0] == File::SEPARATOR[0]
+
+    # Add our name to it.
+    external_command << name
+    begin
+      output = execute(external_command)
+    rescue Puppet::ExecutionFailure => detail
+      Puppet.err "Failed to find #{name} via exec: #{detail}"
+      return nil
     end
 
-    # Call the external command and see if it returns our output.
-    def query(name)
-        external_command = command
-
-        # Make sure it's an arry
-        unless external_command.is_a?(Array)
-            raise Puppet::DevError, "Exec commands must be an array"
-        end
-
-        # Make sure it's fully qualified.
-        unless external_command[0][0] == File::SEPARATOR[0]
-            raise ArgumentError, "You must set the exec parameter to a fully qualified command"
-        end
-
-        # Add our name to it.
-        external_command << name
-        begin
-            output = execute(external_command)
-        rescue Puppet::ExecutionFailure => detail
-            Puppet.err "Failed to find %s via exec: %s" % [name, detail]
-            return nil
-        end
-
-        if output =~ /\A\s*\Z/ # all whitespace
-            Puppet.debug "Empty response for %s from exec %s terminus" % [name, self.name]
-            return nil
-        else
-            return output
-        end
+    if output =~ /\A\s*\Z/ # all whitespace
+      Puppet.debug "Empty response for #{name} from exec #{self.name} terminus"
+      return nil
+    else
+      return output
     end
+  end
 end

data/lib/puppet/indirector/facts/active_record.rb

@@ -4,33 +4,33 @@ require 'puppet/rails/host'
 require 'puppet/indirector/active_record'
 
 class Puppet::Node::Facts::ActiveRecord < Puppet::Indirector::ActiveRecord
-    use_ar_model Puppet::Rails::Host
-
-    # Find the Rails host and pull its facts as a Facts instance.
-    def find(request)
-        return nil unless host = ar_model.find_by_name(request.key, :include => {:fact_values => :fact_name})
-
-        facts = Puppet::Node::Facts.new(host.name)
-        facts.values = host.get_facts_hash.inject({}) do |hash, ary|
-            # Convert all single-member arrays into plain values.
-            param = ary[0]
-            values = ary[1].collect { |v| v.value }
-            values = values[0] if values.length == 1
-            hash[param] = values
-            hash
-        end
-
-        facts
+  use_ar_model Puppet::Rails::Host
+
+  # Find the Rails host and pull its facts as a Facts instance.
+  def find(request)
+    return nil unless host = ar_model.find_by_name(request.key, :include => {:fact_values => :fact_name})
+
+    facts = Puppet::Node::Facts.new(host.name)
+    facts.values = host.get_facts_hash.inject({}) do |hash, ary|
+      # Convert all single-member arrays into plain values.
+      param = ary[0]
+      values = ary[1].collect { |v| v.value }
+      values = values[0] if values.length == 1
+      hash[param] = values
+      hash
     end
 
-    # Save the values from a Facts instance as the facts on a Rails Host instance.
-    def save(request)
-        facts = request.instance
+    facts
+  end
 
-        host = ar_model.find_by_name(facts.name) || ar_model.create(:name => facts.name)
+  # Save the values from a Facts instance as the facts on a Rails Host instance.
+  def save(request)
+    facts = request.instance
 
-        host.merge_facts(facts.values)
+    host = ar_model.find_by_name(facts.name) || ar_model.create(:name => facts.name)
 
-        host.save
-    end
+    host.merge_facts(facts.values)
+
+    host.save
+  end
 end

data/lib/puppet/indirector/facts/couch.rb

@@ -0,0 +1,31 @@
+require 'puppet/node/facts'
+require 'puppet/indirector/couch'
+class Puppet::Node::Facts::Couch < Puppet::Indirector::Couch
+
+  # Return the facts object or nil if there is no document
+  def find(request)
+    doc = super
+    doc ? model.new(doc['_id'], doc['facts']) : nil
+  end
+
+  private
+
+  # Facts values are stored to the document's 'facts' attribute. Hostname is
+  # stored to 'name'
+  #
+  def hash_from(request)
+    super.merge('facts' => request.instance.values)
+  end
+
+  # Facts are stored to the 'node' document.
+  def document_type_for(request)
+    'node'
+  end
+
+  # The id used to store the object in couchdb.
+  def id_for(request)
+    request.key.to_s
+  end
+
+end
+