puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/provider/service/openbsd.rb

@@ -0,0 +1,23 @@
+Puppet::Type.type(:service).provide :openbsd, :parent => :init do
+
+  desc "Provider for OpenBSD's rc.d daemon control scripts"
+
+  confine :operatingsystem => :openbsd
+  defaultfor :operatingsystem => :openbsd
+
+  def self.defpath
+    ["/etc/rc.d"]
+  end
+
+  def startcmd
+    [self.initscript, "-f", :start]
+  end
+
+  def restartcmd
+    (@resource[:hasrestart] == :true) && [self.initscript, "-f", :restart]
+  end
+
+  def statuscmd
+    [self.initscript, :check]
+  end
+end

data/lib/puppet/provider/service/runit.rb

@@ -42,7 +42,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
     def defpath(dummy_argument=:work_arround_for_ruby_GC_bug)
       unless @defpath
         ["/etc/sv", "/var/lib/service"].each do |path|
-          if FileTest.exist?(path)
+          if Puppet::FileSystem::File.exist?(path)
             @defpath = path
             break
           end
@@ -57,7 +57,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
   def servicedir
     unless @servicedir
       ["/service", "/etc/service","/var/service"].each do |path|
-        if FileTest.exist?(path)
+        if Puppet::FileSystem::File.exist?(path)
           @servicedir = path
           break
         end
@@ -105,7 +105,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
   # before a disable
   def disable
     # unlink the daemon symlink to disable it
-    File.unlink(self.service) if FileTest.symlink?(self.service)
+    Puppet::FileSystem::File.unlink(self.service) if Puppet::FileSystem::File.new(self.service).symlink?
   end
 end
 

data/lib/puppet/provider/service/upstart.rb

@@ -71,7 +71,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
       paths.each do |path|
         service_name = name.match(/^(\S+)/)[1]
         fqname = File.join(path, service_name + suffix)
-        if File.exists?(fqname)
+        if Puppet::FileSystem::File.exist?(fqname)
           return fqname
         end
 
@@ -148,7 +148,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
 private
   def is_upstart?(script = initscript)
-    File.exists?(script) && script.match(/\/etc\/init\/\S+\.conf/)
+    Puppet::FileSystem::File.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/)
   end
 
   def version_is_pre_0_6_7
@@ -256,7 +256,7 @@ private
   end
 
   def read_override_file
-    if File.exists?(overscript)
+    if Puppet::FileSystem::File.exist?(overscript)
       read_script_from(overscript)
     else
       ""

data/lib/puppet/provider/ssh_authorized_key/parsed.rb

@@ -41,7 +41,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(
   end
 
   def user
-    uid = File.stat(target).uid
+    uid = Puppet::FileSystem::File.new(target).stat.uid
     Etc.getpwuid(uid).name
   end
 
@@ -55,7 +55,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(
     self.class.backup_target(target)
 
     Puppet::Util::SUIDManager.asuser(@resource.should(:user)) do
-        unless File.exist?(dir = File.dirname(target))
+        unless Puppet::FileSystem::File.exist?(dir = File.dirname(target))
           Puppet.debug "Creating #{dir}"
           Dir.mkdir(dir, dir_perm)
         end

data/lib/puppet/provider/user/directoryservice.rb

@@ -238,7 +238,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   def self.get_sha1(guid)
     password_hash = nil
     password_hash_file = "#{password_hash_dir}/#{guid}"
-    if File.exists?(password_hash_file) and File.file?(password_hash_file)
+    if Puppet::FileSystem::File.exist?(password_hash_file) and File.file?(password_hash_file)
       raise Puppet::Error, "Could not read password hash file at #{password_hash_file}" if not File.readable?(password_hash_file)
       f = File.new(password_hash_file)
       password_hash = f.read

data/lib/puppet/provider/user/useradd.rb

@@ -160,7 +160,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     else
       cmd = [command(:add)]
     end
-    if not @resource.should(gid) and Puppet::Util.gid(@resource[:name])
+    if not @resource.should(:gid) and Puppet::Util.gid(@resource[:name])
       cmd += ["-g", @resource[:name]]
     end
     cmd += add_properties

data/lib/puppet/provider/zone/solaris.rb

@@ -261,7 +261,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
       # which makes zoneadmd mount the zone root
       zoneadm :ready unless File.directory?(zoneetc)
 
-      unless File.exists?(sysidcfg)
+      unless Puppet::FileSystem::File.exist?(sysidcfg)
         begin
           File.open(sysidcfg, "w", 0600) do |f|
             f.puts cfg

data/lib/puppet/rails/benchmark.rb

@@ -52,7 +52,7 @@ module Puppet::Rails::Benchmark
 
     file = "/tmp/time_debugging.yaml"
 
-    if FileTest.exist?(file)
+    if Puppet::FileSystem::File.exist?(file)
       data = YAML.load_file(file)
     else
       data = {}

data/lib/puppet/reference/configuration.rb

@@ -14,14 +14,13 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
 
     # Print the doc string itself
     begin
-      str << object.desc.gsub(/\n/, " ")
+      str << Puppet::Util::Docs.scrub(object.desc)
     rescue => detail
       Puppet.log_exception(detail)
     end
     str << "\n\n"
 
     # Now print the data about the item.
-    str << ""
     val = object.default
     if name.to_s == "vardir"
       val = "/var/lib/puppet"

data/lib/puppet/reference/indirection.rb

@@ -10,16 +10,14 @@ reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirect
     name = indirection.to_s.capitalize
     text << "## " + indirection.to_s + "\n\n"
 
-    text << ind.doc + "\n\n"
-
-    text << "### Termini\n\n"
+    text << Puppet::Util::Docs.scrub(ind.doc) + "\n\n"
 
     Puppet::Indirector::Terminus.terminus_classes(ind.name).sort { |a,b| a.to_s <=> b.to_s }.each do |terminus|
       terminus_name = terminus.to_s
       term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
       if term_class
         terminus_doc = Puppet::Util::Docs.scrub(term_class.doc)
-        text << markdown_definitionlist(terminus_name, terminus_doc)
+        text << markdown_header("`#{terminus_name}` terminus", 3) << terminus_doc << "\n\n"
       else
         Puppet.warning "Could not build docs for indirector #{name.inspect}, terminus #{terminus_name.inspect}: could not locate terminus."
       end
@@ -31,7 +29,7 @@ end
 
 reference.header = <<HEADER
 
-# About Indirection
+## About Indirection
 
 Puppet's indirector support pluggable backends (termini) for a variety of key-value stores (indirections).
 Each indirection type corresponds to a particular Ruby class (the "Indirected Class" below) and values are instances of that class.
@@ -40,15 +38,15 @@ The termini can be local (e.g., on-disk files) or remote (e.g., using a REST int
 
 An indirector has five methods, which are mapped into HTTP verbs for the REST interface:
 
- * `find(key)` - get a single value (mapped to GET or POST with a singular endpoint)
- * `search(key)` - get a list of matching values (mapped to GET with a plural endpoint)
- * `head(key)` - return true if the key exists (mapped to HEAD)
- * `destroy(key)` - remove the key van value (mapped to DELETE)
- * `save(instance)` - write the instance to the store, using the instance's name as the key (mapped to PUT)
+* `find(key)` - get a single value (mapped to GET or POST with a singular endpoint)
+* `search(key)` - get a list of matching values (mapped to GET with a plural endpoint)
+* `head(key)` - return true if the key exists (mapped to HEAD)
+* `destroy(key)` - remove the key van value (mapped to DELETE)
+* `save(instance)` - write the instance to the store, using the instance's name as the key (mapped to PUT)
 
-These methods are available via the `indirection` class method on the indirected classes.  For example::
+These methods are available via the `indirection` class method on the indirected classes.  For example:
 
-  foo_cert = Puppet::SSL::Certificate.indirection.find('foo.example.com')
+    foo_cert = Puppet::SSL::Certificate.indirection.find('foo.example.com')
 
 At startup, each indirection is configured with a terminus.
 In most cases, this is the default terminus defined by the indirected class, but it can be overridden by the application or face, or overridden with the `route_file` configuration.
@@ -58,12 +56,12 @@ Indirections can also have a cache, represented by a second terminus.
 This is a write-through cache: modifications are written both to the cache and to the primary terminus.
 Values fetched from the terminus are written to the cache.
 
-## Interaction with REST
+### Interaction with REST
 
 REST endpoints have the form `/{environment}/{indirection}/{key}`, where the indirection can be singular or plural, following normal English spelling rules.
 On the server side, REST responses are generated from the locally-configured endpoints.
 
-## Indirections and Termini
+### Indirections and Termini
 
 Below is the list of all indirections, their associated terminus classes, and how you select between them.
 

data/lib/puppet/relationship.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 # subscriptions are permanent associations determining how different
 # objects react to an event
 
@@ -72,7 +70,7 @@ class Puppet::Relationship
     "{ #{source} => #{target} }"
   end
 
-  def to_pson_data_hash
+  def to_data_hash
     data = {
       'source' => source.to_s,
       'target' => target.to_s
@@ -85,8 +83,13 @@ class Puppet::Relationship
     data
   end
 
+  # This doesn't include document type as it is part of a catalog
+  def to_pson_data_hash
+    to_data_hash
+  end
+
   def to_pson(*args)
-    to_pson_data_hash.to_pson(*args)
+    to_data_hash.to_pson(*args)
   end
 
   def to_s

data/lib/puppet/reports.rb

@@ -72,9 +72,9 @@ class Puppet::Reports
     instance_loader(:report).loadall
     loaded_instances(:report).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
       mod = self.report(name)
-      docs += "#{name}\n#{"-" * name.to_s.length}\n"
+      docs << "#{name}\n#{"-" * name.to_s.length}\n"
 
-      docs += Puppet::Util::Docs.scrub(mod.doc) + "\n\n"
+      docs << Puppet::Util::Docs.scrub(mod.doc) << "\n\n"
     end
 
     docs

data/lib/puppet/reports/rrdgraph.rb

@@ -114,7 +114,7 @@ Puppet::Reports.register_report(:rrdgraph) do
       metric.graph
     end
 
-    mkhtml unless FileTest.exists?(File.join(hostdir, "index.html"))
+    mkhtml unless Puppet::FileSystem::File.exist?(File.join(hostdir, "index.html"))
   end
 
   # Unfortunately, RRD does not deal well with changing lists of values,

data/lib/puppet/reports/store.rb

@@ -17,7 +17,7 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if ! FileTest.exists?(dir)
+    if ! Puppet::FileSystem::File.exist?(dir)
       FileUtils.mkdir_p(dir)
       FileUtils.chmod_R(0750, dir)
     end
@@ -54,11 +54,11 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if File.exists?(dir)
+    if Puppet::FileSystem::File.exist?(dir)
       Dir.entries(dir).each do |file|
         next if ['.','..'].include?(file)
         file = File.join(dir, file)
-        File.unlink(file) if File.file?(file)
+        Puppet::FileSystem::File.unlink(file) if File.file?(file)
       end
       Dir.rmdir(dir)
     end

data/lib/puppet/reports/tagmail.rb

@@ -108,7 +108,7 @@ Puppet::Reports.register_report(:tagmail) do
 
   # Process the report.  This just calls the other associated messages.
   def process
-    unless FileTest.exists?(Puppet[:tagmap])
+    unless Puppet::FileSystem::File.exist?(Puppet[:tagmap])
       Puppet.notice "Cannot send tagmail report; no tagmap file #{Puppet[:tagmap]}"
       return
     end
@@ -158,7 +158,7 @@ Puppet::Reports.register_report(:tagmail) do
               p.puts "From: #{Puppet[:reportfrom]}"
               p.puts "Subject: Puppet Report for #{self.host}"
               p.puts "To: " + emails.join(", ")
-
+              p.puts
               p.puts messages
             end
           end

data/lib/puppet/resource.rb

@@ -56,7 +56,7 @@ class Puppet::Resource
     "#{@type}[#{@title}]#{to_hash.inspect}"
   end
 
-  def to_pson_data_hash
+  def to_data_hash
     data = ([:type, :title, :tags] + ATTRIBUTES).inject({}) do |hash, param|
       next hash unless value = self.send(param)
       hash[param.to_s] = value
@@ -80,6 +80,11 @@ class Puppet::Resource
     data
   end
 
+  # This doesn't include document type as it is part of a catalog
+  def to_pson_data_hash
+    to_data_hash
+  end
+
   def self.value_to_pson_data(value)
     if value.is_a? Array
       value.map{|v| value_to_pson_data(v) }
@@ -102,8 +107,20 @@ class Puppet::Resource
     end
   end
 
+  YAML_ATTRIBUTES = [:@file, :@line, :@exported, :@type, :@title, :@tags, :@parameters]
+
+  # Explicitly list the instance variables that should be serialized when
+  # converting to YAML.
+  #
+  # @api private
+  # @return [Array<Symbol>] The intersection of our explicit variable list and
+  #   all of the instance variables defined on this class.
+  def to_yaml_properties
+    YAML_ATTRIBUTES & super
+  end
+
   def to_pson(*args)
-    to_pson_data_hash.to_pson(*args)
+    to_data_hash.to_pson(*args)
   end
 
   # Proxy these methods to the parameters hash.  It's likely they'll
@@ -328,10 +345,7 @@ class Puppet::Resource
       result = scope.compiler.injector.lookup(scope, name)
     end
     if result.nil?
-      Puppet::DataBinding.indirection.find(
-        name,
-        :environment => scope.environment.to_s,
-        :variables => Puppet::DataBinding::Variables.new(scope))
+      lookup_with_databinding(name, scope)
     else
       result
     end
@@ -339,6 +353,19 @@ class Puppet::Resource
 
   private :lookup_external_default_for
 
+  def lookup_with_databinding(name, scope)
+    begin
+      Puppet::DataBinding.indirection.find(
+        name,
+        :environment => scope.environment.to_s,
+        :variables => scope)
+    rescue Puppet::DataBinding::LookupError => e
+      raise Puppet::Error.new("Error from DataBinding '#{Puppet[:data_binding_terminus]}' while looking up '#{name}': #{e.message}", e)
+    end
+  end
+
+  private :lookup_with_databinding
+
   def set_default_parameters(scope)
     return [] unless resource_type and resource_type.respond_to?(:arguments)
 
@@ -362,8 +389,39 @@ class Puppet::Resource
     end.compact
   end
 
-  def to_resource
-    self
+  def copy_as_resource
+    result = Puppet::Resource.new(type, title)
+
+    to_hash.each do |p, v|
+      if v.is_a?(Puppet::Resource)
+        v = Puppet::Resource.new(v.type, v.title)
+      elsif v.is_a?(Array)
+        # flatten resource references arrays
+        v = v.flatten if v.flatten.find { |av| av.is_a?(Puppet::Resource) }
+        v = v.collect do |av|
+          av = Puppet::Resource.new(av.type, av.title) if av.is_a?(Puppet::Resource)
+          av
+        end
+      end
+
+      # If the value is an array with only one value, then
+      # convert it to a single value.  This is largely so that
+      # the database interaction doesn't have to worry about
+      # whether it returns an array or a string.
+      result[p] = if v.is_a?(Array) and v.length == 1
+                    v[0]
+                  else
+                    v
+                  end
+    end
+
+    result.file = self.file
+    result.line = self.line
+    result.exported = self.exported
+    result.virtual = self.virtual
+    result.tag(*self.tags)
+
+    result
   end
 
   def valid_parameter?(name)

data/lib/puppet/resource/catalog.rb

@@ -365,19 +365,23 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     result.add_edge(edge)
   end
 
+  def to_data_hash
+    {
+      'tags'      => tags,
+      'name'      => name,
+      'version'   => version,
+      'environment' => environment.to_s,
+      'resources' => @resources.collect { |v| @resource_table[v].to_pson_data_hash },
+      'edges'     => edges.   collect { |e| e.to_pson_data_hash },
+      'classes'   => classes
+    }
+  end
+
   PSON.register_document_type('Catalog',self)
   def to_pson_data_hash
     {
       'document_type' => 'Catalog',
-      'data'       => {
-        'tags'      => tags,
-        'name'      => name,
-        'version'   => version,
-        'environment' => environment.to_s,
-        'resources' => @resources.collect { |v| @resource_table[v].to_pson_data_hash },
-        'edges'     => edges.   collect { |e| e.to_pson_data_hash },
-        'classes'   => classes
-        },
+      'data'       => to_data_hash,
       'metadata' => {
         'api_version' => 1
         }
@@ -465,7 +469,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
   # Verify that the given resource isn't declared elsewhere.
   def fail_on_duplicate_type_and_title(resource)
-    # Short-curcuit the common case,
+    # Short-circuit the common case,
     return unless existing_resource = @resource_table[title_key_for_ref(resource.ref)]
 
     # If we've gotten this far, it's a real conflict
@@ -492,22 +496,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       next if virtual_not_exported?(resource)
       next if block_given? and yield resource
 
-      #This is hackity hack for 1094
-      #Aliases aren't working in the ral catalog because the current instance of the resource
-      #has a reference to the catalog being converted. . . So, give it a reference to the new one
-      #problem solved. . .
-      if resource.class == Puppet::Resource
-        resource = resource.dup
-        resource.catalog = result
-      elsif resource.is_a?(Puppet::Parser::Resource)
-        resource = resource.to_resource
-        resource.catalog = result
-      end
+      newres = resource.copy_as_resource
+      newres.catalog = result
 
-      if resource.is_a?(Puppet::Resource) and convert.to_s == "to_resource"
-        newres = resource
-      else
-        newres = resource.send(convert)
+      if convert != :to_resource
+        newres = newres.to_ral
       end
 
       # We can't guarantee that resources don't munge their names