puppet 4.10.12 → 5.0.0

data/lib/puppet/face/report.rb

@@ -2,14 +2,14 @@ require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:report, '0.0.1') do
   copyright "Puppet Inc.", 2011
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "Create, display, and submit reports."
+  summary _("Create, display, and submit reports.")
 
   save = get_action(:save)
-  save.summary "API only: submit a report."
-  save.arguments "<report>"
-  save.returns "Nothing."
+  save.summary _("API only: submit a report.")
+  save.arguments _("<report>")
+  save.returns _("Nothing.")
   save.examples <<-'EOT'
     From the implementation of `puppet report submit` (API example):
 
@@ -23,13 +23,13 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
   EOT
 
   action(:submit) do
-    summary "API only: submit a report with error handling."
+    summary _("API only: submit a report with error handling.")
     description <<-'EOT'
       API only: Submits a report to the puppet master. This action is
       essentially a shortcut and wrapper for the `save` action with the `rest`
       terminus, and provides additional details in the event of a failure.
     EOT
-    arguments "<report>"
+    arguments _("<report>")
     examples <<-'EOT'
       API example:
 
@@ -42,9 +42,9 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do
       begin
         Puppet::Transaction::Report.indirection.terminus_class = :rest
         Puppet::Face[:report, "0.0.1"].save(report)
-        Puppet.notice "Uploaded report for #{report.name}"
+        Puppet.notice _("Uploaded report for %{name}") % { name: report.name }
       rescue => detail
-        Puppet.log_exception(detail, "Could not send report: #{detail}")
+        Puppet.log_exception(detail, _("Could not send report: %{detail}") % { detail: detail })
       end
     end
   end

data/lib/puppet/face/resource.rb

@@ -2,9 +2,9 @@ require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:resource, '0.0.1') do
   copyright "Puppet Inc.", 2011
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "API only: interact directly with resources via the RAL."
+  summary _("API only: interact directly with resources via the RAL.")
   description <<-'EOT'
     API only: this face provides a Ruby API with functionality similar to the
     puppet resource subcommand.
@@ -13,9 +13,9 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do
   deactivate_action(:destroy)
 
   search = get_action(:search)
-  search.summary "API only: get all resources of a single type."
-  search.arguments "<resource_type>"
-  search.returns "An array of Puppet::Resource objects."
+  search.summary _("API only: get all resources of a single type.")
+  search.arguments _("<resource_type>")
+  search.returns _("An array of Puppet::Resource objects.")
   search.examples <<-'EOT'
     Get a list of all user resources (API example):
 
@@ -23,22 +23,22 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do
   EOT
 
   find = get_action(:find)
-  find.summary "API only: get a single resource."
-  find.arguments "<type>/<title>"
-  find.returns "A Puppet::Resource object."
+  find.summary _("API only: get a single resource.")
+  find.arguments _("<type>/<title>")
+  find.returns _("A Puppet::Resource object.")
   find.examples <<-'EOT'
     Print information about a user on this system (API example):
 
-        puts Puppet::Face[:resource, '0.0.1'].find("user/luke").to_pson
+        puts Puppet::Face[:resource, '0.0.1'].find("user/luke").to_json
   EOT
 
   save = get_action(:save)
-  save.summary "API only: create a new resource."
+  save.summary _("API only: create a new resource.")
   save.description <<-EOT
     API only: creates a new resource.
   EOT
-  save.arguments "<resource_object>"
-  save.returns "The same resource object passed as an argument."
+  save.arguments _("<resource_object>")
+  save.returns _("The same resource object passed as an argument.")
   save.examples <<-'EOT'
     Create a new file resource (API example):
 

data/lib/puppet/face/status.rb

@@ -2,9 +2,9 @@ require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:status, '0.0.1') do
   copyright "Puppet Inc.", 2011
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "View puppet server status."
+  summary _("View puppet server status.")
 
   deactivate_action(:destroy)
   deactivate_action(:save)
@@ -12,8 +12,8 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
 
   find = get_action(:find)
   find.default = true
-  find.summary "Check status of puppet master server."
-  find.returns <<-'EOT'
+  find.summary _("Check status of puppet master server.")
+  find.returns _(<<-'EOT')
     A "true" response or a low-level connection error. When used from the Ruby
     API: returns a Puppet::Status object.
   EOT

data/lib/puppet/feature/base.rb

@@ -32,11 +32,12 @@ Puppet.features.add(:microsoft_windows) do
     require 'win32/service'
     true
   rescue LoadError => err
-    warn "Cannot run on Microsoft Windows without the win32-process, win32-dir and win32-service gems: #{err}" unless Puppet.features.posix?
+    #TRANSLATORS "win32-process", "win32-dir", and "win32-service" are program names and should not be translated
+    warn _("Cannot run on Microsoft Windows without the win32-process, win32-dir and win32-service gems: %{err}") % { err: err } unless Puppet.features.posix?
   end
 end
 
-raise Puppet::Error,"Cannot determine basic system flavour" unless Puppet.features.posix? or Puppet.features.microsoft_windows?
+raise Puppet::Error,_("Cannot determine basic system flavour") unless Puppet.features.posix? or Puppet.features.microsoft_windows?
 
 # We've got LDAP available.
 Puppet.features.add(:ldap, :libs => ["ldap"])

data/lib/puppet/feature/eventlog.rb

@@ -1,5 +1,5 @@
 require 'puppet/util/feature'
 
 if Puppet.features.microsoft_windows?
-  Puppet.features.add(:eventlog, :libs => %{win32/eventlog})
+  Puppet.features.add(:eventlog)
 end

data/lib/puppet/file_bucket/dipper.rb

@@ -37,7 +37,7 @@ class Puppet::FileBucket::Dipper
   # Backs up a file to the file bucket
   def backup(file)
     file_handle = Puppet::FileSystem.pathname(file)
-    raise(ArgumentError, "File #{file} does not exist") unless Puppet::FileSystem.exist?(file_handle)
+    raise(ArgumentError, _("File %{file} does not exist") % { file: file }) unless Puppet::FileSystem.exist?(file_handle)
     begin
       file_bucket_file = Puppet::FileBucket::File.new(file_handle, :bucket_path => @local_path)
       files_original_path = absolutize_path(file)
@@ -52,7 +52,7 @@ class Puppet::FileBucket::Dipper
 
       return file_bucket_file.checksum_data
     rescue => detail
-      message = "Could not back up #{file}: #{detail}"
+      message = _("Could not back up %{file}: %{detail}") % { file: file, detail: detail }
       Puppet.log_exception(detail, message)
       raise Puppet::Error, message, detail.backtrace
     end
@@ -60,7 +60,7 @@ class Puppet::FileBucket::Dipper
 
   # Diffs two filebucket files identified by their sums
   def diff(checksum_a, checksum_b, file_a, file_b)
-    raise RuntimeError, "Diff is not supported on this platform" if Puppet[:diff] == ""
+    raise RuntimeError, _("Diff is not supported on this platform") if Puppet[:diff] == ""
     if checksum_a
       source_path = "#{@rest_path}#{@checksum_type}/#{checksum_a}"
       if checksum_b
@@ -78,7 +78,7 @@ class Puppet::FileBucket::Dipper
           tmp_file.unlink
         end
       else
-        raise Puppet::Error, "Please provide a file or checksum do diff with"
+        raise Puppet::Error, _("Please provide a file or checksum do diff with")
       end
     elsif file_a
       if checksum_b
@@ -94,7 +94,7 @@ class Puppet::FileBucket::Dipper
         file_diff = Puppet::Util::Diff.diff(file_a, file_b)
       end
     end
-    raise Puppet::Error, "Failed to diff files" unless file_diff
+    raise Puppet::Error, _("Failed to diff files") unless file_diff
     file_diff.to_s
   end
 
@@ -108,7 +108,7 @@ class Puppet::FileBucket::Dipper
     source_path = "#{@rest_path}#{@checksum_type}/#{sum}"
     file_bucket_file = Puppet::FileBucket::File.indirection.find(source_path, :bucket_path => @local_path)
 
-    raise Puppet::Error, "File not found" unless file_bucket_file
+    raise Puppet::Error, _("File not found") unless file_bucket_file
     file_bucket_file
   end
 
@@ -142,7 +142,7 @@ class Puppet::FileBucket::Dipper
         }
         ::File.chmod(changed, file) if changed
       else
-        Puppet.err "Could not find file with checksum #{sum}"
+        Puppet.err _("Could not find file with checksum %{sum}") % { sum: sum }
         return nil
       end
       return newsum
@@ -153,7 +153,7 @@ class Puppet::FileBucket::Dipper
 
   # List Filebucket content.
   def list(fromdate, todate)
-    raise Puppet::Error, "Listing remote file buckets is not allowed" unless local?
+    raise Puppet::Error, _("Listing remote file buckets is not allowed") unless local?
 
     source_path = "#{@rest_path}#{@checksum_type}/"
     file_bucket_list = Puppet::FileBucket::File.indirection.find(
@@ -162,7 +162,7 @@ class Puppet::FileBucket::Dipper
       :list_all => true,
       :fromdate => fromdate,
       :todate => todate)
-    raise Puppet::Error, "File not found" unless file_bucket_list
+    raise Puppet::Error, _("File not found") unless file_bucket_list
     file_bucket_list.to_s
   end
 

data/lib/puppet/file_bucket/file.rb

@@ -17,10 +17,6 @@ class Puppet::FileBucket::File
     [:binary]
   end
 
-  def self.default_format
-    :binary
-  end
-
   def initialize(contents, options = {})
     case contents
     when String
@@ -28,12 +24,12 @@ class Puppet::FileBucket::File
     when Pathname
       @contents = FileContents.new(contents)
     else
-      raise ArgumentError.new("contents must be a String or Pathname, got a #{contents.class}")
+      raise ArgumentError.new(_("contents must be a String or Pathname, got a %{contents_class}") % { contents_class: contents.class })
     end
 
     @bucket_path = options.delete(:bucket_path)
     @checksum_type = Puppet[:digest_algorithm].to_sym
-    raise ArgumentError.new("Unknown option(s): #{options.keys.join(', ')}") unless options.empty?
+    raise ArgumentError.new(_("Unknown option(s): %{opts}") % { opts: options.keys.join(', ') }) unless options.empty?
   end
 
   # @return [Num] The size of the contents
@@ -78,15 +74,6 @@ class Puppet::FileBucket::File
     self.new(contents)
   end
 
-  def to_data_hash
-    # Note that this serializes the entire data to a string and places it in a hash.
-    { "contents" => contents.to_binary }
-  end
-
-  def self.from_data_hash(data)
-    self.new(data["contents"])
-  end
-
   private
 
   class StringContents
@@ -108,7 +95,7 @@ class Puppet::FileBucket::File
     end
 
     def checksum_data(base_method)
-      Puppet.info("Computing checksum on string")
+      Puppet.info(_("Computing checksum on string"))
       Puppet::Util::Checksums.method(base_method).call(@contents)
     end
 
@@ -133,7 +120,7 @@ class Puppet::FileBucket::File
     end
 
     def checksum_data(base_method)
-      Puppet.info("Computing checksum on file #{@path}")
+      Puppet.info(_("Computing checksum on file %{path}") % { path: @path })
       Puppet::Util::Checksums.method(:"#{base_method}_file").call(@path)
     end
 

data/lib/puppet/file_serving/base.rb

@@ -53,7 +53,7 @@ class Puppet::FileServing::Base
   # Set our base path.
   attr_reader :path
   def path=(path)
-    raise ArgumentError.new("Paths must be fully qualified") unless Puppet::FileServing::Base.absolute?(path)
+    raise ArgumentError.new(_("Paths must be fully qualified")) unless Puppet::FileServing::Base.absolute?(path)
     @path = path
   end
 
@@ -61,7 +61,7 @@ class Puppet::FileServing::Base
   # the file's path relative to the initial recursion point.
   attr_reader :relative_path
   def relative_path=(path)
-    raise ArgumentError.new("Relative paths must not be fully qualified") if Puppet::FileServing::Base.absolute?(path)
+    raise ArgumentError.new(_("Relative paths must not be fully qualified")) if Puppet::FileServing::Base.absolute?(path)
     @relative_path = path
   end
 
@@ -75,7 +75,7 @@ class Puppet::FileServing::Base
     {
       'path'          => @path,
       'relative_path' => @relative_path,
-      'links'         => @links
+      'links'         => @links.to_s
     }
   end
 

data/lib/puppet/file_serving/configuration.rb

@@ -50,8 +50,8 @@ class Puppet::FileServing::Configuration
 
     mount_name, path = request.key.split(File::Separator, 2)
 
-    raise(ArgumentError, "Cannot find file: Invalid mount '#{mount_name}'") unless mount_name =~ %r{^[-\w]+$}
-    raise(ArgumentError, "Cannot find file: Invalid relative path '#{path}'") if path and path.split('/').include?('..')
+    raise(ArgumentError, _("Cannot find file: Invalid mount '%{mount_name}'") % { mount_name: mount_name }) unless mount_name =~ %r{^[-\w]+$}
+    raise(ArgumentError, _("Cannot find file: Invalid relative path '%{path}'") % { path: path }) if path and path.split('/').include?('..')
 
     return nil unless mount = find_mount(mount_name, request.environment)
     if mount.name == "modules" and mount_name != "modules"
@@ -99,7 +99,7 @@ class Puppet::FileServing::Configuration
       newmounts = @parser.parse
       @mounts = newmounts
     rescue => detail
-      Puppet.log_exception(detail, "Error parsing fileserver configuration: #{detail}; using old configuration")
+      Puppet.log_exception(detail, _("Error parsing fileserver configuration: %{detail}; using old configuration") % { detail: detail })
     end
 
   ensure

data/lib/puppet/file_serving/configuration/parser.rb

@@ -7,8 +7,8 @@ class Puppet::FileServing::Configuration::Parser
 
   # Parse our configuration file.
   def parse
-    raise("File server configuration #{@file} does not exist") unless Puppet::FileSystem.exist?(@file)
-    raise("Cannot read file server configuration #{@file}") unless FileTest.readable?(@file)
+    raise(_("File server configuration %{config_file} does not exist") % { config_file: @file }) unless Puppet::FileSystem.exist?(@file)
+    raise(_("Cannot read file server configuration %{config_file}") % { config_file: @file }) unless FileTest.readable?(@file)
 
     @mounts = {}
     @count = 0
@@ -28,7 +28,7 @@ class Puppet::FileServing::Configuration::Parser
           var = $1
           value = $2
           value.strip!
-          raise(ArgumentError, "Fileserver configuration file does not use '=' as a separator") if value =~ /^=/
+          raise(ArgumentError, _("Fileserver configuration file does not use '=' as a separator")) if value =~ /^=/
           case var
           when "path"
             path(mount, value)
@@ -37,10 +37,10 @@ class Puppet::FileServing::Configuration::Parser
           when "deny"
             deny(mount, value)
           else
-            raise ArgumentError.new("Invalid argument '#{var}' in #{@file.filename}, line #{@count}")
+            raise ArgumentError.new(_("Invalid argument '%{var}' in %{file}, line %{line_num}") % { var: var, file: @file.filename, line_num: @count })
           end
         else
-          raise ArgumentError.new("Invalid line '#{line.chomp}' at #{@file.filename}, line #{@count}")
+          raise ArgumentError.new(_("Invalid line '%{line}' at %{file}, line %{line_num}") % { line: line.chomp, file: @file.filename, line_num: @count })
         end
       }
     }
@@ -64,10 +64,10 @@ class Puppet::FileServing::Configuration::Parser
   def allow(mount, value)
     value.split(/\s*,\s*/).each { |val|
       begin
-        mount.info "allowing #{val} access"
+        mount.info _("allowing %{val} access") % { val: val }
         mount.allow(val)
       rescue Puppet::AuthStoreError => detail
-        raise ArgumentError.new("#{detail.to_s} in #{@file}, line #{@count}")
+        raise ArgumentError.new(_("%{detail} in %{file}, line %{line_num}") % { detail: detail.to_s, file: @file, line_num: @count })
       end
     }
   end
@@ -76,17 +76,17 @@ class Puppet::FileServing::Configuration::Parser
   def deny(mount, value)
     value.split(/\s*,\s*/).each { |val|
       begin
-        mount.info "denying #{val} access"
+        mount.info _("denying %{val} access") % { val: val }
         mount.deny(val)
       rescue Puppet::AuthStoreError => detail
-        raise ArgumentError.new("#{detail.to_s} in #{@file}, line #{@count}")
+        raise ArgumentError.new(_("%{detail} in %{file}, line %{line_num}") % { detail: detail.to_s, file: @file, line_num: @count })
       end
     }
   end
 
   # Create a new mount.
   def newmount(name)
-    raise ArgumentError.new("#{@mounts[name]} is already mounted at #{name} in #{@file}, line #{@count}") if @mounts.include?(name)
+    raise ArgumentError.new(_("%{mount} is already mounted at %{name} in %{file}, line %{line_num}") % { mount: @mounts[name], name: name, file: @file, line_num: @count }) if @mounts.include?(name)
     case name
     when "modules"
       mount = Mount::Modules.new(name)
@@ -105,11 +105,11 @@ class Puppet::FileServing::Configuration::Parser
       begin
         mount.path = value
       rescue ArgumentError => detail
-        Puppet.log_exception(detail, "Removing mount \"#{mount.name}\": #{detail}")
+        Puppet.log_exception(detail, _("Removing mount \"%{mount}\": %{detail}") % { mount: mount.name, detail: detail })
         @mounts.delete(mount.name)
       end
     else
-      Puppet.warning "The '#{mount.name}' module can not have a path. Ignoring attempt to set it"
+      Puppet.warning _("The '%{mount}' module can not have a path. Ignoring attempt to set it") % { mount: mount.name }
     end
   end
 

data/lib/puppet/file_serving/content.rb

@@ -30,7 +30,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
   def content
     unless @content
       # This stat can raise an exception, too.
-      raise(ArgumentError, "Cannot read the contents of links unless following links") if stat.ftype == "symlink"
+      raise(ArgumentError, _("Cannot read the contents of links unless following links")) if stat.ftype == "symlink"
 
       @content = Puppet::FileSystem.binread(full_path)
     end

data/lib/puppet/file_serving/fileset.rb

@@ -31,7 +31,7 @@ class Puppet::FileServing::Fileset
     else
       path = path.chomp(File::SEPARATOR) unless path == File::SEPARATOR
     end
-    raise ArgumentError.new("Fileset paths must be fully qualified: #{path}") unless Puppet::Util.absolute_path?(path)
+    raise ArgumentError.new(_("Fileset paths must be fully qualified: %{path}") % { path: path }) unless Puppet::Util.absolute_path?(path)
 
     @path = path
 
@@ -47,8 +47,9 @@ class Puppet::FileServing::Fileset
       initialize_from_hash(options)
     end
 
-    raise ArgumentError.new("Fileset paths must exist") unless valid?(path)
-    raise ArgumentError.new("Fileset recurse parameter must not be a number anymore, please use recurselimit") if @recurse.is_a?(Integer)
+    raise ArgumentError.new(_("Fileset paths must exist")) unless valid?(path)
+    #TRANSLATORS "recurse" and "recurselimit" are parameter names and should not be translated
+    raise ArgumentError.new(_("Fileset recurse parameter must not be a number anymore, please use recurselimit")) if @recurse.is_a?(Integer)
   end
 
   # Return a list of all files in our fileset.  This is different from the
@@ -75,7 +76,8 @@ class Puppet::FileServing::Fileset
 
   def links=(links)
     links = links.to_sym
-    raise(ArgumentError, "Invalid :links value '#{links}'") unless [:manage, :follow].include?(links)
+    #TRANSLATORS ":links" is a parameter name and should not be translated
+    raise(ArgumentError, _("Invalid :links value '%{links}'") % { links: links }) unless [:manage, :follow].include?(links)
     @links = links
     @stat_method = @links == :manage ? :lstat : :stat
   end
@@ -88,7 +90,7 @@ class Puppet::FileServing::Fileset
       begin
         send(method, value)
       rescue NoMethodError
-        raise ArgumentError, "Invalid option '#{option}'", $!.backtrace
+        raise ArgumentError, _("Invalid option '%{option}'") % { option: option }, $!.backtrace
       end
     end
   end