bolt 0.20.3 → 0.20.5

data/vendored/puppet/lib/puppet/metatype/manager.rb

@@ -93,8 +93,6 @@ module Manager
       end
     end
 
-    options = symbolize_options(options)
-
     # Then create the class.
 
     klass = genclass(

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

@@ -1,6 +1,6 @@
 require 'puppet/util/logging'
 require 'puppet/module/task'
-require 'json'
+require 'puppet/util/json'
 require 'semantic_puppet/gem_version'
 
 # Support for modules
@@ -56,29 +56,8 @@ class Puppet::Module
   end
 
   # @api private
-  def self.parse_range(range, strict)
-    @parse_range_method ||= SemanticPuppet::VersionRange.method(:parse)
-    if @parse_range_method.arity == 1
-      @semver_gem_version ||= SemanticPuppet::Version.parse(SemanticPuppet::VERSION)
-
-      # Give user a heads-up if the desired strict setting cannot be honored
-      if strict
-        if @semver_gem_version.major < 1
-          Puppet.warn_once('strict_version_ranges', 'version_range_cannot_be_strict',
-            _('VersionRanges will never be strict when using non-vendored SemanticPuppet gem, version %{version}') % { version: @semver_gem_version},
-            :default, :default, :notice)
-        end
-      else
-        if @semver_gem_version.major >= 1
-          Puppet.warn_once('strict_version_ranges', 'version_range_always_strict',
-            _('VersionRanges will always be strict when using non-vendored SemanticPuppet gem, version %{version}') % { version: @semver_gem_version},
-            :default, :default, :notice)
-        end
-      end
-      @parse_range_method.call(range)
-    else
-      @parse_range_method.call(range, strict)
-    end
+  def self.parse_range(range)
+    SemanticPuppet::VersionRange.parse(range)
   end
 
   attr_reader :name, :environment, :path, :metadata, :tasks
@@ -87,10 +66,9 @@ class Puppet::Module
   attr_accessor :dependencies, :forge_name
   attr_accessor :source, :author, :version, :license, :summary, :description, :project_page
 
-  def initialize(name, path, environment, strict_semver = true)
+  def initialize(name, path, environment)
     @name = name
     @path = path
-    @strict_semver = strict_semver
     @environment = environment
 
     assert_validity
@@ -202,10 +180,10 @@ class Puppet::Module
 
   def read_metadata
     md_file = metadata_file
-    md_file.nil? ? {} : JSON.parse(File.read(md_file, :encoding => 'utf-8'))
+    md_file.nil? ? {} : Puppet::Util::Json.load(File.read(md_file, :encoding => 'utf-8'))
   rescue Errno::ENOENT
     {}
-  rescue JSON::JSONError => e
+  rescue Puppet::Util::Json::ParseError => e
     #TRANSLATORS 'metadata.json' is a specific file name and should not be translated.
     msg = _("%{name} has an invalid and unparsable metadata.json file. The parse error: %{error}") % { name: name, error: e.message }
     case Puppet[:strict]
@@ -406,7 +384,7 @@ class Puppet::Module
 
       if version_string
         begin
-          required_version_semver_range = self.class.parse_range(version_string, @strict_semver)
+          required_version_semver_range = self.class.parse_range(version_string)
           actual_version_semver = SemanticPuppet::Version.parse(dep_mod.version)
         rescue ArgumentError
           error_details[:reason] = :non_semantic_version
@@ -432,10 +410,6 @@ class Puppet::Module
     self.environment == other.environment
   end
 
-  def strict_semver?
-    @strict_semver
-  end
-
   private
 
   def wanted_manifests_from(pattern)

data/vendored/puppet/lib/puppet/module/task.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'puppet/util/logging'
 
 class Puppet::Module

data/vendored/puppet/lib/puppet/module_tool.rb

@@ -131,8 +131,6 @@ module Puppet
       # Note: environment will have expanded the path
       options[:target_dir] = face_environment.full_modulepath.first
 
-      # Default false to retain backward compatibility with SemanticPuppet 0.1.4
-      options[:strict_semver] = false unless options.include?(:strict_semver)
     end
 
     # Given a hash of options, we should discover or create a
@@ -165,16 +163,15 @@ module Puppet
     # @param where [String] a description of the thing we're parsing the
     #        dependency expression for
     # @param dep [Hash] the dependency description to parse
-    # @param strict_semver [Boolean] set to `false` to relax range semantics to include pre-releases
     # @return [Array(String, SemanticPuppet::VersionRange, String)] a tuple of the
     #         dependent module's name, the version range dependency, and the
     #         unparsed range expression.
-    def self.parse_module_dependency(where, dep, strict_semver = true)
+    def self.parse_module_dependency(where, dep)
       dep_name = dep['name'].tr('/', '-')
       range = dep['version_requirement'] || '>= 0.0.0'
 
       begin
-        parsed_range = Module.parse_range(range, strict_semver)
+        parsed_range = Module.parse_range(range)
       rescue ArgumentError => e
         Puppet.debug "Error in #{where} parsing dependency #{dep_name} (#{e.message}); using empty range."
         parsed_range = SemanticPuppet::VersionRange::EMPTY_RANGE

data/vendored/puppet/lib/puppet/module_tool/applications/application.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require 'json'
+require 'puppet/util/json'
 require 'puppet/util/colors'
 
 module Puppet::ModuleTool
@@ -26,7 +26,7 @@ module Puppet::ModuleTool
         when Net::HTTPOK, Net::HTTPCreated
           Puppet.notice success
         else
-          errors = JSON.parse(response.body)['error'] rescue "HTTP #{response.code}, #{response.body}"
+          errors = Puppet::Util::Json.load(response.body)['error'] rescue "HTTP #{response.code}, #{response.body}"
           Puppet.warning "#{failure} (#{errors})"
         end
       end
@@ -40,7 +40,7 @@ module Puppet::ModuleTool
         end
 
         if require_metadata && !Puppet::ModuleTool.is_module_root?(@path)
-          raise ArgumentError, _("Unable to find metadata.json in module root at %{path} See https://docs.puppet.com/puppet/latest/reference/modules_publishing.html for required file format.") % { path: @path }
+          raise ArgumentError, _("Unable to find metadata.json in module root at %{path} See https://puppet.com/docs/puppet/latest/modules_publishing.html for required file format.") % { path: @path }
         end
 
         metadata_path   = File.join(@path, 'metadata.json')
@@ -48,8 +48,8 @@ module Puppet::ModuleTool
         if File.file?(metadata_path)
           File.open(metadata_path) do |f|
             begin
-              @metadata.update(JSON.load(f))
-            rescue JSON::ParserError => ex
+              @metadata.update(Puppet::Util::Json.load(f))
+            rescue Puppet::Util::Json::ParserError => ex
               raise ArgumentError, _("Could not parse JSON %{metadata_path}") % { metadata_path: metadata_path }, ex.backtrace
             end
           end

data/vendored/puppet/lib/puppet/module_tool/applications/builder.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'json'
+require 'puppet/util/json'
 require 'puppet/file_system'
 require 'pathspec'
 require 'facter'
@@ -140,7 +140,7 @@ module Puppet::ModuleTool
         end
 
         Puppet::FileSystem.open(File.join(build_path, 'checksums.json'), nil, 'wb') do |f|
-          f.write(JSON.pretty_generate(Checksums.new(build_path)))
+          f.write(Puppet::Util::Json.dump(Checksums.new(build_path), :pretty => true))
         end
       end
 

data/vendored/puppet/lib/puppet/module_tool/applications/checksummer.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'puppet/util/json'
 require 'puppet/module_tool/checksums'
 
 module Puppet::ModuleTool
@@ -40,10 +40,10 @@ module Puppet::ModuleTool
 
       def checksums
         if checksums_file.exist?
-          JSON.parse(checksums_file.read)
+          Puppet::Util::Json.load(checksums_file.read)
         elsif metadata_file.exist?
           # Check metadata.json too; legacy modules store their checksums there.
-          JSON.parse(metadata_file.read)['checksums'] or
+          Puppet::Util::Json.load(metadata_file.read)['checksums'] or
           raise ArgumentError, _("No file containing checksums found.")
         else
           raise ArgumentError, _("No file containing checksums found.")

data/vendored/puppet/lib/puppet/module_tool/applications/installer.rb

@@ -25,7 +25,6 @@ module Puppet::ModuleTool
         @ignore_dependencies = forced? || options[:ignore_dependencies]
         @name                = name
         @install_dir         = install_dir
-        @strict_semver       = !!options[:strict_semver]
 
         Puppet::Forge::Cache.clean
 
@@ -63,7 +62,7 @@ module Puppet::ModuleTool
         begin
           if installed_module = installed_modules[name]
             unless forced?
-              if Puppet::Module.parse_range(version, @strict_semver).include? installed_module.version
+              if Puppet::Module.parse_range(version).include? installed_module.version
                 results[:result] = :noop
                 results[:version] = installed_module.version
                 return results
@@ -107,7 +106,7 @@ module Puppet::ModuleTool
               # locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', mod, installed_range) do |node|
-                Puppet::Module.parse_range(installed_range, @strict_semver).include? node.version
+                Puppet::Module.parse_range(installed_range).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
@@ -115,7 +114,7 @@ module Puppet::ModuleTool
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                  Puppet::Module.parse_range(range, @strict_semver).include? node.version
+                  Puppet::Module.parse_range(range).include? node.version
                 end
               end
             end
@@ -189,12 +188,12 @@ module Puppet::ModuleTool
       private
 
       def module_repository
-        @repo ||= Puppet::Forge.new(Puppet[:module_repository], @strict_semver)
+        @repo ||= Puppet::Forge.new(Puppet[:module_repository])
       end
 
       def local_tarball_source
         @tarball_source ||= begin
-          Puppet::ModuleTool::LocalTarball.new(@name, @strict_semver)
+          Puppet::ModuleTool::LocalTarball.new(@name)
         rescue Puppet::Module::Error => e
           raise InvalidModuleError.new(@name, :action => @action, :error  => e)
         end
@@ -209,7 +208,7 @@ module Puppet::ModuleTool
       end
 
       def build_single_module_graph(name, version)
-        range = Puppet::Module.parse_range(version, @strict_semver)
+        range = Puppet::Module.parse_range(version)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }

data/vendored/puppet/lib/puppet/module_tool/applications/uninstaller.rb

@@ -12,7 +12,6 @@ module Puppet::ModuleTool
         @suggestions = []
         @environment = options[:environment_instance]
         @ignore_changes = options[:force] || options[:ignore_changes]
-        @strict_semver  = !!options[:strict_semver]
       end
 
       def run
@@ -61,7 +60,7 @@ module Puppet::ModuleTool
               :path    => mod.modulepath,
             }
             if @options[:version] && mod.version
-              next unless Puppet::Module.parse_range(@options[:version], @strict_semver).include?(SemanticPuppet::Version.parse(mod.version))
+              next unless Puppet::Module.parse_range(@options[:version]).include?(SemanticPuppet::Version.parse(mod.version))
             end
             @installed << mod
           elsif mod_name =~ /#{@name}/

data/vendored/puppet/lib/puppet/module_tool/applications/unpacker.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 require 'tmpdir'
-require 'json'
+require 'puppet/util/json'
 require 'puppet/file_system'
 
 module Puppet::ModuleTool
@@ -75,7 +75,7 @@ module Puppet::ModuleTool
 
       # @api private
       def module_name
-        metadata = JSON.parse((root_dir + 'metadata.json').read)
+        metadata = Puppet::Util::Json.load((root_dir + 'metadata.json').read)
         metadata['name'][/-(.*)/, 1]
       end
 

data/vendored/puppet/lib/puppet/module_tool/applications/upgrader.rb

@@ -20,7 +20,6 @@ module Puppet::ModuleTool
         @name                = name
         @ignore_changes      = forced? || options[:ignore_changes]
         @ignore_dependencies = forced? || options[:ignore_dependencies]
-        @strict_semver       = !!options[:strict_semver]
 
         SemanticPuppet::Dependency.add_source(installed_modules_source)
         SemanticPuppet::Dependency.add_source(module_repository)
@@ -94,7 +93,7 @@ module Puppet::ModuleTool
           if available_versions.empty?
             raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
           elsif results[:requested_version] != :latest
-            requested = Puppet::Module.parse_range(results[:requested_version], @strict_semver)
+            requested = Puppet::Module.parse_range(results[:requested_version])
             unless available_versions.any? {|m| requested.include? m.version}
               raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
             end
@@ -123,7 +122,7 @@ module Puppet::ModuleTool
               # module, locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', installed_module, installed_range) do |node|
-                Puppet::Module.parse_range(installed_range, @strict_semver).include? node.version
+                Puppet::Module.parse_range(installed_range).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
@@ -131,7 +130,7 @@ module Puppet::ModuleTool
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{installed_module} constraint", dep_name, range) do |node|
-                  Puppet::Module.parse_range(range, @strict_semver).include? node.version
+                  Puppet::Module.parse_range(range).include? node.version
                 end
               end
             end
@@ -219,7 +218,7 @@ module Puppet::ModuleTool
 
       private
       def module_repository
-        @repo ||= Puppet::Forge.new(Puppet[:module_repository], @strict_semver)
+        @repo ||= Puppet::Forge.new(Puppet[:module_repository])
       end
 
       def installed_modules_source
@@ -231,7 +230,7 @@ module Puppet::ModuleTool
       end
 
       def build_single_module_graph(name, version)
-        range = Puppet::Module.parse_range(version, @strict_semver)
+        range = Puppet::Module.parse_range(version)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }

data/vendored/puppet/lib/puppet/module_tool/dependency.rb

@@ -16,7 +16,7 @@ module Puppet::ModuleTool
       # TODO: add error checking, the next line raises ArgumentError when +full_module_name+ is invalid
       @username, @name = Puppet::ModuleTool.username_and_modname_from(full_module_name)
       @version_requirement = version_requirement
-      @repository = repository ? Puppet::Forge::Repository.new(repository) : nil
+      @repository = repository ? Puppet::Forge::Repository.new(repository, nil) : nil
     end
 
     # We override Object's ==, eql, and hash so we can more easily find identical

data/vendored/puppet/lib/puppet/module_tool/installed_modules.rb

@@ -54,7 +54,7 @@ module Puppet::ModuleTool
     class ModuleRelease < SemanticPuppet::Dependency::ModuleRelease
       attr_reader :mod, :metadata
 
-      def initialize(source, mod, strict_semver = true)
+      def initialize(source, mod)
         @mod = mod
         @metadata = mod.metadata
         name = mod.forge_name.tr('/', '-')
@@ -70,7 +70,7 @@ module Puppet::ModuleTool
 
         if mod.dependencies
           mod.dependencies.each do |dependency|
-            results = Puppet::ModuleTool.parse_module_dependency(release, dependency, strict_semver)
+            results = Puppet::ModuleTool.parse_module_dependency(release, dependency)
             dep_name, parsed_range, range = results
 
             add_constraint('initialize', dep_name, range.to_s) do |node|

data/vendored/puppet/lib/puppet/module_tool/local_tarball.rb

@@ -8,11 +8,11 @@ module Puppet::ModuleTool
   class LocalTarball < SemanticPuppet::Dependency::Source
     attr_accessor :release
 
-    def initialize(filename, strict_semver = true)
+    def initialize(filename)
       unpack(filename, tmpdir)
       Puppet.debug "Unpacked local tarball to #{tmpdir}"
 
-      mod = Puppet::Module.new('tarball', tmpdir, nil, strict_semver)
+      mod = Puppet::Module.new('tarball', tmpdir, nil)
       @release = ModuleRelease.new(self, mod)
     end
 
@@ -52,7 +52,7 @@ module Puppet::ModuleTool
 
         if mod.dependencies
           dependencies = mod.dependencies.map do |dep|
-            Puppet::ModuleTool.parse_module_dependency(release, dep, mod.strict_semver?)[0..1]
+            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
           end
           dependencies = Hash[dependencies]
         end

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

@@ -1,8 +1,7 @@
-require 'puppet/util/methodhelper'
 require 'puppet/module_tool'
 require 'puppet/network/format_support'
 require 'uri'
-require 'json'
+require 'puppet/util/json'
 require 'set'
 
 module Puppet::ModuleTool
@@ -102,8 +101,8 @@ module Puppet::ModuleTool
       data = @data.dup.merge('dependencies' => dependencies)
 
       contents = data.keys.map do |k|
-        value = (JSON.pretty_generate(data[k]) rescue data[k].to_json)
-        "#{k.to_json}: #{value}"
+        value = (Puppet::Util::Json.dump(data[k], :pretty => true) rescue data[k].to_json)
+        %Q("#{k.to_s}": #{value})
       end
 
       "{\n" + contents.join(",\n").gsub(/^/, '  ') + "\n}\n"

data/vendored/puppet/lib/puppet/module_tool/shared_behaviors.rb

@@ -76,10 +76,10 @@ module Puppet::ModuleTool::Shared
       }
 
       if forced?
-        range = Puppet::Module.parse_range(@version, @strict_semver) rescue Puppet::Module.parse_range('>= 0.0.0', @strict_semver)
+        range = Puppet::Module.parse_range(@version) rescue Puppet::Module.parse_range('>= 0.0.0')
       else
         range = (@conditions[mod]).map do |r|
-          Puppet::Module.parse_range(r[:dependency], @strict_semver) rescue Puppet::Module.parse_range('>= 0.0.0', @strict_semver)
+          Puppet::Module.parse_range(r[:dependency]) rescue Puppet::Module.parse_range('>= 0.0.0')
         end.inject(&:&)
       end
 

data/vendored/puppet/lib/puppet/network/authconfig.rb

@@ -10,10 +10,6 @@ module Puppet
       Puppet::Network::HTTP::MASTER_URL_PREFIX
     end
 
-    def self.ca_url_prefix
-      Puppet::Network::HTTP::CA_URL_PREFIX
-    end
-
     def self.default_acl
       [
       # Master API V3
@@ -28,15 +24,6 @@ module Puppet
       { :acl => "#{master_url_prefix}/v3/file" },
 
       { :acl => "#{master_url_prefix}/v3/status", :method => [:find], :authenticated => true },
-
-      # CA API V1
-      { :acl => "#{ca_url_prefix}/v1/certificate_revocation_list/ca", :method => :find, :authenticated => true },
-
-      # These allow `auth any`, because if you can do them anonymously you
-      # should probably also be able to do them when trusted.
-      { :acl => "#{ca_url_prefix}/v1/certificate/ca", :method => :find, :authenticated => :any },
-      { :acl => "#{ca_url_prefix}/v1/certificate/", :method => :find, :authenticated => :any },
-      { :acl => "#{ca_url_prefix}/v1/certificate_request", :method => [:find, :save], :authenticated => :any },
       ]
     end