puppet 3.0.0.rc5 → 3.0.0.rc7

data/lib/puppet/node.rb

@@ -99,7 +99,7 @@ class Puppet::Node
       @parameters[name] = value unless @parameters.include?(name)
     end
 
-    @parameters["environment"] ||= self.environment.name.to_s if self.environment
+    @parameters["environment"] ||= self.environment.name.to_s
   end
 
   # Calculate the list of names we might use for looking

data/lib/puppet/node/facts.rb

@@ -28,7 +28,6 @@ class Puppet::Node::Facts
   def add_local_facts
     values["clientcert"] = Puppet.settings[:certname]
     values["clientversion"] = Puppet.version.to_s
-    values["environment"] ||= Puppet.settings[:environment]
   end
 
   def initialize(name, values = {})

data/lib/puppet/parser/compiler.rb

@@ -436,7 +436,7 @@ class Puppet::Parser::Compiler
   # Set the node's parameters into the top-scope as variables.
   def set_node_parameters
     node.parameters.each do |param, value|
-      @topscope[param] = value
+      @topscope[param.to_s] = value
     end
 
     # These might be nil.

data/lib/puppet/parser/functions.rb

@@ -52,8 +52,19 @@ module Puppet::Parser::Functions
       raise Puppet::DevError, "Invalid statement type #{ftype.inspect}"
     end
 
+    # the block must be installed as a method because it may use "return",
+    # which is not allowed from procs.
+    real_fname = "real_function_#{name}"
+    environment_module.send(:define_method, real_fname, &block)
+
     fname = "function_#{name}"
-    environment_module.send(:define_method, fname, &block)
+    environment_module.send(:define_method, fname) do |*args|
+      if args[0].is_a? Array
+        self.send(real_fname, args[0])
+      else
+        raise ArgumentError, "custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)"
+      end
+    end
 
     # Someday we'll support specifying an arity, but for now, nope
     #functions[name] = {:arity => arity, :type => ftype}

data/lib/puppet/parser/functions/hiera.rb

@@ -0,0 +1,8 @@
+module Puppet::Parser::Functions
+  newfunction(:hiera, :type => :rvalue) do |*args|
+    require 'hiera_puppet'
+    key, default, override = HieraPuppet.parse_args(args)
+    HieraPuppet.lookup(key, default, self, override, :priority)
+  end
+end
+

data/lib/puppet/parser/functions/hiera_array.rb

@@ -0,0 +1,8 @@
+module Puppet::Parser::Functions
+  newfunction(:hiera_array, :type => :rvalue) do |*args|
+    require 'hiera_puppet'
+    key, default, override = HieraPuppet.parse_args(args)
+    HieraPuppet.lookup(key, default, self, override, :array)
+  end
+end
+

data/lib/puppet/parser/functions/hiera_hash.rb

@@ -0,0 +1,8 @@
+module Puppet::Parser::Functions
+  newfunction(:hiera_hash, :type => :rvalue) do |*args|
+    require 'hiera_puppet'
+    key, default, override = HieraPuppet.parse_args(args)
+    HieraPuppet.lookup(key, default, self, override, :hash)
+  end
+end
+

data/lib/puppet/parser/functions/hiera_include.rb

@@ -0,0 +1,11 @@
+module Puppet::Parser::Functions
+  newfunction(:hiera_include) do |*args|
+    require 'hiera_puppet'
+    key, default, override = HieraPuppet.parse_args(args)
+    answer = HieraPuppet.lookup(key, default, self, override, :array)
+
+    method = Puppet::Parser::Functions.function(:include)
+    send(method, answer)
+  end
+end
+

data/lib/puppet/parser/functions/shellquote.rb

@@ -24,12 +24,7 @@
 # other dealings in this Software without prior written authorization
 # from Thomas Bellman.
 
-module Puppet::Parser::Functions
-
-  Safe = 'a-zA-Z0-9@%_+=:,./-'    # Safe unquoted
-  Dangerous = '!"`$\\'            # Unsafe inside double quotes
-
-  newfunction(:shellquote, :type => :rvalue, :doc => "\
+Puppet::Parser::Functions.newfunction(:shellquote, :type => :rvalue, :doc => "\
     Quote and concatenate arguments for use in Bourne shell.
 
     Each argument is quoted separately, and then all are concatenated
@@ -39,31 +34,28 @@ module Puppet::Parser::Functions
     shellquote instead of having to specify each argument
     individually in the call.
     ") \
-  do |args|
+do |args|
+  safe = 'a-zA-Z0-9@%_+=:,./-'    # Safe unquoted
+  dangerous = '!"`$\\'            # Unsafe inside double quotes
 
-    result = []
-    args.flatten.each do |word|
-      if word.length != 0 and word.count(Safe) == word.length
-        result << word
-      elsif word.count(Dangerous) == 0
-        result << ('"' + word + '"')
-      elsif word.count("'") == 0
-        result << ("'" + word + "'")
-      else
-        r = '"'
-        # We want each byte, because that is how sh will process it in enough
-        # cases; Ruby 1.8.5 ends up making this the way that gets expressed,
-        # because it requires a block to the `each_byte` method.
-        word.each_byte do |c|
-          c = c.chr
-          r += "\\" if Dangerous.include?(c)
-          r += c
-        end
-        r += '"'
-        result << r
+  result = []
+  args.flatten.each do |word|
+    if word.length != 0 and word.count(safe) == word.length
+      result << word
+    elsif word.count(dangerous) == 0
+      result << ('"' + word + '"')
+    elsif word.count("'") == 0
+      result << ("'" + word + "'")
+    else
+      r = '"'
+      word.each_byte do |c|
+        r += "\\" if dangerous.include?(c.chr)
+        r += c.chr
       end
+      r += '"'
+      result << r
     end
-
-    return result.join(" ")
   end
+
+  return result.join(" ")
 end

data/lib/puppet/parser/lexer.rb

@@ -487,7 +487,7 @@ class Puppet::Parser::Lexer
 
   # we've encountered the start of a string...
   # slurp in the rest of the string and return it
-  def slurpstring(terminators,escapes=%w{ \\  $ ' " n t s }+["\n"],ignore_invalid_escapes=false)
+  def slurpstring(terminators,escapes=%w{ \\  $ ' " r n t s }+["\n"],ignore_invalid_escapes=false)
     # we search for the next quote that isn't preceded by a
     # backslash; the caret is there to match empty strings
     str = @scanner.scan_until(/([^\\]|^|[^\\])([\\]{2})*[#{terminators}]/) or lex_error "Unclosed quote after '#{last}' in '#{rest}'"
@@ -496,6 +496,7 @@ class Puppet::Parser::Lexer
       ch = $1
       if escapes.include? ch
         case ch
+        when 'r'; "\r"
         when 'n'; "\n"
         when 't'; "\t"
         when 's'; " "

data/lib/puppet/parser/scope.rb

@@ -236,6 +236,10 @@ class Puppet::Parser::Scope
   end
 
   def lookupvar(name, options = {})
+    unless name.is_a? String
+      raise Puppet::DevError, "Scope variable name is a #{name.class}, not a string"
+    end
+
     # Save the originating scope for the request
     options[:origin] = self unless options[:origin]
     table = ephemeral?(name) ? @ephemeral.last : @symtable
@@ -327,6 +331,10 @@ class Puppet::Parser::Scope
   #   It's preferred that you use self[]= instead of this; only use this
   # when you need to set options.
   def setvar(name, value, options = {})
+    unless name.is_a? String
+      raise Puppet::DevError, "Scope variable name is a #{name.class}, not a string"
+    end
+
     table = options[:ephemeral] ? @ephemeral.last : @symtable
     if table.include?(name)
       if options[:append]

data/lib/puppet/provider/exec/windows.rb

@@ -5,7 +5,7 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
   confine    :operatingsystem => :windows
   defaultfor :operatingsystem => :windows
 
-  desc <<-EOT
+  desc <<-'EOT'
     Execute external binaries on Windows systems. As with the `posix`
     provider, this provider directly calls the command with the arguments
     given, without passing it through a shell or performing any interpolation.

data/lib/puppet/provider/group/groupadd.rb

@@ -7,7 +7,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   commands :add => "groupadd", :delete => "groupdel", :modify => "groupmod"
 
-  has_feature :system_groups
+  has_feature :system_groups unless %w{HP-UX Solaris}.include? Facter.value(:operatingsystem)
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
@@ -21,10 +21,9 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
       end
     end
     cmd << "-o" if @resource.allowdupe?
-    cmd << "-r" if @resource.system?
+    cmd << "-r" if @resource.system? and self.class.system_groups?
     cmd << @resource[:name]
 
     cmd
   end
 end
-

data/lib/puppet/provider/package/pkg.rb

@@ -17,6 +17,8 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
 
   has_feature :upgradable
 
+  has_feature :holdable
+
   commands :pkg => "/usr/bin/pkg"
 
   confine :osfamily => :solaris
@@ -34,14 +36,25 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   # if not the field is -, else we dont know what we are doing and exit with
   # out doing more damage.
   def self.ifo_flag(flags)
-    case flags
-    when /i../
-      {:status => 'installed'}
-    when /-../
-      {:status => 'known'}
-    else
-      raise ArgumentError, 'Unknown format %s: %s' % [self.name, flags]
-    end
+    (
+      case flags[0..0]
+      when 'i'
+        {:status => 'installed'}
+      when '-'
+        {:status => 'known'}
+      else
+        raise ArgumentError, 'Unknown format %s: %s[%s]' % [self.name, flags, flags[0..0]]
+      end
+    ).merge(
+      case flags[1..1]
+      when 'f'
+        {:ensure => 'held'}
+      when '-'
+        {}
+      else
+        raise ArgumentError, 'Unknown format %s: %s[%s]' % [self.name, flags, flags[1..1]]
+      end
+    )
   end
 
   # The UFOXI field is the field present in the older pkg
@@ -51,6 +64,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   # f_rozen(n/i) o_bsolete x_cluded(n/i) i_constrained(n/i)
   # note that u_pdate flag may not be trustable due to constraints.
   # so we dont rely on it
+  # Frozen was never implemented in UFOXI so skipping frozen here.
   def self.ufoxi_flag(flags)
     {}
   end
@@ -82,7 +96,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
       {:name => $1, :ensure => $2}.merge ifo_flag($3)
 
     # x11/wm/fvwm (fvwm.org)      2.6.1-3           i--
-    when /^(\S+) \((.+)\) +(\S+) +(\S+)$/
+    when /^(\S+) \((.+)\) +(\S+) +(...)$/
       {:name => $1, :publisher => $2, :ensure => $3}.merge ifo_flag($4)
 
     # NAME (PUBLISHER)                  VERSION          STATE      UFOXI (dvd:052adf36c3f4)
@@ -99,6 +113,15 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     end).merge({:provider => self.name})
   end
 
+  def hold
+    pkg(:freeze, @resource[:name])
+  end
+
+  def unhold
+    r = exec_cmd(command(:pkg), 'unfreeze', @resource[:name])
+    raise Puppet::Error, "Unable to unfreeze #{r[:out]}" unless [0,4].include? r[:exit]
+  end
+
   # Return the version of the package. Note that the bug
   # http://defect.opensolaris.org/bz/show_bug.cgi?id=19159%
   # notes that we can't use -Ha for the same even though the manual page reads that way.
@@ -119,10 +142,14 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   def install(nofail = false)
     name = @resource[:name]
     should = @resource[:ensure]
+    # always unhold if explicitly told to install/update
+    self.unhold
     unless should.is_a? Symbol
       name += "@#{should}"
       is = self.query
-      self.uninstall if Puppet::Util::Package.versioncmp(should, is[:ensure]) < 0
+      unless is[:ensure].to_sym == :absent
+        self.uninstall if Puppet::Util::Package.versioncmp(should, is[:ensure]) < 0
+      end
     end
     r = exec_cmd(command(:pkg), 'install', '--accept', name)
     return r if nofail

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

@@ -2,7 +2,7 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :daemontools, :parent => :base do
-  desc <<-EOT
+  desc <<-'EOT'
     Daemontools service management.
 
     This provider manages daemons supervised by D.J. Bernstein daemontools.

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

@@ -1,6 +1,6 @@
 require 'facter/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
-  desc <<-EOT
+  desc <<-'EOT'
     This provider manages jobs with `launchd`, which is the default service
     framework for Mac OS X (and may be available for use on other platforms).
 

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

@@ -48,7 +48,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   # Don't support them specifying runlevels; always use the runlevels
   # in the init scripts.
   def enable
-    output = chkconfig(@resource[:name], :reset)
+      output = chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
     raise Puppet::Error, "Could not enable #{self.name}: #{detail}"
   end

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

@@ -2,7 +2,7 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
-  desc <<-EOT
+  desc <<-'EOT'
     Runit service management.
 
     This provider manages daemons running supervised by Runit.

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

@@ -21,7 +21,8 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     value !~ /\s/
   end
 
-  has_features :manages_homedir, :allows_duplicates, :manages_expiry, :system_users
+  has_features :manages_homedir, :allows_duplicates, :manages_expiry
+  has_features :system_users unless %w{HP-UX Solaris}.include? Facter.value(:operatingsystem)
 
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
 
@@ -33,7 +34,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     cmd = []
     if @resource.managehome?
       cmd << "-m"
-    elsif %w{Fedora RedHat CentOS OEL OVS}.include?(Facter.value("operatingsystem"))
+    elsif %w{Fedora RedHat CentOS OEL OVS}.include?(Facter.value(:operatingsystem))
       cmd << "-M"
     end
     cmd
@@ -49,7 +50,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   def check_system_users
-    @resource.system? ? ["-r"] : []
+    if self.class.system_users? and resource.system?
+      ["-r"]
+    else
+      []
+    end
   end
 
   def add_properties

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

@@ -28,6 +28,10 @@ Puppet::Type.type(:user).provide :windows_adsi do
     [:comment, :home, :groups].each do |prop|
       send("#{prop}=", @resource[prop]) if @resource[prop]
     end
+
+    if @resource.managehome?
+      Puppet::Util::Windows::User.load_profile(@resource[:name], @resource[:password])
+    end
   end
 
   def exists?
@@ -35,7 +39,14 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def delete
+    # lookup sid before we delete account
+    sid = uid if @resource.managehome?
+
     Puppet::Util::ADSI::User.delete(@resource[:name])
+
+    if sid
+      Puppet::Util::ADSI::UserProfile.delete(sid)
+    end
   end
 
   # Only flush if we created or modified a user, not deleted

data/lib/puppet/provider/zfs/zfs.rb

@@ -37,11 +37,38 @@ Puppet::Type.type(:zfs).provide(:zfs) do
     end
   end
 
-  [:aclinherit, :aclmode, :atime, :canmount, :checksum,
+  PARAMETER_UNSET_OR_NOT_AVAILABLE = '-'
+
+  # http://docs.oracle.com/cd/E19963-01/html/821-1448/gbscy.html
+  # shareiscsi (added in build 120) was removed from S11 build 136
+  # aclmode was removed from S11 in build 139 but it may have been added back
+  # http://webcache.googleusercontent.com/search?q=cache:-p74K0DVsdwJ:developers.slashdot.org/story/11/11/09/2343258/solaris-11-released+&cd=13
+  [:aclmode, :shareiscsi].each do |field|
+    # The zfs commands use the property value '-' to indicate that the
+    # property is not set. We make use of this value to indicate that the
+    # property is not set since it is not avaliable. Conversely, if these
+    # properties are attempted to be unset, and resulted in an error, our
+    # best bet is to catch the exception and continue.
+    define_method(field) do
+      begin
+        zfs(:get, "-H", "-o", "value", field, @resource[:name]).strip
+      rescue
+        PARAMETER_UNSET_OR_NOT_AVAILABLE
+      end
+    end
+    define_method(field.to_s + "=") do |should|
+      begin
+        zfs(:set, "#{field}=#{should}", @resource[:name])
+      rescue
+      end
+    end
+  end
+
+  [:aclinherit, :atime, :canmount, :checksum,
    :compression, :copies, :dedup, :devices, :exec, :logbias,
    :mountpoint, :nbmand,  :primarycache, :quota, :readonly,
    :recordsize, :refquota, :refreservation, :reservation,
-   :secondarycache, :setuid, :shareiscsi, :sharenfs, :sharesmb,
+   :secondarycache, :setuid, :sharenfs, :sharesmb,
    :snapdir, :version, :volsize, :vscan, :xattr, :zoned].each do |field|
     define_method(field) do
       zfs(:get, "-H", "-o", "value", field, @resource[:name]).strip