bolt 0.20.3 → 0.20.5

data/vendored/puppet/lib/puppet/type/yumrepo.rb

@@ -39,7 +39,7 @@ Puppet::Type.newtype(:yumrepo) do
   end
 
   newparam(:target) do
-    desc "The filename to write the yum repository to."
+    desc "The target parameter will be enabled in a future release and should not be used."
 
     defaultto :absent
   end
@@ -261,17 +261,12 @@ Puppet::Type.newtype(:yumrepo) do
   end
 
   newproperty(:priority) do
-    desc "Priority of this repository from 1-99. Requires that
-      the `priorities` plugin is installed and enabled.
+    desc "Priority of this repository. Can be any integer value
+      (including negative). Requires that the `priorities` plugin
+      is installed and enabled.
       #{ABSENT_DOC}"
 
-    newvalues(/.*/, :absent)
-    validate do |value|
-      next if value.to_s == 'absent'
-      unless (1..99).include?(value.to_i)
-        fail(_("Must be within range 1-99"))
-      end
-    end
+    newvalues(/^-?\d+$/, :absent)
   end
 
   newproperty(:throttle) do
@@ -326,6 +321,8 @@ Puppet::Type.newtype(:yumrepo) do
     desc "Password for this proxy. #{ABSENT_DOC}"
 
     newvalues(/.*/, :absent)
+
+    sensitive true
   end
 
   newproperty(:s3_enabled) do
@@ -428,12 +425,6 @@ Puppet::Type.newtype(:yumrepo) do
     desc "Password to use with the username for basic authentication.
       #{ABSENT_DOC}"
     newvalues(/.*/, :absent)
-  end
-
-  private
-
-  def set_sensitive_parameters(sensitive_parameters)
-    parameter(:password).sensitive = true if parameter(:password)
-    super(sensitive_parameters)
+    sensitive true
   end
 end

data/vendored/puppet/lib/puppet/util.rb

@@ -690,7 +690,6 @@ end
 
 
 require 'puppet/util/errors'
-require 'puppet/util/methodhelper'
 require 'puppet/util/metaid'
 require 'puppet/util/classgen'
 require 'puppet/util/docs'

data/vendored/puppet/lib/puppet/util/autoload.rb

@@ -1,7 +1,6 @@
 require 'pathname'
 require 'puppet/util/rubygems'
 require 'puppet/util/warnings'
-require 'puppet/util/methodhelper'
 require 'puppet/pops/adaptable'
 
 # An adapter that ties the module_directories cache to the environment where the modules are parsed. This
@@ -14,8 +13,6 @@ end
 
 # Autoload paths, either based on names or all at once.
 class Puppet::Util::Autoload
-  include Puppet::Util::MethodHelper
-
   @loaded = {}
 
   class << self
@@ -182,12 +179,10 @@ class Puppet::Util::Autoload
 
   attr_accessor :object, :path
 
-  def initialize(obj, path, options = {})
+  def initialize(obj, path)
     @path = path.to_s
     raise ArgumentError, _("Autoload paths cannot be fully qualified") if Puppet::Util.absolute_path?(@path)
     @object = obj
-
-    set_options(options)
   end
 
   def load(name, env = nil)

data/vendored/puppet/lib/puppet/util/checksums.rb

@@ -340,8 +340,6 @@ module Puppet::Util::Checksums
     end
   end
 
-  private_class_method
-
   # Perform an incremental checksum on a file.
   def checksum_file(digest, filename, lite = false)
     buffer = lite ? 512 : 4096

data/vendored/puppet/lib/puppet/util/classgen.rb

@@ -1,5 +1,3 @@
-require 'puppet/util/methodhelper'
-
 module Puppet
   class ConstantAlreadyDefined < Error; end
   class SubclassAlreadyDefined < Error; end
@@ -9,7 +7,6 @@ end
 # @api public
 #
 module Puppet::Util::ClassGen
-  include Puppet::Util::MethodHelper
   include Puppet::Util
 
   # Create a new class.
@@ -66,7 +63,6 @@ module Puppet::Util::ClassGen
   # @return [Boolean] whether the class was removed or not
   #
   def rmclass(name, options)
-    options = symbolize_options(options)
     const = genconst_string(name, options)
     retval = false
     if is_constant_defined?(const)
@@ -100,8 +96,6 @@ module Puppet::Util::ClassGen
   # slightly abstract version of genclass.
   # @api private
   def genthing(name, type, options, block)
-    options = symbolize_options(options)
-
     name = name.to_s.downcase.intern
 
     if type == Module

data/vendored/puppet/lib/puppet/util/fileparsing.rb

@@ -24,15 +24,12 @@
 # You could then call 'parser.to_line(hash)' on any of those hashes to generate
 # the text line again.
 
-require 'puppet/util/methodhelper'
-
 module Puppet::Util::FileParsing
   include Puppet::Util
   attr_writer :line_separator, :trailing_separator
 
   class FileRecord
     include Puppet::Util
-    include Puppet::Util::MethodHelper
     attr_accessor :absent, :joiner, :rts, :separator, :rollup, :name, :match, :block_eval
 
     attr_reader :fields, :optional, :type
@@ -48,11 +45,36 @@ module Puppet::Util::FileParsing
       end
     end
 
-    def initialize(type, options = {}, &block)
+    def initialize(type,
+                   absent: nil,
+                   block_eval: nil,
+                   fields: nil,
+                   joiner: nil,
+                   match: nil,
+                   optional: nil,
+                   post_parse: nil,
+                   pre_gen: nil,
+                   rollup: nil,
+                   rts: nil,
+                   separator: nil,
+                   to_line: nil,
+                   &block)
       @type = type.intern
       raise ArgumentError, _("Invalid record type %{record_type}") % { record_type: @type } unless [:record, :text].include?(@type)
 
-      set_options(options)
+      @absent = absent
+      @block_eval = block_eval
+      @joiner = joiner
+      @match = match
+      @rollup = rollup if rollup
+      @rts = rts
+      @separator = separator
+
+      self.fields = fields if fields
+      self.optional = optional if optional
+      self.post_parse = post_parse if post_parse
+      self.pre_gen = pre_gen if pre_gen
+      self.to_line = to_line if to_line
 
       if self.type == :record
         # Now set defaults.

data/vendored/puppet/lib/puppet/util/instance_loader.rb

@@ -12,12 +12,12 @@ module Puppet::Util::InstanceLoader
   end
 
   # Define a new type of autoloading.
-  def instance_load(type, path, options = {})
+  def instance_load(type, path)
     @autoloaders ||= {}
     @instances ||= {}
     type = type.intern
     @instances[type] = {}
-    @autoloaders[type] = Puppet::Util::Autoload.new(self, path, options)
+    @autoloaders[type] = Puppet::Util::Autoload.new(self, path)
 
     # Now define our new simple methods
     unless respond_to?(type)
@@ -41,7 +41,7 @@ module Puppet::Util::InstanceLoader
 
     # Use this method so they all get loaded
     loaded_instances(type).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-      mod = self.loaded_instance(name)
+      mod = self.loaded_instance(type, name)
       docs << "#{name}\n#{"-" * name.to_s.length}\n"
 
       docs << Puppet::Util::Docs.scrub(mod.doc) << "\n\n"

data/vendored/puppet/lib/puppet/util/json.rb

@@ -0,0 +1,77 @@
+module Puppet::Util
+  module Json
+    class ParseError < StandardError
+      attr_reader :cause, :data
+
+      def self.build(original_exception, data)
+        new(original_exception.message).tap do |exception|
+          exception.instance_eval do
+            @cause = original_exception
+            set_backtrace original_exception.backtrace
+            @data = data
+          end
+        end
+      end
+    end
+
+    begin
+      require 'multi_json'
+      # Force backend detection before attempting to use the library
+      # or load any other JSON libraries
+      MultiJson.default_adapter
+
+      # Preserve core type monkey-patching done by the built-in JSON gem
+      require 'json'
+    rescue LoadError
+      require 'json'
+    end
+
+    # These methods do similar processing to the fallback implemented by MultiJson
+    # when using the built-in JSON backend, to ensure consistent behavior
+    # whether or not MultiJson can be loaded.
+    def self.load(string, options = {})
+      if defined? MultiJson
+        begin
+          # This ensures that JrJackson will parse very large or very small
+          # numbers as floats rather than BigDecimals, which are serialized as
+          # strings by the built-in JSON gem and therefore can cause schema errors,
+          # for example, when we are rendering reports to JSON using `to_pson` in
+          # PuppetDB.
+          if MultiJson.adapter.name == "MultiJson::Adapters::JrJackson"
+            options[:use_bigdecimal] = false
+          end
+
+          MultiJson.load(string, options)
+        rescue MultiJson::ParseError => e
+          raise Puppet::Util::Json::ParseError.build(e, string)
+        end
+      else
+        begin
+          string = string.read if string.respond_to?(:read)
+
+          options[:symbolize_names] = true if options.delete(:symbolize_keys)
+          ::JSON.parse(string, options)
+        rescue JSON::ParserError => e
+          raise Puppet::Util::Json::ParseError.build(e, string)
+        end
+      end
+    end
+
+    def self.dump(object, options = {})
+      if defined? MultiJson
+        # MultiJson calls `merge` on the options it is passed, which relies
+        # on the options' defining a `to_hash` method. In Ruby 1.9.3,
+        # JSON::Ext::Generator::State only defines `to_h`, not `to_hash`, so we
+        # need to convert it first, similar to what is done in the `else` block
+        # below. Later versions of the JSON gem alias `to_h` to `to_hash`, so this
+        # can be removed once we drop Ruby 1.9.3 support.
+        options = options.to_h if options.class.name == "JSON::Ext::Generator::State"
+
+        MultiJson.dump(object, options)
+      else
+        options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h) if options.delete(:pretty)
+        object.to_json(options)
+      end
+    end
+  end
+end

data/vendored/puppet/lib/puppet/util/json_lockfile.rb

@@ -23,7 +23,7 @@ class Puppet::Util::JsonLockfile < Puppet::Util::Lockfile
   def lock(lock_data = nil)
     return false if locked?
 
-    super(lock_data.to_json)
+    super(Puppet::Util::Json.dump(lock_data))
   end
 
   # Retrieve the (optional) lock data that was specified at the time the file
@@ -35,8 +35,8 @@ class Puppet::Util::JsonLockfile < Puppet::Util::Lockfile
     return nil unless file_locked?
     file_contents = super
     return nil if file_contents.nil? or file_contents.empty?
-    JSON.parse(file_contents)
-  rescue JSON::ParserError
+    Puppet::Util::Json.load(file_contents)
+  rescue Puppet::Util::Json::ParseError
     Puppet.warning _("Unable to read lockfile data from %{path}: not in JSON") % { path: @file_path }
     nil
   end

data/vendored/puppet/lib/puppet/util/ldap/connection.rb

@@ -1,9 +1,6 @@
 require 'puppet/util/ldap'
-require 'puppet/util/methodhelper'
 
 class Puppet::Util::Ldap::Connection
-  include Puppet::Util::MethodHelper
-
   attr_accessor :host, :port, :user, :password, :reset, :ssl
 
   attr_reader :connection
@@ -34,12 +31,15 @@ class Puppet::Util::Ldap::Connection
     connection.unbind if connection.bound?
   end
 
-  def initialize(host, port, options = {})
+  def initialize(host, port, user: nil, password: nil, reset: nil, ssl: nil)
     raise Puppet::Error, _("Could not set up LDAP Connection: Missing ruby/ldap libraries") unless Puppet.features.ldap?
 
-    @host, @port = host, port
-
-    set_options(options)
+    @host = host
+    @port = port
+    @user = user
+    @password = password
+    @reset = reset
+    @ssl = ssl
   end
 
   # Create a per-connection unique name.

data/vendored/puppet/lib/puppet/util/log/destinations.rb

@@ -109,7 +109,7 @@ Puppet::Util::Log.newdesttype :file do
   def handle(msg)
     if @json > 0
       @json > 1 ? @file.puts(',') : @json = 2
-      JSON.dump(msg.to_structured_hash, @file)
+      Puppet::Util::Json.dump(msg.to_structured_hash, @file)
     else
       @file.puts("#{msg.time} #{msg.source} (#{msg.level}): #{msg}")
     end
@@ -135,7 +135,7 @@ Puppet::Util::Log.newdesttype :logstash_event do
 
   def handle(msg)
     message = format(msg)
-    $stdout.puts message.to_json
+    $stdout.puts Puppet::Util::Json.dump(message)
   end
 end
 

data/vendored/puppet/lib/puppet/util/logging.rb

@@ -176,7 +176,7 @@ module Logging
                      else
                        error_location_str = Puppet::Util::Errors.error_location(file, line)
                        if error_location_str.empty?
-                         '\n   ' + _('(file & line not available)')
+                         "\n   " + _('(file & line not available)')
                        else
                          "\n   %{error_location}" % { error_location: error_location_str }
                        end

data/vendored/puppet/lib/puppet/util/plist.rb

@@ -41,7 +41,7 @@ module Puppet::Util::Plist
 
         Puppet.debug "Plist #{file_path} ill-formatted, converting with plutil"
         begin
-          plist = Puppet::Util::Execution.execute(['/usr/bin/plutil', '-convert', 'xml1', '-o', '/dev/stdout', file_path],
+          plist = Puppet::Util::Execution.execute(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', file_path],
                                                   {:failonfail => true, :combine => true})
           return parse_plist(plist)
         rescue Puppet::ExecutionFailure => detail

data/vendored/puppet/lib/puppet/util/provider_features.rb

@@ -1,5 +1,4 @@
 # Provides feature definitions.
-require 'puppet/util/methodhelper'
 require 'puppet/util/docs'
 require 'puppet/util'
 # This module models provider features and handles checking whether the features
@@ -13,7 +12,6 @@ module Puppet::Util::ProviderFeatures
   # @todo Unclear what is api and what is private in this class
   class ProviderFeature
     include Puppet::Util
-    include Puppet::Util::MethodHelper
     include Puppet::Util::Docs
     attr_accessor :name, :docs, :methods
 
@@ -32,11 +30,10 @@ module Puppet::Util::ProviderFeatures
       end
     end
 
-    def initialize(name, docs, hash)
+    def initialize(name, docs, methods: nil)
       self.name = name.intern
       self.docs = docs
-      hash = symbolize_options(hash)
-      set_options(hash)
+      @methods = methods
     end
 
     private

data/vendored/puppet/lib/puppet/util/reference.rb

@@ -1,11 +1,9 @@
 require 'puppet/util/instance_loader'
-require 'puppet/util/methodhelper'
 require 'fileutils'
 
 # Manage Reference Documentation.
 class Puppet::Util::Reference
   include Puppet::Util
-  include Puppet::Util::MethodHelper
   include Puppet::Util::Docs
 
   extend Puppet::Util::InstanceLoader
@@ -78,9 +76,12 @@ class Puppet::Util::Reference
     self.dynamic
   end
 
-  def initialize(name, options = {}, &block)
+  def initialize(name, title: nil, depth: nil, dynamic: nil, doc: nil, &block)
     @name = name
-    set_options(options)
+    @title = title
+    @depth = depth
+    @dynamic = dynamic
+    @doc = doc
 
     meta_def(:generate, &block)
 

data/vendored/puppet/lib/puppet/util/tagging.rb

@@ -1,7 +1,7 @@
 require 'puppet/util/tag_set'
 
 module Puppet::Util::Tagging
-  ValidTagRegex = /\A[[:alnum:]_][[:alnum:]_:.-]*\Z/
+  ValidTagRegex = /\A[[:alnum:]_][[:alnum:]_:.-]*\Z/u
 
   # Add a tag to the current tag set.
   # When a tag set is used for a scope, these tags will be added to all of
@@ -17,7 +17,7 @@ module Puppet::Util::Tagging
       # up since we get a lot of duplicates and rarely fail on bad tags
       if @tags.add?(name)
         # not seen before, so now we test if it is valid
-        if name =~ ValidTagRegex
+        if valid_tag?(name)
           if split_qualified_tags?
           # avoid adding twice by first testing if the string contains '::'
             @tags.merge(name.split('::')) if name.include?('::')
@@ -40,7 +40,7 @@ module Puppet::Util::Tagging
   # since that results in testing the same string twice
   #
   def tag_if_valid(name)
-    if name.is_a?(String) && name =~ ValidTagRegex
+    if name.is_a?(String) && valid_tag?(name)
       name = name.downcase
       @tags ||= new_tags
       if @tags.add?(name) && name.include?('::')
@@ -106,6 +106,19 @@ module Puppet::Util::Tagging
     tag(*tags)
   end
 
+  def valid_tag?(maybe_tag)
+    begin
+      tag_enc = maybe_tag.encoding
+      if tag_enc == Encoding::UTF_8 || tag_enc == Encoding::ASCII
+        maybe_tag =~ ValidTagRegex
+      else
+        maybe_tag.encode(Encoding::UTF_8) =~ ValidTagRegex
+      end
+    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
+      false
+    end
+  end
+
   private
 
   def split_qualified_tags?