puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/type/zone.rb

@@ -6,6 +6,7 @@ Puppet::Type.newtype(:zone) do
 the zone's filesystem (with the `path` attribute), the zone resource will
 autorequire that directory."
 
+module Puppet::Zone
   class StateMachine
     # A silly little state machine.
     def initialize
@@ -47,6 +48,7 @@ autorequire that directory."
       index(a) < index(b)
     end
   end
+end
 
   ensurable do
     desc "The running state of the zone.  The valid states directly reflect
@@ -57,7 +59,7 @@ autorequire that directory."
 
     def self.fsm
       return @fsm if @fsm
-      @fsm = StateMachine.new
+      @fsm = Puppet::Zone::StateMachine.new
     end
 
     def self.alias_state(values)
@@ -148,9 +150,17 @@ autorequire that directory."
   newproperty(:ip, :parent => Puppet::Property::List) do
     require 'ipaddr'
 
-    desc "The IP address of the zone.  IP addresses must be specified
-      with the interface, separated by a colon, e.g.: bge0:192.168.0.1.
-      For multiple interfaces, specify them in an array."
+    desc "The IP address of the zone.  IP addresses **must** be specified
+      with an interface, and may optionally be specified with a default router
+      (sometimes called a defrouter). The interface, IP address, and default
+      router should be separated by colons to form a complete IP address string.
+      For example: `bge0:192.168.178.200` would be a valid IP address string
+      without a default router, and `bge0:192.168.178.200:192.168.178.1` adds a
+      default router to it.
+
+      For zones with multiple interfaces, the value of this attribute should be
+      an array of IP address strings (each of which must include an interface
+      and may include a default router)."
 
     # The default action of list should is to lst.join(' '). By specifying
     # @should, we ensure the should remains an array. If we override should, we
@@ -320,7 +330,7 @@ autorequire that directory."
   def validate_ip(ip, name)
     IPAddr.new(ip) if ip
   rescue ArgumentError
-    self.fail "'#{ip}' is an invalid #{name}"
+    self.fail Puppet::Error, "'#{ip}' is an invalid #{name}", $!
   end
 
   def validate_exclusive(interface, address, router)

data/lib/puppet/util.rb

@@ -263,7 +263,7 @@ module Util
     begin
       URI::Generic.build(params)
     rescue => detail
-      raise Puppet::Error, "Failed to convert '#{path}' to URI: #{detail}"
+      raise Puppet::Error, "Failed to convert '#{path}' to URI: #{detail}", detail.backtrace
     end
   end
   module_function :path_to_uri
@@ -396,8 +396,8 @@ module Util
       end
     end
 
-    file     = Puppet::FileSystem::File.new(file)
-    tempfile = Tempfile.new(file.basename, file.dir.to_s)
+    file     = Puppet::FileSystem.pathname(file)
+    tempfile = Tempfile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
 
     # Set properties of the temporary file before we write the content, because
     # Tempfile doesn't promise to be safe from reading by other people, just
@@ -409,12 +409,13 @@ module Util
     # secure" tempfile permissions instead.  Magic happens later.
     if !Puppet.features.microsoft_windows?
       # Grab the current file mode, and fall back to the defaults.
-      if file.exist?
-        stat = file.path.lstat
+      effective_mode =
+      if Puppet::FileSystem.exist?(file)
+        stat = Puppet::FileSystem.lstat(file)
         tempfile.chown(stat.uid, stat.gid)
-        effective_mode = stat.mode
+        stat.mode
       else
-        effective_mode = mode
+        mode
       end
 
       if effective_mode
@@ -445,25 +446,25 @@ module Util
 
     if Puppet.features.microsoft_windows?
       # Windows ReplaceFile needs a file to exist, so touch handles this
-      if !file.exist?
-        file.touch
+      if !Puppet::FileSystem.exist?(file)
+        Puppet::FileSystem.touch(file)
         if mode
-          Puppet::Util::Windows::Security.set_mode(mode, file.path.to_s)
+          Puppet::Util::Windows::Security.set_mode(mode, Puppet::FileSystem.path_string(file))
         end
       end
       # Yes, the arguments are reversed compared to the rename in the rest
       # of the world.
-      Puppet::Util::Windows::File.replace_file(file.path, tempfile.path)
+      Puppet::Util::Windows::File.replace_file(FileSystem.path_string(file), tempfile.path)
 
     else
-      File.rename(tempfile.path, file.path.to_s)
+      File.rename(tempfile.path, Puppet::FileSystem.path_string(file))
     end
 
     # Ideally, we would now fsync the directory as well, but Ruby doesn't
     # have support for that, and it doesn't matter /that/ much...
 
     # Return something true, and possibly useful.
-    file.path
+    file
   end
   module_function :replace_file
 

data/lib/puppet/util/adsi.rb

@@ -12,7 +12,7 @@ module Puppet::Util::ADSI
       begin
         WIN32OLE.connect(uri)
       rescue Exception => e
-        raise Puppet::Error.new( "ADSI connection error: #{e}" )
+        raise Puppet::Error.new( "ADSI connection error: #{e}", e )
       end
     end
 
@@ -41,6 +41,18 @@ module Puppet::Util::ADSI
       "winmgmts:{impersonationLevel=impersonate}!//#{host}/root/cimv2"
     end
 
+    # @api private
+    def sid_uri_safe(sid)
+      return sid_uri(sid) if sid.kind_of?(Win32::Security::SID)
+
+      begin
+        sid = Win32::Security::SID.new(Win32::Security::SID.string_to_sid(sid))
+        sid_uri(sid)
+      rescue Win32::Security::SID::Error
+        return nil
+      end
+    end
+
     def sid_uri(sid)
       raise Puppet::Error.new( "Must use a valid SID object" ) if !sid.kind_of?(Win32::Security::SID)
       "WinNT://#{sid.to_s}"
@@ -96,6 +108,8 @@ module Puppet::Util::ADSI
     end
 
     def self.uri(name, host = '.')
+      if sid_uri = Puppet::Util::ADSI.sid_uri_safe(name) then return sid_uri end
+
       host = '.' if ['NT AUTHORITY', 'BUILTIN', Socket.gethostname].include?(host)
 
       Puppet::Util::ADSI.uri(name, 'user', host)
@@ -121,7 +135,7 @@ module Puppet::Util::ADSI
       begin
         native_user.SetInfo unless native_user.nil?
       rescue Exception => e
-        raise Puppet::Error.new( "User update failed: #{e}" )
+        raise Puppet::Error.new( "User update failed: #{e}", e )
       end
       self
     end
@@ -240,6 +254,8 @@ module Puppet::Util::ADSI
     end
 
     def self.uri(name, host = '.')
+      if sid_uri = Puppet::Util::ADSI.sid_uri_safe(name) then return sid_uri end
+
       Puppet::Util::ADSI.uri(name, 'group', host)
     end
 
@@ -251,7 +267,7 @@ module Puppet::Util::ADSI
       begin
         native_group.SetInfo unless native_group.nil?
       rescue Exception => e
-        raise Puppet::Error.new( "Group update failed: #{e}" )
+        raise Puppet::Error.new( "Group update failed: #{e}", e )
       end
       self
     end

data/lib/puppet/util/autoload.rb

@@ -43,7 +43,8 @@ class Puppet::Util::Autoload
       name = cleanpath(name).chomp('.rb')
       return true unless loaded.include?(name)
       file, old_mtime = loaded[name]
-      return true unless file == get_file(name)
+      environment = Puppet.lookup(:environments).get(Puppet[:environment])
+      return true unless file == get_file(name, environment)
       begin
         old_mtime.to_i != File.mtime(file).to_i
       rescue Errno::ENOENT
@@ -53,7 +54,7 @@ class Puppet::Util::Autoload
 
     # Load a single plugin by name.  We use 'load' here so we can reload a
     # given plugin.
-    def load_file(name, env=nil)
+    def load_file(name, env)
       file = get_file(name.to_s, env)
       return false unless file
       begin
@@ -65,7 +66,7 @@ class Puppet::Util::Autoload
       rescue Exception => detail
         message = "Could not autoload #{name}: #{detail}"
         Puppet.log_exception(detail, message)
-        raise Puppet::Error, message
+        raise Puppet::Error, message, detail.backtrace
       end
     end
 
@@ -73,24 +74,24 @@ class Puppet::Util::Autoload
       # Load every instance of everything we can find.
       files_to_load(path).each do |file|
         name = file.chomp(".rb")
-        load_file(name) unless loaded?(name)
+        load_file(name, nil) unless loaded?(name)
       end
     end
 
     def reload_changed
-      loaded.keys.each { |file| load_file(file) if changed?(file) }
+      loaded.keys.each { |file| load_file(file, nil) if changed?(file) }
     end
 
     # Get the correct file to load for a given path
     # returns nil if no file is found
-    def get_file(name, env=nil)
+    def get_file(name, env)
       name = name + '.rb' unless name =~ /\.rb$/
-      path = search_directories(env).find { |dir| Puppet::FileSystem::File.exist?(File.join(dir, name)) }
+      path = search_directories(env).find { |dir| Puppet::FileSystem.exist?(File.join(dir, name)) }
       path and File.join(path, name)
     end
 
     def files_to_load(path)
-      search_directories.map {|dir| files_in_dir(dir, path) }.flatten.uniq
+      search_directories(nil).map {|dir| files_in_dir(dir, path) }.flatten.uniq
     end
 
     def files_in_dir(dir, path)
@@ -100,15 +101,7 @@ class Puppet::Util::Autoload
       end
     end
 
-    def module_directories(env=nil)
-      # We have to require this late in the process because otherwise we might
-      # have load order issues. Since require is much slower than defined?, we
-      # can skip that - and save some 2,155 invocations of require in my real
-      # world testing. --daniel 2012-07-10
-      require 'puppet/node/environment' unless defined?(Puppet::Node::Environment)
-
-      real_env = Puppet::Node::Environment.new(env)
-
+    def module_directories(env)
       # We're using a per-thread cache of module directories so that we don't
       # scan the filesystem each time we try to load something. This is reset
       # at the beginning of compilation and at the end of an agent run.
@@ -135,10 +128,12 @@ class Puppet::Util::Autoload
       # "app_defaults_initialized?" method on the main puppet Settings object.
       # --cprice 2012-03-16
       if Puppet.settings.app_defaults_initialized?
+        env ||= Puppet.lookup(:environments).get(Puppet[:environment])
+
         # if the app defaults have been initialized then it should be safe to access the module path setting.
-        $env_module_directories[real_env] ||= real_env.modulepath.collect do |dir|
-          Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f| File.join(dir, f) }
-        end.flatten.collect { |d| File.join(d, "lib") }.find_all do |d|
+        $env_module_directories[env] ||= env.modulepath.collect do |dir|
+          Dir.entries(dir).reject { |f| f =~ /^\./ }.collect { |f| File.join(dir, f, "lib") }
+        end.flatten.find_all do |d|
           FileTest.directory?(d)
         end
       else
@@ -161,7 +156,7 @@ class Puppet::Util::Autoload
       gem_source.directories
     end
 
-    def search_directories(env=nil)
+    def search_directories(env)
       [gem_directories, module_directories(env), libdirs(), $LOAD_PATH].flatten
     end
 
@@ -196,12 +191,20 @@ class Puppet::Util::Autoload
     @wrap = true unless defined?(@wrap)
   end
 
-  def load(name, env=nil)
+  def load(name, env = nil)
     self.class.load_file(expand(name), env)
   end
 
-  # Load all instances that we can.  This uses require, rather than load,
-  # so that already-loaded files don't get reloaded unnecessarily.
+  # Load all instances from a path of Autoload.search_directories matching the
+  # relative path this Autoloader was initialized with.  For example, if we
+  # have created a Puppet::Util::Autoload for Puppet::Type::User with a path of
+  # 'puppet/provider/user', the search_directories path will be searched for
+  # all ruby files matching puppet/provider/user/*.rb and they will then be
+  # loaded from the first directory in the search path providing them.  So
+  # earlier entries in the search path may shadow later entries.
+  #
+  # This uses require, rather than load, so that already-loaded files don't get
+  # reloaded unnecessarily.
   def loadall
     self.class.loadall(@path)
   end

data/lib/puppet/util/backups.rb

@@ -10,7 +10,7 @@ module Puppet::Util::Backups
 
     # let the path be specified
     file ||= self[:path]
-    return true unless Puppet::FileSystem::File.exist?(file)
+    return true unless Puppet::FileSystem.exist?(file)
 
     return(self.bucket ? perform_backup_with_bucket(file) : perform_backup_with_backuplocal(file, self[:backup]))
   end
@@ -19,7 +19,7 @@ module Puppet::Util::Backups
 
   def perform_backup_with_bucket(fileobj)
     file = (fileobj.class == String) ? fileobj : fileobj.name
-    case Puppet::FileSystem::File.new(file).lstat.ftype
+    case Puppet::FileSystem.lstat(file).ftype
     when "directory"
       # we don't need to backup directories when recurse is on
       return true if self[:recurse]
@@ -46,7 +46,7 @@ module Puppet::Util::Backups
     rescue => detail
       # since they said they want a backup, let's error out
       # if we couldn't make one
-      self.fail "Could not back #{file} up: #{detail.message}"
+      self.fail Puppet::Error, "Could not back #{file} up: #{detail.message}", detail
     end
   end
 
@@ -58,7 +58,7 @@ module Puppet::Util::Backups
     end
 
     begin
-      stat = Puppet::FileSystem::File.new(newfile).send(method)
+      stat = Puppet::FileSystem.send(method, newfile)
     rescue Errno::ENOENT
       return
     end
@@ -70,11 +70,11 @@ module Puppet::Util::Backups
     info "Removing old backup of type #{stat.ftype}"
 
     begin
-      Puppet::FileSystem::File.unlink(newfile)
+      Puppet::FileSystem.unlink(newfile)
     rescue => detail
       message = "Could not remove old backup: #{detail}"
       self.log_exception(detail, message)
-      self.fail message
+      self.fail Puppet::Error, message, detail
     end
   end
 

data/lib/puppet/util/checksums.rb

@@ -56,7 +56,7 @@ module Puppet::Util::Checksums
 
   # Return the :mtime timestamp of a file.
   def mtime_file(filename)
-    Puppet::FileSystem::File.new(filename).stat.send(:mtime)
+    Puppet::FileSystem.stat(filename).send(:mtime)
   end
 
   # by definition this doesn't exist
@@ -102,7 +102,7 @@ module Puppet::Util::Checksums
 
   # Return the :ctime of a file.
   def ctime_file(filename)
-    Puppet::FileSystem::File.new(filename).stat.send(:ctime)
+    Puppet::FileSystem.stat(filename).send(:ctime)
   end
 
   alias :ctime_stream :mtime_stream

data/lib/puppet/util/classgen.rb

@@ -150,7 +150,7 @@ module Puppet::Util::ClassGen
   # @api private
   #
   def is_constant_defined?(const)
-    if ::RUBY_VERSION =~ /^1.8/
+    if ::RUBY_VERSION =~ /^1\.8/
       const_defined?(const)
     else
       const_defined?(const, false)

data/lib/puppet/util/colors.rb

@@ -84,7 +84,7 @@ module Puppet::Util::Colors
     begin
       require 'Win32API'
       require 'win32console'
-      require 'windows/wide_string'
+      require 'puppet/util/windows/string'
 
       # The win32console gem uses ANSI functions for writing to the console
       # which doesn't work for unicode strings, e.g. module tool. Ruby 1.9
@@ -112,17 +112,9 @@ module Puppet::Util::Colors
           WriteConsole.call(@handle, utf16, nChars, written, reserved)
         end
 
-        if String.method_defined?("encode")
-          def string_encode(str)
-            wstr = str.encode('UTF-16LE')
-            [wstr, wstr.length]
-          end
-        else
-          require 'iconv'
-          def string_encode(str)
-            wstr = Iconv.conv('UTF-16LE', 'UTF-8', str)
-            [wstr, wstr.length/2]
-          end
+        def string_encode(str)
+          wstr = Puppet::Util::Windows::String.wide_string(str)
+          [wstr, wstr.length - 1]
         end
       end
 

data/lib/puppet/util/command_line.rb

@@ -82,7 +82,7 @@ module Puppet
       #
       # @return [void]
       def execute
-        Puppet::Util.exit_on_fail("intialize global default settings") do
+        Puppet::Util.exit_on_fail("initialize global default settings") do
           Puppet.initialize_settings(args)
         end
 
@@ -126,7 +126,7 @@ module Puppet
           # we try to restrict to only code that can be autoloaded from the node's
           # environment.
           if @subcommand_name != 'master' and @subcommand_name != 'agent'
-            Puppet::Node::Environment.new.each_plugin_directory do |dir|
+            Puppet.lookup(:environments).get(Puppet[:environment]).each_plugin_directory do |dir|
               $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
             end
           end

data/lib/puppet/util/command_line/trollop.rb

@@ -115,7 +115,7 @@ class Parser
   ## [+:long+] Specify the long form of the argument, i.e. the form with two dashes. If unspecified, will be automatically derived based on the argument name by turning the +name+ option into a string, and replacing any _'s by -'s.
   ## [+:short+] Specify the short form of the argument, i.e. the form with one dash. If unspecified, will be automatically derived from +name+.
   ## [+:type+] Require that the argument take a parameter or parameters of type +type+. For a single parameter, the value can be a member of +SINGLE_ARG_TYPES+, or a corresponding Ruby class (e.g. +Integer+ for +:int+). For multiple-argument parameters, the value can be any member of +MULTI_ARG_TYPES+ constant. If unset, the default argument type is +:flag+, meaning that the argument does not take a parameter. The specification of +:type+ is not necessary if a +:default+ is given.
-  ## [+:default+] Set the default value for an argument. Without a default value, the hash returned by #parse (and thus Trollop::options) will have a +nil+ value for this key unless the argument is given on the commandline. The argument type is derived automatically from the class of the default value given, so specifying a +:type+ is not necessary if a +:default+ is given. (But see below for an important caveat when +:multi+: is specified too.) If the argument is a flag, and the default is set to +true+, then if it is specified on the the commandline the value will be +false+.
+  ## [+:default+] Set the default value for an argument. Without a default value, the hash returned by #parse (and thus Trollop::options) will have a +nil+ value for this key unless the argument is given on the commandline. The argument type is derived automatically from the class of the default value given, so specifying a +:type+ is not necessary if a +:default+ is given. (But see below for an important caveat when +:multi+: is specified too.) If the argument is a flag, and the default is set to +true+, then if it is specified on the commandline the value will be +false+.
   ## [+:required+] If set to +true+, the argument must be provided on the commandline.
   ## [+:multi+] If set to +true+, allows multiple occurrences of the option on the commandline. Otherwise, only a single instance of the option is allowed. (Note that this is different from taking multiple parameters. See below.)
   ##
@@ -455,7 +455,7 @@ class Parser
       end
       time ? Date.new(time.year, time.month, time.day) : Date.parse(param)
     rescue ArgumentError
-      raise CommandlineError, "option '#{arg}' needs a date"
+      raise CommandlineError, "option '#{arg}' needs a date", $!.backtrace
     end
   end
 
@@ -651,7 +651,7 @@ private
       begin
         open param
       rescue SystemCallError => e
-        raise CommandlineError, "file or url for option '#{arg}' cannot be opened: #{e.message}"
+        raise CommandlineError, "file or url for option '#{arg}' cannot be opened: #{e.message}", e.backtrace
       end
     end
   end