puppet 3.8.7-x86-mingw32 → 4.0.0.rc1-x86-mingw32

data/spec/unit/version_spec.rb

@@ -17,11 +17,11 @@ describe "Puppet.version Public API" do
     end
 
     it "is Puppet::PUPPETVERSION" do
-      Puppet.version.should == Puppet::PUPPETVERSION
+      expect(Puppet.version).to eq(Puppet::PUPPETVERSION)
     end
     it "respects the version= setter" do
       Puppet.version = '1.2.3'
-      Puppet.version.should == '1.2.3'
+      expect(Puppet.version).to eq('1.2.3')
     end
   end
 
@@ -32,11 +32,11 @@ describe "Puppet.version Public API" do
         pathname.basename.to_s == "VERSION"
       end.returns('3.0.1-260-g9ca4e54')
 
-      Puppet.version.should == '3.0.1-260-g9ca4e54'
+      expect(Puppet.version).to eq('3.0.1-260-g9ca4e54')
     end
     it "respects the version= setter" do
       Puppet.version = '1.2.3'
-      Puppet.version.should == '1.2.3'
+      expect(Puppet.version).to eq('1.2.3')
     end
   end
 end

data/spec/watchr.rb

@@ -14,11 +14,7 @@ def run_comp(cmd)
         putc c
         line << c
         if c == ?\n
-          results << if RUBY_VERSION >= "1.9" then
-                       line.join
-                     else
-                       line.pack "c*"
-                     end
+          results << line.join
           line.clear
         end
       end

data/tasks/benchmark.rake

@@ -36,14 +36,9 @@ namespace :benchmark do
 
       desc "Run the #{name} scenario."
       task :run, [*run_args] =>  :generate do |_, args|
-        format = if RUBY_VERSION =~ /^1\.8/
-                   Benchmark::FMTSTR
-                 else
-                   Benchmark::FORMAT
-                 end
         report = []
         details = []
-        Benchmark.benchmark(Benchmark::CAPTION, 10, format, "> total:", "> avg:") do |b|
+        Benchmark.benchmark(Benchmark::CAPTION, 10, Benchmark::FORMAT, "> total:", "> avg:") do |b|
           times = []
           ENV['ITERATIONS'].to_i.times do |i|
             start_time = Time.now.to_i

data/tasks/ci.rake

@@ -4,7 +4,7 @@ require 'time'
 namespace "ci" do
   task :spec do
     ENV["LOG_SPEC_ORDER"] = "true"
-    sh %{rspec -r yarjuf -f JUnit -o result.xml -fp spec}
+    sh %{rspec --require rspec/legacy_formatters -r yarjuf -f JUnit -o result.xml -fp spec}
   end
 
   desc "Tar up the acceptance/ directory so that package test runs have tests to run against."

data/tasks/manpages.rake

@@ -15,15 +15,6 @@ task :gen_manpages do
   helpface = Puppet::Face[:help, '0.0.1']
   manface  = Puppet::Face[:man, '0.0.1']
 
-  # TODO: This line is terrible.  The reason we need this here is because we
-  #  handle state initialization differently when we run via command line
-  #  (application.rb) than we do when we try to use Faces as library code.
-  #  This is bad, we need to come up with an official stance on what our
-  #  API is and what the entry points, so that we can make sure that
-  #  state initialization is consistent.  See:
-  # http://projects.puppetlabs.com/issues/14441
-  Puppet::Util::Instrumentation.init()
-
   sbins = Dir.glob(%w{sbin/*})
   bins  = Dir.glob(%w{bin/*})
   non_face_applications = helpface.legacy_applications

data/tasks/parallel.rake

@@ -158,8 +158,6 @@ else
       # Responsible for parallelizing spec testing.
       #
       class Parallelizer
-        include ::RSpec::Core::Formatters::Helpers
-
         # Number of processes to use
         attr_reader :process_count
         # Approximate size of each group of tests
@@ -341,7 +339,7 @@ else
           end
 
           # Print out the run time
-          puts "\nFinished in #{format_duration(Time.now - @start_time)}"
+          puts "\nFinished in #{::RSpec::Core::Formatters::Helpers.format_duration(Time.now - @start_time)}"
 
           # Count all of the examples
           examples = 0
@@ -373,8 +371,8 @@ else
         end
 
         def summary_count_line(examples, failures, pending)
-          summary = pluralize(examples, "example")
-          summary << ", " << pluralize(failures, "failure")
+          summary = ::RSpec::Core::Formatters::Helpers.pluralize(examples, "example")
+          summary << ", " << ::RSpec::Core::Formatters::Helpers.pluralize(failures, "failure")
           summary << ", #{pending} pending" if pending > 0
           summary
         end
@@ -389,7 +387,6 @@ else
       config.error_stream = $stderr
       config.output_stream = $stdout
       options = ::RSpec::Core::ConfigurationOptions.new []
-      options.parse_options
       options.configure config
       config.color
     end
@@ -399,7 +396,7 @@ else
       # Default group size in rspec examples
       DEFAULT_GROUP_SIZE = 1000
 
-      process_count = [(args[:process_count] || Facter["processorcount"].value).to_i, 1].max
+      process_count = [(args[:process_count] || Facter.value("processorcount")).to_i, 1].max
       group_size = [(args[:group_size] || DEFAULT_GROUP_SIZE).to_i, 1].max
 
       abort unless Parallel::RSpec::Parallelizer.new(process_count, group_size, color_output?).run

data/tasks/parser.rake

@@ -1,8 +1,3 @@
-desc "Generate the 3.x 'current' parser"
-task :gen_parser do
-  %x{racc -olib/puppet/parser/parser.rb lib/puppet/parser/grammar.ra}
-end
-
 desc "Generate the 4.x 'future' parser"
 task :gen_eparser do
   %x{racc -olib/puppet/pops/parser/eparser.rb lib/puppet/pops/parser/egrammar.ra}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.8.7
-  prerelease: 
+  version: 4.0.0.rc1
+  prerelease: 6
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -18,10 +18,10 @@ dependencies:
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
     - - <
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,26 +29,32 @@ dependencies:
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
     - - <
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +78,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,7 +86,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.9.6
 - !ruby/object:Gem::Dependency
   name: win32-dir
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +110,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +118,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: win32-process
   requirement: !ruby/object:Gem::Requirement
@@ -161,22 +167,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.6
-- !ruby/object:Gem::Dependency
-  name: win32console
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -211,40 +201,21 @@ files:
 - bin/extlookup2hiera
 - lib/semver.rb
 - lib/hiera/scope.rb
-- lib/hiera/backend/puppet_backend.rb
 - lib/hiera/puppet_function.rb
 - lib/puppet/scheduler/splay_job.rb
 - lib/puppet/scheduler/job.rb
 - lib/puppet/scheduler/scheduler.rb
 - lib/puppet/scheduler/timer.rb
-- lib/puppet/rails/host.rb
-- lib/puppet/rails/fact_value.rb
-- lib/puppet/rails/param_name.rb
-- lib/puppet/rails/benchmark.rb
-- lib/puppet/rails/resource.rb
-- lib/puppet/rails/inventory_fact.rb
-- lib/puppet/rails/database/004_add_inventory_service_tables.rb
-- lib/puppet/rails/database/schema.rb
-- lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
-- lib/puppet/rails/database/003_add_environment_to_host.rb
-- lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb
-- lib/puppet/rails/resource_tag.rb
-- lib/puppet/rails/inventory_node.rb
-- lib/puppet/rails/source_file.rb
-- lib/puppet/rails/puppet_tag.rb
-- lib/puppet/rails/param_value.rb
-- lib/puppet/rails/fact_name.rb
 - lib/puppet/file_bucket/dipper.rb
 - lib/puppet/file_bucket/file.rb
 - lib/puppet/node/facts.rb
 - lib/puppet/node/environment.rb
 - lib/puppet/version.rb
-- lib/puppet/file_collection.rb
-- lib/puppet/rails.rb
 - lib/puppet/property.rb
 - lib/puppet/interface.rb
 - lib/puppet/file_system.rb
 - lib/puppet/configurer.rb
+- lib/puppet/plugins.rb
 - lib/puppet/network/auth_config_parser.rb
 - lib/puppet/network/format_support.rb
 - lib/puppet/network/server.rb
@@ -266,10 +237,14 @@ files:
 - lib/puppet/network/http/rack/rest.rb
 - lib/puppet/network/http/request.rb
 - lib/puppet/network/http/response.rb
-- lib/puppet/network/http/api/v2/environments.rb
-- lib/puppet/network/http/api/v2/authorization.rb
-- lib/puppet/network/http/api/v1.rb
-- lib/puppet/network/http/api/v2.rb
+- lib/puppet/network/http/api/master/v3/environments.rb
+- lib/puppet/network/http/api/master/v3/authorization.rb
+- lib/puppet/network/http/api/master/v3.rb
+- lib/puppet/network/http/api/indirection_type.rb
+- lib/puppet/network/http/api/indirected_routes.rb
+- lib/puppet/network/http/api/ca.rb
+- lib/puppet/network/http/api/master.rb
+- lib/puppet/network/http/api/ca/v1.rb
 - lib/puppet/network/http/rack.rb
 - lib/puppet/network/http/session.rb
 - lib/puppet/network/http/site.rb
@@ -277,7 +252,6 @@ files:
 - lib/puppet/network/authconfig.rb
 - lib/puppet/network/http_pool.rb
 - lib/puppet/network/client_request.rb
-- lib/puppet/network/authentication.rb
 - lib/puppet/network/rights.rb
 - lib/puppet/network/rest_controller.rb
 - lib/puppet/network/authstore.rb
@@ -285,7 +259,6 @@ files:
 - lib/puppet/network/http.rb
 - lib/puppet/network/format.rb
 - lib/puppet/error.rb
-- lib/puppet/file_collection/lookup.rb
 - lib/puppet/parameter/path.rb
 - lib/puppet/parameter/value.rb
 - lib/puppet/parameter/package_options.rb
@@ -301,7 +274,6 @@ files:
 - lib/puppet/indirector/node/rest.rb
 - lib/puppet/indirector/node/yaml.rb
 - lib/puppet/indirector/node/plain.rb
-- lib/puppet/indirector/node/active_record.rb
 - lib/puppet/indirector/node/exec.rb
 - lib/puppet/indirector/node/ldap.rb
 - lib/puppet/indirector/node/memory.rb
@@ -311,38 +283,26 @@ files:
 - lib/puppet/indirector/certificate_revocation_list/ca.rb
 - lib/puppet/indirector/certificate_revocation_list/disabled_ca.rb
 - lib/puppet/indirector/none.rb
-- lib/puppet/indirector/instrumentation_probe/rest.rb
-- lib/puppet/indirector/instrumentation_probe/local.rb
 - lib/puppet/indirector/resource_type.rb
 - lib/puppet/indirector/key/file.rb
 - lib/puppet/indirector/key/ca.rb
 - lib/puppet/indirector/key/memory.rb
 - lib/puppet/indirector/key/disabled_ca.rb
 - lib/puppet/indirector/facts/facter.rb
-- lib/puppet/indirector/facts/inventory_service.rb
-- lib/puppet/indirector/facts/inventory_active_record.rb
-- lib/puppet/indirector/facts/rest.rb
 - lib/puppet/indirector/facts/yaml.rb
 - lib/puppet/indirector/facts/network_device.rb
-- lib/puppet/indirector/facts/active_record.rb
-- lib/puppet/indirector/facts/couch.rb
 - lib/puppet/indirector/facts/memory.rb
 - lib/puppet/indirector/facts/store_configs.rb
 - lib/puppet/indirector/msgpack.rb
 - lib/puppet/indirector/rest.rb
-- lib/puppet/indirector/run/rest.rb
-- lib/puppet/indirector/run/local.rb
 - lib/puppet/indirector/certificate/rest.rb
 - lib/puppet/indirector/certificate/file.rb
 - lib/puppet/indirector/certificate/ca.rb
 - lib/puppet/indirector/certificate/disabled_ca.rb
 - lib/puppet/indirector/yaml.rb
 - lib/puppet/indirector/errors.rb
-- lib/puppet/indirector/instrumentation_listener.rb
 - lib/puppet/indirector/indirection.rb
 - lib/puppet/indirector/face.rb
-- lib/puppet/indirector/instrumentation_listener/rest.rb
-- lib/puppet/indirector/instrumentation_listener/local.rb
 - lib/puppet/indirector/certificate_status/rest.rb
 - lib/puppet/indirector/certificate_status/file.rb
 - lib/puppet/indirector/certificate_request/rest.rb
@@ -360,13 +320,9 @@ files:
 - lib/puppet/indirector/report/rest.rb
 - lib/puppet/indirector/report/yaml.rb
 - lib/puppet/indirector/report/processor.rb
-- lib/puppet/indirector/active_record.rb
 - lib/puppet/indirector/direct_file_server.rb
-- lib/puppet/indirector/instrumentation_data.rb
 - lib/puppet/indirector/hiera.rb
-- lib/puppet/indirector/couch.rb
 - lib/puppet/indirector/file_server.rb
-- lib/puppet/indirector/instrumentation_probe.rb
 - lib/puppet/indirector/status/rest.rb
 - lib/puppet/indirector/status/local.rb
 - lib/puppet/indirector/code.rb
@@ -376,8 +332,6 @@ files:
 - lib/puppet/indirector/catalog/rest.rb
 - lib/puppet/indirector/catalog/yaml.rb
 - lib/puppet/indirector/catalog/static_compiler.rb
-- lib/puppet/indirector/catalog/active_record.rb
-- lib/puppet/indirector/catalog/queue.rb
 - lib/puppet/indirector/catalog/compiler.rb
 - lib/puppet/indirector/catalog/store_configs.rb
 - lib/puppet/indirector/file_bucket_file/rest.rb
@@ -387,10 +341,7 @@ files:
 - lib/puppet/indirector/file_content.rb
 - lib/puppet/indirector/resource_type/rest.rb
 - lib/puppet/indirector/resource_type/parser.rb
-- lib/puppet/indirector/queue.rb
 - lib/puppet/indirector/ssl_file.rb
-- lib/puppet/indirector/instrumentation_data/rest.rb
-- lib/puppet/indirector/instrumentation_data/local.rb
 - lib/puppet/indirector/envelope.rb
 - lib/puppet/indirector/ldap.rb
 - lib/puppet/indirector/memory.rb
@@ -398,17 +349,12 @@ files:
 - lib/puppet/indirector/request.rb
 - lib/puppet/indirector/data_binding/none.rb
 - lib/puppet/indirector/data_binding/hiera.rb
-- lib/puppet/indirector/resource/rest.rb
 - lib/puppet/indirector/resource/ral.rb
 - lib/puppet/indirector/resource/validator.rb
-- lib/puppet/indirector/resource/active_record.rb
 - lib/puppet/indirector/resource/store_configs.rb
 - lib/puppet/indirector/store_configs.rb
 - lib/puppet/indirector/status.rb
 - lib/puppet/util/rubygems.rb
-- lib/puppet/util/rails/reference_serializer.rb
-- lib/puppet/util/rails/cache_accumulator.rb
-- lib/puppet/util/rails/collection_merger.rb
 - lib/puppet/util/autoload.rb
 - lib/puppet/util/pidlock.rb
 - lib/puppet/util/filetype.rb
@@ -417,8 +363,6 @@ files:
 - lib/puppet/util/ldap/connection.rb
 - lib/puppet/util/ldap/generator.rb
 - lib/puppet/util/ldap/manager.rb
-- lib/puppet/util/plugins.rb
-- lib/puppet/util/retryaction.rb
 - lib/puppet/util/command_line/trollop.rb
 - lib/puppet/util/command_line/puppet_option_parser.rb
 - lib/puppet/util/log.rb
@@ -433,30 +377,26 @@ files:
 - lib/puppet/util/watched_file.rb
 - lib/puppet/util/windows.rb
 - lib/puppet/util/metaid.rb
-- lib/puppet/util/monkey_patches/lines.rb
 - lib/puppet/util/ssl.rb
 - lib/puppet/util/diff.rb
 - lib/puppet/util/platform.rb
 - lib/puppet/util/posix.rb
 - lib/puppet/util/network_device.rb
-- lib/puppet/util/queue/stomp.rb
 - lib/puppet/util/profiler.rb
 - lib/puppet/util/storage.rb
-- lib/puppet/util/inline_docs.rb
 - lib/puppet/util/rdoc.rb
 - lib/puppet/util/http_proxy.rb
 - lib/puppet/util/methodhelper.rb
 - lib/puppet/util/selinux.rb
 - lib/puppet/util/execution_stub.rb
+- lib/puppet/util/psych_support.rb
 - lib/puppet/util/log/destinations.rb
 - lib/puppet/util/log/destination.rb
-- lib/puppet/util/log/rate_limited_logger.rb
 - lib/puppet/util/execution.rb
 - lib/puppet/util/classgen.rb
 - lib/puppet/util/package.rb
 - lib/puppet/util/json_lockfile.rb
 - lib/puppet/util/command_line.rb
-- lib/puppet/util/instrumentation.rb
 - lib/puppet/util/network_device/transport.rb
 - lib/puppet/util/network_device/cisco.rb
 - lib/puppet/util/network_device/transport/telnet.rb
@@ -474,11 +414,9 @@ files:
 - lib/puppet/util/rdoc/parser.rb
 - lib/puppet/util/rdoc/parser/puppet_parser_core.rb
 - lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb
-- lib/puppet/util/rdoc/parser/puppet_parser_rdoc1.rb
 - lib/puppet/util/rdoc/code_objects.rb
 - lib/puppet/util/rdoc/generators/puppet_generator.rb
 - lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
-- lib/puppet/util/cacher.rb
 - lib/puppet/util/tagging.rb
 - lib/puppet/util/profiler/aggregate.rb
 - lib/puppet/util/profiler/logging.rb
@@ -487,23 +425,16 @@ files:
 - lib/puppet/util/profiler/object_counts.rb
 - lib/puppet/util/file_watcher.rb
 - lib/puppet/util/watcher.rb
-- lib/puppet/util/queue.rb
 - lib/puppet/util/colors.rb
 - lib/puppet/util/checksums.rb
 - lib/puppet/util/libuser.rb
+- lib/puppet/util/retry_action.rb
 - lib/puppet/util/instance_loader.rb
 - lib/puppet/util/ldap.rb
-- lib/puppet/util/zaml.rb
 - lib/puppet/util/user_attr.rb
 - lib/puppet/util/provider_features.rb
 - lib/puppet/util/warnings.rb
 - lib/puppet/util/docs.rb
-- lib/puppet/util/instrumentation/listeners/log.rb
-- lib/puppet/util/instrumentation/listeners/performance.rb
-- lib/puppet/util/instrumentation/listener.rb
-- lib/puppet/util/instrumentation/data.rb
-- lib/puppet/util/instrumentation/instrumentable.rb
-- lib/puppet/util/instrumentation/indirection_probe.rb
 - lib/puppet/util/nagios_maker.rb
 - lib/puppet/util/inifile.rb
 - lib/puppet/util/constant_inflector.rb
@@ -530,19 +461,18 @@ files:
 - lib/puppet/util/windows/security_descriptor.rb
 - lib/puppet/util/symbolic_file_mode.rb
 - lib/puppet/util/reference.rb
-- lib/puppet/util/pson.rb
 - lib/puppet/util/limits.rb
 - lib/puppet/environments.rb
 - lib/puppet/functions.rb
+- lib/puppet/syntax_checkers/json.rb
 - lib/puppet/settings.rb
 - lib/puppet/confiner.rb
 - lib/puppet/application/indirection_base.rb
+- lib/puppet/application/epp.rb
 - lib/puppet/application/catalog.rb
 - lib/puppet/application/face_base.rb
 - lib/puppet/application/resource_type.rb
 - lib/puppet/application/plugin.rb
-- lib/puppet/application/instrumentation_listener.rb
-- lib/puppet/application/kick.rb
 - lib/puppet/application/describe.rb
 - lib/puppet/application/parser.rb
 - lib/puppet/application/report.rb
@@ -550,20 +480,16 @@ files:
 - lib/puppet/application/cert.rb
 - lib/puppet/application/resource.rb
 - lib/puppet/application/config.rb
-- lib/puppet/application/secret_agent.rb
 - lib/puppet/application/certificate.rb
 - lib/puppet/application/certificate_request.rb
 - lib/puppet/application/man.rb
-- lib/puppet/application/instrumentation_data.rb
 - lib/puppet/application/inspect.rb
 - lib/puppet/application/facts.rb
-- lib/puppet/application/instrumentation_probe.rb
 - lib/puppet/application/node.rb
 - lib/puppet/application/device.rb
 - lib/puppet/application/ca.rb
 - lib/puppet/application/help.rb
 - lib/puppet/application/master.rb
-- lib/puppet/application/queue.rb
 - lib/puppet/application/apply.rb
 - lib/puppet/application/agent.rb
 - lib/puppet/application/certificate_revocation_list.rb
@@ -651,33 +577,27 @@ files:
 - lib/puppet/reference/metaparameter.rb
 - lib/puppet/loaders.rb
 - lib/puppet/parameter.rb
-- lib/puppet/feature/rubygems.rb
 - lib/puppet/feature/zlib.rb
-- lib/puppet/feature/rails.rb
 - lib/puppet/feature/msgpack.rb
 - lib/puppet/feature/cfacter.rb
 - lib/puppet/feature/selinux.rb
-- lib/puppet/feature/stomp.rb
 - lib/puppet/feature/eventlog.rb
 - lib/puppet/feature/libuser.rb
-- lib/puppet/feature/rdoc1.rb
 - lib/puppet/feature/external_facts.rb
 - lib/puppet/feature/pe_license.rb
 - lib/puppet/feature/ssh.rb
 - lib/puppet/feature/rack.rb
 - lib/puppet/feature/base.rb
-- lib/puppet/feature/pson.rb
-- lib/puppet/dsl/resource_type_api.rb
-- lib/puppet/dsl/resource_api.rb
 - lib/puppet/configurer/downloader_factory.rb
 - lib/puppet/configurer/fact_handler.rb
 - lib/puppet/configurer/plugin_handler.rb
 - lib/puppet/configurer/downloader.rb
+- lib/puppet/data_providers.rb
 - lib/puppet/relationship.rb
+- lib/puppet/application_support.rb
 - lib/puppet/vendor/load_pathspec.rb
-- lib/puppet/vendor/load_safe_yaml.rb
 - lib/puppet/vendor/load_rgen.rb
-- lib/puppet/vendor/safe_yaml_patches.rb
+- lib/puppet/vendor/load_deep_merge.rb
 - lib/puppet/vendor/rgen/lib/metamodels/uml13_metamodel_ext.rb
 - lib/puppet/vendor/rgen/lib/metamodels/uml13_metamodel.rb
 - lib/puppet/vendor/rgen/lib/rgen/util/pattern_matcher.rb
@@ -836,6 +756,18 @@ files:
 - lib/puppet/vendor/rgen/design_rationale.txt
 - lib/puppet/vendor/rgen/CHANGELOG
 - lib/puppet/vendor/require_vendored.rb
+- lib/puppet/vendor/deep_merge/lib/deep_merge.rb
+- lib/puppet/vendor/deep_merge/lib/deep_merge/deep_merge_hash.rb
+- lib/puppet/vendor/deep_merge/lib/deep_merge/core.rb
+- lib/puppet/vendor/deep_merge/lib/deep_merge/rails_compat.rb
+- lib/puppet/vendor/deep_merge/Rakefile
+- lib/puppet/vendor/deep_merge/LICENSE
+- lib/puppet/vendor/deep_merge/Gemfile
+- lib/puppet/vendor/deep_merge/test/test_deep_merge.rb
+- lib/puppet/vendor/deep_merge/deep_merge.gemspec
+- lib/puppet/vendor/deep_merge/README.md
+- lib/puppet/vendor/deep_merge/CHANGELOG
+- lib/puppet/vendor/rgen_patch.rb
 - lib/puppet/vendor/semantic/lib/semantic.rb
 - lib/puppet/vendor/semantic/lib/semantic/version.rb
 - lib/puppet/vendor/semantic/lib/semantic/version_range.rb
@@ -858,48 +790,6 @@ files:
 - lib/puppet/vendor/semantic/Gemfile
 - lib/puppet/vendor/semantic/PUPPET_README.md
 - lib/puppet/vendor/load_semantic.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_resolver.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_hack.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/version.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/resolver.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_node_monkeypatch.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_handler.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_boolean.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_integer.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_date.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_symbol.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_float.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_nil.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/transformation_map.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/sexagesimal.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/hexadecimal.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/date.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_resolver.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/safe_to_ruby_visitor.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/deep.rb
-- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform.rb
-- lib/puppet/vendor/safe_yaml/run_specs_all_ruby_versions.sh
-- lib/puppet/vendor/safe_yaml/safe_yaml.gemspec
-- lib/puppet/vendor/safe_yaml/Rakefile
-- lib/puppet/vendor/safe_yaml/spec/resolver_specs.rb
-- lib/puppet/vendor/safe_yaml/spec/support/exploitable_back_door.rb
-- lib/puppet/vendor/safe_yaml/spec/exploit.1.9.2.yaml
-- lib/puppet/vendor/safe_yaml/spec/safe_yaml_spec.rb
-- lib/puppet/vendor/safe_yaml/spec/transform/to_integer_spec.rb
-- lib/puppet/vendor/safe_yaml/spec/transform/to_date_spec.rb
-- lib/puppet/vendor/safe_yaml/spec/transform/to_symbol_spec.rb
-- lib/puppet/vendor/safe_yaml/spec/transform/base64_spec.rb
-- lib/puppet/vendor/safe_yaml/spec/transform/to_float_spec.rb
-- lib/puppet/vendor/safe_yaml/spec/spec_helper.rb
-- lib/puppet/vendor/safe_yaml/spec/psych_resolver_spec.rb
-- lib/puppet/vendor/safe_yaml/spec/exploit.1.9.3.yaml
-- lib/puppet/vendor/safe_yaml/spec/syck_resolver_spec.rb
-- lib/puppet/vendor/safe_yaml/Gemfile
-- lib/puppet/vendor/safe_yaml/CHANGES.md
-- lib/puppet/vendor/safe_yaml/LICENSE.txt
-- lib/puppet/vendor/safe_yaml/PUPPET_README.md
-- lib/puppet/vendor/safe_yaml/README.md
 - lib/puppet/vendor/pathspec/lib/pathspec.rb
 - lib/puppet/vendor/pathspec/lib/pathspec/spec.rb
 - lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb
@@ -939,63 +829,30 @@ files:
 - lib/puppet/confine/exists.rb
 - lib/puppet/confine/any.rb
 - lib/puppet/confine/true.rb
+- lib/puppet/syntax_checkers.rb
 - lib/puppet/data_binding.rb
 - lib/puppet/parser/scope.rb
-- lib/puppet/parser/grammar.ra
 - lib/puppet/parser/functions.rb
 - lib/puppet/parser/ast.rb
-- lib/puppet/parser/parser.rb
 - lib/puppet/parser/templatewrapper.rb
 - lib/puppet/parser/yaml_trimmer.rb
 - lib/puppet/parser/relationship.rb
 - lib/puppet/parser/resource.rb
 - lib/puppet/parser/e4_parser_adapter.rb
-- lib/puppet/parser/makefile
-- lib/puppet/parser/lexer.rb
 - lib/puppet/parser/parser_factory.rb
 - lib/puppet/parser/type_loader.rb
 - lib/puppet/parser/compiler.rb
-- lib/puppet/parser/parser_support.rb
 - lib/puppet/parser/ast/block_expression.rb
-- lib/puppet/parser/ast/astarray.rb
-- lib/puppet/parser/ast/collexpr.rb
-- lib/puppet/parser/ast/resource_defaults.rb
-- lib/puppet/parser/ast/lambda.rb
 - lib/puppet/parser/ast/hostclass.rb
-- lib/puppet/parser/ast/comparison_operator.rb
-- lib/puppet/parser/ast/in_operator.rb
-- lib/puppet/parser/ast/else.rb
 - lib/puppet/parser/ast/branch.rb
-- lib/puppet/parser/ast/casestatement.rb
-- lib/puppet/parser/ast/nop.rb
-- lib/puppet/parser/ast/function.rb
 - lib/puppet/parser/ast/leaf.rb
-- lib/puppet/parser/ast/asthash.rb
-- lib/puppet/parser/ast/relationship.rb
-- lib/puppet/parser/ast/caseopt.rb
 - lib/puppet/parser/ast/resource.rb
 - lib/puppet/parser/ast/top_level_construct.rb
-- lib/puppet/parser/ast/method_call.rb
-- lib/puppet/parser/ast/resource_reference.rb
-- lib/puppet/parser/ast/definition.rb
 - lib/puppet/parser/ast/resourceparam.rb
 - lib/puppet/parser/ast/resource_instance.rb
 - lib/puppet/parser/ast/node.rb
-- lib/puppet/parser/ast/collection.rb
-- lib/puppet/parser/ast/match_operator.rb
-- lib/puppet/parser/ast/minus.rb
-- lib/puppet/parser/ast/vardef.rb
-- lib/puppet/parser/ast/arithmetic_operator.rb
 - lib/puppet/parser/ast/pops_bridge.rb
-- lib/puppet/parser/ast/not.rb
-- lib/puppet/parser/ast/resource_override.rb
-- lib/puppet/parser/ast/selector.rb
-- lib/puppet/parser/ast/boolean_operator.rb
-- lib/puppet/parser/ast/ifstatement.rb
-- lib/puppet/parser/code_merger.rb
 - lib/puppet/parser/files.rb
-- lib/puppet/parser/methods.rb
-- lib/puppet/parser/collector.rb
 - lib/puppet/parser/resource/param.rb
 - lib/puppet/parser/functions/regsubst.rb
 - lib/puppet/parser/functions/include.rb
@@ -1024,7 +881,6 @@ files:
 - lib/puppet/parser/functions/hiera.rb
 - lib/puppet/parser/functions/fqdn_rand.rb
 - lib/puppet/parser/functions/versioncmp.rb
-- lib/puppet/parser/functions/search.rb
 - lib/puppet/parser/functions/tag.rb
 - lib/puppet/parser/functions/hiera_include.rb
 - lib/puppet/parser/functions/inline_template.rb
@@ -1033,11 +889,14 @@ files:
 - lib/puppet/parser/functions/template.rb
 - lib/puppet/parser/functions/assert_type.rb
 - lib/puppet/parser/functions/require.rb
-- lib/puppet/parser/functions/extlookup.rb
 - lib/puppet/parser/functions/with.rb
 - lib/puppet/parser/functions/inline_epp.rb
 - lib/puppet/parser/functions/create_resources.rb
 - lib/puppet/node.rb
+- lib/puppet/data_providers/data_function_support.rb
+- lib/puppet/data_providers/function_module_data_provider.rb
+- lib/puppet/data_providers/data_adapter.rb
+- lib/puppet/data_providers/function_env_data_provider.rb
 - lib/puppet/graph/sequential_prioritizer.rb
 - lib/puppet/graph/relationship_graph.rb
 - lib/puppet/graph/title_hash_prioritizer.rb
@@ -1066,9 +925,7 @@ files:
 - lib/puppet/settings/boolean_setting.rb
 - lib/puppet/settings/string_setting.rb
 - lib/puppet/context.rb
-- lib/puppet/reports/tagmail.rb
 - lib/puppet/reports/log.rb
-- lib/puppet/reports/rrdgraph.rb
 - lib/puppet/reports/store.rb
 - lib/puppet/reports/http.rb
 - lib/puppet/interface/action.rb
@@ -1081,20 +938,21 @@ files:
 - lib/puppet/interface/option_manager.rb
 - lib/puppet/file_bucket.rb
 - lib/puppet/util.rb
-- lib/puppet/dsl.rb
 - lib/puppet/confine.rb
 - lib/puppet/pops/semantic_error.rb
 - lib/puppet/pops/visitor.rb
 - lib/puppet/pops/patterns.rb
 - lib/puppet/pops/types/type_factory.rb
+- lib/puppet/pops/types/type_assertion_error.rb
 - lib/puppet/pops/types/class_loader.rb
 - lib/puppet/pops/types/type_calculator.rb
 - lib/puppet/pops/types/types.rb
 - lib/puppet/pops/types/types_meta.rb
 - lib/puppet/pops/types/type_parser.rb
 - lib/puppet/pops/types/enumeration.rb
+- lib/puppet/pops/types/type_asserter.rb
 - lib/puppet/pops/validation.rb
-- lib/puppet/pops/migration/migration_checker.rb
+- lib/puppet/pops/merge_strategy.rb
 - lib/puppet/pops/loaders.rb
 - lib/puppet/pops/evaluator/puppet_proc.rb
 - lib/puppet/pops/evaluator/access_operator.rb
@@ -1144,6 +1002,7 @@ files:
 - lib/puppet/pops/issue_reporter.rb
 - lib/puppet/pops/utils.rb
 - lib/puppet/pops/containment.rb
+- lib/puppet/pops/lookup.rb
 - lib/puppet/pops/binder/scheme_handler/module_scheme.rb
 - lib/puppet/pops/binder/scheme_handler/symbolic_scheme.rb
 - lib/puppet/pops/binder/scheme_handler/confdir_scheme.rb
@@ -1163,7 +1022,6 @@ files:
 - lib/puppet/pops/binder/bindings_loader.rb
 - lib/puppet/pops/binder/binder_issues.rb
 - lib/puppet/pops/binder/bindings_validator_factory.rb
-- lib/puppet/pops/binder/lookup.rb
 - lib/puppet/pops/binder/bindings_model.rb
 - lib/puppet/pops/binder/bindings_model_meta.rb
 - lib/puppet/pops/binder/binder.rb
@@ -1176,7 +1034,6 @@ files:
 - lib/puppet/pops/model/model.rb
 - lib/puppet/pops/model/tree_dumper.rb
 - lib/puppet/pops/model/ast_transformer.rb
-- lib/puppet/pops/model/ast_tree_dumper.rb
 - lib/puppet/pops/model/model_meta.rb
 - lib/puppet/pops/adaptable.rb
 - lib/puppet/pops/functions/dispatch.rb
@@ -1186,6 +1043,10 @@ files:
 - lib/puppet/indirector.rb
 - lib/puppet/context/trusted_information.rb
 - lib/puppet/network.rb
+- lib/puppet/plugins/configuration.rb
+- lib/puppet/plugins/binding_schemes.rb
+- lib/puppet/plugins/data_providers.rb
+- lib/puppet/plugins/syntax_checkers.rb
 - lib/puppet/module_tool/errors/uninstaller.rb
 - lib/puppet/module_tool/errors/installer.rb
 - lib/puppet/module_tool/errors/upgrader.rb
@@ -1208,7 +1069,6 @@ files:
 - lib/puppet/module_tool/tar/mini.rb
 - lib/puppet/module_tool/tar/gnu.rb
 - lib/puppet/module_tool/applications.rb
-- lib/puppet/module_tool/modulefile.rb
 - lib/puppet/module_tool/applications/uninstaller.rb
 - lib/puppet/module_tool/applications/checksummer.rb
 - lib/puppet/module_tool/applications/installer.rb
@@ -1222,14 +1082,12 @@ files:
 - lib/puppet/module_tool/dependency.rb
 - lib/puppet/module_tool/metadata.rb
 - lib/puppet/file_system/path_pattern.rb
-- lib/puppet/file_system/file19windows.rb
 - lib/puppet/file_system/file_impl.rb
+- lib/puppet/file_system/windows.rb
 - lib/puppet/file_system/uniquefile.rb
+- lib/puppet/file_system/posix.rb
 - lib/puppet/file_system/memory_file.rb
 - lib/puppet/file_system/memory_impl.rb
-- lib/puppet/file_system/file19.rb
-- lib/puppet/file_system/file18.rb
-- lib/puppet/run.rb
 - lib/puppet/scheduler.rb
 - lib/puppet/agent.rb
 - lib/puppet/test/test_helper.rb
@@ -1255,29 +1113,26 @@ files:
 - lib/puppet/ssl/inventory.rb
 - lib/puppet/ssl/base.rb
 - lib/puppet/ssl/key.rb
+- lib/puppet/face/epp.rb
 - lib/puppet/face/node/clean.rb
 - lib/puppet/face/catalog.rb
 - lib/puppet/face/resource_type.rb
 - lib/puppet/face/plugin.rb
-- lib/puppet/face/instrumentation_listener.rb
 - lib/puppet/face/parser.rb
 - lib/puppet/face/report.rb
 - lib/puppet/face/file.rb
 - lib/puppet/face/resource.rb
 - lib/puppet/face/config.rb
-- lib/puppet/face/secret_agent.rb
 - lib/puppet/face/certificate.rb
 - lib/puppet/face/certificate_request.rb
 - lib/puppet/face/man.rb
 - lib/puppet/face/file/store.rb
 - lib/puppet/face/file/download.rb
-- lib/puppet/face/instrumentation_data.rb
 - lib/puppet/face/help/action.erb
 - lib/puppet/face/help/global.erb
 - lib/puppet/face/help/man.erb
 - lib/puppet/face/help/face.erb
 - lib/puppet/face/facts.rb
-- lib/puppet/face/instrumentation_probe.rb
 - lib/puppet/face/node.rb
 - lib/puppet/face/catalog/select.rb
 - lib/puppet/face/ca.rb
@@ -1302,9 +1157,9 @@ files:
 - lib/puppet/resource/type_collection.rb
 - lib/puppet/resource/type.rb
 - lib/puppet/resource/status.rb
+- lib/puppet/functions/regsubst.rb
 - lib/puppet/functions/epp.rb
 - lib/puppet/functions/map.rb
-- lib/puppet/functions/defined.rb
 - lib/puppet/functions/match.rb
 - lib/puppet/functions/hiera_hash.rb
 - lib/puppet/functions/filter.rb
@@ -1312,9 +1167,11 @@ files:
 - lib/puppet/functions/reduce.rb
 - lib/puppet/functions/scanf.rb
 - lib/puppet/functions/each.rb
+- lib/puppet/functions/split.rb
 - lib/puppet/functions/hiera.rb
 - lib/puppet/functions/hiera_include.rb
 - lib/puppet/functions/slice.rb
+- lib/puppet/functions/lookup.rb
 - lib/puppet/functions/import.rb
 - lib/puppet/functions/assert_type.rb
 - lib/puppet/functions/with.rb
@@ -1334,6 +1191,7 @@ files:
 - lib/puppet/provider/cron/crontab.rb
 - lib/puppet/provider/user/pw.rb
 - lib/puppet/provider/user/useradd.rb
+- lib/puppet/provider/user/openbsd.rb
 - lib/puppet/provider/user/hpux.rb
 - lib/puppet/provider/user/windows_adsi.rb
 - lib/puppet/provider/user/aix.rb
@@ -1429,8 +1287,6 @@ files:
 - lib/puppet/provider/package/dpkg.rb
 - lib/puppet/provider/package/up2date.rb
 - lib/puppet/provider/package/pacman.rb
-- lib/puppet/provider/package/yumhelper.py
-- lib/puppet/provider/package/msi.rb
 - lib/puppet/provider/package/nim.rb
 - lib/puppet/provider/package/ports.rb
 - lib/puppet/provider/package/macports.rb
@@ -1454,25 +1310,22 @@ files:
 - lib/puppet/confine_collection.rb
 - lib/puppet/metatype/manager.rb
 - lib/puppet/vendor.rb
-- lib/puppetx/puppet/bindings_scheme_handler.rb
-- lib/puppetx/puppet/syntax_checker.rb
-- lib/puppetx/puppetlabs/syntax_checkers/json.rb
 - lib/puppet.rb
-- lib/puppetx.rb
 - lib/hiera_puppet.rb
+- lib/puppet_x.rb
 - conf/auth.conf
-- conf/tagmail.conf
+- conf/puppet.conf
+- conf/environment.conf
 - conf/fileserver.conf
 - man/man5/puppet.conf.5
 - man/man8/puppet-certificate.8
 - man/man8/puppet-plugin.8
-- man/man8/puppet-queue.8
-- man/man8/puppet-instrumentation_listener.8
 - man/man8/puppet-catalog.8
 - man/man8/puppet-certificate_request.8
 - man/man8/puppet-config.8
 - man/man8/puppet-status.8
 - man/man8/puppet-resource.8
+- man/man8/puppet-epp.8
 - man/man8/puppet-help.8
 - man/man8/puppet-module.8
 - man/man8/extlookup2hiera.8
@@ -1480,10 +1333,8 @@ files:
 - man/man8/puppet-node.8
 - man/man8/puppet-parser.8
 - man/man8/puppet-agent.8
-- man/man8/puppet-instrumentation_data.8
 - man/man8/puppet-inspect.8
 - man/man8/puppet-file.8
-- man/man8/puppet-instrumentation_probe.8
 - man/man8/puppet-man.8
 - man/man8/puppet-facts.8
 - man/man8/puppet-describe.8
@@ -1494,8 +1345,6 @@ files:
 - man/man8/puppet-ca.8
 - man/man8/puppet-report.8
 - man/man8/puppet-filebucket.8
-- man/man8/puppet-kick.8
-- man/man8/puppet-secret_agent.8
 - man/man8/puppet-doc.8
 - man/man8/puppet-cert.8
 - man/man8/puppet-certificate_revocation_list.8
@@ -1526,7 +1375,6 @@ files:
 - ext/solaris/smf/puppetmasterd.xml
 - ext/solaris/pkginfo
 - ext/ldap/puppet.schema
-- ext/gentoo/puppet/puppet.conf
 - ext/gentoo/puppet/fileserver.conf
 - ext/gentoo/conf.d/puppet
 - ext/gentoo/conf.d/puppetmaster
@@ -1535,14 +1383,13 @@ files:
 - ext/ips/rules
 - ext/ips/puppetagent.xml
 - ext/ips/transforms
-- ext/ips/puppet.conf
 - ext/ips/puppetmaster.xml
 - ext/ips/puppet-agent
 - ext/ips/puppet.p5m.erb
 - ext/ips/puppet-master
 - ext/upload_facts.rb
-- ext/nagios/naggen
 - ext/nagios/check_puppet.rb
+- ext/puppet-nm-dispatcher
 - ext/freebsd/puppetmasterd
 - ext/freebsd/puppetd
 - ext/dbfix.sql
@@ -1564,6 +1411,7 @@ files:
 - ext/puppet-test
 - ext/logcheck/puppet
 - ext/debian/compat
+- ext/debian/puppetmaster-common.postinst
 - ext/debian/puppetmaster-common.install
 - ext/debian/source/format
 - ext/debian/source/options
@@ -1577,13 +1425,11 @@ files:
 - ext/debian/vim-puppet.yaml
 - ext/debian/vim-puppet.README.Debian
 - ext/debian/docs
-- ext/debian/puppetmaster-common.puppetqd.init
 - ext/debian/puppet.logrotate
 - ext/debian/puppetmaster-passenger.dirs
 - ext/debian/puppet-common.lintian-overrides
 - ext/debian/puppet-common.postinst
 - ext/debian/vim-puppet.dirs
-- ext/debian/puppet.conf
 - ext/debian/watch
 - ext/debian/puppet.init
 - ext/debian/puppet-el.emacsen-startup
@@ -1594,7 +1440,6 @@ files:
 - ext/debian/puppet-common.install
 - ext/debian/puppetmaster.preinst
 - ext/debian/puppet-common.manpages
-- ext/debian/puppetmaster-common.puppetqd.default
 - ext/debian/puppet-el.dirs
 - ext/debian/puppet.postrm
 - ext/debian/changelog.erb
@@ -1622,7 +1467,6 @@ files:
 - ext/regexp_nodes/parameters/service/prod
 - ext/regexp_nodes/parameters/service/sandbox
 - ext/regexp_nodes/parameters/service/qa
-- ext/puppet-load.rb
 - ext/rack/config.ru
 - ext/rack/example-passenger-vhost.conf
 - ext/osx/postflight.erb
@@ -1639,8 +1483,6 @@ files:
 - ext/windows/eventlog/puppetres.mc
 - ext/redhat/server.sysconfig
 - ext/redhat/puppet.spec.erb
-- ext/redhat/puppet.conf
-- ext/redhat/queue.init
 - ext/redhat/server.init
 - ext/redhat/client.init
 - ext/redhat/client.sysconfig
@@ -1656,11 +1498,12 @@ files:
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/scope.rb
 - spec/lib/puppet_spec/matchers.rb
-- spec/lib/puppet_spec/database.rb
 - spec/lib/puppet_spec/settings.rb
 - spec/lib/puppet_spec/pops.rb
 - spec/lib/puppet_spec/modules.rb
 - spec/lib/puppet_spec/language.rb
+- spec/lib/puppet_spec/handler.rb
+- spec/lib/puppet_spec/network.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
 - spec/lib/puppet_spec/module_tool/stub_source.rb
 - spec/lib/puppet_spec/compiler.rb
@@ -1675,6 +1518,7 @@ files:
 - spec/lib/puppet/face/1.0.0/huzzah.rb
 - spec/lib/puppet/face/basetest.rb
 - spec/lib/puppet/face/huzzah.rb
+- spec/lib/puppet/indirector_proxy.rb
 - spec/lib/matchers/include.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/containment_matchers.rb
@@ -1704,9 +1548,9 @@ files:
 - spec/fixtures/integration/provider/cron/crontab/remove_named_resource
 - spec/fixtures/integration/provider/cron/crontab/create_normal_entry
 - spec/fixtures/integration/provider/mailalias/aliases/test1
+- spec/fixtures/integration/provider/sshkey/sample
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
-- spec/fixtures/yaml/report0.25.x.yaml
 - spec/fixtures/yaml/report2.6.x.yaml
 - spec/fixtures/yaml/test.local.yaml
 - spec/fixtures/unit/indirector/hiera/invalid.yaml
@@ -1763,6 +1607,17 @@ files:
 - spec/fixtures/unit/parser/lexer/arraytrailingcomma.pp
 - spec/fixtures/unit/parser/functions/create_resources/foo/manifests/wrongdefine.pp
 - spec/fixtures/unit/parser/functions/create_resources/foo/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb
+- spec/fixtures/unit/data_providers/environments/production/environment.conf
+- spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb
+- spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb
+- spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/sample/environment.conf
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet/bindings/dataprovider/default.rb
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/sample/manifests/site.pp
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_passers.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -1809,12 +1664,13 @@ files:
 - spec/fixtures/unit/pops/parser/lexer/singleselector.pp
 - spec/fixtures/unit/pops/parser/lexer/implicititeration.pp
 - spec/fixtures/unit/pops/parser/lexer/arraytrailingcomma.pp
+- spec/fixtures/unit/pops/binder/config/binder_config/nolayer/binder_config.yaml
 - spec/fixtures/unit/pops/binder/config/binder_config/ok/binder_config.yaml
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/lib/puppet/bindings/confdirtest.rb
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/binder_config.yaml
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/lib/puppet/bindings/good/default.rb
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet/bindings/awesome2/default.rb
-- spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppetx/awesome2/echo_scheme_handler.rb
+- spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet_x/awesome2/echo_scheme_handler.rb
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/lib/puppet/bindings/bad/default.rb
 - spec/fixtures/unit/pops/loaders/loaders/wo_metadata_module/modules/moduleb/lib/puppet/functions/moduleb/rb_func_b.rb
 - spec/fixtures/unit/pops/loaders/loaders/wo_metadata_module/modules/moduleb/manifests/init.pp
@@ -1831,7 +1687,14 @@ files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/lib/puppet/functions/user/caller.rb
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/usee/lib/puppet/functions/usee/callee.rb
+- spec/fixtures/unit/ssl/certificate/old-style-cert-exts.pem
+- spec/fixtures/unit/ssl/certificate_request/old-style-cert-request.pem
 - spec/fixtures/unit/module/trailing-comma.json
+- spec/fixtures/unit/functions/lookup/environments/production/lib/puppet/functions/environment/data.rb
+- spec/fixtures/unit/functions/lookup/environments/production/environment.conf
+- spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb
+- spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/functions/abc/data.rb
+- spec/fixtures/unit/functions/lookup/environments/production/modules/abc/manifests/init.pp
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/crontab/single_line.yaml
 - spec/fixtures/unit/provider/cron/parsed/managed
@@ -1841,6 +1704,7 @@ files:
 - spec/fixtures/unit/provider/service/openrc/rcservice_list
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
 - spec/fixtures/unit/provider/service/smf/svcs.out
+- spec/fixtures/unit/provider/service/openbsd/rcctl_getall
 - spec/fixtures/unit/provider/mount/mount-output.aix.txt
 - spec/fixtures/unit/provider/mount/parsed/darwin.mount
 - spec/fixtures/unit/provider/mount/parsed/freebsd.mount
@@ -1874,12 +1738,11 @@ files:
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/pkg/solaris11
 - spec/fixtures/unit/provider/package/pkg/unknown_status
+- spec/fixtures/unit/provider/package/pkg/dummy_implicit_version
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.certificate_warning
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.installed
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.known
-- spec/fixtures/unit/provider/package/pkg/simple
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.known
-- spec/fixtures/unit/provider/package/pkg/publisher
 - spec/fixtures/unit/provider/package/pkg/incomplete
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris10
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.installed
@@ -1888,6 +1751,8 @@ files:
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.list
 - spec/fixtures/unit/provider/package/openbsd/pkginfo_flavors.list
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.query
+- spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
+- spec/fixtures/unit/provider/package/yum/yum-check-update-multiline.txt
 - spec/fixtures/unit/provider/zpool/zpool/zpool-list.out
 - spec/fixtures/unit/provider/zfs/zfs/zfs-list.out
 - spec/fixtures/releases/jamtur01-apache/lib/puppet/type/a2mod.rb
@@ -1910,9 +1775,9 @@ files:
 - spec/fixtures/releases/jamtur01-apache/manifests/ssl.pp
 - spec/fixtures/releases/jamtur01-apache/manifests/params.pp
 - spec/fixtures/hiera.yaml
-- spec/fixtures/module.tar.gz
 - spec/fixtures/manifests/site.pp
 - spec/fixtures/java.tgz
+- spec/integration/environments/settings_spec.rb
 - spec/integration/environments/default_manifest_spec.rb
 - spec/integration/environments/settings_interpolation_spec.rb
 - spec/integration/environments/setting_hooks_spec.rb
@@ -1920,6 +1785,7 @@ files:
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
 - spec/integration/configurer_spec.rb
+- spec/integration/network/http/api/indirected_routes_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/node_spec.rb
@@ -1927,12 +1793,10 @@ files:
 - spec/integration/indirector/node/ldap_spec.rb
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
-- spec/integration/indirector/catalog/queue_spec.rb
 - spec/integration/indirector/catalog/compiler_spec.rb
 - spec/integration/indirector/direct_file_server_spec.rb
 - spec/integration/util/settings_spec.rb
 - spec/integration/util/autoload_spec.rb
-- spec/integration/util/feature_spec.rb
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/execution_spec.rb
 - spec/integration/util/windows/security_spec.rb
@@ -1946,7 +1810,6 @@ files:
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type/package_spec.rb
 - spec/integration/type/file_spec.rb
-- spec/integration/type/sshkey_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/user_spec.rb
 - spec/integration/reference/providers_spec.rb
@@ -1961,22 +1824,17 @@ files:
 - spec/integration/file_serving/metadata_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/integration/data_binding.rb
-- spec/integration/parser/future_compiler_spec.rb
 - spec/integration/parser/resource_expressions_spec.rb
 - spec/integration/parser/node_spec.rb
 - spec/integration/parser/class_spec.rb
 - spec/integration/parser/conditionals_spec.rb
-- spec/integration/parser/parser_spec.rb
-- spec/integration/parser/collector_spec.rb
-- spec/integration/parser/dynamic_scoping_spec.rb
+- spec/integration/parser/collection_spec.rb
 - spec/integration/parser/catalog_spec.rb
 - spec/integration/parser/compiler_spec.rb
 - spec/integration/parser/environment_spec.rb
-- spec/integration/parser/ruby_manifest_spec.rb
 - spec/integration/parser/functions/require_spec.rb
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/undef_param_spec.rb
-- spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/type_spec.rb
 - spec/integration/agent/logging_spec.rb
 - spec/integration/ssl/certificate_request_spec.rb
@@ -1995,19 +1853,15 @@ files:
 - spec/integration/provider/ssh_authorized_key_spec.rb
 - spec/integration/provider/mount_spec.rb
 - spec/integration/provider/package_spec.rb
-- spec/monkey_patches/alias_should_to_must.rb
+- spec/integration/provider/sshkey_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
 - spec/unit/scheduler/splay_job_spec.rb
 - spec/unit/scheduler/job_spec.rb
-- spec/unit/rails/param_value_spec.rb
-- spec/unit/rails/host_spec.rb
-- spec/unit/rails/resource_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
 - spec/unit/file_bucket/file_spec.rb
 - spec/unit/node/environment_spec.rb
 - spec/unit/node/facts_spec.rb
 - spec/unit/puppet_spec.rb
-- spec/unit/rails_spec.rb
 - spec/unit/data_binding_spec.rb
 - spec/unit/application_spec.rb
 - spec/unit/provider_spec.rb
@@ -2015,7 +1869,6 @@ files:
 - spec/unit/hiera_puppet_spec.rb
 - spec/unit/configurer_spec.rb
 - spec/unit/relationship_spec.rb
-- spec/unit/hiera/backend/puppet_backend_spec.rb
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/context_spec.rb
 - spec/unit/network/http_pool_spec.rb
@@ -2029,19 +1882,20 @@ files:
 - spec/unit/network/http/webrick_spec.rb
 - spec/unit/network/http/error_spec.rb
 - spec/unit/network/http/pool_spec.rb
+- spec/unit/network/http/api_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/rack/rest_spec.rb
 - spec/unit/network/http/nocache_pool_spec.rb
-- spec/unit/network/http/api/v2/environments_spec.rb
-- spec/unit/network/http/api/v2/authorization_spec.rb
-- spec/unit/network/http/api/v1_spec.rb
-- spec/unit/network/http/api/v2_spec.rb
+- spec/unit/network/http/api/master/v3/environments_spec.rb
+- spec/unit/network/http/api/master/v3/authorization_spec.rb
+- spec/unit/network/http/api/master/v3_spec.rb
+- spec/unit/network/http/api/indirected_routes_spec.rb
+- spec/unit/network/http/api/ca/v1_spec.rb
 - spec/unit/network/http/rack_spec.rb
 - spec/unit/network/format_handler_spec.rb
 - spec/unit/network/authconfig_spec.rb
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/auth_config_parser_spec.rb
-- spec/unit/network/authentication_spec.rb
 - spec/unit/network/authorization_spec.rb
 - spec/unit/network/resolver_spec.rb
 - spec/unit/network/rights_spec.rb
@@ -2064,7 +1918,6 @@ files:
 - spec/unit/indirector/file_content/file_server_spec.rb
 - spec/unit/indirector/node/rest_spec.rb
 - spec/unit/indirector/node/store_configs_spec.rb
-- spec/unit/indirector/node/active_record_spec.rb
 - spec/unit/indirector/node/yaml_spec.rb
 - spec/unit/indirector/node/plain_spec.rb
 - spec/unit/indirector/node/ldap_spec.rb
@@ -2075,36 +1928,23 @@ files:
 - spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb
 - spec/unit/indirector/certificate_revocation_list/ca_spec.rb
 - spec/unit/indirector/certificate_revocation_list/file_spec.rb
-- spec/unit/indirector/instrumentation_probe/rest_spec.rb
-- spec/unit/indirector/instrumentation_probe/local_spec.rb
 - spec/unit/indirector/rest_spec.rb
 - spec/unit/indirector/key/disabled_ca_spec.rb
 - spec/unit/indirector/key/ca_spec.rb
 - spec/unit/indirector/key/file_spec.rb
-- spec/unit/indirector/facts/rest_spec.rb
 - spec/unit/indirector/facts/store_configs_spec.rb
-- spec/unit/indirector/facts/active_record_spec.rb
-- spec/unit/indirector/facts/inventory_active_record_spec.rb
 - spec/unit/indirector/facts/yaml_spec.rb
-- spec/unit/indirector/facts/inventory_service_spec.rb
 - spec/unit/indirector/facts/network_device_spec.rb
 - spec/unit/indirector/facts/facter_spec.rb
-- spec/unit/indirector/facts/couch_spec.rb
-- spec/unit/indirector/run/rest_spec.rb
-- spec/unit/indirector/run/local_spec.rb
 - spec/unit/indirector/json_spec.rb
 - spec/unit/indirector/certificate/rest_spec.rb
 - spec/unit/indirector/certificate/disabled_ca_spec.rb
 - spec/unit/indirector/certificate/ca_spec.rb
 - spec/unit/indirector/certificate/file_spec.rb
-- spec/unit/indirector/queue_spec.rb
 - spec/unit/indirector/store_configs_spec.rb
-- spec/unit/indirector/instrumentation_listener/rest_spec.rb
-- spec/unit/indirector/instrumentation_listener/local_spec.rb
 - spec/unit/indirector/request_spec.rb
 - spec/unit/indirector/certificate_status/rest_spec.rb
 - spec/unit/indirector/certificate_status/file_spec.rb
-- spec/unit/indirector/active_record_spec.rb
 - spec/unit/indirector/certificate_request/rest_spec.rb
 - spec/unit/indirector/certificate_request/disabled_ca_spec.rb
 - spec/unit/indirector/certificate_request/ca_spec.rb
@@ -2130,9 +1970,7 @@ files:
 - spec/unit/indirector/status/local_spec.rb
 - spec/unit/indirector/catalog/rest_spec.rb
 - spec/unit/indirector/catalog/json_spec.rb
-- spec/unit/indirector/catalog/queue_spec.rb
 - spec/unit/indirector/catalog/store_configs_spec.rb
-- spec/unit/indirector/catalog/active_record_spec.rb
 - spec/unit/indirector/catalog/yaml_spec.rb
 - spec/unit/indirector/catalog/msgpack_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
@@ -2143,17 +1981,13 @@ files:
 - spec/unit/indirector/msgpack_spec.rb
 - spec/unit/indirector/resource_type/rest_spec.rb
 - spec/unit/indirector/resource_type/parser_spec.rb
-- spec/unit/indirector/instrumentation_data/rest_spec.rb
-- spec/unit/indirector/instrumentation_data/local_spec.rb
 - spec/unit/indirector/file_server_spec.rb
 - spec/unit/indirector/envelope_spec.rb
 - spec/unit/indirector/direct_file_server_spec.rb
 - spec/unit/indirector/data_binding/none_spec.rb
 - spec/unit/indirector/data_binding/hiera_spec.rb
-- spec/unit/indirector/resource/rest_spec.rb
 - spec/unit/indirector/resource/ral_spec.rb
 - spec/unit/indirector/resource/store_configs_spec.rb
-- spec/unit/indirector/resource/active_record_spec.rb
 - spec/unit/indirector/indirection_spec.rb
 - spec/unit/indirector/exec_spec.rb
 - spec/unit/indirector/hiera_spec.rb
@@ -2172,20 +2006,16 @@ files:
 - spec/unit/util/run_mode_spec.rb
 - spec/unit/util/ssl_spec.rb
 - spec/unit/util/watcher/periodic_watcher_spec.rb
-- spec/unit/util/queue_spec.rb
 - spec/unit/util/symbolic_file_mode_spec.rb
 - spec/unit/util/resource_template_spec.rb
 - spec/unit/util/warnings_spec.rb
 - spec/unit/util/colors_spec.rb
-- spec/unit/util/monkey_patches/lines_spec.rb
 - spec/unit/util/user_attr_spec.rb
 - spec/unit/util/inifile_spec.rb
-- spec/unit/util/pson_spec.rb
 - spec/unit/util/json_lockfile_spec.rb
 - spec/unit/util/posix_spec.rb
 - spec/unit/util/metric_spec.rb
-- spec/unit/util/cacher_spec.rb
-- spec/unit/util/queue/stomp_spec.rb
+- spec/unit/util/retry_action_spec.rb
 - spec/unit/util/watched_file_spec.rb
 - spec/unit/util/nagios_maker_spec.rb
 - spec/unit/util/yaml_spec.rb
@@ -2195,12 +2025,9 @@ files:
 - spec/unit/util/tagging_spec.rb
 - spec/unit/util/autoload_spec.rb
 - spec/unit/util/log_spec.rb
-- spec/unit/util/log/rate_limited_logger_spec.rb
 - spec/unit/util/log/destinations_spec.rb
 - spec/unit/util/feature_spec.rb
 - spec/unit/util/package_spec.rb
-- spec/unit/util/inline_docs_spec.rb
-- spec/unit/util/zaml_spec.rb
 - spec/unit/util/storage_spec.rb
 - spec/unit/util/network_device/transport/telnet_spec.rb
 - spec/unit/util/network_device/transport/base_spec.rb
@@ -2212,7 +2039,6 @@ files:
 - spec/unit/util/network_device/cisco/facts_spec.rb
 - spec/unit/util/filetype_spec.rb
 - spec/unit/util/constant_inflector_spec.rb
-- spec/unit/util/rdoc/parser_spec.rb
 - spec/unit/util/suidmanager_spec.rb
 - spec/unit/util/profiler/logging_spec.rb
 - spec/unit/util/profiler/around_profiler_spec.rb
@@ -2222,20 +2048,10 @@ files:
 - spec/unit/util/network_device_spec.rb
 - spec/unit/util/lockfile_spec.rb
 - spec/unit/util/command_line_utils/puppet_option_parser_spec.rb
-- spec/unit/util/retryaction_spec.rb
 - spec/unit/util/watcher_spec.rb
 - spec/unit/util/execution_stub_spec.rb
-- spec/unit/util/reference_serializer_spec.rb
-- spec/unit/util/cache_accumulator_spec.rb
 - spec/unit/util/reference_spec.rb
 - spec/unit/util/command_line_spec.rb
-- spec/unit/util/instrumentation/listeners/log_spec.rb
-- spec/unit/util/instrumentation/listeners/performance_spec.rb
-- spec/unit/util/instrumentation/indirection_probe_spec.rb
-- spec/unit/util/instrumentation/listener_spec.rb
-- spec/unit/util/instrumentation/data_spec.rb
-- spec/unit/util/instrumentation/instrumentable_spec.rb
-- spec/unit/util/instrumentation_spec.rb
 - spec/unit/util/errors_spec.rb
 - spec/unit/util/execution_spec.rb
 - spec/unit/util/tag_set_spec.rb
@@ -2253,17 +2069,14 @@ files:
 - spec/unit/application/certificate_spec.rb
 - spec/unit/application/agent_spec.rb
 - spec/unit/application/apply_spec.rb
-- spec/unit/application/queue_spec.rb
 - spec/unit/application/indirection_base_spec.rb
 - spec/unit/application/doc_spec.rb
 - spec/unit/application/face_base_spec.rb
 - spec/unit/application/filebucket_spec.rb
 - spec/unit/application/device_spec.rb
 - spec/unit/application/config_spec.rb
-- spec/unit/application/kick_spec.rb
 - spec/unit/application/master_spec.rb
 - spec/unit/application/inspect_spec.rb
-- spec/unit/application/secret_agent_spec.rb
 - spec/unit/application/cert_spec.rb
 - spec/unit/application/describe_spec.rb
 - spec/unit/application/resource_spec.rb
@@ -2319,8 +2132,6 @@ files:
 - spec/unit/type/exec_spec.rb
 - spec/unit/type/user_spec.rb
 - spec/unit/defaults_spec.rb
-- spec/unit/dsl/resource_type_api_spec.rb
-- spec/unit/dsl/resource_api_spec.rb
 - spec/unit/configurer/plugin_handler_spec.rb
 - spec/unit/configurer/downloader_factory_spec.rb
 - spec/unit/configurer/fact_handler_spec.rb
@@ -2335,7 +2146,6 @@ files:
 - spec/unit/transaction/report_spec.rb
 - spec/unit/transaction/resource_harness_spec.rb
 - spec/unit/transaction/event_manager_spec.rb
-- spec/unit/run_spec.rb
 - spec/unit/file_serving/configuration/parser_spec.rb
 - spec/unit/file_serving/base_spec.rb
 - spec/unit/file_serving/configuration_spec.rb
@@ -2363,40 +2173,11 @@ files:
 - spec/unit/parser/relationship_spec.rb
 - spec/unit/parser/templatewrapper_spec.rb
 - spec/unit/parser/type_loader_spec.rb
-- spec/unit/parser/ast_spec.rb
 - spec/unit/parser/files_spec.rb
-- spec/unit/parser/parser_spec.rb
-- spec/unit/parser/collector_spec.rb
 - spec/unit/parser/functions_spec.rb
 - spec/unit/parser/compiler_spec.rb
-- spec/unit/parser/ast/boolean_operator_spec.rb
-- spec/unit/parser/ast/vardef_spec.rb
-- spec/unit/parser/ast/arithmetic_operator_spec.rb
-- spec/unit/parser/ast/in_operator_spec.rb
-- spec/unit/parser/ast/relationship_spec.rb
-- spec/unit/parser/ast/node_spec.rb
-- spec/unit/parser/ast/casestatement_spec.rb
-- spec/unit/parser/ast/resource_reference_spec.rb
-- spec/unit/parser/ast/nop_spec.rb
-- spec/unit/parser/ast/selector_spec.rb
-- spec/unit/parser/ast/collection_spec.rb
 - spec/unit/parser/ast/block_expression_spec.rb
-- spec/unit/parser/ast/function_spec.rb
-- spec/unit/parser/ast/collexpr_spec.rb
-- spec/unit/parser/ast/astarray_spec.rb
 - spec/unit/parser/ast/leaf_spec.rb
-- spec/unit/parser/ast/not_spec.rb
-- spec/unit/parser/ast/match_operator_spec.rb
-- spec/unit/parser/ast/resourceparam_spec.rb
-- spec/unit/parser/ast/comparison_operator_spec.rb
-- spec/unit/parser/ast/definition_spec.rb
-- spec/unit/parser/ast/ifstatement_spec.rb
-- spec/unit/parser/ast/resource_override_spec.rb
-- spec/unit/parser/ast/resource_defaults_spec.rb
-- spec/unit/parser/ast/hostclass_spec.rb
-- spec/unit/parser/ast/asthash_spec.rb
-- spec/unit/parser/ast/minus_spec.rb
-- spec/unit/parser/ast/resource_spec.rb
 - spec/unit/parser/resource/param_spec.rb
 - spec/unit/parser/functions/generate_spec.rb
 - spec/unit/parser/functions/hiera_hash_spec.rb
@@ -2416,7 +2197,6 @@ files:
 - spec/unit/parser/functions/lookup_spec.rb
 - spec/unit/parser/functions/tag_spec.rb
 - spec/unit/parser/functions/versioncmp_spec.rb
-- spec/unit/parser/functions/extlookup_spec.rb
 - spec/unit/parser/functions/template_spec.rb
 - spec/unit/parser/functions/contain_spec.rb
 - spec/unit/parser/functions/file_spec.rb
@@ -2424,19 +2204,19 @@ files:
 - spec/unit/parser/functions/include_spec.rb
 - spec/unit/parser/functions/hiera_array_spec.rb
 - spec/unit/parser/functions/fail_spec.rb
-- spec/unit/parser/functions/search_spec.rb
 - spec/unit/parser/functions/hiera_spec.rb
 - spec/unit/parser/scope_spec.rb
 - spec/unit/parser/resource_spec.rb
-- spec/unit/parser/lexer_spec.rb
 - spec/unit/version_spec.rb
 - spec/unit/environments_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/functions4_spec.rb
+- spec/unit/data_providers/sample_data_provider_spec.rb
+- spec/unit/data_providers/function_data_provider_spec.rb
 - spec/unit/graph/relationship_graph_spec.rb
 - spec/unit/graph/key_spec.rb
 - spec/unit/graph/sequential_prioritizer_spec.rb
-- spec/unit/graph/simple_graph.rb
+- spec/unit/graph/simple_graph_spec.rb
 - spec/unit/graph/title_hash_prioritizer_spec.rb
 - spec/unit/graph/rb_tree_map_spec.rb
 - spec/unit/settings/directory_setting_spec.rb
@@ -2454,10 +2234,8 @@ files:
 - spec/unit/settings/path_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
 - spec/unit/parameter_spec.rb
-- spec/unit/reports/tagmail_spec.rb
 - spec/unit/reports/store_spec.rb
 - spec/unit/reports/http_spec.rb
-- spec/unit/reports/rrdgraph_spec.rb
 - spec/unit/interface/face_collection_spec.rb
 - spec/unit/interface/option_builder_spec.rb
 - spec/unit/interface/documentation_spec.rb
@@ -2471,13 +2249,12 @@ files:
 - spec/unit/pops/adaptable_spec.rb
 - spec/unit/pops/label_provider_spec.rb
 - spec/unit/pops/types/enumeration_spec.rb
+- spec/unit/pops/types/class_loader_spec.rb
 - spec/unit/pops/types/type_calculator_spec.rb
 - spec/unit/pops/types/type_parser_spec.rb
 - spec/unit/pops/types/type_factory_spec.rb
 - spec/unit/pops/factory_spec.rb
 - spec/unit/pops/validator/validator_spec.rb
-- spec/unit/pops/validation_spec.rb
-- spec/unit/pops/evaluator/runtime3_converter_spec.rb
 - spec/unit/pops/evaluator/conditionals_spec.rb
 - spec/unit/pops/evaluator/variables_spec.rb
 - spec/unit/pops/evaluator/collections_ops_spec.rb
@@ -2489,11 +2266,6 @@ files:
 - spec/unit/pops/evaluator/string_interpolation_spec.rb
 - spec/unit/pops/evaluator/logical_ops_spec.rb
 - spec/unit/pops/evaluator/arithmetic_ops_spec.rb
-- spec/unit/pops/transformer/transform_basic_expressions_spec.rb
-- spec/unit/pops/transformer/transform_conditionals_spec.rb
-- spec/unit/pops/transformer/transformer_rspec_helper.rb
-- spec/unit/pops/transformer/transform_calls_spec.rb
-- spec/unit/pops/transformer/transform_containers_spec.rb
 - spec/unit/pops/containment_spec.rb
 - spec/unit/pops/issues_spec.rb
 - spec/unit/pops/parser/parse_containers_spec.rb
@@ -2509,7 +2281,6 @@ files:
 - spec/unit/pops/parser/parse_resource_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
-- spec/unit/pops/migration_spec.rb
 - spec/unit/pops/utils_spec.rb
 - spec/unit/pops/binder/bindings_checker_spec.rb
 - spec/unit/pops/binder/bindings_composer_spec.rb
@@ -2517,7 +2288,6 @@ files:
 - spec/unit/pops/binder/config/binder_config_spec.rb
 - spec/unit/pops/binder/binder_spec.rb
 - spec/unit/pops/binder/bindings_validator_factory_spec.rb
-- spec/unit/pops/model/ast_transformer_spec.rb
 - spec/unit/pops/model/model_spec.rb
 - spec/unit/pops/visitor_spec.rb
 - spec/unit/pops/loaders/dependency_loader_spec.rb
@@ -2561,19 +2331,16 @@ files:
 - spec/unit/ssl/certificate_request_attributes_spec.rb
 - spec/unit/ssl/oids_spec.rb
 - spec/unit/ssl/certificate_factory_spec.rb
+- spec/unit/face/epp_face_spec.rb
 - spec/unit/face/certificate_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/plugin_spec.rb
 - spec/unit/face/config_spec.rb
-- spec/unit/face/instrumentation_data_spec.rb
 - spec/unit/face/module_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/help_spec.rb
-- spec/unit/face/instrumentation_probe_spec.rb
-- spec/unit/face/secret_agent_spec.rb
 - spec/unit/face/catalog_spec.rb
 - spec/unit/face/file_spec.rb
-- spec/unit/face/instrumentation_listener_spec.rb
 - spec/unit/face/module/build_spec.rb
 - spec/unit/face/module/uninstall_spec.rb
 - spec/unit/face/module/upgrade_spec.rb
@@ -2587,9 +2354,11 @@ files:
 - spec/unit/resource/type_collection_helper_spec.rb
 - spec/unit/resource/catalog_spec.rb
 - spec/unit/resource/type_spec.rb
+- spec/unit/functions/split_spec.rb
 - spec/unit/functions/scanf_spec.rb
+- spec/unit/functions/regsubst_spec.rb
 - spec/unit/functions/with_spec.rb
-- spec/unit/functions/defined_spec.rb
+- spec/unit/functions/lookup_spec.rb
 - spec/unit/functions/match_spec.rb
 - spec/unit/functions/slice_spec.rb
 - spec/unit/functions/reduce_spec.rb
@@ -2601,11 +2370,13 @@ files:
 - spec/unit/functions/epp_spec.rb
 - spec/unit/functions/hiera_spec.rb
 - spec/unit/confine_collection_spec.rb
+- spec/unit/external/pson_spec.rb
 - spec/unit/provider/command_spec.rb
 - spec/unit/provider/cron/crontab_spec.rb
 - spec/unit/provider/cron/parsed_spec.rb
 - spec/unit/provider/user/useradd_spec.rb
 - spec/unit/provider/user/directoryservice_spec.rb
+- spec/unit/provider/user/openbsd_spec.rb
 - spec/unit/provider/user/user_role_add_spec.rb
 - spec/unit/provider/user/ldap_spec.rb
 - spec/unit/provider/user/aix_spec.rb
@@ -2668,7 +2439,6 @@ files:
 - spec/unit/provider/package/nim_spec.rb
 - spec/unit/provider/package/sun_spec.rb
 - spec/unit/provider/package/pip_spec.rb
-- spec/unit/provider/package/msi_spec.rb
 - spec/unit/provider/package/appdmg_spec.rb
 - spec/unit/provider/package/windows_spec.rb
 - spec/unit/provider/package/pkgin_spec.rb
@@ -2682,11 +2452,11 @@ files:
 - spec/unit/provider/package/opkg_spec.rb
 - spec/unit/provider/package/aix_spec.rb
 - spec/unit/provider/package/pkgdmg_spec.rb
+- spec/unit/provider/package/urpmi_spec.rb
 - spec/unit/provider/package/up2date_spec.rb
 - spec/unit/provider/package/hpux_spec.rb
 - spec/unit/provider/package/yum_spec.rb
 - spec/unit/provider/package/aptrpm_spec.rb
-- spec/unit/provider/package/urpmi.rb
 - spec/unit/provider/package/apt_spec.rb
 - spec/unit/provider/package/zypper_spec.rb
 - spec/unit/provider/package/windows/msi_package_spec.rb
@@ -2709,8 +2479,8 @@ files:
 - spec/unit/forge/errors_spec.rb
 - spec/spec_helper.rb
 - spec/watchr.rb
-- spec/shared_contexts/platform.rb
-- spec/shared_contexts/checksums.rb
+- spec/shared_contexts/checksum.rb
+- spec/shared_contexts/digests.rb
 - spec/shared_behaviours/hiera_indirections.rb
 - spec/shared_behaviours/iterative_functions.rb
 - spec/shared_behaviours/documentation_on_faces.rb
@@ -2743,9 +2513,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: puppet
 rubygems_version: 1.8.23
@@ -2756,11 +2526,12 @@ test_files:
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/scope.rb
 - spec/lib/puppet_spec/matchers.rb
-- spec/lib/puppet_spec/database.rb
 - spec/lib/puppet_spec/settings.rb
 - spec/lib/puppet_spec/pops.rb
 - spec/lib/puppet_spec/modules.rb
 - spec/lib/puppet_spec/language.rb
+- spec/lib/puppet_spec/handler.rb
+- spec/lib/puppet_spec/network.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
 - spec/lib/puppet_spec/module_tool/stub_source.rb
 - spec/lib/puppet_spec/compiler.rb
@@ -2775,6 +2546,7 @@ test_files:
 - spec/lib/puppet/face/1.0.0/huzzah.rb
 - spec/lib/puppet/face/basetest.rb
 - spec/lib/puppet/face/huzzah.rb
+- spec/lib/puppet/indirector_proxy.rb
 - spec/lib/matchers/include.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/containment_matchers.rb
@@ -2804,9 +2576,9 @@ test_files:
 - spec/fixtures/integration/provider/cron/crontab/remove_named_resource
 - spec/fixtures/integration/provider/cron/crontab/create_normal_entry
 - spec/fixtures/integration/provider/mailalias/aliases/test1
+- spec/fixtures/integration/provider/sshkey/sample
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
-- spec/fixtures/yaml/report0.25.x.yaml
 - spec/fixtures/yaml/report2.6.x.yaml
 - spec/fixtures/yaml/test.local.yaml
 - spec/fixtures/unit/indirector/hiera/invalid.yaml
@@ -2863,6 +2635,17 @@ test_files:
 - spec/fixtures/unit/parser/lexer/arraytrailingcomma.pp
 - spec/fixtures/unit/parser/functions/create_resources/foo/manifests/wrongdefine.pp
 - spec/fixtures/unit/parser/functions/create_resources/foo/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb
+- spec/fixtures/unit/data_providers/environments/production/environment.conf
+- spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb
+- spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/functions/abc/data.rb
+- spec/fixtures/unit/data_providers/environments/production/modules/abc/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/sample/environment.conf
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet/bindings/dataprovider/default.rb
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_module_data.rb
+- spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/sample/manifests/site.pp
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_passers.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -2909,12 +2692,13 @@ test_files:
 - spec/fixtures/unit/pops/parser/lexer/singleselector.pp
 - spec/fixtures/unit/pops/parser/lexer/implicititeration.pp
 - spec/fixtures/unit/pops/parser/lexer/arraytrailingcomma.pp
+- spec/fixtures/unit/pops/binder/config/binder_config/nolayer/binder_config.yaml
 - spec/fixtures/unit/pops/binder/config/binder_config/ok/binder_config.yaml
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/lib/puppet/bindings/confdirtest.rb
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/binder_config.yaml
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/lib/puppet/bindings/good/default.rb
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet/bindings/awesome2/default.rb
-- spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppetx/awesome2/echo_scheme_handler.rb
+- spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet_x/awesome2/echo_scheme_handler.rb
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/lib/puppet/bindings/bad/default.rb
 - spec/fixtures/unit/pops/loaders/loaders/wo_metadata_module/modules/moduleb/lib/puppet/functions/moduleb/rb_func_b.rb
 - spec/fixtures/unit/pops/loaders/loaders/wo_metadata_module/modules/moduleb/manifests/init.pp
@@ -2931,7 +2715,14 @@ test_files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/lib/puppet/functions/user/caller.rb
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/usee/lib/puppet/functions/usee/callee.rb
+- spec/fixtures/unit/ssl/certificate/old-style-cert-exts.pem
+- spec/fixtures/unit/ssl/certificate_request/old-style-cert-request.pem
 - spec/fixtures/unit/module/trailing-comma.json
+- spec/fixtures/unit/functions/lookup/environments/production/lib/puppet/functions/environment/data.rb
+- spec/fixtures/unit/functions/lookup/environments/production/environment.conf
+- spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb
+- spec/fixtures/unit/functions/lookup/environments/production/modules/abc/lib/puppet/functions/abc/data.rb
+- spec/fixtures/unit/functions/lookup/environments/production/modules/abc/manifests/init.pp
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/crontab/single_line.yaml
 - spec/fixtures/unit/provider/cron/parsed/managed
@@ -2941,6 +2732,7 @@ test_files:
 - spec/fixtures/unit/provider/service/openrc/rcservice_list
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
 - spec/fixtures/unit/provider/service/smf/svcs.out
+- spec/fixtures/unit/provider/service/openbsd/rcctl_getall
 - spec/fixtures/unit/provider/mount/mount-output.aix.txt
 - spec/fixtures/unit/provider/mount/parsed/darwin.mount
 - spec/fixtures/unit/provider/mount/parsed/freebsd.mount
@@ -2974,12 +2766,11 @@ test_files:
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/pkg/solaris11
 - spec/fixtures/unit/provider/package/pkg/unknown_status
+- spec/fixtures/unit/provider/package/pkg/dummy_implicit_version
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.certificate_warning
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.installed
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.known
-- spec/fixtures/unit/provider/package/pkg/simple
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.ifo.known
-- spec/fixtures/unit/provider/package/pkg/publisher
 - spec/fixtures/unit/provider/package/pkg/incomplete
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris10
 - spec/fixtures/unit/provider/package/pkg/dummy_solaris11.installed
@@ -2988,6 +2779,8 @@ test_files:
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.list
 - spec/fixtures/unit/provider/package/openbsd/pkginfo_flavors.list
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.query
+- spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
+- spec/fixtures/unit/provider/package/yum/yum-check-update-multiline.txt
 - spec/fixtures/unit/provider/zpool/zpool/zpool-list.out
 - spec/fixtures/unit/provider/zfs/zfs/zfs-list.out
 - spec/fixtures/releases/jamtur01-apache/lib/puppet/type/a2mod.rb
@@ -3010,9 +2803,9 @@ test_files:
 - spec/fixtures/releases/jamtur01-apache/manifests/ssl.pp
 - spec/fixtures/releases/jamtur01-apache/manifests/params.pp
 - spec/fixtures/hiera.yaml
-- spec/fixtures/module.tar.gz
 - spec/fixtures/manifests/site.pp
 - spec/fixtures/java.tgz
+- spec/integration/environments/settings_spec.rb
 - spec/integration/environments/default_manifest_spec.rb
 - spec/integration/environments/settings_interpolation_spec.rb
 - spec/integration/environments/setting_hooks_spec.rb
@@ -3020,6 +2813,7 @@ test_files:
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
 - spec/integration/configurer_spec.rb
+- spec/integration/network/http/api/indirected_routes_spec.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/node_spec.rb
@@ -3027,12 +2821,10 @@ test_files:
 - spec/integration/indirector/node/ldap_spec.rb
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
-- spec/integration/indirector/catalog/queue_spec.rb
 - spec/integration/indirector/catalog/compiler_spec.rb
 - spec/integration/indirector/direct_file_server_spec.rb
 - spec/integration/util/settings_spec.rb
 - spec/integration/util/autoload_spec.rb
-- spec/integration/util/feature_spec.rb
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/execution_spec.rb
 - spec/integration/util/windows/security_spec.rb
@@ -3046,7 +2838,6 @@ test_files:
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type/package_spec.rb
 - spec/integration/type/file_spec.rb
-- spec/integration/type/sshkey_spec.rb
 - spec/integration/type/exec_spec.rb
 - spec/integration/type/user_spec.rb
 - spec/integration/reference/providers_spec.rb
@@ -3061,22 +2852,17 @@ test_files:
 - spec/integration/file_serving/metadata_spec.rb
 - spec/integration/transaction_spec.rb
 - spec/integration/data_binding.rb
-- spec/integration/parser/future_compiler_spec.rb
 - spec/integration/parser/resource_expressions_spec.rb
 - spec/integration/parser/node_spec.rb
 - spec/integration/parser/class_spec.rb
 - spec/integration/parser/conditionals_spec.rb
-- spec/integration/parser/parser_spec.rb
-- spec/integration/parser/collector_spec.rb
-- spec/integration/parser/dynamic_scoping_spec.rb
+- spec/integration/parser/collection_spec.rb
 - spec/integration/parser/catalog_spec.rb
 - spec/integration/parser/compiler_spec.rb
 - spec/integration/parser/environment_spec.rb
-- spec/integration/parser/ruby_manifest_spec.rb
 - spec/integration/parser/functions/require_spec.rb
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/undef_param_spec.rb
-- spec/integration/module_tool/tar/mini_spec.rb
 - spec/integration/type_spec.rb
 - spec/integration/agent/logging_spec.rb
 - spec/integration/ssl/certificate_request_spec.rb
@@ -3095,19 +2881,15 @@ test_files:
 - spec/integration/provider/ssh_authorized_key_spec.rb
 - spec/integration/provider/mount_spec.rb
 - spec/integration/provider/package_spec.rb
-- spec/monkey_patches/alias_should_to_must.rb
+- spec/integration/provider/sshkey_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
 - spec/unit/scheduler/splay_job_spec.rb
 - spec/unit/scheduler/job_spec.rb
-- spec/unit/rails/param_value_spec.rb
-- spec/unit/rails/host_spec.rb
-- spec/unit/rails/resource_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
 - spec/unit/file_bucket/file_spec.rb
 - spec/unit/node/environment_spec.rb
 - spec/unit/node/facts_spec.rb
 - spec/unit/puppet_spec.rb
-- spec/unit/rails_spec.rb
 - spec/unit/data_binding_spec.rb
 - spec/unit/application_spec.rb
 - spec/unit/provider_spec.rb
@@ -3115,7 +2897,6 @@ test_files:
 - spec/unit/hiera_puppet_spec.rb
 - spec/unit/configurer_spec.rb
 - spec/unit/relationship_spec.rb
-- spec/unit/hiera/backend/puppet_backend_spec.rb
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/context_spec.rb
 - spec/unit/network/http_pool_spec.rb
@@ -3129,19 +2910,20 @@ test_files:
 - spec/unit/network/http/webrick_spec.rb
 - spec/unit/network/http/error_spec.rb
 - spec/unit/network/http/pool_spec.rb
+- spec/unit/network/http/api_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/rack/rest_spec.rb
 - spec/unit/network/http/nocache_pool_spec.rb
-- spec/unit/network/http/api/v2/environments_spec.rb
-- spec/unit/network/http/api/v2/authorization_spec.rb
-- spec/unit/network/http/api/v1_spec.rb
-- spec/unit/network/http/api/v2_spec.rb
+- spec/unit/network/http/api/master/v3/environments_spec.rb
+- spec/unit/network/http/api/master/v3/authorization_spec.rb
+- spec/unit/network/http/api/master/v3_spec.rb
+- spec/unit/network/http/api/indirected_routes_spec.rb
+- spec/unit/network/http/api/ca/v1_spec.rb
 - spec/unit/network/http/rack_spec.rb
 - spec/unit/network/format_handler_spec.rb
 - spec/unit/network/authconfig_spec.rb
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/auth_config_parser_spec.rb
-- spec/unit/network/authentication_spec.rb
 - spec/unit/network/authorization_spec.rb
 - spec/unit/network/resolver_spec.rb
 - spec/unit/network/rights_spec.rb
@@ -3164,7 +2946,6 @@ test_files:
 - spec/unit/indirector/file_content/file_server_spec.rb
 - spec/unit/indirector/node/rest_spec.rb
 - spec/unit/indirector/node/store_configs_spec.rb
-- spec/unit/indirector/node/active_record_spec.rb
 - spec/unit/indirector/node/yaml_spec.rb
 - spec/unit/indirector/node/plain_spec.rb
 - spec/unit/indirector/node/ldap_spec.rb
@@ -3175,36 +2956,23 @@ test_files:
 - spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb
 - spec/unit/indirector/certificate_revocation_list/ca_spec.rb
 - spec/unit/indirector/certificate_revocation_list/file_spec.rb
-- spec/unit/indirector/instrumentation_probe/rest_spec.rb
-- spec/unit/indirector/instrumentation_probe/local_spec.rb
 - spec/unit/indirector/rest_spec.rb
 - spec/unit/indirector/key/disabled_ca_spec.rb
 - spec/unit/indirector/key/ca_spec.rb
 - spec/unit/indirector/key/file_spec.rb
-- spec/unit/indirector/facts/rest_spec.rb
 - spec/unit/indirector/facts/store_configs_spec.rb
-- spec/unit/indirector/facts/active_record_spec.rb
-- spec/unit/indirector/facts/inventory_active_record_spec.rb
 - spec/unit/indirector/facts/yaml_spec.rb
-- spec/unit/indirector/facts/inventory_service_spec.rb
 - spec/unit/indirector/facts/network_device_spec.rb
 - spec/unit/indirector/facts/facter_spec.rb
-- spec/unit/indirector/facts/couch_spec.rb
-- spec/unit/indirector/run/rest_spec.rb
-- spec/unit/indirector/run/local_spec.rb
 - spec/unit/indirector/json_spec.rb
 - spec/unit/indirector/certificate/rest_spec.rb
 - spec/unit/indirector/certificate/disabled_ca_spec.rb
 - spec/unit/indirector/certificate/ca_spec.rb
 - spec/unit/indirector/certificate/file_spec.rb
-- spec/unit/indirector/queue_spec.rb
 - spec/unit/indirector/store_configs_spec.rb
-- spec/unit/indirector/instrumentation_listener/rest_spec.rb
-- spec/unit/indirector/instrumentation_listener/local_spec.rb
 - spec/unit/indirector/request_spec.rb
 - spec/unit/indirector/certificate_status/rest_spec.rb
 - spec/unit/indirector/certificate_status/file_spec.rb
-- spec/unit/indirector/active_record_spec.rb
 - spec/unit/indirector/certificate_request/rest_spec.rb
 - spec/unit/indirector/certificate_request/disabled_ca_spec.rb
 - spec/unit/indirector/certificate_request/ca_spec.rb
@@ -3230,9 +2998,7 @@ test_files:
 - spec/unit/indirector/status/local_spec.rb
 - spec/unit/indirector/catalog/rest_spec.rb
 - spec/unit/indirector/catalog/json_spec.rb
-- spec/unit/indirector/catalog/queue_spec.rb
 - spec/unit/indirector/catalog/store_configs_spec.rb
-- spec/unit/indirector/catalog/active_record_spec.rb
 - spec/unit/indirector/catalog/yaml_spec.rb
 - spec/unit/indirector/catalog/msgpack_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
@@ -3243,17 +3009,13 @@ test_files:
 - spec/unit/indirector/msgpack_spec.rb
 - spec/unit/indirector/resource_type/rest_spec.rb
 - spec/unit/indirector/resource_type/parser_spec.rb
-- spec/unit/indirector/instrumentation_data/rest_spec.rb
-- spec/unit/indirector/instrumentation_data/local_spec.rb
 - spec/unit/indirector/file_server_spec.rb
 - spec/unit/indirector/envelope_spec.rb
 - spec/unit/indirector/direct_file_server_spec.rb
 - spec/unit/indirector/data_binding/none_spec.rb
 - spec/unit/indirector/data_binding/hiera_spec.rb
-- spec/unit/indirector/resource/rest_spec.rb
 - spec/unit/indirector/resource/ral_spec.rb
 - spec/unit/indirector/resource/store_configs_spec.rb
-- spec/unit/indirector/resource/active_record_spec.rb
 - spec/unit/indirector/indirection_spec.rb
 - spec/unit/indirector/exec_spec.rb
 - spec/unit/indirector/hiera_spec.rb
@@ -3272,20 +3034,16 @@ test_files:
 - spec/unit/util/run_mode_spec.rb
 - spec/unit/util/ssl_spec.rb
 - spec/unit/util/watcher/periodic_watcher_spec.rb
-- spec/unit/util/queue_spec.rb
 - spec/unit/util/symbolic_file_mode_spec.rb
 - spec/unit/util/resource_template_spec.rb
 - spec/unit/util/warnings_spec.rb
 - spec/unit/util/colors_spec.rb
-- spec/unit/util/monkey_patches/lines_spec.rb
 - spec/unit/util/user_attr_spec.rb
 - spec/unit/util/inifile_spec.rb
-- spec/unit/util/pson_spec.rb
 - spec/unit/util/json_lockfile_spec.rb
 - spec/unit/util/posix_spec.rb
 - spec/unit/util/metric_spec.rb
-- spec/unit/util/cacher_spec.rb
-- spec/unit/util/queue/stomp_spec.rb
+- spec/unit/util/retry_action_spec.rb
 - spec/unit/util/watched_file_spec.rb
 - spec/unit/util/nagios_maker_spec.rb
 - spec/unit/util/yaml_spec.rb
@@ -3295,12 +3053,9 @@ test_files:
 - spec/unit/util/tagging_spec.rb
 - spec/unit/util/autoload_spec.rb
 - spec/unit/util/log_spec.rb
-- spec/unit/util/log/rate_limited_logger_spec.rb
 - spec/unit/util/log/destinations_spec.rb
 - spec/unit/util/feature_spec.rb
 - spec/unit/util/package_spec.rb
-- spec/unit/util/inline_docs_spec.rb
-- spec/unit/util/zaml_spec.rb
 - spec/unit/util/storage_spec.rb
 - spec/unit/util/network_device/transport/telnet_spec.rb
 - spec/unit/util/network_device/transport/base_spec.rb
@@ -3312,7 +3067,6 @@ test_files:
 - spec/unit/util/network_device/cisco/facts_spec.rb
 - spec/unit/util/filetype_spec.rb
 - spec/unit/util/constant_inflector_spec.rb
-- spec/unit/util/rdoc/parser_spec.rb
 - spec/unit/util/suidmanager_spec.rb
 - spec/unit/util/profiler/logging_spec.rb
 - spec/unit/util/profiler/around_profiler_spec.rb
@@ -3322,20 +3076,10 @@ test_files:
 - spec/unit/util/network_device_spec.rb
 - spec/unit/util/lockfile_spec.rb
 - spec/unit/util/command_line_utils/puppet_option_parser_spec.rb
-- spec/unit/util/retryaction_spec.rb
 - spec/unit/util/watcher_spec.rb
 - spec/unit/util/execution_stub_spec.rb
-- spec/unit/util/reference_serializer_spec.rb
-- spec/unit/util/cache_accumulator_spec.rb
 - spec/unit/util/reference_spec.rb
 - spec/unit/util/command_line_spec.rb
-- spec/unit/util/instrumentation/listeners/log_spec.rb
-- spec/unit/util/instrumentation/listeners/performance_spec.rb
-- spec/unit/util/instrumentation/indirection_probe_spec.rb
-- spec/unit/util/instrumentation/listener_spec.rb
-- spec/unit/util/instrumentation/data_spec.rb
-- spec/unit/util/instrumentation/instrumentable_spec.rb
-- spec/unit/util/instrumentation_spec.rb
 - spec/unit/util/errors_spec.rb
 - spec/unit/util/execution_spec.rb
 - spec/unit/util/tag_set_spec.rb
@@ -3353,17 +3097,14 @@ test_files:
 - spec/unit/application/certificate_spec.rb
 - spec/unit/application/agent_spec.rb
 - spec/unit/application/apply_spec.rb
-- spec/unit/application/queue_spec.rb
 - spec/unit/application/indirection_base_spec.rb
 - spec/unit/application/doc_spec.rb
 - spec/unit/application/face_base_spec.rb
 - spec/unit/application/filebucket_spec.rb
 - spec/unit/application/device_spec.rb
 - spec/unit/application/config_spec.rb
-- spec/unit/application/kick_spec.rb
 - spec/unit/application/master_spec.rb
 - spec/unit/application/inspect_spec.rb
-- spec/unit/application/secret_agent_spec.rb
 - spec/unit/application/cert_spec.rb
 - spec/unit/application/describe_spec.rb
 - spec/unit/application/resource_spec.rb
@@ -3419,8 +3160,6 @@ test_files:
 - spec/unit/type/exec_spec.rb
 - spec/unit/type/user_spec.rb
 - spec/unit/defaults_spec.rb
-- spec/unit/dsl/resource_type_api_spec.rb
-- spec/unit/dsl/resource_api_spec.rb
 - spec/unit/configurer/plugin_handler_spec.rb
 - spec/unit/configurer/downloader_factory_spec.rb
 - spec/unit/configurer/fact_handler_spec.rb
@@ -3435,7 +3174,6 @@ test_files:
 - spec/unit/transaction/report_spec.rb
 - spec/unit/transaction/resource_harness_spec.rb
 - spec/unit/transaction/event_manager_spec.rb
-- spec/unit/run_spec.rb
 - spec/unit/file_serving/configuration/parser_spec.rb
 - spec/unit/file_serving/base_spec.rb
 - spec/unit/file_serving/configuration_spec.rb
@@ -3463,40 +3201,11 @@ test_files:
 - spec/unit/parser/relationship_spec.rb
 - spec/unit/parser/templatewrapper_spec.rb
 - spec/unit/parser/type_loader_spec.rb
-- spec/unit/parser/ast_spec.rb
 - spec/unit/parser/files_spec.rb
-- spec/unit/parser/parser_spec.rb
-- spec/unit/parser/collector_spec.rb
 - spec/unit/parser/functions_spec.rb
 - spec/unit/parser/compiler_spec.rb
-- spec/unit/parser/ast/boolean_operator_spec.rb
-- spec/unit/parser/ast/vardef_spec.rb
-- spec/unit/parser/ast/arithmetic_operator_spec.rb
-- spec/unit/parser/ast/in_operator_spec.rb
-- spec/unit/parser/ast/relationship_spec.rb
-- spec/unit/parser/ast/node_spec.rb
-- spec/unit/parser/ast/casestatement_spec.rb
-- spec/unit/parser/ast/resource_reference_spec.rb
-- spec/unit/parser/ast/nop_spec.rb
-- spec/unit/parser/ast/selector_spec.rb
-- spec/unit/parser/ast/collection_spec.rb
 - spec/unit/parser/ast/block_expression_spec.rb
-- spec/unit/parser/ast/function_spec.rb
-- spec/unit/parser/ast/collexpr_spec.rb
-- spec/unit/parser/ast/astarray_spec.rb
 - spec/unit/parser/ast/leaf_spec.rb
-- spec/unit/parser/ast/not_spec.rb
-- spec/unit/parser/ast/match_operator_spec.rb
-- spec/unit/parser/ast/resourceparam_spec.rb
-- spec/unit/parser/ast/comparison_operator_spec.rb
-- spec/unit/parser/ast/definition_spec.rb
-- spec/unit/parser/ast/ifstatement_spec.rb
-- spec/unit/parser/ast/resource_override_spec.rb
-- spec/unit/parser/ast/resource_defaults_spec.rb
-- spec/unit/parser/ast/hostclass_spec.rb
-- spec/unit/parser/ast/asthash_spec.rb
-- spec/unit/parser/ast/minus_spec.rb
-- spec/unit/parser/ast/resource_spec.rb
 - spec/unit/parser/resource/param_spec.rb
 - spec/unit/parser/functions/generate_spec.rb
 - spec/unit/parser/functions/hiera_hash_spec.rb
@@ -3516,7 +3225,6 @@ test_files:
 - spec/unit/parser/functions/lookup_spec.rb
 - spec/unit/parser/functions/tag_spec.rb
 - spec/unit/parser/functions/versioncmp_spec.rb
-- spec/unit/parser/functions/extlookup_spec.rb
 - spec/unit/parser/functions/template_spec.rb
 - spec/unit/parser/functions/contain_spec.rb
 - spec/unit/parser/functions/file_spec.rb
@@ -3524,19 +3232,19 @@ test_files:
 - spec/unit/parser/functions/include_spec.rb
 - spec/unit/parser/functions/hiera_array_spec.rb
 - spec/unit/parser/functions/fail_spec.rb
-- spec/unit/parser/functions/search_spec.rb
 - spec/unit/parser/functions/hiera_spec.rb
 - spec/unit/parser/scope_spec.rb
 - spec/unit/parser/resource_spec.rb
-- spec/unit/parser/lexer_spec.rb
 - spec/unit/version_spec.rb
 - spec/unit/environments_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/functions4_spec.rb
+- spec/unit/data_providers/sample_data_provider_spec.rb
+- spec/unit/data_providers/function_data_provider_spec.rb
 - spec/unit/graph/relationship_graph_spec.rb
 - spec/unit/graph/key_spec.rb
 - spec/unit/graph/sequential_prioritizer_spec.rb
-- spec/unit/graph/simple_graph.rb
+- spec/unit/graph/simple_graph_spec.rb
 - spec/unit/graph/title_hash_prioritizer_spec.rb
 - spec/unit/graph/rb_tree_map_spec.rb
 - spec/unit/settings/directory_setting_spec.rb
@@ -3554,10 +3262,8 @@ test_files:
 - spec/unit/settings/path_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
 - spec/unit/parameter_spec.rb
-- spec/unit/reports/tagmail_spec.rb
 - spec/unit/reports/store_spec.rb
 - spec/unit/reports/http_spec.rb
-- spec/unit/reports/rrdgraph_spec.rb
 - spec/unit/interface/face_collection_spec.rb
 - spec/unit/interface/option_builder_spec.rb
 - spec/unit/interface/documentation_spec.rb
@@ -3571,13 +3277,12 @@ test_files:
 - spec/unit/pops/adaptable_spec.rb
 - spec/unit/pops/label_provider_spec.rb
 - spec/unit/pops/types/enumeration_spec.rb
+- spec/unit/pops/types/class_loader_spec.rb
 - spec/unit/pops/types/type_calculator_spec.rb
 - spec/unit/pops/types/type_parser_spec.rb
 - spec/unit/pops/types/type_factory_spec.rb
 - spec/unit/pops/factory_spec.rb
 - spec/unit/pops/validator/validator_spec.rb
-- spec/unit/pops/validation_spec.rb
-- spec/unit/pops/evaluator/runtime3_converter_spec.rb
 - spec/unit/pops/evaluator/conditionals_spec.rb
 - spec/unit/pops/evaluator/variables_spec.rb
 - spec/unit/pops/evaluator/collections_ops_spec.rb
@@ -3589,11 +3294,6 @@ test_files:
 - spec/unit/pops/evaluator/string_interpolation_spec.rb
 - spec/unit/pops/evaluator/logical_ops_spec.rb
 - spec/unit/pops/evaluator/arithmetic_ops_spec.rb
-- spec/unit/pops/transformer/transform_basic_expressions_spec.rb
-- spec/unit/pops/transformer/transform_conditionals_spec.rb
-- spec/unit/pops/transformer/transformer_rspec_helper.rb
-- spec/unit/pops/transformer/transform_calls_spec.rb
-- spec/unit/pops/transformer/transform_containers_spec.rb
 - spec/unit/pops/containment_spec.rb
 - spec/unit/pops/issues_spec.rb
 - spec/unit/pops/parser/parse_containers_spec.rb
@@ -3609,7 +3309,6 @@ test_files:
 - spec/unit/pops/parser/parse_resource_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
-- spec/unit/pops/migration_spec.rb
 - spec/unit/pops/utils_spec.rb
 - spec/unit/pops/binder/bindings_checker_spec.rb
 - spec/unit/pops/binder/bindings_composer_spec.rb
@@ -3617,7 +3316,6 @@ test_files:
 - spec/unit/pops/binder/config/binder_config_spec.rb
 - spec/unit/pops/binder/binder_spec.rb
 - spec/unit/pops/binder/bindings_validator_factory_spec.rb
-- spec/unit/pops/model/ast_transformer_spec.rb
 - spec/unit/pops/model/model_spec.rb
 - spec/unit/pops/visitor_spec.rb
 - spec/unit/pops/loaders/dependency_loader_spec.rb
@@ -3661,19 +3359,16 @@ test_files:
 - spec/unit/ssl/certificate_request_attributes_spec.rb
 - spec/unit/ssl/oids_spec.rb
 - spec/unit/ssl/certificate_factory_spec.rb
+- spec/unit/face/epp_face_spec.rb
 - spec/unit/face/certificate_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/plugin_spec.rb
 - spec/unit/face/config_spec.rb
-- spec/unit/face/instrumentation_data_spec.rb
 - spec/unit/face/module_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/help_spec.rb
-- spec/unit/face/instrumentation_probe_spec.rb
-- spec/unit/face/secret_agent_spec.rb
 - spec/unit/face/catalog_spec.rb
 - spec/unit/face/file_spec.rb
-- spec/unit/face/instrumentation_listener_spec.rb
 - spec/unit/face/module/build_spec.rb
 - spec/unit/face/module/uninstall_spec.rb
 - spec/unit/face/module/upgrade_spec.rb
@@ -3687,9 +3382,11 @@ test_files:
 - spec/unit/resource/type_collection_helper_spec.rb
 - spec/unit/resource/catalog_spec.rb
 - spec/unit/resource/type_spec.rb
+- spec/unit/functions/split_spec.rb
 - spec/unit/functions/scanf_spec.rb
+- spec/unit/functions/regsubst_spec.rb
 - spec/unit/functions/with_spec.rb
-- spec/unit/functions/defined_spec.rb
+- spec/unit/functions/lookup_spec.rb
 - spec/unit/functions/match_spec.rb
 - spec/unit/functions/slice_spec.rb
 - spec/unit/functions/reduce_spec.rb
@@ -3701,11 +3398,13 @@ test_files:
 - spec/unit/functions/epp_spec.rb
 - spec/unit/functions/hiera_spec.rb
 - spec/unit/confine_collection_spec.rb
+- spec/unit/external/pson_spec.rb
 - spec/unit/provider/command_spec.rb
 - spec/unit/provider/cron/crontab_spec.rb
 - spec/unit/provider/cron/parsed_spec.rb
 - spec/unit/provider/user/useradd_spec.rb
 - spec/unit/provider/user/directoryservice_spec.rb
+- spec/unit/provider/user/openbsd_spec.rb
 - spec/unit/provider/user/user_role_add_spec.rb
 - spec/unit/provider/user/ldap_spec.rb
 - spec/unit/provider/user/aix_spec.rb
@@ -3768,7 +3467,6 @@ test_files:
 - spec/unit/provider/package/nim_spec.rb
 - spec/unit/provider/package/sun_spec.rb
 - spec/unit/provider/package/pip_spec.rb
-- spec/unit/provider/package/msi_spec.rb
 - spec/unit/provider/package/appdmg_spec.rb
 - spec/unit/provider/package/windows_spec.rb
 - spec/unit/provider/package/pkgin_spec.rb
@@ -3782,11 +3480,11 @@ test_files:
 - spec/unit/provider/package/opkg_spec.rb
 - spec/unit/provider/package/aix_spec.rb
 - spec/unit/provider/package/pkgdmg_spec.rb
+- spec/unit/provider/package/urpmi_spec.rb
 - spec/unit/provider/package/up2date_spec.rb
 - spec/unit/provider/package/hpux_spec.rb
 - spec/unit/provider/package/yum_spec.rb
 - spec/unit/provider/package/aptrpm_spec.rb
-- spec/unit/provider/package/urpmi.rb
 - spec/unit/provider/package/apt_spec.rb
 - spec/unit/provider/package/zypper_spec.rb
 - spec/unit/provider/package/windows/msi_package_spec.rb
@@ -3809,8 +3507,8 @@ test_files:
 - spec/unit/forge/errors_spec.rb
 - spec/spec_helper.rb
 - spec/watchr.rb
-- spec/shared_contexts/platform.rb
-- spec/shared_contexts/checksums.rb
+- spec/shared_contexts/checksum.rb
+- spec/shared_contexts/digests.rb
 - spec/shared_behaviours/hiera_indirections.rb
 - spec/shared_behaviours/iterative_functions.rb
 - spec/shared_behaviours/documentation_on_faces.rb