bolt 0.11.0 → 0.12.0

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

@@ -442,9 +442,9 @@ class Puppet::Resource::Type
   def convert_from_ast(name)
     value = name.value
     if value.is_a?(Puppet::Parser::AST::Regex)
-      name = value.value
+      value.value
     else
-      name = value
+      value
     end
   end
 
@@ -476,7 +476,7 @@ class Puppet::Resource::Type
       # Note we're doing something somewhat weird here -- we're setting
       # the class's namespace to its fully qualified name.  This means
       # anything inside that class starts looking in that namespace first.
-      @namespace, ignored_shortname = @type == :hostclass ? [@name, ''] : namesplit(@name)
+      @namespace, _ = @type == :hostclass ? [@name, ''] : namesplit(@name)
     end
   end
 

data/vendored/puppet/lib/puppet/resource/type_collection.rb

@@ -58,7 +58,7 @@ class Puppet::Resource::TypeCollection
 
   def add(instance)
     # return a merged instance, or the given
-    result = catch(:merged) {
+    catch(:merged) {
       send("add_#{instance.type}", instance)
       instance.resource_type_collection = self
       instance

data/vendored/puppet/lib/puppet/settings/environment_conf.rb

@@ -22,7 +22,6 @@ class Puppet::Settings::EnvironmentConf
   def self.load_from(path_to_env, global_module_path)
     path_to_env = File.expand_path(path_to_env)
     conf_file = File.join(path_to_env, 'environment.conf')
-    config = nil
 
     begin
       config = Puppet.settings.parse_file(conf_file)

data/vendored/puppet/lib/puppet/ssl/host.rb

@@ -211,7 +211,7 @@ DOC
     raise Puppet::Error, _("No private key with which to validate certificate with fingerprint: %{fingerprint}") % { fingerprint: certificate.fingerprint } unless key
     unless certificate.content.check_private_key(key.content)
       raise Puppet::Error, _(<<ERROR_STRING) % { fingerprint: certificate.fingerprint, cert_name: Puppet[:certname], ssl_dir: Puppet[:ssldir], cert_dir: Puppet[:certdir].gsub('/', '\\') }
-The certificate retrieved from the master does not match the agent's private key.
+The certificate retrieved from the master does not match the agent's private key. Did you forget to run as root?
 Certificate fingerprint: %{fingerprint}
 To fix this, remove the certificate from both the master and the agent and then start a puppet run, which will automatically regenerate a certificate.
 On the master:

data/vendored/puppet/lib/puppet/syntax_checkers/base64.rb

@@ -23,7 +23,7 @@ class Puppet::SyntaxCheckers::Base64 < Puppet::Plugins::SyntaxCheckers::SyntaxCh
       # Do a strict decode64 on text with all whitespace stripped since the non strict version
       # simply skips all non base64 characters
       Base64.strict_decode64(cleaned_text)
-    rescue => e
+    rescue
       msg = if (cleaned_text.bytes.to_a.size * 8) % 6 != 0
               _("Base64 syntax checker: Cannot parse invalid Base64 string - padding is not correct")
             else

data/vendored/puppet/lib/puppet/transaction/persistence.rb

@@ -52,7 +52,7 @@ class Puppet::Transaction::Persistence
     end
 
     result = nil
-    Puppet::Util.benchmark(:debug, _("Loaded transaction store file")) do
+    Puppet::Util.benchmark(:debug, _("Loaded transaction store file in %{seconds} seconds")) do
       begin
         result = Puppet::Util::Yaml.load_file(filename, false, true)
       rescue Puppet::Util::Yaml::YamlLoadError => detail

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

@@ -1336,9 +1336,9 @@ class Type
 
     def properties_to_audit(list)
       if !list.kind_of?(Array) && list.to_sym == :all
-        list = all_properties
+        all_properties
       else
-        list = Array(list).collect { |p| p.to_sym }
+        Array(list).collect { |p| p.to_sym }
       end
     end
   end
@@ -1537,12 +1537,25 @@ class Type
             :event => self.class.events,
             :callback => method
           }
-          self.debug { "subscribes to #{related_resource.ref}" }
         else
           # If there's no callback, there's no point in even adding
           # a label.
           subargs = nil
-          self.debug { "subscribes to #{related_resource.ref}" }
+        end
+
+        ## Corrected syntax of debug statement to reflect the way this was called.
+        # i.e. before, after, subscribe, notify
+        self.debug do
+          relation = case self.class.name
+          when "subscribe"
+            "subscribes"
+          when "notify"
+            "notifies"
+          else
+            self.class.name
+          end
+
+          "#{relation} to #{related_resource.ref}"
         end
 
         Puppet::Relationship.new(source, target, subargs)

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

@@ -828,11 +828,11 @@ Puppet::Type.newtype(:file) do
 
     @stat = begin
       Puppet::FileSystem.send(method, self[:path])
-    rescue Errno::ENOENT => error
+    rescue Errno::ENOENT
       nil
-    rescue Errno::ENOTDIR => error
+    rescue Errno::ENOTDIR
       nil
-    rescue Errno::EACCES => error
+    rescue Errno::EACCES
       warning _("Could not stat; permission denied")
       nil
     end

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

@@ -16,6 +16,9 @@ module Puppet
       that is, other mount points higher up in the filesystem --- the child
       mount will autorequire them.
 
+      **Autorequires:** If Puppet is managing a `File` resource for the mount
+      point of a mount resource, the mount will autorequire it.
+
       **Autobefores:**  If Puppet is managing any child file paths of a mount
       point, the mount resource will autobefore them."
 
@@ -300,6 +303,12 @@ module Puppet
       dependencies[0..-2]
     end
 
+    # Ensure that the mountpoint is created first
+    autorequire(:file) do
+      dependencies = []
+      dependencies.unshift @parameters[:name].value
+    end
+
     # Autobefore the mount point's child file paths
     autobefore(:file) do
       dependencies = []

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

@@ -346,9 +346,9 @@ module Puppet
     newparam(:weekday) do
       desc <<-EOT
         The days of the week in which the schedule should be valid.
-        You may specify the full day name (Tuesday), the three character
-        abbreviation (Tue), or a number corresponding to the day of the
-        week where 0 is Sunday, 1 is Monday, etc. Multiple days can be specified
+        You may specify the full day name 'Tuesday', the three character
+        abbreviation 'Tue', or a number (as a string or as an integer) corresponding to the day of the
+        week where 0 is Sunday, 1 is Monday, and so on. Multiple days can be specified
         as an array. If not specified, the day of the week will not be
         considered in the schedule.
 
@@ -369,13 +369,22 @@ module Puppet
       validate do |values|
         values = [values] unless values.is_a?(Array)
         values.each { |value|
-          unless value.is_a?(String) and
-              (value =~ /^[0-6]$/ or value =~ /^(Mon|Tues?|Wed(?:nes)?|Thu(?:rs)?|Fri|Sat(?:ur)?|Sun)(day)?$/i)
+          if weekday_integer?(value) || weekday_string?(value)
+            value
+          else
             raise ArgumentError, _("%{value} is not a valid day of the week") % { value: value }
           end
         }
       end
 
+      def weekday_integer?(value)
+        value.is_a?(Integer) && (0..6).include?(value)
+      end
+
+      def weekday_string?(value)
+        value.is_a?(String) && (value =~ /^[0-6]$/ || value =~ /^(Mon|Tues?|Wed(?:nes)?|Thu(?:rs)?|Fri|Sat(?:ur)?|Sun)(day)?$/i)
+      end
+
       weekdays = {
         'sun' => 0,
         'mon' => 1,
@@ -390,14 +399,17 @@ module Puppet
         values = [values] unless values.is_a?(Array)
         ret = {}
 
-        values.each { |value|
-           if value =~ /^[0-6]$/
-              index = value.to_i
-           else
-              index = weekdays[value[0,3].downcase]
-           end
-            ret[index] = true
-        }
+        values.each do |value|
+          case value
+          when /^[0-6]$/
+            index = value.to_i
+          when 0..6
+            index = value
+          else
+            index = weekdays[value[0,3].downcase]
+          end
+          ret[index] = true
+        end
         ret
       end
 

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

@@ -326,10 +326,10 @@ Puppet::Type.newtype(:tidy) do
   def stat(path)
     begin
       Puppet::FileSystem.lstat(path)
-    rescue Errno::ENOENT => error
+    rescue Errno::ENOENT
       info _("File does not exist")
       return nil
-    rescue Errno::EACCES => error
+    rescue Errno::EACCES
       #TRANSLATORS "stat" is a program name and should not be translated
       warning _("Could not stat; permission denied")
       return nil

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

@@ -767,7 +767,7 @@ module Puppet
         # the name is stored in the 4th capture of the regex
         name = $4
         if name.empty?
-          key = $3.delete("\n")
+          $3.delete("\n")
           # If no comment is specified for this key, generate a unique internal
           # name. This uses the same rules as
           # provider/ssh_authorized_key/parsed (PUP-3357)

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

@@ -197,20 +197,27 @@ module Util
     }
   end
 
+  # execute a block of work and based on the logging level provided, log the provided message with the seconds taken
+  # The message 'msg' should include string ' in %{seconds} seconds' as part of the message and any content should escape
+  # any percent signs '%' so that they are not interpreted as formatting commands
+  #     escaped_str = str.gsub(/%/, '%%')
+  #
+  # @param msg [String] the message to be formated to assigned the %{seconds} seconds take to execute,
+  #                     other percent signs '%' need to be escaped
+  # @param level [Symbol] the logging level for this message
+  # @param object [Object] The object use for logging the message
   def benchmark(*args)
     msg = args.pop
     level = args.pop
-    object = nil
-
-    if args.empty?
-      if respond_to?(level)
-        object = self
-      else
-        object = Puppet
-      end
-    else
-      object = args.pop
-    end
+    object = if args.empty?
+               if respond_to?(level)
+                 self
+               else
+                 Puppet
+               end
+             else
+               args.pop
+             end
 
     raise Puppet::DevError, "Failed to provide level to :benchmark" unless level
 
@@ -223,9 +230,7 @@ module Util
       seconds = Benchmark.realtime {
         yield
       }
-      #TRANSLATORS forms the end of a string indicating how long a
-      # given operation took
-      object.send(level, msg + (_(" in %0.2f seconds") % seconds))
+      object.send(level, msg % { seconds: "%0.2f" % seconds })
       return seconds
     else
       yield

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

@@ -42,7 +42,7 @@ class Puppet::Util::FileType
           else
             return ""
           end
-        rescue Puppet::Error => detail
+        rescue Puppet::Error
           raise
         rescue => detail
           message = _("%{klass} could not read %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
@@ -58,7 +58,7 @@ class Puppet::Util::FileType
           val = real_write(text)
           @synced = Time.now
           return val
-        rescue Puppet::Error => detail
+        rescue Puppet::Error
           raise
         rescue => detail
           message = _("%{klass} could not write %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }

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

@@ -36,7 +36,7 @@ class Puppet::Util::JsonLockfile < Puppet::Util::Lockfile
     file_contents = super
     return nil if file_contents.nil? or file_contents.empty?
     JSON.parse(file_contents)
-  rescue JSON::ParserError => e
+  rescue JSON::ParserError
     Puppet.warning _("Unable to read lockfile data from %{path}: not in JSON") % { path: @file_path }
     nil
   end

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

@@ -124,7 +124,7 @@ class Puppet::Util::Log
       return
     end
 
-    name, type = @desttypes.find do |name, klass|
+    _, type = @desttypes.find do |name, klass|
       klass.match?(dest)
     end
 
@@ -169,8 +169,10 @@ class Puppet::Util::Log
     return Puppet::Util::CharacterEncoding.convert_to_utf_8(str) if str.valid_encoding?
 
     # We only select the last 10 callers in the stack to avoid being spammy
-    _("Received a Log attribute with invalid encoding:%{log_message}\nBacktrace:\n%{backtrace}") %
-        { log_message: Puppet::Util::CharacterEncoding.convert_to_utf_8(str.dump), backtrace: caller[0..10].join("\n") }
+    message = _("Received a Log attribute with invalid encoding:%{log_message}") %
+        { log_message: Puppet::Util::CharacterEncoding.convert_to_utf_8(str.dump)}
+    message += '\n' + _("Backtrace:\n%{backtrace}") % { backtrace: caller[0..10].join("\n") }
+    message
   end
 
   public

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

@@ -125,7 +125,6 @@ Puppet::Util::Log.newdesttype :logstash_event do
     # logstash_event format is documented at
     # https://logstash.jira.com/browse/LOGSTASH-675
 
-    data = {}
     data = msg.to_hash
     data['version'] = 1
     data['@timestamp'] = data['time']

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

@@ -69,7 +69,7 @@ if Puppet::Util::Platform.windows?
         Puppet::Util::Windows::RootCerts.instance.to_a.uniq { |cert| cert.to_der }.each do |x509|
           begin
             add_cert(x509)
-          rescue OpenSSL::X509::StoreError => e
+          rescue OpenSSL::X509::StoreError
             warn "Failed to add #{x509.subject.to_s}"
           end
         end

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

@@ -67,10 +67,10 @@ class Puppet::Util::NetworkDevice::Config
           count += 1
         }
       }
-    rescue Errno::EACCES => detail
+    rescue Errno::EACCES
       Puppet.err _("Configuration error: Cannot read %{file}; cannot serve") % { file: @file }
       #raise Puppet::Error, "Cannot read #{@config}"
-    rescue Errno::ENOENT => detail
+    rescue Errno::ENOENT
       Puppet.err _("Configuration error: '%{file}' does not exit; cannot serve") % { file: @file }
     end
 

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

@@ -45,7 +45,9 @@ module Puppet::Util::Plist
                                                   {:failonfail => true, :combine => true})
           return parse_plist(plist)
         rescue Puppet::ExecutionFailure => detail
-          Puppet.warning(_("Cannot read file %{file_path}; Puppet is skipping it.\nDetails: %{detail}") % { file_path: file_path, detail: detail })
+          message = _("Cannot read file %{file_path}; Puppet is skipping it.") % { file_path: file_path }
+          message += '\n' + _("Details: %{detail}") % { detail: detail }
+          Puppet.warning(message)
         end
       end
       return nil
@@ -122,11 +124,11 @@ module Puppet::Util::Plist
 
     def to_format(format)
       if format.to_sym == :xml
-        plist_format = CFPropertyList::List::FORMAT_XML
+        CFPropertyList::List::FORMAT_XML
       elsif format.to_sym == :binary
-        plist_format = CFPropertyList::List::FORMAT_BINARY
+        CFPropertyList::List::FORMAT_BINARY
       elsif format.to_sym == :plain
-        plist_format = CFPropertyList::List::FORMAT_PLAIN
+        CFPropertyList::List::FORMAT_PLAIN
       else
         raise FormatError.new "Unknown plist format #{format}"
       end

data/vendored/puppet/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -896,7 +896,7 @@ module Generators
 
     def find_symbol(symbol, method=nil)
       res = @context.parent.find_symbol(symbol, method)
-      res &&= res.viewer
+      res && res.viewer
     end
 
   end

data/vendored/puppet/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb

@@ -8,7 +8,7 @@ module RDoc
     include PuppetParserCore
 
     def create_rdoc_preprocess
-      preprocess = Markup::PreProcess.new(@input_file_name, @options.rdoc_include)
+      Markup::PreProcess.new(@input_file_name, @options.rdoc_include)
     end
   end
 end

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

@@ -53,7 +53,7 @@ class Puppet::Util::Storage
       Puppet.warning(_("Checksumfile %{filename} is not a file, ignoring") % { filename: filename })
       return
     end
-    Puppet::Util.benchmark(:debug, "Loaded state") do
+    Puppet::Util.benchmark(:debug, "Loaded state in %{seconds} seconds") do
       begin
         @@state = Puppet::Util::Yaml.load_file(filename)
       rescue Puppet::Util::Yaml::YamlLoadError => detail
@@ -82,7 +82,7 @@ class Puppet::Util::Storage
 
     Puppet.info _("Creating state file %{file}") % { file: Puppet[:statefile] } unless Puppet::FileSystem.exist?(Puppet[:statefile])
 
-    Puppet::Util.benchmark(:debug, "Stored state") do
+    Puppet::Util.benchmark(:debug, "Stored state in %{seconds} seconds") do
       Puppet::Util::Yaml.dump(@@state, Puppet[:statefile])
     end
   end

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

@@ -44,7 +44,7 @@ module Puppet::Util::Windows
       index = 0
       subkey = nil
 
-      subkey_max_len, value_max_len = reg_query_info_key_max_lengths(key)
+      subkey_max_len, _ = reg_query_info_key_max_lengths(key)
 
       begin
         subkey, filetime = reg_enum_key(key, index, subkey_max_len)
@@ -69,7 +69,7 @@ module Puppet::Util::Windows
       index = 0
       subkey = nil
 
-      subkey_max_len, value_max_len = reg_query_info_key_max_lengths(key)
+      _, value_max_len = reg_query_info_key_max_lengths(key)
 
       begin
         subkey, type, data = reg_enum_value(key, index, value_max_len)