puppet 4.10.12 → 5.0.0

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

@@ -37,9 +37,9 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
 
     if absolute_path?(exe)
       if !Puppet::FileSystem.exist?(exe)
-        raise ArgumentError, "Could not find command '#{exe}'"
+        raise ArgumentError, _("Could not find command '%{exe}'") % { exe: exe }
       elsif !File.file?(exe)
-        raise ArgumentError, "'#{exe}' is a #{File.ftype(exe)}, not a file"
+        raise ArgumentError, _("'%{exe}' is a %{klass}, not a file") % { exe: exe, klass: File.ftype(exe) }
       end
       return
     end
@@ -50,6 +50,6 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
       end
     end
 
-    raise ArgumentError, "Could not find command '#{exe}'"
+    raise ArgumentError, _("Could not find command '%{exe}'") % { exe: exe }
   end
 end

data/lib/puppet/provider/file/posix.rb

@@ -63,7 +63,7 @@ Puppet::Type.type(:file).provide :posix do
     # large UIDs instead of negative ones.  This isn't a Ruby bug,
     # it's an OS X bug, since it shows up in perl, too.
     if currentvalue > Puppet[:maximum_uid].to_i
-      self.warning "Apparently using negative UID (#{currentvalue}) on a platform that does not consistently handle them"
+      self.warning _("Apparently using negative UID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
       currentvalue = :silly
     end
 
@@ -81,7 +81,7 @@ Puppet::Type.type(:file).provide :posix do
     begin
       File.send(method, should, nil, resource[:path])
     rescue => detail
-      raise Puppet::Error, "Failed to set owner to '#{should}': #{detail}", detail.backtrace
+      raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
     end
   end
 
@@ -94,7 +94,7 @@ Puppet::Type.type(:file).provide :posix do
     # large GIDs instead of negative ones.  This isn't a Ruby bug,
     # it's an OS X bug, since it shows up in perl, too.
     if currentvalue > Puppet[:maximum_uid].to_i
-      self.warning "Apparently using negative GID (#{currentvalue}) on a platform that does not consistently handle them"
+      self.warning _("Apparently using negative GID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
       currentvalue = :silly
     end
 
@@ -112,7 +112,7 @@ Puppet::Type.type(:file).provide :posix do
     begin
       File.send(method, nil, should, resource[:path])
     rescue => detail
-      raise Puppet::Error, "Failed to set group to '#{should}': #{detail}", detail.backtrace
+      raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
     end
   end
 
@@ -128,7 +128,7 @@ Puppet::Type.type(:file).provide :posix do
     begin
       File.chmod(value.to_i(8), resource[:path])
     rescue => detail
-      error = Puppet::Error.new("failed to set mode #{mode} on #{resource[:path]}: #{detail.message}")
+      error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
       error.set_backtrace detail.backtrace
       raise error
     end

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

@@ -43,7 +43,7 @@ Puppet::Type.type(:file).provide :windows do
     begin
       set_owner(should, resolved_path)
     rescue => detail
-      raise Puppet::Error, "Failed to set owner to '#{should}': #{detail}", detail.backtrace
+      raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
     end
   end
 
@@ -56,7 +56,7 @@ Puppet::Type.type(:file).provide :windows do
     begin
       set_group(should, resolved_path)
     rescue => detail
-      raise Puppet::Error, "Failed to set group to '#{should}': #{detail}", detail.backtrace
+      raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
     end
   end
 
@@ -73,7 +73,7 @@ Puppet::Type.type(:file).provide :windows do
     begin
       set_mode(value.to_i(8), resource[:path])
     rescue => detail
-      error = Puppet::Error.new("failed to set mode #{mode} on #{resource[:path]}: #{detail.message}")
+      error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
       error.set_backtrace detail.backtrace
       raise error
     end
@@ -82,7 +82,7 @@ Puppet::Type.type(:file).provide :windows do
 
   def validate
     if [:owner, :group, :mode].any?{|p| resource[p]} and !supports_acl?(resource[:path])
-      resource.fail("Can only manage owner, group, and mode on filesystems that support Windows ACLs, such as NTFS")
+      resource.fail(_("Can only manage owner, group, and mode on filesystems that support Windows ACLs, such as NTFS"))
     end
   end
 

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

@@ -98,7 +98,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   def get_arguments(key, value, mapping, objectinfo)
     # In the case of attributes, return a list of key=value
     if key == :attributes
-      raise Puppet::Error, "Attributes must be a list of pairs key=value on #{@resource.class.name}[#{@resource.name}]" \
+      raise Puppet::Error, _("Attributes must be a list of pairs key=value on %{resource}[%{name}]") % { resource: @resource.class.name, name: @resource.name } \
         unless value and value.is_a? Hash
       return value.select { |k,v| true }.map { |pair| pair.join("=") }
     end
@@ -127,7 +127,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
       begin
         execute(cmd)
       rescue Puppet::ExecutionFailure  => detail
-        raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
+        raise Puppet::Error, _("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
       end
     end
   end

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

@@ -10,7 +10,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   has_feature :system_groups unless %w{HP-UX Solaris}.include? Facter.value(:operatingsystem)
 
-  verify :gid, "GID must be an integer" do |value|
+  verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
   end
 
@@ -56,7 +56,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     # using both useradd and luseradd
     if not @resource.allowdupe? and @resource.forcelocal?
        if @resource.should(:gid) and findgroup('gid', @resource.should(:gid).to_s)
-           raise(Puppet::Error, "GID #{@resource.should(:gid).to_s} already exists, use allowdupe to force group creation")
+           raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
        end
     elsif @resource.allowdupe? and not @resource.forcelocal?
        return ["-o"]

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

@@ -11,7 +11,7 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
 
   options :members, :flag => "-M", :method => :mem
 
-  verify :gid, "GID must be an integer" do |value|
+  verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
   end
 

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

@@ -23,9 +23,12 @@ Puppet::Type.type(:group).provide :windows_adsi do
     # Cannot use munge of the group property to canonicalize @should
     # since the default array_matching comparison is not commutative
 
-    current_sids = current.map(&:sid)
     # dupes automatically weeded out when hashes built
-    specified_sids = Puppet::Util::Windows::ADSI::Group.name_sid_hash(should).keys.to_a
+    current_users = Puppet::Util::Windows::ADSI::Group.name_sid_hash(current)
+    specified_users = Puppet::Util::Windows::ADSI::Group.name_sid_hash(should)
+
+    current_sids = current_users.keys.to_a
+    specified_sids = specified_users.keys.to_a
 
     if @resource[:auth_membership]
       current_sids.sort == specified_sids.sort
@@ -37,7 +40,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   def members_to_s(users)
     return '' if users.nil? or !users.kind_of?(Array)
     users = users.map do |user_name|
-      sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
+      sid = Puppet::Util::Windows::SID.name_to_sid_object(user_name)
       if !sid
         resource.debug("#{user_name} (unresolvable to SID)")
         next user_name
@@ -55,7 +58,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def member_valid?(user_name)
-    ! Puppet::Util::Windows::SID.name_to_principal(user_name).nil?
+    ! Puppet::Util::Windows::SID.name_to_sid_object(user_name).nil?
   end
 
   def group

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

@@ -30,7 +30,7 @@ Puppet::Type.type(:host).provide(:parsed,:parent => Puppet::Provider::ParsedFile
     },
     :to_line  => proc { |hash|
       [:ip, :name].each do |n|
-        raise ArgumentError, "#{n} is a required attribute for hosts" unless hash[n] and hash[n] != :absent
+        raise ArgumentError, _("%{attr} is a required attribute for hosts") % { attr: n } unless hash[n] and hash[n] != :absent
       end
       str = "#{hash[:ip]}\t#{hash[:name]}"
       if hash.include? :host_aliases and !hash[:host_aliases].nil? and hash[:host_aliases] != :absent

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -52,7 +52,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
 
     def populate_rules_rights
       auth_plist = Puppet::Util::Plist.parse_plist(AuthDB)
-      raise Puppet::Error.new("Cannot parse: #{AuthDB}") if not auth_plist
+      raise Puppet::Error.new(_("Cannot parse: %{auth}") % { auth: AuthDB }) if not auth_plist
       self.rights = auth_plist["rights"].dup
       self.rules = auth_plist["rules"].dup
       self.parsed_auth_db = self.rights.dup
@@ -93,7 +93,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     when :rule
       destroy_rule
     else
-      raise Puppet::Error.new("Must specify auth_type when destroying.")
+      raise Puppet::Error.new(_("Must specify auth_type when destroying."))
     end
   end
 
@@ -111,7 +111,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       when :rule
         flush_rule
       else
-        raise Puppet::Error.new("flush requested for unknown type.")
+        raise Puppet::Error.new(_("flush requested for unknown type."))
       end
       @property_hash.clear
     end
@@ -132,7 +132,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         authdb["rules"].delete(resource[:name])
         Puppet::Util::Plist.write_plist_file(authdb, AuthDB)
       rescue Errno::EACCES => e
-        raise Puppet::Error.new("Error saving #{AuthDB}: #{e}", e)
+        raise Puppet::Error.new(_("Error saving %{auth}: %{error}") % { auth: AuthDB, error: e }, e)
       end
     end
   end
@@ -177,7 +177,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       cmds << :security << "authorizationdb" << "write" << name
       execute(cmds, :failonfail => false, :combine => false, :stdinfile => tmp.path.to_s)
     rescue Errno::EACCES => e
-      raise Puppet::Error.new("Cannot save right to #{tmp.path}: #{e}", e)
+      raise Puppet::Error.new(_("Cannot save right to %{path}: %{error}") % { path: tmp.path, error: e }, e)
     ensure
       tmp.close
       tmp.unlink
@@ -196,7 +196,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     begin
       Puppet::Util::Plist.write_plist_file(authdb, AuthDB)
     rescue
-      raise Puppet::Error.new("Error writing to: #{AuthDB}")
+      raise Puppet::Error.new(_("Error writing to: %{auth_db}") % { auth_db: AuthDB })
     end
   end
 
@@ -229,7 +229,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
 
   def retrieve_value(resource_name, attribute)
     # We set boolean values to symbols when retrieving values
-    raise Puppet::Error.new("Cannot find #{resource_name} in auth db") if not self.class.parsed_auth_db.has_key?(resource_name)
+    raise Puppet::Error.new(_("Cannot find %{resource_name} in auth db") % { resource_name: resource_name }) if not self.class.parsed_auth_db.has_key?(resource_name)
 
     if PuppetToNativeAttributeMap.has_key?(attribute)
       native_attribute = PuppetToNativeAttributeMap[attribute]
@@ -284,10 +284,10 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       elsif self.class.rules.has_key?(resource[:name])
         return :rule
       else
-        raise Puppet::Error.new("#{resource[:name]} is unknown type.")
+        raise Puppet::Error.new(_("%{resource} is unknown type.") % { resource: resource[:name] })
       end
     else
-      raise Puppet::Error.new("auth_type required for new resources.")
+      raise Puppet::Error.new(_("auth_type required for new resources."))
     end
   end
 

data/lib/puppet/provider/maillist/mailman.rb

@@ -52,12 +52,12 @@ Puppet::Type.type(:maillist).provide(:mailman) do
     if val = @resource[:admin]
       args << val
     else
-      raise ArgumentError, "Mailman lists require an administrator email address"
+      raise ArgumentError, _("Mailman lists require an administrator email address")
     end
     if val = @resource[:password]
       args << val
     else
-      raise ArgumentError, "Mailman lists require an administrator password"
+      raise ArgumentError, _("Mailman lists require an administrator password")
     end
     newlist(*args)
   end

data/lib/puppet/provider/mcx/mcxcontent.rb

@@ -134,13 +134,13 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
     ds_type = name.split('/')[1]
     unless ds_type
       raise MCXContentProviderException,
-      "Could not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
+      _("Could not parse ds_type from resource name '%{name}'.  Specify with ds_type parameter.") % { name: name }
     end
     # De-pluralize and downcase.
     ds_type = ds_type.chop.downcase.to_sym
     unless TypeMap.key? ds_type
       raise MCXContentProviderException,
-      "Could not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
+      _("Could not parse ds_type from resource name '%{name}'.  Specify with ds_type parameter.") % { name: name }
     end
     ds_type
   end
@@ -150,7 +150,7 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
     ds_name = name.split('/')[2]
     unless ds_name
       raise MCXContentProviderException,
-      "Could not parse ds_name from resource name '#{name}'.  Specify with ds_name parameter."
+      _("Could not parse ds_name from resource name '%{name}'.  Specify with ds_name parameter.") % { name: name }
     end
     ds_name
   end

data/lib/puppet/provider/mount.rb

@@ -24,7 +24,8 @@ module Puppet::Provider::Mount
   end
 
   def remount
-    info "Remounting"
+    #TRANSLATORS refers to remounting a file system
+    info _("Remounting")
     if resource[:remounts] == :true
       mountcmd "-o", "remount", resource[:name]
     elsif ["FreeBSD", "DragonFly", "OpenBSD"].include?(Facter.value(:operatingsystem))

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

@@ -123,11 +123,13 @@ Puppet::Type.type(:mount).provide(
         result[:options] = [result[:options],special_options.sort].flatten.compact.join(',')
         if ! result[:device]
           result[:device] = :absent
-          Puppet.err "Prefetch: Mount[#{result[:name]}]: Field 'device' is missing"
+          #TRANSLATORS "prefetch" is a program name and should not be translated
+          Puppet.err _("Prefetch: Mount[%{name}]: Field 'device' is missing") % { name: result[:name] }
         end
         if ! result[:fstype]
           result[:fstype] = :absent
-          Puppet.err "Prefetch: Mount[#{result[:name]}]: Field 'fstype' is missing"
+          #TRANSLATORS "prefetch" is a program name and should not be translated
+          Puppet.err _("Prefetch: Mount[%{name}]: Field 'fstype' is missing") % { name: result[:name] }
         end
       end
       def to_line(result)
@@ -138,7 +140,7 @@ Puppet::Type.type(:mount).provide(
         elsif result[:device] and result[:device] != :absent
           if ! result[:device].match(%{^.+:/})
             # Just skip this entry; it was malformed to begin with
-            Puppet.err "Mount[#{result[:name]}]: Field 'device' must be in the format of <absolute path> or <host>:<absolute path>"
+            Puppet.err _("Mount[%{name}]: Field 'device' must be in the format of <absolute path> or <host>:<absolute path>") % { name: result[:name] }
             return result[:line]
           end
           nodename, path = result[:device].split(":")
@@ -146,14 +148,14 @@ Puppet::Type.type(:mount).provide(
           output << "\tnodename\t= #{nodename}"
         else
           # Just skip this entry; it was malformed to begin with
-          Puppet.err "Mount[#{result[:name]}]: Field 'device' is required"
+          Puppet.err _("Mount[%{name}]: Field 'device' is required") % { name: result[:name] }
           return result[:line]
         end
         if result[:fstype] and result[:fstype] != :absent
           output << "\tvfs\t\t= #{result[:fstype]}"
         else
           # Just skip this entry; it was malformed to begin with
-          Puppet.err "Mount[#{result[:name]}]: Field 'device' is required"
+          Puppet.err _("Mount[%{name}]: Field 'device' is required") % { name: result[:name] }
           return result[:line]
         end
         if result[:options]
@@ -184,11 +186,11 @@ Puppet::Type.type(:mount).provide(
           if Facter.value(:kernel) == 'Linux'
             record[:options] = 'defaults'
           else
-            raise Puppet::Error, "Mount[#{record[:name]}]: Field 'options' is required"
+            raise Puppet::Error, _("Mount[%{name}]: Field 'options' is required") % { name: record[:name] }
           end
         end
         if !record[:fstype] || record[:fstype].empty?
-          raise Puppet::Error, "Mount[#{record[:name]}]: Field 'fstype' is required"
+          raise Puppet::Error, _("Mount[%{name}]: Field 'fstype' is required") % { name: record[:name] }
         end
         record
       end
@@ -266,7 +268,7 @@ Puppet::Type.type(:mount).provide(
       if match = regex.match(line) and name = match.captures.first
         instances << {:name => name, :mounted => :yes} # Only :name is important here
       else
-        raise Puppet::Error, "Could not understand line #{line} from mount output"
+        raise Puppet::Error, _("Could not understand line %{line} from mount output") % { line: line }
       end
     end
     instances

data/lib/puppet/provider/naginator.rb

@@ -23,7 +23,7 @@ class Puppet::Provider::Naginator < Puppet::Provider::ParsedFile
   def self.parse(text)
       Nagios::Parser.new.parse(text.gsub(NAME_STRING, "_naginator_name"))
   rescue => detail
-      raise Puppet::Error, "Could not parse configuration for #{resource_type.name}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not parse configuration for %{resource}: %{detail}") % { resource: resource_type.name, detail: detail }, detail.backtrace
   end
 
   def self.to_file(records)

data/lib/puppet/provider/nameservice.rb

@@ -24,13 +24,11 @@ class Puppet::Provider::NameService < Puppet::Provider
 
     def instances
       objects = []
+      Puppet::Etc.send("set#{section}ent")
       begin
-        method = Puppet::Etc.method(:"get#{section}ent")
-        while ent = method.call
+        while ent = Puppet::Etc.send("get#{section}ent")
           objects << new(:name => ent.name, :canonical_name => ent.canonical_name, :ensure => :present)
         end
-      ensure
-        Puppet::Etc.send("end#{section}ent")
       end
       objects
     end
@@ -98,7 +96,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       name = name.intern if name.is_a? String
       if @checks.include? name
         block = @checks[name][:block]
-        raise ArgumentError, "Invalid value #{value}: #{@checks[name][:error]}" unless block.call(value)
+        raise ArgumentError, _("Invalid value %{value}: %{error}") % { value: value, error: @checks[name][:error] } unless block.call(value)
       end
     end
 
@@ -163,7 +161,7 @@ class Puppet::Provider::NameService < Puppet::Provider
 
   def create
     if exists?
-      info "already exists"
+      info _("already exists")
       # The object already exists
       return nil
     end
@@ -174,13 +172,13 @@ class Puppet::Provider::NameService < Puppet::Provider
         execute(cmd)
       end
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not create #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not create %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
   end
 
   def delete
     unless exists?
-      info "already absent"
+      info _("already absent")
       # the object already doesn't exist
       return nil
     end
@@ -188,7 +186,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     begin
       execute(self.deletecmd)
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not delete #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not delete %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
   end
 
@@ -295,7 +293,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     begin
       execute(cmd)
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
   end