bolt 0.5.1 → 0.6.0

data/vendored/puppet/lib/puppet/network/http/webrick.rb

@@ -54,6 +54,7 @@ class Puppet::Network::HTTP::WEBrick
 
   # @api private
   def create_server(address, port)
+    address = nil if address == '*'
     arguments = {:BindAddress => address, :Port => port, :DoNotReverseLookup => true}
     arguments.merge!(setup_logger)
     arguments.merge!(setup_ssl)

data/vendored/puppet/lib/puppet/pops/loader/loader_paths.rb

@@ -93,6 +93,10 @@ module LoaderPaths
       TypedName.new(type, n, name_authority)
     end
 
+    def valid_name?(typed_name)
+      true
+    end
+
     def relative_path
       raise NotImplementedError.new
     end
@@ -221,6 +225,11 @@ module LoaderPaths
       require_relative 'task_instantiator'
       TaskInstantiator
     end
+
+    def valid_name?(typed_name)
+      # TODO: Remove when PE has proper namespace handling
+      typed_name.name_parts.size <= 2
+    end
   end
 
   class ResourceTypeImplPP < PuppetSmartPath

data/vendored/puppet/lib/puppet/pops/loader/module_loaders.rb

@@ -113,6 +113,7 @@ module ModuleLoaders
         smart_paths.effective_paths(type).each do |sp|
           relative_paths(sp).each do |rp|
             tp = sp.typed_name(type, name_authority, rp, global ? nil : @module_name)
+            next unless sp.valid_name?(tp)
             load_typed(tp) unless block_given? && !block.yield(tp)
           end
         end
@@ -333,6 +334,7 @@ module ModuleLoaders
     def find_existing_path(typed_name)
       is_global = global?
       smart_paths.effective_paths(typed_name.type).each do |sp|
+        next unless sp.valid_name?(typed_name)
         origin = sp.effective_path(typed_name, is_global ? 0 : 1)
         unless origin.nil?
           if sp.match_many?
@@ -388,6 +390,12 @@ module ModuleLoaders
 
     def add_to_index(smart_path)
       found = Dir.glob(File.join(smart_path.generic_path, '**', "*#{smart_path.extension}"))
+
+      # The reason for not always rejecting directories here is performance (avoid extra stat calls). The
+      # false positives (directories with a matching extension) is an error in any case and will be caught
+      # later.
+      found = found.reject { |file_name| File.directory?(file_name) } if smart_path.extension.empty?
+
       @path_index.merge(found)
       found
     end

data/vendored/puppet/lib/puppet/pops/types/p_error_type.rb

@@ -12,6 +12,10 @@ class PErrorType < PAnyType
       return PErrorType::DEFAULT
     end
 
+    def self.from_hash(hash)
+      self.new(hash['message'], hash['kind'], hash['issue_code'] || DEFAULT_ISSUE_CODE, hash['partial_result'], hash['details'])
+    end
+
     def initialize(message, kind = nil, issue_code = DEFAULT_ISSUE_CODE, partial_result = nil, details = nil)
       @issue_code = issue_code
       @kind = kind
@@ -63,6 +67,14 @@ class PErrorType < PAnyType
         optional_param 'Optional[DataHash]', :details
       end
 
+      dispatch :from_hash do
+        param 'Struct[message => String[1], Optional[kind] => String[1], Optional[issue_code] => String[1], Optional[partial_result] => Data, Optional[details] => DataHash]', :hash
+      end
+
+      def from_hash(hash)
+        Error.from_hash(hash)
+      end
+
       def create(message, kind = nil, issue_code = nil, partial_result = nil, details = nil)
         issue_code = DEFAULT_ISSUE_CODE if issue_code.nil?
         Error.new(message, kind, issue_code, partial_result, details)

data/vendored/puppet/lib/puppet/pops/types/p_object_type.rb

@@ -228,10 +228,10 @@ class PObjectType < PMetaType
       # TODO: Assumes Ruby implementation for now
       if(callable_type.is_a?(PVariantType))
         callable_type.types.map do |ct|
-          Functions::Dispatch.new(ct, name, [], false, ct.block_type.nil? ? nil : 'block')
+          Functions::Dispatch.new(ct, RubyGenerator.protect_reserved_name(name), [], false, ct.block_type.nil? ? nil : 'block')
         end
       else
-        [Functions::Dispatch.new(callable_type, name, [], false, callable_type.block_type.nil? ? nil : 'block')]
+        [Functions::Dispatch.new(callable_type, RubyGenerator.protect_reserved_name(name), [], false, callable_type.block_type.nil? ? nil : 'block')]
       end
     end
 
@@ -546,7 +546,13 @@ class PObjectType < PMetaType
     init_non_opt_count = 0
     init_param_names = init.parameters.map do |p|
       init_non_opt_count += 1 if :req == p[0]
-      p[1].to_s
+      n = p[1].to_s
+      r = RubyGenerator.unprotect_reserved_name(n)
+      unless r.equal?(n)
+        # assert that the protected name wasn't a real name (names can start with underscore)
+        n = r unless param_names.index(r).nil?
+      end
+      n
     end
 
     if init_param_names != param_names

data/vendored/puppet/lib/puppet/pops/types/ruby_generator.rb

@@ -3,6 +3,43 @@ module Types
 
 # @api private
 class RubyGenerator < TypeFormatter
+
+  RUBY_RESERVED_WORDS = {
+    'alias' => '_alias',
+    'begin' => '_begin',
+    'break' => '_break',
+    'def' => '_def',
+    'do' => '_do',
+    'end' => '_end',
+    'ensure' => '_ensure',
+    'for' => '_for',
+    'module' => '_module',
+    'next' => '_next',
+    'nil' => '_nil',
+    'not' => '_not',
+    'redo' => '_redo',
+    'rescue' => '_rescue',
+    'retry' => '_retry',
+    'return' => '_return',
+    'self' => '_self',
+    'super' => '_super',
+    'then' => '_then',
+    'until' => '_until',
+    'when' => '_when',
+    'while' => '_while',
+    'yield' => '_yield',
+  }
+
+  RUBY_RESERVED_WORDS_REVERSED = Hash[RUBY_RESERVED_WORDS.map { |k, v| [v, k] }]
+
+  def self.protect_reserved_name(name)
+    RUBY_RESERVED_WORDS[name] || name
+  end
+
+  def self.unprotect_reserved_name(name)
+    RUBY_RESERVED_WORDS_REVERSED[name] || name
+  end
+
   def remove_common_namespace(namespace_segments, name)
     segments = name.split(TypeFormatter::NAME_SEGMENT_SEPARATOR)
     namespace_segments.size.times do |idx|
@@ -174,8 +211,8 @@ class RubyGenerator < TypeFormatter
     constants, others = obj.attributes(true).values.partition { |a| a.kind == PObjectType::ATTRIBUTE_KIND_CONSTANT }
     constants = constants.select { |ca| ca.container.equal?(obj) }
     unless constants.empty?
-      constants.each { |ca| bld << "\n  def self." << ca.name << "\n    _pcore_type['" << ca.name << "'].value\n  end\n" }
-      constants.each { |ca| bld << "\n  def " << ca.name << "\n    self.class." << ca.name << "\n  end\n" }
+      constants.each { |ca| bld << "\n  def self." << rname(ca.name) << "\n    _pcore_type['" << ca.name << "'].value\n  end\n" }
+      constants.each { |ca| bld << "\n  def " << rname(ca.name) << "\n    self.class." << ca.name << "\n  end\n" }
     end
 
     init_params = others.reject { |a| a.kind == PObjectType::ATTRIBUTE_KIND_DERIVED }
@@ -216,9 +253,9 @@ class RubyGenerator < TypeFormatter
       bld << "\n    new"
     else
       bld << '('
-      non_opt.each { |ip| bld << ip.name << ', ' }
+      non_opt.each { |ip| bld << rname(ip.name) << ', ' }
       opt.each do |ip|
-        bld << ip.name << ' = '
+        bld << rname(ip.name) << ' = '
         default_string(bld, ip)
         bld << ', '
       end
@@ -228,11 +265,11 @@ class RubyGenerator < TypeFormatter
       bld << "    attrs = _pcore_type.attributes(true)\n"
       init_params.each do |a|
         bld << "    ta.assert_instance_of('" << a.container.name << '[' << a.name << ']'
-        bld << "', attrs['" << a.name << "'].type, " << a.name << ")\n"
+        bld << "', attrs['" << a.name << "'].type, " << rname(a.name) << ")\n"
       end
       bld << '    new('
-      non_opt.each { |a| bld << a.name << ', ' }
-      opt.each { |a| bld << a.name << ', ' }
+      non_opt.each { |a| bld << rname(a.name) << ', ' }
+      opt.each { |a| bld << rname(a.name) << ', ' }
       bld.chomp!(', ')
       bld << ')'
     end
@@ -242,13 +279,13 @@ class RubyGenerator < TypeFormatter
       # Output attr_readers
       unless obj_attrs.empty?
         bld << "\n"
-        obj_attrs.each { |a| bld << '  attr_reader :' << a.name << "\n" }
+        obj_attrs.each { |a| bld << '  attr_reader :' << rname(a.name) << "\n" }
       end
 
       bld << "  attr_reader :hash\n" if obj.parent.nil?
 
       derived_attrs.each do |a|
-        bld << "\n  def " << a.name << "\n"
+        bld << "\n  def " << rname(a.name) << "\n"
         code_annotation = RubyMethod.annotate(a)
         ruby_body = code_annotation.nil? ? nil: code_annotation.body
         if ruby_body.nil?
@@ -265,9 +302,9 @@ class RubyGenerator < TypeFormatter
         # Output initializer
         bld << "\n  def initialize"
         bld << '('
-        non_opt.each { |ip| bld << ip.name << ', ' }
+        non_opt.each { |ip| bld << rname(ip.name) << ', ' }
         opt.each do |ip|
-          bld << ip.name << ' = '
+          bld << rname(ip.name) << ' = '
           default_string(bld, ip)
           bld << ', '
         end
@@ -282,18 +319,18 @@ class RubyGenerator < TypeFormatter
           bld << "\n    super("
           super_args = (non_opt + opt).select { |ip| !ip.container.equal?(obj) }
           unless super_args.empty?
-            super_args.each { |ip| bld << ip.name << ', ' }
+            super_args.each { |ip| bld << rname(ip.name) << ', ' }
             bld.chomp!(', ')
           end
           bld << ")\n"
           bld << '    @hash = @hash ^ ' unless hash_participants.empty?
         end
         unless hash_participants.empty?
-          hash_participants.each { |a| bld << a.name << '.hash ^ ' if a.container.equal?(obj) }
+          hash_participants.each { |a| bld << rname(a.name) << '.hash ^ ' if a.container.equal?(obj) }
           bld.chomp!(' ^ ')
           bld << "\n"
         end
-        init_params.each { |a| bld << '    @' << a.name << ' = ' << a.name << "\n" if a.container.equal?(obj) }
+        init_params.each { |a| bld << '    @' << rname(a.name) << ' = ' << rname(a.name) << "\n" if a.container.equal?(obj) }
         bld << "  end\n"
       end
     end
@@ -304,7 +341,7 @@ class RubyGenerator < TypeFormatter
       bld << (obj.parent.nil? ? '{}' : 'super')
       bld << "\n"
       obj_attrs.each do |a|
-        bld << "    result['" << a.name << "'] = @" << a.name
+        bld << "    result['" << a.name << "'] = @" << rname(a.name)
         if a.value?
           bld << ' unless '
           equals_default_string(bld, a)
@@ -324,21 +361,21 @@ class RubyGenerator < TypeFormatter
       bld << "\n  def _pcore_contents\n"
       content_participants.each do |cp|
         if array_type?(cp.type)
-          bld << '    @' << cp.name << ".each { |value| yield(value) }\n"
+          bld << '    @' << rname(cp.name) << ".each { |value| yield(value) }\n"
         else
-          bld << '    yield(@' << cp.name << ') unless @' << cp.name  << ".nil?\n"
+          bld << '    yield(@' << rname(cp.name) << ') unless @' << rname(cp.name)  << ".nil?\n"
         end
       end
       bld << "  end\n\n  def _pcore_all_contents(path, &block)\n    path << self\n"
       content_participants.each do |cp|
         if array_type?(cp.type)
-          bld << '    @' << cp.name << ".each do |value|\n"
+          bld << '    @' << rname(cp.name) << ".each do |value|\n"
           bld << "      block.call(value, path)\n"
           bld << "      value._pcore_all_contents(path, &block)\n"
         else
-          bld << '    unless @' << cp.name << ".nil?\n"
-          bld << '      block.call(@' << cp.name << ", path)\n"
-          bld << '      @' << cp.name << "._pcore_all_contents(path, &block)\n"
+          bld << '    unless @' << rname(cp.name) << ".nil?\n"
+          bld << '      block.call(@' << rname(cp.name) << ", path)\n"
+          bld << '      @' << rname(cp.name) << "._pcore_all_contents(path, &block)\n"
         end
         bld << "    end\n"
       end
@@ -351,13 +388,13 @@ class RubyGenerator < TypeFormatter
       if code_annotation
         body = code_annotation.body
         params = code_annotation.parameters
-        bld << "\n  def " << func.name
+        bld << "\n  def " << rname(func.name)
         unless params.nil? || params.empty?
           bld << '(' << params << ')'
         end
         bld << "\n    " << body << "\n"
       else
-        bld << "\n  def " << func.name << "(*args)\n"
+        bld << "\n  def " << rname(func.name) << "(*args)\n"
         bld << "    # Placeholder for #{func.type}\n"
         bld << "    raise Puppet::Error, \"no method is implemented for #{func.label}\"\n"
       end
@@ -368,7 +405,7 @@ class RubyGenerator < TypeFormatter
       bld << "\n  def eql?(o)\n"
       bld << "    super &&\n" unless obj.parent.nil?
       bld << "    o.instance_of?(self.class) &&\n" if include_type
-      eq_names.each { |eqn| bld << '    @' << eqn << '.eql?(o.' <<  eqn << ") &&\n" }
+      eq_names.each { |eqn| bld << '    @' << rname(eqn) << '.eql?(o.' <<  rname(eqn) << ") &&\n" }
       bld.chomp!(" &&\n")
       bld << "\n  end\n  alias == eql?\n"
     end
@@ -427,6 +464,10 @@ class RubyGenerator < TypeFormatter
       bld << "_pcore_type['" << a.name << "'].default_value?(@" << a.name << ')'
     end
   end
+
+  def rname(name)
+    RUBY_RESERVED_WORDS[name] || name
+  end
 end
 end
 end

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

@@ -26,21 +26,38 @@ module Puppet::Provider::Mount
   def remount
     #TRANSLATORS refers to remounting a file system
     info _("Remounting")
-    if resource[:remounts] == :true
+    os = Facter.value(:operatingsystem)
+    supports_remounts = (resource[:remounts] == :true)
+    if supports_remounts && os == 'AIX'
+      remount_with_option("remount")
+    elsif os.match(/^(FreeBSD|DragonFly|OpenBSD)$/)
+      remount_with_option("update")
+    elsif supports_remounts
       mountcmd "-o", "remount", resource[:name]
-    elsif ["FreeBSD", "DragonFly", "OpenBSD"].include?(Facter.value(:operatingsystem))
-      if self.options && !self.options.empty?
-        options = self.options + ",update"
-      else
-        options = "update"
-      end
-      mountcmd "-o", options, resource[:name]
     else
       unmount
       mount
     end
   end
 
+  # Remount by appending the supplied param "option" to any existing explicitly
+  # defined options. If resource has no explicitly defined options, will mount
+  # with only "option".
+  # @param [String] option A remount option to use or append with existing options
+  #
+  def remount_with_option(option)
+    if using_explicit_options?
+      options = self.options + "," + option
+    else
+      options = option
+    end
+    mountcmd "-o", options, resource[:name]
+  end
+
+  def using_explicit_options?
+    !self.options.nil? && !self.options.empty?
+  end
+
   # This only works when the mount point is synced to the fstab.
   def unmount
     umount(resource[:name])

data/vendored/puppet/lib/puppet/provider/package/dnf.rb

@@ -28,7 +28,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
       end
   end
 
-  defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24', '25']
+  defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24', '25', '26']
 
   def self.update_command
     # In DNF, update is deprecated for upgrade

data/vendored/puppet/lib/puppet/provider/package/gem.rb

@@ -31,7 +31,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       gem_list_command << "--source" << options[:source]
     end
     if name = options[:justme]
-      gem_list_command << "^" + name + "$"
+      gem_list_command << '\A' + name + '\z'
     end
 
     begin

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

@@ -171,6 +171,9 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   # 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.
   def latest
+    # Refresh package metadata before looking for latest versions
+    pkg(:refresh)
+
     lines = pkg(:list, "-Hvn", @resource[:name]).split("\n")
 
     # remove certificate expiration warnings from the output, but report them

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

@@ -141,7 +141,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
         if job.has_key?("Label")
           @label_to_path_map[job["Label"]] = filepath
         else
-          Puppet.warning("The #{filepath} plist does not contain a 'label' key; " +
+          Puppet.debug("The #{filepath} plist does not contain a 'label' key; " +
                        "Puppet is skipping it")
           next
         end

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

@@ -38,6 +38,16 @@ Puppet::Type.type(:zfs).provide(:zfs) do
     end
   end
 
+  # On FreeBSD zoned is called jailed
+  def container_property
+    case Facter.value(:operatingsystem)
+      when "FreeBSD"
+        :jailed
+      else
+        :zoned
+    end
+  end
+
   PARAMETER_UNSET_OR_NOT_AVAILABLE = '-'
 
   # https://docs.oracle.com/cd/E19963-01/html/821-1448/gbscy.html
@@ -70,7 +80,7 @@ Puppet::Type.type(:zfs).provide(:zfs) do
    :mountpoint, :nbmand,  :primarycache, :quota, :readonly,
    :recordsize, :refquota, :refreservation, :reservation,
    :secondarycache, :setuid, :sharenfs, :sharesmb,
-   :snapdir, :version, :volsize, :vscan, :xattr, :zoned].each do |field|
+   :snapdir, :version, :volsize, :vscan, :xattr].each do |field|
     define_method(field) do
       zfs(:get, "-H", "-o", "value", field, @resource[:name]).strip
     end
@@ -80,5 +90,14 @@ Puppet::Type.type(:zfs).provide(:zfs) do
     end
   end
 
+
+  define_method(:zoned) do
+    zfs(:get, "-H", "-o", "value", container_property, @resource[:name]).strip
+  end
+
+  define_method("zoned=") do |should|
+    zfs(:set, "#{container_property}=#{should}", @resource[:name])
+  end
+
 end
 

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

@@ -173,8 +173,12 @@ module Puppet
 
     newproperty(:options) do
       desc "A single string containing options for the mount, as they would
-        appear in fstab. For many platforms this is a comma delimited string.
-        Consult the fstab(5) man page for system-specific details."
+        appear in fstab on Linux. For many platforms this is a comma-delimited
+        string. Consult the fstab(5) man page for system-specific details.
+        AIX options other than dev, nodename, or vfs can be defined here. If
+        specified, AIX options of account, boot, check, free, mount, size,
+        type, vol, log, and quota must be ordered alphabetically at the end of
+        the list."
 
       validate do |value|
         raise Puppet::Error, _("options must not contain whitespace: %{value}") % { value: value } if value =~ /\s/