puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/spec/unit/util/windows/api_types_spec.rb

@@ -0,0 +1,28 @@
+# encoding: UTF-8
+#!/usr/bin/env ruby
+
+require 'spec_helper'
+
+describe "FFI::MemoryPointer", :if => Puppet.features.microsoft_windows? do
+  context "read_wide_string" do
+    let (:string) { "foo_bar" }
+
+    it "should properly roundtrip a given string" do
+      read_string = nil
+      FFI::MemoryPointer.from_string_to_wide_string(string) do |ptr|
+        read_string = ptr.read_wide_string(string.length)
+      end
+
+      read_string.should == string
+    end
+
+    it "should return a given string in the default encoding" do
+      read_string = nil
+      FFI::MemoryPointer.from_string_to_wide_string(string) do |ptr|
+        read_string = ptr.read_wide_string(string.length)
+      end
+
+      read_string.encoding.should == Encoding.default_external
+    end
+  end
+end

data/spec/unit/util/windows/registry_spec.rb

@@ -1,7 +1,6 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/windows'
-require 'puppet/util/windows/registry'
 
 describe Puppet::Util::Windows::Registry, :if => Puppet::Util::Platform.windows? do
   subject do
@@ -43,12 +42,14 @@ describe Puppet::Util::Windows::Registry, :if => Puppet::Util::Platform.windows?
       yielded.should == subkey
     end
 
-    [described_class::KEY64, described_class::KEY32].each do |access|
-      it "should open the key for read access 0x#{access.to_s(16)}" do
-        mode = described_class::KEY_READ | access
-        hkey.expects(:open).with(path, mode)
+    if Puppet::Util::Platform.windows?
+      [described_class::KEY64, described_class::KEY32].each do |access|
+        it "should open the key for read access 0x#{access.to_s(16)}" do
+          mode = described_class::KEY_READ | access
+          hkey.expects(:open).with(path, mode)
 
-        subject.open(name, path, mode) {|reg| }
+          subject.open(name, path, mode) {|reg| }
+        end
       end
     end
 

data/spec/unit/util/windows/sid_spec.rb

@@ -4,12 +4,9 @@ require 'spec_helper'
 describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows? do
   if Puppet.features.microsoft_windows?
     require 'puppet/util/windows'
-    class SIDTester
-      include Puppet::Util::Windows::SID
-    end
   end
 
-  let(:subject)      { SIDTester.new }
+  let(:subject)      { Puppet::Util::Windows::SID }
   let(:sid)          { Win32::Security::SID::LocalSystem }
   let(:invalid_sid)  { 'bogus' }
   let(:unknown_sid)  { 'S-0-0-0' }
@@ -50,7 +47,7 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
       expect {
         invalid_octet = [1]
         subject.octet_string_to_sid_object(invalid_octet)
-      }.to raise_error(Win32::Security::SID::Error, /No mapping between account names and security IDs was done./)
+      }.to raise_error(SystemCallError, /No mapping between account names and security IDs was done./)
     end
   end
 
@@ -159,7 +156,7 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
 
     it "should raise if the conversion fails" do
       subject.expects(:string_to_sid_ptr).with(sid).
-        raises(Puppet::Util::Windows::Error.new("Failed to convert string SID: #{sid}", Windows::Error::ERROR_ACCESS_DENIED))
+        raises(Puppet::Util::Windows::Error.new("Failed to convert string SID: #{sid}", Puppet::Util::Windows::Error::ERROR_ACCESS_DENIED))
 
       expect {
         subject.string_to_sid_ptr(sid) {|ptr| }

data/spec/unit/util/windows/string_spec.rb

@@ -50,5 +50,9 @@ describe "Puppet::Util::Windows::String", :if => Puppet.features.microsoft_windo
     it "should convert an UTF-32BE string" do
       converts_to_wide_string("bob\u00E8".encode(Encoding::UTF_32BE))
     end
+
+    it "should return a nil when given a nil" do
+      wide_string(nil).should == nil
+    end
   end
 end

data/spec/unit/util/zaml_spec.rb

@@ -69,7 +69,11 @@ describe "Pure ruby yaml implementation" do
     end
 
     it "serializes a time in UTC" do
-      pending("not supported on Windows", :if => Puppet.features.microsoft_windows? && RUBY_VERSION[0,3] == '1.8') do
+      bad_rubies =
+        RUBY_VERSION[0,3] == '1.8' ||
+        RUBY_VERSION[0,3] == '2.0' && RUBY_PLATFORM == 'i386-mingw32'
+
+      pending("not supported on Windows", :if => Puppet.features.microsoft_windows? && bad_rubies) do
         the_time_in("Europe/London").should be_equivalent_to(the_time_in_yaml_offset_by("+00:00"))
       end
     end

data/tasks/benchmark.rake

@@ -6,6 +6,14 @@ namespace :benchmark do
   def generate_scenario_tasks(location, name)
     desc File.read(File.join(location, 'description'))
     task name => "#{name}:run"
+    # Load a BenchmarkerTask to handle config of the benchmark
+    task_handler_file = File.expand_path(File.join(location, 'benchmarker_task.rb'))
+    if File.exist?(task_handler_file)
+      require task_handler_file
+      run_args = BenchmarkerTask.run_args
+    else
+      run_args = []
+    end
 
     namespace name do
       task :setup do
@@ -27,20 +35,20 @@ namespace :benchmark do
       end
 
       desc "Run the #{name} scenario."
-      task :run => :generate do
+      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|
           times = []
           ENV['ITERATIONS'].to_i.times do |i|
             start_time = Time.now.to_i
             times << b.report("Run #{i + 1}") do
-              @benchmark.run
+              details << @benchmark.run(args)
             end
             report << [to_millis(start_time), to_millis(times.last.real), 200, true, name]
           end
@@ -53,14 +61,41 @@ namespace :benchmark do
         write_csv("#{name}.samples",
                   %w{timestamp elapsed responsecode success name},
                   report)
+
+        # report details, if any were produced
+        if details[0].is_a?(Array) && details[0][0].is_a?(Benchmark::Tms)
+          # assume all entries are Tms if the first is
+          # turn each into a hash of label => tms (since labels are lost when doing arithmetic on Tms)
+          hashed = details.reduce([]) do |memo, measures|
+            memo << measures.reduce({}) {|memo2, measure| memo2[measure.label] = measure; memo2}
+            memo
+          end
+          # sum across all hashes
+          result = {}
+
+          hashed_totals = hashed.reduce {|memo, h| memo.merge(h) {|k, old, new| old + new }}
+          # average the totals
+          hashed_totals.keys.each {|k| hashed_totals[k] /= details.length }
+          min_width = 14
+          max_width = (hashed_totals.keys.map(&:length) << min_width).max
+          puts "\n"
+          puts sprintf("%2$*1$s %3$s", -max_width, 'Details (avg)', "      user     system      total        real")
+          puts "-" * (46 + max_width)
+          hashed_totals.sort.each {|k,v| puts sprintf("%2$*1$s %3$s", -max_width, k, v.format) }
+        end
       end
 
       desc "Profile a single run of the #{name} scenario."
-      task :profile => :generate do
+      task :profile, [:warm_up_runs, *run_args] => :generate do |_, args|
+        warm_up_runs = (args[:warm_up_runs] || '0').to_i
+        warm_up_runs.times do
+          @benchmark.run(args)
+        end
+
         require 'ruby-prof'
 
         result = RubyProf.profile do
-          @benchmark.run
+          @benchmark.run(args)
         end
 
         printer = RubyProf::CallTreePrinter.new(result)

data/tasks/parser.rake

@@ -1,5 +1,19 @@
-
-desc "Generate the parser"
+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}
+end
+
+desc "Generate the 4.x 'future' parser with egrammar.output"
+task :gen_eparser_output do
+  %x{racc -v -olib/puppet/pops/parser/eparser.rb lib/puppet/pops/parser/egrammar.ra}
+end
+
+desc "Generate the 4.x 'future' parser with debugging output"
+task :gen_eparser_debug do
+  %x{racc -t -olib/puppet/pops/parser/eparser.rb lib/puppet/pops/parser/egrammar.ra}
+end

data/tasks/yard.rake

@@ -54,6 +54,6 @@ begin
   end
 rescue LoadError => e
   if verbose
-    puts "Document generation not available without yard. #{e.message}"
+    STDERR.puts "Document generation not available without yard. #{e.message}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.7.0
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -44,20 +44,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rgen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -78,126 +64,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: sys-admin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-- !ruby/object:Gem::Dependency
-  name: win32-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: win32-dir
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: win32-eventlog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: win32-process
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: win32-security
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: win32-service
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-- !ruby/object:Gem::Dependency
-  name: win32-taskscheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: win32console
   requirement: !ruby/object:Gem::Requirement
@@ -212,34 +156,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.2
-- !ruby/object:Gem::Dependency
-  name: windows-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: windows-pr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +234,7 @@ files:
 - lib/puppet/coercion.rb
 - lib/puppet/configurer.rb
 - lib/puppet/configurer/downloader.rb
+- lib/puppet/configurer/downloader_factory.rb
 - lib/puppet/configurer/fact_handler.rb
 - lib/puppet/configurer/plugin_handler.rb
 - lib/puppet/confine.rb
@@ -391,10 +308,12 @@ files:
 - lib/puppet/face/secret_agent.rb
 - lib/puppet/face/status.rb
 - lib/puppet/feature/base.rb
+- lib/puppet/feature/cfacter.rb
 - lib/puppet/feature/eventlog.rb
 - lib/puppet/feature/external_facts.rb
 - lib/puppet/feature/libuser.rb
 - lib/puppet/feature/msgpack.rb
+- lib/puppet/feature/pe_license.rb
 - lib/puppet/feature/pson.rb
 - lib/puppet/feature/rack.rb
 - lib/puppet/feature/rails.rb
@@ -431,14 +350,23 @@ files:
 - lib/puppet/file_system/memory_file.rb
 - lib/puppet/file_system/memory_impl.rb
 - lib/puppet/file_system/path_pattern.rb
-- lib/puppet/file_system/tempfile.rb
+- lib/puppet/file_system/uniquefile.rb
 - lib/puppet/forge.rb
 - lib/puppet/forge/cache.rb
 - lib/puppet/forge/errors.rb
 - lib/puppet/forge/repository.rb
 - lib/puppet/functions.rb
 - lib/puppet/functions/assert_type.rb
+- lib/puppet/functions/each.rb
+- lib/puppet/functions/epp.rb
+- lib/puppet/functions/filter.rb
 - lib/puppet/functions/import.rb
+- lib/puppet/functions/inline_epp.rb
+- lib/puppet/functions/map.rb
+- lib/puppet/functions/match.rb
+- lib/puppet/functions/reduce.rb
+- lib/puppet/functions/slice.rb
+- lib/puppet/functions/with.rb
 - lib/puppet/graph.rb
 - lib/puppet/graph/key.rb
 - lib/puppet/graph/prioritizer.rb
@@ -508,6 +436,7 @@ files:
 - lib/puppet/indirector/file_metadata/rest.rb
 - lib/puppet/indirector/file_metadata/selector.rb
 - lib/puppet/indirector/file_server.rb
+- lib/puppet/indirector/hiera.rb
 - lib/puppet/indirector/indirection.rb
 - lib/puppet/indirector/instrumentation_data.rb
 - lib/puppet/indirector/instrumentation_data/local.rb
@@ -599,6 +528,7 @@ files:
 - lib/puppet/module_tool/metadata.rb
 - lib/puppet/module_tool/modulefile.rb
 - lib/puppet/module_tool/shared_behaviors.rb
+- lib/puppet/module_tool/skeleton/templates/generator/Gemfile
 - lib/puppet/module_tool/skeleton/templates/generator/README.md.erb
 - lib/puppet/module_tool/skeleton/templates/generator/Rakefile
 - lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
@@ -629,14 +559,19 @@ files:
 - lib/puppet/network/http/compression.rb
 - lib/puppet/network/http/connection.rb
 - lib/puppet/network/http/error.rb
+- lib/puppet/network/http/factory.rb
 - lib/puppet/network/http/handler.rb
 - lib/puppet/network/http/issues.rb
 - lib/puppet/network/http/memory_response.rb
+- lib/puppet/network/http/nocache_pool.rb
+- lib/puppet/network/http/pool.rb
 - lib/puppet/network/http/rack.rb
 - lib/puppet/network/http/rack/rest.rb
 - lib/puppet/network/http/request.rb
 - lib/puppet/network/http/response.rb
 - lib/puppet/network/http/route.rb
+- lib/puppet/network/http/session.rb
+- lib/puppet/network/http/site.rb
 - lib/puppet/network/http/webrick.rb
 - lib/puppet/network/http/webrick/rest.rb
 - lib/puppet/network/http_pool.rb
@@ -695,13 +630,13 @@ files:
 - lib/puppet/parser/collector.rb
 - lib/puppet/parser/compiler.rb
 - lib/puppet/parser/e4_parser_adapter.rb
-- lib/puppet/parser/e_parser_adapter.rb
 - lib/puppet/parser/files.rb
 - lib/puppet/parser/functions.rb
-- lib/puppet/parser/functions/collect.rb
+- lib/puppet/parser/functions/assert_type.rb
 - lib/puppet/parser/functions/contain.rb
 - lib/puppet/parser/functions/create_resources.rb
 - lib/puppet/parser/functions/defined.rb
+- lib/puppet/parser/functions/digest.rb
 - lib/puppet/parser/functions/each.rb
 - lib/puppet/parser/functions/epp.rb
 - lib/puppet/parser/functions/extlookup.rb
@@ -719,13 +654,13 @@ files:
 - lib/puppet/parser/functions/inline_template.rb
 - lib/puppet/parser/functions/lookup.rb
 - lib/puppet/parser/functions/map.rb
+- lib/puppet/parser/functions/match.rb
 - lib/puppet/parser/functions/md5.rb
 - lib/puppet/parser/functions/realize.rb
 - lib/puppet/parser/functions/reduce.rb
 - lib/puppet/parser/functions/regsubst.rb
 - lib/puppet/parser/functions/require.rb
 - lib/puppet/parser/functions/search.rb
-- lib/puppet/parser/functions/select.rb
 - lib/puppet/parser/functions/sha1.rb
 - lib/puppet/parser/functions/shellquote.rb
 - lib/puppet/parser/functions/slice.rb
@@ -735,6 +670,7 @@ files:
 - lib/puppet/parser/functions/tagged.rb
 - lib/puppet/parser/functions/template.rb
 - lib/puppet/parser/functions/versioncmp.rb
+- lib/puppet/parser/functions/with.rb
 - lib/puppet/parser/grammar.ra
 - lib/puppet/parser/lexer.rb
 - lib/puppet/parser/makefile
@@ -761,6 +697,7 @@ files:
 - lib/puppet/pops/binder/bindings_loader.rb
 - lib/puppet/pops/binder/bindings_model.rb
 - lib/puppet/pops/binder/bindings_model_dumper.rb
+- lib/puppet/pops/binder/bindings_model_meta.rb
 - lib/puppet/pops/binder/bindings_validator_factory.rb
 - lib/puppet/pops/binder/config/binder_config.rb
 - lib/puppet/pops/binder/config/binder_config_checker.rb
@@ -777,6 +714,7 @@ files:
 - lib/puppet/pops/binder/system_bindings.rb
 - lib/puppet/pops/containment.rb
 - lib/puppet/pops/evaluator/access_operator.rb
+- lib/puppet/pops/evaluator/callable_mismatch_describer.rb
 - lib/puppet/pops/evaluator/callable_signature.rb
 - lib/puppet/pops/evaluator/closure.rb
 - lib/puppet/pops/evaluator/compare_operator.rb
@@ -799,7 +737,6 @@ files:
 - lib/puppet/pops/loader/module_loaders.rb
 - lib/puppet/pops/loader/null_loader.rb
 - lib/puppet/pops/loader/ruby_function_instantiator.rb
-- lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb
 - lib/puppet/pops/loader/simple_environment_loader.rb
 - lib/puppet/pops/loader/static_loader.rb
 - lib/puppet/pops/loader/uri_helper.rb
@@ -809,6 +746,7 @@ files:
 - lib/puppet/pops/model/factory.rb
 - lib/puppet/pops/model/model.rb
 - lib/puppet/pops/model/model_label_provider.rb
+- lib/puppet/pops/model/model_meta.rb
 - lib/puppet/pops/model/model_tree_dumper.rb
 - lib/puppet/pops/model/tree_dumper.rb
 - lib/puppet/pops/parser/code_merger.rb
@@ -819,12 +757,10 @@ files:
 - lib/puppet/pops/parser/evaluating_parser.rb
 - lib/puppet/pops/parser/heredoc_support.rb
 - lib/puppet/pops/parser/interpolation_support.rb
-- lib/puppet/pops/parser/lexer.rb
 - lib/puppet/pops/parser/lexer2.rb
 - lib/puppet/pops/parser/lexer_support.rb
 - lib/puppet/pops/parser/locatable.rb
 - lib/puppet/pops/parser/locator.rb
-- lib/puppet/pops/parser/makefile
 - lib/puppet/pops/parser/parser_support.rb
 - lib/puppet/pops/parser/slurp_support.rb
 - lib/puppet/pops/patterns.rb
@@ -835,11 +771,10 @@ files:
 - lib/puppet/pops/types/type_factory.rb
 - lib/puppet/pops/types/type_parser.rb
 - lib/puppet/pops/types/types.rb
+- lib/puppet/pops/types/types_meta.rb
 - lib/puppet/pops/utils.rb
 - lib/puppet/pops/validation.rb
-- lib/puppet/pops/validation/checker3_1.rb
 - lib/puppet/pops/validation/checker4_0.rb
-- lib/puppet/pops/validation/validator_factory_3_1.rb
 - lib/puppet/pops/validation/validator_factory_4_0.rb
 - lib/puppet/pops/visitable.rb
 - lib/puppet/pops/visitor.rb
@@ -1118,7 +1053,6 @@ files:
 - lib/puppet/type/zone.rb
 - lib/puppet/type/zpool.rb
 - lib/puppet/util.rb
-- lib/puppet/util/adsi.rb
 - lib/puppet/util/autoload.rb
 - lib/puppet/util/backups.rb
 - lib/puppet/util/cacher.rb
@@ -1187,8 +1121,9 @@ files:
 - lib/puppet/util/plugins.rb
 - lib/puppet/util/posix.rb
 - lib/puppet/util/profiler.rb
+- lib/puppet/util/profiler/aggregate.rb
+- lib/puppet/util/profiler/around_profiler.rb
 - lib/puppet/util/profiler/logging.rb
-- lib/puppet/util/profiler/none.rb
 - lib/puppet/util/profiler/object_counts.rb
 - lib/puppet/util/profiler/wall_clock.rb
 - lib/puppet/util/provider_features.rb
@@ -1229,6 +1164,9 @@ files:
 - lib/puppet/util/windows.rb
 - lib/puppet/util/windows/access_control_entry.rb
 - lib/puppet/util/windows/access_control_list.rb
+- lib/puppet/util/windows/adsi.rb
+- lib/puppet/util/windows/api_types.rb
+- lib/puppet/util/windows/com.rb
 - lib/puppet/util/windows/error.rb
 - lib/puppet/util/windows/file.rb
 - lib/puppet/util/windows/process.rb
@@ -1238,16 +1176,185 @@ files:
 - lib/puppet/util/windows/security_descriptor.rb
 - lib/puppet/util/windows/sid.rb
 - lib/puppet/util/windows/string.rb
+- lib/puppet/util/windows/taskscheduler.rb
 - lib/puppet/util/windows/user.rb
 - lib/puppet/util/yaml.rb
 - lib/puppet/util/zaml.rb
 - lib/puppet/vendor.rb
+- lib/puppet/vendor/load_pathspec.rb
+- lib/puppet/vendor/load_rgen.rb
 - lib/puppet/vendor/load_safe_yaml.rb
 - lib/puppet/vendor/load_semantic.rb
+- lib/puppet/vendor/pathspec/CHANGELOG.md
+- lib/puppet/vendor/pathspec/LICENSE
+- lib/puppet/vendor/pathspec/PUPPET_README.md
+- lib/puppet/vendor/pathspec/README.md
+- lib/puppet/vendor/pathspec/lib/pathspec.rb
+- lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb
+- lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb
+- lib/puppet/vendor/pathspec/lib/pathspec/spec.rb
 - lib/puppet/vendor/require_vendored.rb
+- lib/puppet/vendor/rgen/CHANGELOG
+- lib/puppet/vendor/rgen/MIT-LICENSE
+- lib/puppet/vendor/rgen/PUPPET_README.md
+- lib/puppet/vendor/rgen/README.rdoc
+- lib/puppet/vendor/rgen/Rakefile
+- lib/puppet/vendor/rgen/TODO
+- lib/puppet/vendor/rgen/anounce.txt
+- lib/puppet/vendor/rgen/design_rationale.txt
+- lib/puppet/vendor/rgen/lib/ea_support/ea_support.rb
+- lib/puppet/vendor/rgen/lib/ea_support/id_store.rb
+- lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_metamodel.rb
+- lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_metamodel_ext.rb
+- lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_metamodel_generator.rb
+- lib/puppet/vendor/rgen/lib/ea_support/uml13_ea_to_uml13.rb
+- lib/puppet/vendor/rgen/lib/ea_support/uml13_to_uml13_ea.rb
+- lib/puppet/vendor/rgen/lib/metamodels/uml13_metamodel.rb
+- lib/puppet/vendor/rgen/lib/metamodels/uml13_metamodel_ext.rb
+- lib/puppet/vendor/rgen/lib/mmgen/metamodel_generator.rb
+- lib/puppet/vendor/rgen/lib/mmgen/mm_ext/ecore_mmgen_ext.rb
+- lib/puppet/vendor/rgen/lib/mmgen/mmgen.rb
+- lib/puppet/vendor/rgen/lib/mmgen/templates/annotations.tpl
+- lib/puppet/vendor/rgen/lib/mmgen/templates/metamodel_generator.tpl
+- lib/puppet/vendor/rgen/lib/rgen/array_extensions.rb
+- lib/puppet/vendor/rgen/lib/rgen/ecore/ecore.rb
+- lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_builder_methods.rb
+- lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_ext.rb
+- lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_interface.rb
+- lib/puppet/vendor/rgen/lib/rgen/ecore/ecore_to_ruby.rb
+- lib/puppet/vendor/rgen/lib/rgen/ecore/ruby_to_ecore.rb
+- lib/puppet/vendor/rgen/lib/rgen/environment.rb
+- lib/puppet/vendor/rgen/lib/rgen/fragment/dump_file_cache.rb
+- lib/puppet/vendor/rgen/lib/rgen/fragment/fragmented_model.rb
+- lib/puppet/vendor/rgen/lib/rgen/fragment/model_fragment.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/abstract_instantiator.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/abstract_xml_instantiator.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/default_xml_instantiator.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/ecore_xml_instantiator.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/json_instantiator.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/json_parser.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/json_parser.y
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/nodebased_xml_instantiator.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/qualified_name_resolver.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/reference_resolver.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/resolution_helper.rb
+- lib/puppet/vendor/rgen/lib/rgen/instantiator/xmi11_instantiator.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/builder_extensions.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/builder_runtime.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/constant_order_helper.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/data_types.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/intermediate/annotation.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/intermediate/feature.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/mm_multiple.rb
+- lib/puppet/vendor/rgen/lib/rgen/metamodel_builder/module_extension.rb
+- lib/puppet/vendor/rgen/lib/rgen/model_builder.rb
+- lib/puppet/vendor/rgen/lib/rgen/model_builder/builder_context.rb
+- lib/puppet/vendor/rgen/lib/rgen/model_builder/model_serializer.rb
+- lib/puppet/vendor/rgen/lib/rgen/model_builder/reference_resolver.rb
+- lib/puppet/vendor/rgen/lib/rgen/serializer/json_serializer.rb
+- lib/puppet/vendor/rgen/lib/rgen/serializer/opposite_reference_filter.rb
+- lib/puppet/vendor/rgen/lib/rgen/serializer/qualified_name_provider.rb
+- lib/puppet/vendor/rgen/lib/rgen/serializer/xmi11_serializer.rb
+- lib/puppet/vendor/rgen/lib/rgen/serializer/xmi20_serializer.rb
+- lib/puppet/vendor/rgen/lib/rgen/serializer/xml_serializer.rb
+- lib/puppet/vendor/rgen/lib/rgen/template_language.rb
+- lib/puppet/vendor/rgen/lib/rgen/template_language/directory_template_container.rb
+- lib/puppet/vendor/rgen/lib/rgen/template_language/output_handler.rb
+- lib/puppet/vendor/rgen/lib/rgen/template_language/template_container.rb
+- lib/puppet/vendor/rgen/lib/rgen/template_language/template_helper.rb
+- lib/puppet/vendor/rgen/lib/rgen/transformer.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/auto_class_creator.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/cached_glob.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/file_cache_map.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/file_change_detector.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/method_delegation.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/model_comparator.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/model_comparator_base.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/model_dumper.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/name_helper.rb
+- lib/puppet/vendor/rgen/lib/rgen/util/pattern_matcher.rb
+- lib/puppet/vendor/rgen/lib/transformers/ecore_to_uml13.rb
+- lib/puppet/vendor/rgen/lib/transformers/uml13_to_ecore.rb
+- lib/puppet/vendor/rgen/test/array_extensions_test.rb
+- lib/puppet/vendor/rgen/test/ea_instantiator_test.rb
+- lib/puppet/vendor/rgen/test/ea_serializer_test.rb
+- lib/puppet/vendor/rgen/test/ecore_self_test.rb
+- lib/puppet/vendor/rgen/test/environment_test.rb
+- lib/puppet/vendor/rgen/test/json_test.rb
+- lib/puppet/vendor/rgen/test/metamodel_builder_test.rb
+- lib/puppet/vendor/rgen/test/metamodel_from_ecore_test.rb
+- lib/puppet/vendor/rgen/test/metamodel_order_test.rb
+- lib/puppet/vendor/rgen/test/metamodel_roundtrip_test.rb
+- lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/TestModel.rb
+- lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/houseMetamodel.ecore
+- lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/houseMetamodel_from_ecore.rb
+- lib/puppet/vendor/rgen/test/metamodel_roundtrip_test/using_builtin_types.ecore
+- lib/puppet/vendor/rgen/test/method_delegation_test.rb
+- lib/puppet/vendor/rgen/test/model_builder/builder_context_test.rb
+- lib/puppet/vendor/rgen/test/model_builder/builder_test.rb
+- lib/puppet/vendor/rgen/test/model_builder/ecore_original.rb
+- lib/puppet/vendor/rgen/test/model_builder/ecore_original_regenerated.rb
+- lib/puppet/vendor/rgen/test/model_builder/reference_resolver_test.rb
+- lib/puppet/vendor/rgen/test/model_builder/serializer_test.rb
+- lib/puppet/vendor/rgen/test/model_builder/statemachine_metamodel.rb
+- lib/puppet/vendor/rgen/test/model_builder/test_model/statemachine1.rb
+- lib/puppet/vendor/rgen/test/model_builder_test.rb
+- lib/puppet/vendor/rgen/test/model_fragment_test.rb
+- lib/puppet/vendor/rgen/test/output_handler_test.rb
+- lib/puppet/vendor/rgen/test/qualified_name_provider_test.rb
+- lib/puppet/vendor/rgen/test/qualified_name_resolver_test.rb
+- lib/puppet/vendor/rgen/test/reference_resolver_test.rb
+- lib/puppet/vendor/rgen/test/rgen_test.rb
+- lib/puppet/vendor/rgen/test/template_language_test.rb
+- lib/puppet/vendor/rgen/test/template_language_test/expected_result1.txt
+- lib/puppet/vendor/rgen/test/template_language_test/expected_result2.txt
+- lib/puppet/vendor/rgen/test/template_language_test/expected_result3.txt
+- lib/puppet/vendor/rgen/test/template_language_test/indentStringTestDefaultIndent.out
+- lib/puppet/vendor/rgen/test/template_language_test/indentStringTestTabIndent.out
+- lib/puppet/vendor/rgen/test/template_language_test/templates/callback_indent_test/a.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/callback_indent_test/b.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/code/array.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/content/author.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/content/chapter.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/define_local_test/local.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/define_local_test/test.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/evaluate_test/test.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/indent_string_test.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/index/c/cmod.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/index/chapter.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/no_backslash_r_test.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/no_indent.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/sub1/no_indent.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/test.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/test2.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/no_indent_test/test3.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/null_context_test.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/root.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/template_resolution_test/sub1.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/template_resolution_test/sub1/sub1.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/templates/template_resolution_test/test.tpl
+- lib/puppet/vendor/rgen/test/template_language_test/testout.txt
+- lib/puppet/vendor/rgen/test/testmodel/class_model_checker.rb
+- lib/puppet/vendor/rgen/test/testmodel/ea_testmodel.eap
+- lib/puppet/vendor/rgen/test/testmodel/ea_testmodel.xml
+- lib/puppet/vendor/rgen/test/testmodel/ea_testmodel_partial.xml
+- lib/puppet/vendor/rgen/test/testmodel/ecore_model_checker.rb
+- lib/puppet/vendor/rgen/test/testmodel/manual_testmodel.xml
+- lib/puppet/vendor/rgen/test/testmodel/object_model_checker.rb
+- lib/puppet/vendor/rgen/test/transformer_test.rb
+- lib/puppet/vendor/rgen/test/util/file_cache_map_test.rb
+- lib/puppet/vendor/rgen/test/util/pattern_matcher_test.rb
+- lib/puppet/vendor/rgen/test/util_test.rb
+- lib/puppet/vendor/rgen/test/xml_instantiator_test.rb
+- lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_ecore_model_checker.rb
+- lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_ecore_instantiator.rb
+- lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_metamodel.rb
+- lib/puppet/vendor/rgen/test/xml_instantiator_test/simple_xmi_to_ecore.rb
 - lib/puppet/vendor/safe_yaml/CHANGES.md
 - lib/puppet/vendor/safe_yaml/Gemfile
 - 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/safe_yaml/Rakefile
 - lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
@@ -1288,6 +1395,7 @@ files:
 - lib/puppet/vendor/safe_yaml/spec/transform/to_symbol_spec.rb
 - lib/puppet/vendor/safe_yaml_patches.rb
 - lib/puppet/vendor/semantic/Gemfile
+- lib/puppet/vendor/semantic/PUPPET_README.md
 - lib/puppet/vendor/semantic/Rakefile
 - lib/puppet/vendor/semantic/lib/semantic.rb
 - lib/puppet/vendor/semantic/lib/semantic/dependency.rb
@@ -1512,6 +1620,10 @@ files:
 - spec/fixtures/integration/node/environment/sitedir/01_b.pp
 - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
 - spec/fixtures/integration/node/environment/sitedir/04_include.pp
+- spec/fixtures/integration/node/environment/sitedir2/00_a.pp
+- spec/fixtures/integration/node/environment/sitedir2/02_folder/01_b.pp
+- spec/fixtures/integration/node/environment/sitedir2/03_c.pp
+- spec/fixtures/integration/node/environment/sitedir2/04_include.pp
 - spec/fixtures/integration/provider/cron/crontab/create_normal_entry
 - spec/fixtures/integration/provider/cron/crontab/create_special_entry
 - spec/fixtures/integration/provider/cron/crontab/crontab_user1
@@ -1548,7 +1660,11 @@ files:
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/unit/indirector/data_binding/hiera/global.yaml
 - spec/fixtures/unit/indirector/data_binding/hiera/invalid.yaml
+- spec/fixtures/unit/indirector/hiera/global.yaml
+- spec/fixtures/unit/indirector/hiera/invalid.yaml
 - spec/fixtures/unit/module/trailing-comma.json
+- spec/fixtures/unit/parser/functions/create_resources/foo/manifests/init.pp
+- spec/fixtures/unit/parser/functions/create_resources/foo/manifests/wrongdefine.pp
 - spec/fixtures/unit/parser/lexer/aliastest.pp
 - spec/fixtures/unit/parser/lexer/append.pp
 - spec/fixtures/unit/parser/lexer/argumentdefaults.pp
@@ -1677,6 +1793,7 @@ files:
 - spec/fixtures/unit/provider/mount/parsed/solaris.fstab
 - spec/fixtures/unit/provider/mount/parsed/solaris.mount
 - spec/fixtures/unit/provider/naginator/define_empty_param
+- spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.list
@@ -1725,6 +1842,7 @@ files:
 - spec/integration/data_binding.rb
 - spec/integration/defaults_spec.rb
 - spec/integration/directory_environments_spec.rb
+- spec/integration/environments/default_manifest_spec.rb
 - spec/integration/faces/ca_spec.rb
 - spec/integration/faces/documentation_spec.rb
 - spec/integration/faces/plugin_spec.rb
@@ -1746,11 +1864,15 @@ files:
 - spec/integration/node/facts_spec.rb
 - spec/integration/node_spec.rb
 - spec/integration/parser/catalog_spec.rb
+- spec/integration/parser/class_spec.rb
 - spec/integration/parser/collector_spec.rb
 - spec/integration/parser/compiler_spec.rb
+- spec/integration/parser/conditionals_spec.rb
 - spec/integration/parser/functions/require_spec.rb
 - spec/integration/parser/future_compiler_spec.rb
+- spec/integration/parser/node_spec.rb
 - spec/integration/parser/parser_spec.rb
+- spec/integration/parser/resource_expressions_spec.rb
 - spec/integration/parser/ruby_manifest_spec.rb
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/undef_param_spec.rb
@@ -1776,6 +1898,7 @@ files:
 - spec/integration/type/file_spec.rb
 - spec/integration/type/nagios_spec.rb
 - spec/integration/type/package_spec.rb
+- spec/integration/type/sshkey_spec.rb
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type/user_spec.rb
 - spec/integration/type_spec.rb
@@ -1810,6 +1933,7 @@ files:
 - spec/lib/puppet_spec/database.rb
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
+- spec/lib/puppet_spec/language.rb
 - spec/lib/puppet_spec/matchers.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
 - spec/lib/puppet_spec/module_tool/stub_source.rb
@@ -1825,6 +1949,8 @@ files:
 - spec/shared_behaviours/file_server_terminus.rb
 - spec/shared_behaviours/file_serving.rb
 - spec/shared_behaviours/file_serving_model.rb
+- spec/shared_behaviours/hiera_indirections.rb
+- spec/shared_behaviours/iterative_functions.rb
 - spec/shared_behaviours/memory_terminus.rb
 - spec/shared_behaviours/path_parameters.rb
 - spec/shared_behaviours/store_configs_terminus.rb
@@ -1854,6 +1980,7 @@ files:
 - spec/unit/application/resource_spec.rb
 - spec/unit/application/secret_agent_spec.rb
 - spec/unit/application_spec.rb
+- spec/unit/configurer/downloader_factory_spec.rb
 - spec/unit/configurer/downloader_spec.rb
 - spec/unit/configurer/fact_handler_spec.rb
 - spec/unit/configurer/plugin_handler_spec.rb
@@ -1875,8 +2002,6 @@ files:
 - spec/unit/dsl/resource_type_api_spec.rb
 - spec/unit/environments_spec.rb
 - spec/unit/face/catalog_spec.rb
-- spec/unit/face/certificate_request_spec.rb
-- spec/unit/face/certificate_revocation_list_spec.rb
 - spec/unit/face/certificate_spec.rb
 - spec/unit/face/config_spec.rb
 - spec/unit/face/facts_spec.rb
@@ -1885,7 +2010,6 @@ files:
 - spec/unit/face/instrumentation_data_spec.rb
 - spec/unit/face/instrumentation_listener_spec.rb
 - spec/unit/face/instrumentation_probe_spec.rb
-- spec/unit/face/key_spec.rb
 - spec/unit/face/module/build_spec.rb
 - spec/unit/face/module/install_spec.rb
 - spec/unit/face/module/list_spec.rb
@@ -1896,9 +2020,6 @@ files:
 - spec/unit/face/node_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/plugin_spec.rb
-- spec/unit/face/report_spec.rb
-- spec/unit/face/resource_spec.rb
-- spec/unit/face/resource_type_spec.rb
 - spec/unit/face/secret_agent_spec.rb
 - spec/unit/face_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
@@ -1917,13 +2038,22 @@ files:
 - spec/unit/file_serving/terminus_helper_spec.rb
 - spec/unit/file_serving/terminus_selector_spec.rb
 - spec/unit/file_system/path_pattern_spec.rb
-- spec/unit/file_system/tempfile_spec.rb
+- spec/unit/file_system/uniquefile_spec.rb
 - spec/unit/file_system_spec.rb
 - spec/unit/forge/errors_spec.rb
 - spec/unit/forge/module_release_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb
 - spec/unit/functions/assert_type_spec.rb
+- spec/unit/functions/each_spec.rb
+- spec/unit/functions/epp_spec.rb
+- spec/unit/functions/filter_spec.rb
+- spec/unit/functions/inline_epp_spec.rb
+- spec/unit/functions/map_spec.rb
+- spec/unit/functions/match_spec.rb
+- spec/unit/functions/reduce_spec.rb
+- spec/unit/functions/slice_spec.rb
+- spec/unit/functions/with_spec.rb
 - spec/unit/functions4_spec.rb
 - spec/unit/graph/key_spec.rb
 - spec/unit/graph/rb_tree_map_spec.rb
@@ -1986,6 +2116,7 @@ files:
 - spec/unit/indirector/file_metadata/rest_spec.rb
 - spec/unit/indirector/file_metadata/selector_spec.rb
 - spec/unit/indirector/file_server_spec.rb
+- spec/unit/indirector/hiera_spec.rb
 - spec/unit/indirector/indirection_spec.rb
 - spec/unit/indirector/instrumentation_data/local_spec.rb
 - spec/unit/indirector/instrumentation_data/rest_spec.rb
@@ -2052,6 +2183,7 @@ files:
 - spec/unit/module_tool/applications/unpacker_spec.rb
 - spec/unit/module_tool/applications/upgrader_spec.rb
 - spec/unit/module_tool/install_directory_spec.rb
+- spec/unit/module_tool/installed_modules_spec.rb
 - spec/unit/module_tool/metadata_spec.rb
 - spec/unit/module_tool/tar/gnu_spec.rb
 - spec/unit/module_tool/tar/mini_spec.rb
@@ -2073,13 +2205,19 @@ files:
 - spec/unit/network/http/compression_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
+- spec/unit/network/http/factory_spec.rb
 - spec/unit/network/http/handler_spec.rb
+- spec/unit/network/http/nocache_pool_spec.rb
+- spec/unit/network/http/pool_spec.rb
 - spec/unit/network/http/rack/rest_spec.rb
 - spec/unit/network/http/rack_spec.rb
 - spec/unit/network/http/route_spec.rb
+- spec/unit/network/http/session_spec.rb
+- spec/unit/network/http/site_spec.rb
 - spec/unit/network/http/webrick/rest_spec.rb
 - spec/unit/network/http/webrick_spec.rb
 - spec/unit/network/http_pool_spec.rb
+- spec/unit/network/http_spec.rb
 - spec/unit/network/resolver_spec.rb
 - spec/unit/network/rights_spec.rb
 - spec/unit/network/server_spec.rb
@@ -2124,12 +2262,11 @@ files:
 - spec/unit/parser/ast_spec.rb
 - spec/unit/parser/collector_spec.rb
 - spec/unit/parser/compiler_spec.rb
-- spec/unit/parser/eparser_adapter_spec.rb
 - spec/unit/parser/files_spec.rb
 - spec/unit/parser/functions/contain_spec.rb
 - spec/unit/parser/functions/create_resources_spec.rb
 - spec/unit/parser/functions/defined_spec.rb
-- spec/unit/parser/functions/epp_spec.rb
+- spec/unit/parser/functions/digest_spec.rb
 - spec/unit/parser/functions/extlookup_spec.rb
 - spec/unit/parser/functions/fail_spec.rb
 - spec/unit/parser/functions/file_spec.rb
@@ -2140,13 +2277,13 @@ files:
 - spec/unit/parser/functions/hiera_include_spec.rb
 - spec/unit/parser/functions/hiera_spec.rb
 - spec/unit/parser/functions/include_spec.rb
-- spec/unit/parser/functions/inline_epp_spec.rb
 - spec/unit/parser/functions/inline_template_spec.rb
 - spec/unit/parser/functions/lookup_spec.rb
 - spec/unit/parser/functions/realize_spec.rb
 - spec/unit/parser/functions/regsubst_spec.rb
 - spec/unit/parser/functions/require_spec.rb
 - spec/unit/parser/functions/search_spec.rb
+- spec/unit/parser/functions/shared.rb
 - spec/unit/parser/functions/shellquote_spec.rb
 - spec/unit/parser/functions/split_spec.rb
 - spec/unit/parser/functions/sprintf_spec.rb
@@ -2155,12 +2292,6 @@ files:
 - spec/unit/parser/functions/versioncmp_spec.rb
 - spec/unit/parser/functions_spec.rb
 - spec/unit/parser/lexer_spec.rb
-- spec/unit/parser/methods/each_spec.rb
-- spec/unit/parser/methods/filter_spec.rb
-- spec/unit/parser/methods/map_spec.rb
-- spec/unit/parser/methods/reduce_spec.rb
-- spec/unit/parser/methods/shared.rb
-- spec/unit/parser/methods/slice_spec.rb
 - spec/unit/parser/parser_spec.rb
 - spec/unit/parser/relationship_spec.rb
 - spec/unit/parser/resource/param_spec.rb
@@ -2202,7 +2333,6 @@ files:
 - spec/unit/pops/parser/epp_parser_spec.rb
 - spec/unit/pops/parser/evaluating_parser_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
-- spec/unit/pops/parser/lexer_spec.rb
 - spec/unit/pops/parser/parse_basic_expressions_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
 - spec/unit/pops/parser/parse_conditionals_spec.rb
@@ -2211,12 +2341,12 @@ files:
 - spec/unit/pops/parser/parse_resource_spec.rb
 - spec/unit/pops/parser/parser_rspec_helper.rb
 - spec/unit/pops/parser/parser_spec.rb
+- spec/unit/pops/parser/parsing_typed_parameters_spec.rb
 - spec/unit/pops/parser/rgen_sanitycheck_spec.rb
 - spec/unit/pops/transformer/transform_basic_expressions_spec.rb
 - spec/unit/pops/transformer/transform_calls_spec.rb
 - spec/unit/pops/transformer/transform_conditionals_spec.rb
 - spec/unit/pops/transformer/transform_containers_spec.rb
-- spec/unit/pops/transformer/transform_resource_spec.rb
 - spec/unit/pops/transformer/transformer_rspec_helper.rb
 - spec/unit/pops/types/enumeration_spec.rb
 - spec/unit/pops/types/type_calculator_spec.rb
@@ -2437,7 +2567,6 @@ files:
 - spec/unit/type/zone_spec.rb
 - spec/unit/type/zpool_spec.rb
 - spec/unit/type_spec.rb
-- spec/unit/util/adsi_spec.rb
 - spec/unit/util/autoload_spec.rb
 - spec/unit/util/backups_spec.rb
 - spec/unit/util/cache_accumulator_spec.rb
@@ -2489,10 +2618,12 @@ files:
 - spec/unit/util/package_spec.rb
 - spec/unit/util/pidlock_spec.rb
 - spec/unit/util/posix_spec.rb
+- spec/unit/util/profiler/aggregate_spec.rb
+- spec/unit/util/profiler/around_profiler_spec.rb
 - spec/unit/util/profiler/logging_spec.rb
-- spec/unit/util/profiler/none_spec.rb
 - spec/unit/util/profiler/object_counts_spec.rb
 - spec/unit/util/profiler/wall_clock_spec.rb
+- spec/unit/util/profiler_spec.rb
 - spec/unit/util/pson_spec.rb
 - spec/unit/util/queue/stomp_spec.rb
 - spec/unit/util/queue_spec.rb
@@ -2519,6 +2650,8 @@ files:
 - spec/unit/util/watcher_spec.rb
 - spec/unit/util/windows/access_control_entry_spec.rb
 - spec/unit/util/windows/access_control_list_spec.rb
+- spec/unit/util/windows/adsi_spec.rb
+- spec/unit/util/windows/api_types_spec.rb
 - spec/unit/util/windows/registry_spec.rb
 - spec/unit/util/windows/root_certs_spec.rb
 - spec/unit/util/windows/security_descriptor_spec.rb
@@ -2553,7 +2686,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: puppet
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Puppet, an automated configuration management tool
@@ -2564,6 +2697,10 @@ test_files:
 - spec/fixtures/integration/node/environment/sitedir/01_b.pp
 - spec/fixtures/integration/node/environment/sitedir/03_empty.pp
 - spec/fixtures/integration/node/environment/sitedir/04_include.pp
+- spec/fixtures/integration/node/environment/sitedir2/00_a.pp
+- spec/fixtures/integration/node/environment/sitedir2/02_folder/01_b.pp
+- spec/fixtures/integration/node/environment/sitedir2/03_c.pp
+- spec/fixtures/integration/node/environment/sitedir2/04_include.pp
 - spec/fixtures/integration/provider/cron/crontab/create_normal_entry
 - spec/fixtures/integration/provider/cron/crontab/create_special_entry
 - spec/fixtures/integration/provider/cron/crontab/crontab_user1
@@ -2600,7 +2737,11 @@ test_files:
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/unit/indirector/data_binding/hiera/global.yaml
 - spec/fixtures/unit/indirector/data_binding/hiera/invalid.yaml
+- spec/fixtures/unit/indirector/hiera/global.yaml
+- spec/fixtures/unit/indirector/hiera/invalid.yaml
 - spec/fixtures/unit/module/trailing-comma.json
+- spec/fixtures/unit/parser/functions/create_resources/foo/manifests/init.pp
+- spec/fixtures/unit/parser/functions/create_resources/foo/manifests/wrongdefine.pp
 - spec/fixtures/unit/parser/lexer/aliastest.pp
 - spec/fixtures/unit/parser/lexer/append.pp
 - spec/fixtures/unit/parser/lexer/argumentdefaults.pp
@@ -2729,6 +2870,7 @@ test_files:
 - spec/fixtures/unit/provider/mount/parsed/solaris.fstab
 - spec/fixtures/unit/provider/mount/parsed/solaris.mount
 - spec/fixtures/unit/provider/naginator/define_empty_param
+- spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.list
@@ -2777,6 +2919,7 @@ test_files:
 - spec/integration/data_binding.rb
 - spec/integration/defaults_spec.rb
 - spec/integration/directory_environments_spec.rb
+- spec/integration/environments/default_manifest_spec.rb
 - spec/integration/faces/ca_spec.rb
 - spec/integration/faces/documentation_spec.rb
 - spec/integration/faces/plugin_spec.rb
@@ -2798,11 +2941,15 @@ test_files:
 - spec/integration/node/facts_spec.rb
 - spec/integration/node_spec.rb
 - spec/integration/parser/catalog_spec.rb
+- spec/integration/parser/class_spec.rb
 - spec/integration/parser/collector_spec.rb
 - spec/integration/parser/compiler_spec.rb
+- spec/integration/parser/conditionals_spec.rb
 - spec/integration/parser/functions/require_spec.rb
 - spec/integration/parser/future_compiler_spec.rb
+- spec/integration/parser/node_spec.rb
 - spec/integration/parser/parser_spec.rb
+- spec/integration/parser/resource_expressions_spec.rb
 - spec/integration/parser/ruby_manifest_spec.rb
 - spec/integration/parser/scope_spec.rb
 - spec/integration/parser/undef_param_spec.rb
@@ -2828,6 +2975,7 @@ test_files:
 - spec/integration/type/file_spec.rb
 - spec/integration/type/nagios_spec.rb
 - spec/integration/type/package_spec.rb
+- spec/integration/type/sshkey_spec.rb
 - spec/integration/type/tidy_spec.rb
 - spec/integration/type/user_spec.rb
 - spec/integration/type_spec.rb
@@ -2862,6 +3010,7 @@ test_files:
 - spec/lib/puppet_spec/database.rb
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
+- spec/lib/puppet_spec/language.rb
 - spec/lib/puppet_spec/matchers.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
 - spec/lib/puppet_spec/module_tool/stub_source.rb
@@ -2877,6 +3026,8 @@ test_files:
 - spec/shared_behaviours/file_server_terminus.rb
 - spec/shared_behaviours/file_serving.rb
 - spec/shared_behaviours/file_serving_model.rb
+- spec/shared_behaviours/hiera_indirections.rb
+- spec/shared_behaviours/iterative_functions.rb
 - spec/shared_behaviours/memory_terminus.rb
 - spec/shared_behaviours/path_parameters.rb
 - spec/shared_behaviours/store_configs_terminus.rb
@@ -2906,6 +3057,7 @@ test_files:
 - spec/unit/application/resource_spec.rb
 - spec/unit/application/secret_agent_spec.rb
 - spec/unit/application_spec.rb
+- spec/unit/configurer/downloader_factory_spec.rb
 - spec/unit/configurer/downloader_spec.rb
 - spec/unit/configurer/fact_handler_spec.rb
 - spec/unit/configurer/plugin_handler_spec.rb
@@ -2927,8 +3079,6 @@ test_files:
 - spec/unit/dsl/resource_type_api_spec.rb
 - spec/unit/environments_spec.rb
 - spec/unit/face/catalog_spec.rb
-- spec/unit/face/certificate_request_spec.rb
-- spec/unit/face/certificate_revocation_list_spec.rb
 - spec/unit/face/certificate_spec.rb
 - spec/unit/face/config_spec.rb
 - spec/unit/face/facts_spec.rb
@@ -2937,7 +3087,6 @@ test_files:
 - spec/unit/face/instrumentation_data_spec.rb
 - spec/unit/face/instrumentation_listener_spec.rb
 - spec/unit/face/instrumentation_probe_spec.rb
-- spec/unit/face/key_spec.rb
 - spec/unit/face/module/build_spec.rb
 - spec/unit/face/module/install_spec.rb
 - spec/unit/face/module/list_spec.rb
@@ -2948,9 +3097,6 @@ test_files:
 - spec/unit/face/node_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/plugin_spec.rb
-- spec/unit/face/report_spec.rb
-- spec/unit/face/resource_spec.rb
-- spec/unit/face/resource_type_spec.rb
 - spec/unit/face/secret_agent_spec.rb
 - spec/unit/face_spec.rb
 - spec/unit/file_bucket/dipper_spec.rb
@@ -2969,13 +3115,22 @@ test_files:
 - spec/unit/file_serving/terminus_helper_spec.rb
 - spec/unit/file_serving/terminus_selector_spec.rb
 - spec/unit/file_system/path_pattern_spec.rb
-- spec/unit/file_system/tempfile_spec.rb
+- spec/unit/file_system/uniquefile_spec.rb
 - spec/unit/file_system_spec.rb
 - spec/unit/forge/errors_spec.rb
 - spec/unit/forge/module_release_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb
 - spec/unit/functions/assert_type_spec.rb
+- spec/unit/functions/each_spec.rb
+- spec/unit/functions/epp_spec.rb
+- spec/unit/functions/filter_spec.rb
+- spec/unit/functions/inline_epp_spec.rb
+- spec/unit/functions/map_spec.rb
+- spec/unit/functions/match_spec.rb
+- spec/unit/functions/reduce_spec.rb
+- spec/unit/functions/slice_spec.rb
+- spec/unit/functions/with_spec.rb
 - spec/unit/functions4_spec.rb
 - spec/unit/graph/key_spec.rb
 - spec/unit/graph/rb_tree_map_spec.rb
@@ -3038,6 +3193,7 @@ test_files:
 - spec/unit/indirector/file_metadata/rest_spec.rb
 - spec/unit/indirector/file_metadata/selector_spec.rb
 - spec/unit/indirector/file_server_spec.rb
+- spec/unit/indirector/hiera_spec.rb
 - spec/unit/indirector/indirection_spec.rb
 - spec/unit/indirector/instrumentation_data/local_spec.rb
 - spec/unit/indirector/instrumentation_data/rest_spec.rb
@@ -3104,6 +3260,7 @@ test_files:
 - spec/unit/module_tool/applications/unpacker_spec.rb
 - spec/unit/module_tool/applications/upgrader_spec.rb
 - spec/unit/module_tool/install_directory_spec.rb
+- spec/unit/module_tool/installed_modules_spec.rb
 - spec/unit/module_tool/metadata_spec.rb
 - spec/unit/module_tool/tar/gnu_spec.rb
 - spec/unit/module_tool/tar/mini_spec.rb
@@ -3125,13 +3282,19 @@ test_files:
 - spec/unit/network/http/compression_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
+- spec/unit/network/http/factory_spec.rb
 - spec/unit/network/http/handler_spec.rb
+- spec/unit/network/http/nocache_pool_spec.rb
+- spec/unit/network/http/pool_spec.rb
 - spec/unit/network/http/rack/rest_spec.rb
 - spec/unit/network/http/rack_spec.rb
 - spec/unit/network/http/route_spec.rb
+- spec/unit/network/http/session_spec.rb
+- spec/unit/network/http/site_spec.rb
 - spec/unit/network/http/webrick/rest_spec.rb
 - spec/unit/network/http/webrick_spec.rb
 - spec/unit/network/http_pool_spec.rb
+- spec/unit/network/http_spec.rb
 - spec/unit/network/resolver_spec.rb
 - spec/unit/network/rights_spec.rb
 - spec/unit/network/server_spec.rb
@@ -3176,12 +3339,11 @@ test_files:
 - spec/unit/parser/ast_spec.rb
 - spec/unit/parser/collector_spec.rb
 - spec/unit/parser/compiler_spec.rb
-- spec/unit/parser/eparser_adapter_spec.rb
 - spec/unit/parser/files_spec.rb
 - spec/unit/parser/functions/contain_spec.rb
 - spec/unit/parser/functions/create_resources_spec.rb
 - spec/unit/parser/functions/defined_spec.rb
-- spec/unit/parser/functions/epp_spec.rb
+- spec/unit/parser/functions/digest_spec.rb
 - spec/unit/parser/functions/extlookup_spec.rb
 - spec/unit/parser/functions/fail_spec.rb
 - spec/unit/parser/functions/file_spec.rb
@@ -3192,13 +3354,13 @@ test_files:
 - spec/unit/parser/functions/hiera_include_spec.rb
 - spec/unit/parser/functions/hiera_spec.rb
 - spec/unit/parser/functions/include_spec.rb
-- spec/unit/parser/functions/inline_epp_spec.rb
 - spec/unit/parser/functions/inline_template_spec.rb
 - spec/unit/parser/functions/lookup_spec.rb
 - spec/unit/parser/functions/realize_spec.rb
 - spec/unit/parser/functions/regsubst_spec.rb
 - spec/unit/parser/functions/require_spec.rb
 - spec/unit/parser/functions/search_spec.rb
+- spec/unit/parser/functions/shared.rb
 - spec/unit/parser/functions/shellquote_spec.rb
 - spec/unit/parser/functions/split_spec.rb
 - spec/unit/parser/functions/sprintf_spec.rb
@@ -3207,12 +3369,6 @@ test_files:
 - spec/unit/parser/functions/versioncmp_spec.rb
 - spec/unit/parser/functions_spec.rb
 - spec/unit/parser/lexer_spec.rb
-- spec/unit/parser/methods/each_spec.rb
-- spec/unit/parser/methods/filter_spec.rb
-- spec/unit/parser/methods/map_spec.rb
-- spec/unit/parser/methods/reduce_spec.rb
-- spec/unit/parser/methods/shared.rb
-- spec/unit/parser/methods/slice_spec.rb
 - spec/unit/parser/parser_spec.rb
 - spec/unit/parser/relationship_spec.rb
 - spec/unit/parser/resource/param_spec.rb
@@ -3254,7 +3410,6 @@ test_files:
 - spec/unit/pops/parser/epp_parser_spec.rb
 - spec/unit/pops/parser/evaluating_parser_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
-- spec/unit/pops/parser/lexer_spec.rb
 - spec/unit/pops/parser/parse_basic_expressions_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
 - spec/unit/pops/parser/parse_conditionals_spec.rb
@@ -3263,12 +3418,12 @@ test_files:
 - spec/unit/pops/parser/parse_resource_spec.rb
 - spec/unit/pops/parser/parser_rspec_helper.rb
 - spec/unit/pops/parser/parser_spec.rb
+- spec/unit/pops/parser/parsing_typed_parameters_spec.rb
 - spec/unit/pops/parser/rgen_sanitycheck_spec.rb
 - spec/unit/pops/transformer/transform_basic_expressions_spec.rb
 - spec/unit/pops/transformer/transform_calls_spec.rb
 - spec/unit/pops/transformer/transform_conditionals_spec.rb
 - spec/unit/pops/transformer/transform_containers_spec.rb
-- spec/unit/pops/transformer/transform_resource_spec.rb
 - spec/unit/pops/transformer/transformer_rspec_helper.rb
 - spec/unit/pops/types/enumeration_spec.rb
 - spec/unit/pops/types/type_calculator_spec.rb
@@ -3489,7 +3644,6 @@ test_files:
 - spec/unit/type/zone_spec.rb
 - spec/unit/type/zpool_spec.rb
 - spec/unit/type_spec.rb
-- spec/unit/util/adsi_spec.rb
 - spec/unit/util/autoload_spec.rb
 - spec/unit/util/backups_spec.rb
 - spec/unit/util/cache_accumulator_spec.rb
@@ -3541,10 +3695,12 @@ test_files:
 - spec/unit/util/package_spec.rb
 - spec/unit/util/pidlock_spec.rb
 - spec/unit/util/posix_spec.rb
+- spec/unit/util/profiler/aggregate_spec.rb
+- spec/unit/util/profiler/around_profiler_spec.rb
 - spec/unit/util/profiler/logging_spec.rb
-- spec/unit/util/profiler/none_spec.rb
 - spec/unit/util/profiler/object_counts_spec.rb
 - spec/unit/util/profiler/wall_clock_spec.rb
+- spec/unit/util/profiler_spec.rb
 - spec/unit/util/pson_spec.rb
 - spec/unit/util/queue/stomp_spec.rb
 - spec/unit/util/queue_spec.rb
@@ -3571,6 +3727,8 @@ test_files:
 - spec/unit/util/watcher_spec.rb
 - spec/unit/util/windows/access_control_entry_spec.rb
 - spec/unit/util/windows/access_control_list_spec.rb
+- spec/unit/util/windows/adsi_spec.rb
+- spec/unit/util/windows/api_types_spec.rb
 - spec/unit/util/windows/registry_spec.rb
 - spec/unit/util/windows/root_certs_spec.rb
 - spec/unit/util/windows/security_descriptor_spec.rb