bolt 0.20.3 → 0.20.5

data/vendored/puppet/lib/puppet/external/dot.rb

@@ -15,7 +15,7 @@ module DOT
 
   # if we don't like 4 spaces, we can change it any time
 
-  def change_tab (t)
+  def change_tab(t)
     $tab  = t
     $tab2 = t * 2
   end
@@ -118,7 +118,7 @@ module DOT
 
     attr_accessor :name
 
-    def initialize (params = {})
+    def initialize(params = {})
       @label = params['name'] ? params['name'] : ''
     end
 
@@ -134,7 +134,7 @@ module DOT
     # attr_reader :parent
     attr_accessor :name, :options
 
-    def initialize (params = {}, option_list = [])
+    def initialize(params = {}, option_list = [])
       super(params)
       @name   = params['name']   ? params['name']   : nil
       @parent = params['parent'] ? params['parent'] : nil
@@ -168,7 +168,7 @@ module DOT
 
     attr_accessor :label
 
-    def initialize (params = {})
+    def initialize(params = {})
       super(params)
       @name = params['label'] ? params['label'] : ''
     end
@@ -181,7 +181,7 @@ module DOT
   # node element
 
   class DOTNode < DOTElement
-    def initialize (params = {}, option_list = NODE_OPTS)
+    def initialize(params = {}, option_list = NODE_OPTS)
       super(params, option_list)
       @ports = params['ports'] ? params['ports'] : []
     end
@@ -190,11 +190,11 @@ module DOT
       @ports.each { |i| yield i }
     end
 
-    def << (thing)
+    def <<(thing)
       @ports << thing
     end
 
-    def push (thing)
+    def push(thing)
       @ports.push(thing)
     end
 
@@ -202,16 +202,16 @@ module DOT
       @ports.pop
     end
 
-    def to_s (t = '')
+    def to_s(t = '')
 
       # This code is totally incomprehensible; it needs to be replaced!
 
       label = @options['shape'] != 'record' && @ports.length == 0 ?
           @options['label'] ?
-            t + $tab + "label = \"#{@options['label']}\"\n" :
+            t + $tab + "label = #{stringify(@options['label'])}\n" :
             '' :
           t + $tab + 'label = "' + " \\\n" +
-          t + $tab2 + "#{@options['label']}| \\\n" +
+          t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
           @ports.collect{ |i|
             t + $tab2 + i.to_s
           }.join( "| \\\n" ) + " \\\n" +
@@ -226,13 +226,19 @@ module DOT
         t + "]\n"
     end
 
+    private
+
+    def stringify(s)
+      %("#{s.gsub('"', '\\"')}")
+    end
+
   end
 
   # A subgraph element is the same to graph, but has another header in dot
   # notation.
 
   class DOTSubgraph < DOTElement
-    def initialize (params = {}, option_list = GRAPH_OPTS)
+    def initialize(params = {}, option_list = GRAPH_OPTS)
       super(params, option_list)
       @nodes      = params['nodes'] ? params['nodes'] : []
       @dot_string = 'graph'
@@ -242,11 +248,11 @@ module DOT
       @nodes.each{ |i| yield i }
     end
 
-    def << (thing)
+    def <<(thing)
       @nodes << thing
     end
 
-    def push (thing)
+    def push(thing)
       @nodes.push( thing )
     end
 
@@ -254,7 +260,7 @@ module DOT
       @nodes.pop
     end
 
-    def to_s (t = '')
+    def to_s(t = '')
       hdr = t + "#{@dot_string} #{@name} {\n"
 
       options = @options.to_a.collect{ |name, val|
@@ -275,7 +281,7 @@ module DOT
 
   class DOTDigraph < DOTSubgraph
 
-  def initialize (params = {}, option_list = GRAPH_OPTS)
+  def initialize(params = {}, option_list = GRAPH_OPTS)
     super(params, option_list)
     @dot_string = 'digraph'
   end
@@ -288,7 +294,7 @@ module DOT
 
     attr_accessor :from, :to
 
-    def initialize (params = {}, option_list = EDGE_OPTS)
+    def initialize(params = {}, option_list = EDGE_OPTS)
       super(params, option_list)
       @from = params['from'] ? params['from'] : nil
       @to   = params['to'] ? params['to'] : nil
@@ -298,7 +304,7 @@ module DOT
       '--'
     end
 
-    def to_s (t = '')
+    def to_s(t = '')
       t + "#{@from} #{edge_link} #{to} [\n" +
         @options.to_a.collect{ |i|
           i[1] && i[0] != 'label' ?

data/vendored/puppet/lib/puppet/face/config.rb

@@ -2,6 +2,7 @@ require 'puppet/face'
 require 'puppet/settings/ini_file'
 
 Puppet::Face.define(:config, '0.0.1') do
+  extend Puppet::Util::Colors
   copyright "Puppet Inc.", 2011
   license   _("Apache 2 license; see COPYING")
 
@@ -9,10 +10,12 @@ Puppet::Face.define(:config, '0.0.1') do
 
   description "This subcommand can inspect and modify settings from Puppet's
     'puppet.conf' configuration file. For documentation about individual settings,
-    see https://docs.puppetlabs.com/puppet/latest/reference/configuration.html."
+    see https://puppet.com/docs/puppet/latest/configuration.html."
 
+  DEFAULT_SECTION_MARKER = Object.new
+  DEFAULT_SECTION = "main"
   option "--section " + _("SECTION_NAME") do
-    default_to { "main" }
+    default_to { DEFAULT_SECTION_MARKER } #Sentinel object for default detection during commands
     summary _("The section of the configuration file to interact with.")
     description <<-EOT
       The section of the puppet.conf configuration file to interact with.
@@ -56,6 +59,13 @@ Puppet::Face.define(:config, '0.0.1') do
 
     when_invoked do |*args|
       options = args.pop
+
+      @default_section = false
+      if options[:section] == DEFAULT_SECTION_MARKER
+        options[:section] = DEFAULT_SECTION
+        @default_section = true
+      end
+
       render_all_settings = args.empty? || args == ['all']
 
       args = Puppet.settings.to_a.collect(&:first) if render_all_settings
@@ -75,6 +85,11 @@ Puppet::Face.define(:config, '0.0.1') do
         # the requested section
         values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
 
+        if Puppet::Util::Log.sendlevel?(:info)
+          warn_default_section(options[:section]) if @default_section
+          report_section_and_environment(options[:section], Puppet.settings[:environment])
+        end
+
         to_be_rendered = {}
         args.sort.each do |setting_name|
           to_be_rendered[setting_name] = values.print(setting_name.to_sym)
@@ -117,6 +132,25 @@ Puppet::Face.define(:config, '0.0.1') do
     newhash
   end
 
+  def warn_default_section(section_name)
+    messages = []
+    messages << _("No section specified; defaulting to '%{section_name}'.") %
+      { section_name: section_name }
+    #TRANSLATORS '--section' is a command line option and should not be translated
+    messages << _("Set the config section by using the `--section` flag.")
+    #TRANSLATORS `puppet config --section user print foo` is a command line example and should not be translated
+    messages << _("For example, `puppet config --section user print foo`.")
+    messages << _("For more information, see https://puppet.com/docs/puppet/latest/configuration.html")
+
+    Puppet.warning(messages.join("\n"))
+  end
+
+  def report_section_and_environment(section_name, environment_name)
+      $stderr.puts colorize(:hyellow,
+        _("Resolving settings from section '%{section_name}' in environment '%{environment_name}'") %
+          { section_name: section_name, environment_name: environment_name })
+  end
+
   action(:set) do
     summary _("Set Puppet's settings.")
     arguments _("[setting_name] [setting_value]")
@@ -139,6 +173,13 @@ Puppet::Face.define(:config, '0.0.1') do
     EOT
 
     when_invoked do |name, value, options|
+
+      @default_section = false
+      if options[:section] == DEFAULT_SECTION_MARKER
+        options[:section] = DEFAULT_SECTION
+        @default_section = true
+      end
+
       if name == 'environment' && options[:section] == 'main'
         Puppet.warning _(<<-EOM).chomp
 The environment should be set in either the `[user]`, `[agent]`, or `[master]`
@@ -152,6 +193,10 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
         EOM
       end
 
+      if Puppet::Util::Log.sendlevel?(:info)
+        report_section_and_environment(options[:section], Puppet.settings[:environment])
+      end
+
       path = Puppet::FileSystem.pathname(Puppet.settings.which_configuration_file)
       Puppet::FileSystem.touch(path)
       Puppet::FileSystem.open(path, nil, 'r+:UTF-8') do |file|
@@ -184,7 +229,12 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
     EOT
 
     when_invoked do |name, options|
-      options[:section] = options[:section].to_s # If value was left as default - set to default string
+
+      @default_section = false
+      if options[:section] == DEFAULT_SECTION_MARKER
+        options[:section] = DEFAULT_SECTION
+        @default_section = true
+      end
 
       path = Puppet::FileSystem.pathname(Puppet.settings.which_configuration_file)
       if Puppet::FileSystem.exist?(path)
@@ -192,6 +242,11 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
           Puppet::Settings::IniFile.update(file) do |config|
             setting_string = config.delete(options[:section], name)
             if setting_string
+
+              if Puppet::Util::Log.sendlevel?(:info)
+                report_section_and_environment(options[:section], Puppet.settings[:environment])
+              end
+
               puts(_("Deleted setting from '%{section_name}': '%{setting_string}'") %
                        { section_name: options[:section], name: name, setting_string: setting_string.strip })
             else

data/vendored/puppet/lib/puppet/face/epp.rb

@@ -509,7 +509,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       if fact_file.is_a?(Hash) # when used via the Face API
         given_facts = fact_file
       elsif fact_file.end_with?("json")
-        given_facts = JSON.parse(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
+        given_facts = Puppet::Util::Json.load(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
       else
         given_facts = YAML.load(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
       end

data/vendored/puppet/lib/puppet/face/module/build.rb

@@ -7,7 +7,7 @@ Puppet::Face.define(:module, '1.0.0') do
       Note: Module build uses MD5 checksums, which are prohibited on FIPS enabled systems.
 
       This action uses the metadata.json file in the module directory to set metadata
-      used by the Forge. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for more
+      used by the Forge. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for more
       about writing metadata.json files.
 
       After being built, the release archive file can be found in the module's
@@ -44,11 +44,11 @@ Puppet::Face.define(:module, '1.0.0') do
         pwd = Dir.pwd
         module_path = Puppet::ModuleTool.find_module_root(pwd)
         if module_path.nil?
-          raise _("Unable to find metadata.json in module root %{pwd} or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format.") % { pwd: pwd }
+          raise _("Unable to find metadata.json in module root %{pwd} or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format.") % { pwd: pwd }
         end
       else
         unless Puppet::ModuleTool.is_module_root?(module_path)
-          raise _("Unable to find metadata.json in module root %{module_path} or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format.") % { module_path: module_path }
+          raise _("Unable to find metadata.json in module root %{module_path} or parent directories. See <https://puppet.com/docs/puppet/latest/modules_publishing.html> for required file format.") % { module_path: module_path }
         end
       end
 

data/vendored/puppet/lib/puppet/face/module/install.rb

@@ -120,10 +120,6 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
       Puppet::ModuleTool.set_option_defaults options
       Puppet.notice _("Preparing to install into %{dir} ...") % { dir: options[:target_dir] }

data/vendored/puppet/lib/puppet/face/module/list.rb

@@ -17,10 +17,6 @@ Puppet::Face.define(:module, '1.0.0') do
       summary _("Whether to show dependencies as a tree view")
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     examples <<-'EOT'
       List installed modules:
 
@@ -77,7 +73,6 @@ Puppet::Face.define(:module, '1.0.0') do
 
       output = ''
 
-      environment.modules_strict_semver = !!options[:strict_semver]
       warn_unmet_dependencies(environment)
 
       environment.modulepath.each do |path|

data/vendored/puppet/lib/puppet/face/module/search.rb

@@ -23,7 +23,7 @@ Puppet::Face.define(:module, '1.0.0') do
 
     when_invoked do |term, options|
       Puppet::ModuleTool.set_option_defaults options
-      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new(options[:module_repository] || Puppet[:module_repository], options[:strict_semver]), options).run
+      Puppet::ModuleTool::Applications::Searcher.new(term, Puppet::Forge.new(options[:module_repository] || Puppet[:module_repository]), options).run
     end
 
     when_rendering :console do |results, term, options|

data/vendored/puppet/lib/puppet/face/module/uninstall.rb

@@ -56,10 +56,6 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
       name = name.gsub('/', '-')
 

data/vendored/puppet/lib/puppet/face/module/upgrade.rb

@@ -62,10 +62,6 @@ Puppet::Face.define(:module, '1.0.0') do
       EOT
     end
 
-    option '--strict-semver' do
-      summary _('Whether version ranges should exclude pre-release versions')
-    end
-
     when_invoked do |name, options|
       name = name.gsub('/', '-')
       Puppet.notice _("Preparing to upgrade '%{name}' ...") % { name: name }

data/vendored/puppet/lib/puppet/face/status.rb

@@ -38,7 +38,7 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
     This action requires that the server's `auth.conf` file allow find
     access to the `status` REST terminus. Puppet agent does not use this
     facility, and it is turned off by default. See
-    <https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html>
+    <https://puppet.com/docs/puppet/latest/config_file_auth.html>
     for more details.
   EOT
   find.examples <<-'EOT'
@@ -46,6 +46,6 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
 
     $ puppet status find --terminus rest
   EOT
-  
+
   deprecate
 end

data/vendored/puppet/lib/puppet/file_serving/base.rb

@@ -1,12 +1,9 @@
 require 'puppet/file_serving'
 require 'puppet/util'
-require 'puppet/util/methodhelper'
 
 # The base class for Content and Metadata; provides common
 # functionality like the behaviour around links.
 class Puppet::FileServing::Base
-  include Puppet::Util::MethodHelper
-
   # This is for external consumers to store the source that was used
   # to retrieve the metadata.
   attr_accessor :source
@@ -35,10 +32,13 @@ class Puppet::FileServing::Base
     end
   end
 
-  def initialize(path, options = {})
+  def initialize(path, links: nil, relative_path: nil, source: nil)
     self.path = path
     @links = :manage
-    set_options(options)
+
+    self.links = links if links
+    self.relative_path = relative_path if relative_path
+    self.source = source if source
   end
 
   # Determine how we deal with links.

data/vendored/puppet/lib/puppet/file_serving/metadata.rb

@@ -136,7 +136,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     @destination = data.delete('destination')
     @source      = data.delete('source')
     @content_uri = data.delete('content_uri')
-    super(path,data)
+
+    super(path, data.map { |k, v| [k.to_sym, v] }.to_h)
   end
 
   def to_data_hash

data/vendored/puppet/lib/puppet/forge.rb

@@ -5,7 +5,7 @@ require 'net/http'
 require 'tempfile'
 require 'uri'
 require 'pathname'
-require 'json'
+require 'puppet/util/json'
 require 'semantic_puppet'
 
 class Puppet::Forge < SemanticPuppet::Dependency::Source
@@ -19,10 +19,9 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
   attr_reader :host, :repository
 
-  def initialize(host = Puppet[:module_repository], strict_semver = true)
+  def initialize(host = Puppet[:module_repository])
     @host = host
     @repository = Puppet::Forge::Repository.new(host, USER_AGENT)
-    @strict_semver = strict_semver
   end
 
   # Return a list of module metadata hashes that match the search query.
@@ -64,7 +63,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       response = make_http_request(uri)
 
       if response.code == '200'
-        result = JSON.parse(response.body)
+        result = Puppet::Util::Json.load(response.body)
         uri = decode_uri(result['pagination']['next'])
         matches.concat result['results']
       else
@@ -101,7 +100,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       response = make_http_request(uri)
 
       if response.code == '200'
-        response = JSON.parse(response.body)
+        response = Puppet::Util::Json.load(response.body)
       else
         raise ResponseError.new(:uri => URI.parse(@host).merge(uri), :response => response)
       end
@@ -120,7 +119,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
   class ModuleRelease < SemanticPuppet::Dependency::ModuleRelease
     attr_reader :install_dir, :metadata
 
-    def initialize(source, data, strict_semver = true)
+    def initialize(source, data)
       @data = data
       @metadata = meta = data['metadata']
 
@@ -132,7 +131,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
         dependencies = meta['dependencies'].collect do |dep|
           begin
             Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
-            Puppet::ModuleTool.parse_module_dependency(release, dep, strict_semver)[0..1]
+            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
           rescue ArgumentError => e
             raise ArgumentError, _("Malformed dependency: %{name}.") % { name: dep['name'] } +
                 ' ' + _("Exception was: %{detail}") % { detail: e }
@@ -224,7 +223,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     l = list.map do |release|
       metadata = release['metadata']
       begin
-        ModuleRelease.new(self, release, @strict_semver)
+        ModuleRelease.new(self, release)
       rescue ArgumentError => e
         Puppet.warning _("Cannot consider release %{name}-%{version}: %{error}") % { name: metadata['name'], version: metadata['version'], error: e }
         false