chef 12.5.1 → 12.6.0

data/spec/unit/rest_spec.rb

@@ -69,8 +69,8 @@ describe Chef::REST do
     rest
   end
 
-  let(:standard_read_headers) {{"Accept"=>"application/json", "Accept"=>"application/json", "Accept-Encoding"=>"gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "X-REMOTE-REQUEST-ID"=>request_id, 'X-Ops-Server-API-Version' => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION}}
-  let(:standard_write_headers) {{"Accept"=>"application/json", "Content-Type"=>"application/json", "Accept"=>"application/json", "Accept-Encoding"=>"gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "X-REMOTE-REQUEST-ID"=>request_id, 'X-Ops-Server-API-Version' => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION}}
+  let(:standard_read_headers) {{"Accept"=>"application/json", "Accept-Encoding"=>"gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "X-REMOTE-REQUEST-ID"=>request_id, 'X-Ops-Server-API-Version' => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION}}
+  let(:standard_write_headers) {{"Accept"=>"application/json", "Content-Type"=>"application/json", "Accept-Encoding"=>"gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "X-REMOTE-REQUEST-ID"=>request_id, 'X-Ops-Server-API-Version' => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION}}
 
   before(:each) do
     Chef::Log.init(log_stringio)

data/spec/unit/run_list/run_list_expansion_spec.rb

@@ -21,7 +21,7 @@ require 'spec_helper'
 describe Chef::RunList::RunListExpansion do
   before do
     @run_list = Chef::RunList.new
-    @run_list << 'recipe[lobster]' << 'role[rage]' << 'recipe[fist]'
+    @run_list << 'recipe[lobster::mastercookbook@0.1.0]' << 'role[rage]' << 'recipe[fist@0.1]'
     @expansion = Chef::RunList::RunListExpansion.new("_default", @run_list.run_list_items)
   end
 
@@ -59,7 +59,7 @@ describe Chef::RunList::RunListExpansion do
     end
 
     it "has the correct list of recipes for the given environment" do
-      expect(@expansion.recipes).to eq(["lobster", "prod-only", "fist"])
+      expect(@expansion.recipes).to eq(["lobster::mastercookbook", "prod-only", "fist"])
     end
 
   end
@@ -82,19 +82,34 @@ describe Chef::RunList::RunListExpansion do
   describe "after expanding a run list" do
     before do
       @first_role = Chef::Role.new
+      @first_role.name('rage')
       @first_role.run_list('role[mollusk]')
       @first_role.default_attributes({'foo' => 'bar'})
       @first_role.override_attributes({'baz' => 'qux'})
       @second_role = Chef::Role.new
+      @second_role.name('rage')
       @second_role.run_list('recipe[crabrevenge]')
       @second_role.default_attributes({'foo' => 'boo'})
       @second_role.override_attributes({'baz' => 'bux'})
       allow(@expansion).to receive(:fetch_role).and_return(@first_role, @second_role)
       @expansion.expand
+      @json = '{"id":"_default","run_list":[{"type":"recipe","name":"lobster::mastercookbook","version":"0.1.0",'
+      .concat(
+'"skipped":false},{"type":"role","name":"rage","children":[{"type":"role","name":"mollusk","children":[],"missing":null,'
+      .concat(
+'"error":null,"skipped":null},{"type":"recipe","name":"crabrevenge","version":null,"skipped":false}],"missing":null,'
+      .concat(
+'"error":null,"skipped":null},{"type":"recipe","name":"fist","version":"0.1","skipped":false}]}')))
+
+    end
+
+    it "produces json tree upon tracing expansion" do
+      jsonRunList = @expansion.to_json
+      expect(jsonRunList).to eq(@json)
     end
 
     it "has the ordered list of recipes" do
-      expect(@expansion.recipes).to eq(['lobster', 'crabrevenge', 'fist'])
+      expect(@expansion.recipes).to eq(['lobster::mastercookbook', 'crabrevenge', 'fist'])
     end
 
     it "has the merged attributes from the roles with outer roles overriding inner" do

data/spec/unit/search/query_spec.rb

@@ -83,6 +83,8 @@ describe Chef::Search::Query do
   describe "search" do
     let(:query_string) { "search/node?q=platform:rhel&sort=X_CHEF_id_CHEF_X%20asc&start=0" }
     let(:query_string_continue) { "search/node?q=platform:rhel&sort=X_CHEF_id_CHEF_X%20asc&start=4" }
+    let(:query_string_with_rows) { "search/node?q=platform:rhel&sort=X_CHEF_id_CHEF_X%20asc&start=0&rows=4" }
+    let(:query_string_continue_with_rows) { "search/node?q=platform:rhel&sort=X_CHEF_id_CHEF_X%20asc&start=4&rows=4" }
 
     let(:response) { {
       "rows" => [
@@ -149,6 +151,14 @@ describe Chef::Search::Query do
       r
     }
 
+    let(:big_response_empty) {
+      {
+        "start" => 0,
+        "total" => 8,
+        "rows" => []
+      }
+    }
+
     let(:big_response_end) {
       r = response.dup
       r["start"] = 4
@@ -208,7 +218,7 @@ describe Chef::Search::Query do
     it "pages through the responses" do
       @call_me = double("blocky")
       response["rows"].each { |r| expect(@call_me).to receive(:do).with(r) }
-      query.search(:node, "*:*", sort: nil, start: 0, rows: 1) { |r| @call_me.do(r) }
+      query.search(:node, "*:*", sort: nil, start: 0, rows: 4) { |r| @call_me.do(r) }
     end
 
     it "sends multiple API requests when the server indicates there is more data" do
@@ -219,6 +229,14 @@ describe Chef::Search::Query do
       end
     end
 
+    it "paginates correctly in the face of filtered nodes" do
+      expect(rest).to receive(:get_rest).with(query_string_with_rows).and_return(big_response_empty)
+      expect(rest).to receive(:get_rest).with(query_string_continue_with_rows).and_return(big_response_end)
+      query.search(:node, "platform:rhel", rows: 4) do |r|
+        nil
+      end
+    end
+
     context "when :filter_result is provided as a result" do
       include_context "filtered search" do
         let(:filter_key) { :filter_result }

data/spec/unit/util/powershell/ps_credential_spec.rb

@@ -21,7 +21,7 @@ require 'chef/util/powershell/ps_credential'
 
 describe Chef::Util::Powershell::PSCredential do
   let (:username) { 'foo' }
-  let (:password) { 'password' }
+  let (:password) { 'ThIsIsThEpAsSwOrD' }
 
   context 'when username and password are provided' do
     let(:ps_credential) { Chef::Util::Powershell::PSCredential.new(username, password)}
@@ -33,5 +33,12 @@ describe Chef::Util::Powershell::PSCredential do
             "'#{username}',('encrypted' | ConvertTo-SecureString))")
       end
     end
+
+    context 'when to_text is called' do
+      it 'should not contain the password' do
+        allow(ps_credential).to receive(:encrypt).with(password).and_return('encrypted')
+        expect(ps_credential.to_text).not_to match(/#{password}/)
+      end
+    end
   end
 end

data/spec/unit/windows_service_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Mukta Aphale (<mukta.aphale@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,51 +21,96 @@ if Chef::Platform.windows?
 end
 
 describe "Chef::Application::WindowsService", :windows_only do
-  let (:instance) {Chef::Application::WindowsService.new}
-  let (:shell_out_result) {Object.new}
-  let (:tempfile) {Tempfile.new "log_file"}
+  let(:shell_out_result) { double('shellout', stdout: nil, stderr: nil) }
+  let(:config_options) do
+    {
+      log_location: STDOUT,
+      config_file: "test_config_file",
+      log_level: :info
+    }
+  end
+  let(:timeout) { 7200 }
+  let(:shellout_options) do
+    {
+      :timeout => timeout,
+      :logger => Chef::Log
+    }
+  end
+
   before do
-    allow(instance).to receive(:parse_options)
-    allow(shell_out_result).to receive(:stdout)
-    allow(shell_out_result).to receive(:stderr)
+    Chef::Config.merge!(config_options)
+    allow(subject).to receive(:configure_chef)
+    allow(subject).to receive(:parse_options)
+    allow(MonoLogger).to receive(:new)
+    allow(subject).to receive(:running?).and_return(true, false)
+    allow(subject).to receive(:state).and_return(4)
+    subject.service_init
   end
-  it "runs chef-client in new process" do
-    expect(instance).to receive(:configure_chef).twice
-    instance.service_init
-    expect(instance).to receive(:run_chef_client).and_call_original
-    expect(instance).to receive(:shell_out).and_return(shell_out_result)
-    allow(instance).to receive(:running?).and_return(true, false)
-    allow(instance.instance_variable_get(:@service_signal)).to receive(:wait)
-    allow(instance).to receive(:state).and_return(4)
-    instance.service_main
+
+  subject { Chef::Application::WindowsService.new }
+
+  it "passes DEFAULT_LOG_LOCATION to chef-client instead of STDOUT" do
+    expect(subject).to receive(:shell_out).with(
+      "chef-client  --no-fork -c test_config_file -L #{Chef::Application::WindowsService::DEFAULT_LOG_LOCATION}",
+      shellout_options
+    ).and_return(shell_out_result)
+    subject.service_main
   end
 
-  context 'when running chef-client' do
-    it "passes config params to new process with a default timeout of 2 hours (7200 seconds)" do
-      Chef::Config.merge!({:log_location => tempfile.path, :config_file => "test_config_file", :log_level => :info})
-      expect(instance).to receive(:configure_chef).twice
-      instance.service_init
-      allow(instance).to receive(:running?).and_return(true, false)
-      allow(instance.instance_variable_get(:@service_signal)).to receive(:wait)
-      allow(instance).to receive(:state).and_return(4)
-      expect(instance).to receive(:run_chef_client).and_call_original
-      expect(instance).to receive(:shell_out).with("chef-client  --no-fork -c test_config_file -L #{tempfile.path}", {:timeout => 7200}).and_return(shell_out_result)
-      instance.service_main
+  context 'has a log location configured' do
+    let(:tempfile) { Tempfile.new 'log_file' }
+    let(:config_options) do
+      {
+        log_location: tempfile.path,
+        config_file: "test_config_file",
+        log_level: :info
+      }
+    end
+
+    after do
       tempfile.unlink
     end
 
-    it "passes config params to new process with a the timeout specified in the config" do
-      Chef::Config.merge!({:log_location => tempfile.path, :config_file => "test_config_file", :log_level => :info})
+    it "uses the configured log location" do
+      expect(subject).to receive(:shell_out).with(
+        "chef-client  --no-fork -c test_config_file -L #{tempfile.path}",
+        shellout_options
+      ).and_return(shell_out_result)
+      subject.service_main
+    end
+
+    context 'configured to Event Logger' do
+      let(:config_options) do
+        {
+          log_location: Chef::Log::WinEvt.new,
+          config_file: "test_config_file",
+          log_level: :info
+        }
+      end
+
+      it "does not pass log location to new process" do
+        expect(subject).to receive(:shell_out).with(
+          "chef-client  --no-fork -c test_config_file",
+          shellout_options
+        ).and_return(shell_out_result)
+        subject.service_main
+      end
+    end
+  end
+
+  context 'configueres a watchdog timeout' do
+    let(:timeout) { 10 }
+
+    before do
       Chef::Config[:windows_service][:watchdog_timeout] = 10
-      expect(instance).to receive(:configure_chef).twice
-      instance.service_init
-      allow(instance).to receive(:running?).and_return(true, false)
-      allow(instance.instance_variable_get(:@service_signal)).to receive(:wait)
-      allow(instance).to receive(:state).and_return(4)
-      expect(instance).to receive(:run_chef_client).and_call_original
-      expect(instance).to receive(:shell_out).with("chef-client  --no-fork -c test_config_file -L #{tempfile.path}", {:timeout => 10}).and_return(shell_out_result)
-      instance.service_main
-      tempfile.unlink
+    end
+
+    it "passes watchdog timeout to new process" do
+      expect(subject).to receive(:shell_out).with(
+        "chef-client  --no-fork -c test_config_file -L #{Chef::Application::WindowsService::DEFAULT_LOG_LOCATION}",
+        shellout_options
+      ).and_return(shell_out_result)
+      subject.service_main
     end
   end
 end

data/tasks/external_tests.rb

@@ -1,38 +1,48 @@
 require 'tempfile'
+require 'bundler'
+
+CURRENT_GEM_NAME = 'chef'
+CURRENT_GEM_PATH = File.expand_path('../..', __FILE__)
 
 def bundle_exec_with_chef(test_gem, commands)
   gem_path = Bundler.environment.specs[test_gem].first.full_gem_path
-  gemfile_path = File.join(gem_path, 'Gemfile.chef-external-test')
+  gemfile_path = File.join(gem_path, "Gemfile.#{CURRENT_GEM_NAME}-external-test")
   gemfile = File.open(gemfile_path, "w")
   begin
     IO.read(File.join(gem_path, 'Gemfile')).each_line do |line|
       if line =~ /^\s*gemspec/
         next
-      elsif line =~ /^\s*gem 'chef'|\s*gem "chef"/
+      elsif line =~ /^\s*gem '#{CURRENT_GEM_NAME}'|\s*gem "#{CURRENT_GEM_NAME}"/
         next
       elsif line =~ /^\s*dev_gem\s*['"](.+)['"]\s*$/
         line = "gem '#{$1}', github: 'poise/#{$1}'"
-      elsif line =~ /\s*gem\s*['"]#{test_gem}['"]/ # foodcritic
+      elsif line =~ /\s*gem\s*['"]#{test_gem}['"]/ # foodcritic      end
         next
       end
       gemfile.puts(line)
     end
-    gemfile.puts("gem 'chef', path: #{File.expand_path('../..', __FILE__).inspect}")
+    gemfile.puts("gem #{CURRENT_GEM_NAME.inspect}, path: #{CURRENT_GEM_PATH.inspect}")
     gemfile.puts("gemspec path: #{gem_path.inspect}")
     gemfile.close
     Dir.chdir(gem_path) do
-      system({ 'BUNDLE_GEMFILE' => gemfile.path, 'RUBYOPT' => nil }, "bundle install")
-      Array(commands).each do |command|
-        system({ 'BUNDLE_GEMFILE' => gemfile.path, 'RUBYOPT' => nil }, "bundle exec #{command}")
+      Bundler.with_clean_env do
+        unless system({ 'RUBYOPT' => nil, 'GEMFILE_MOD' => nil }, "bundle install --gemfile #{gemfile_path}")
+          raise "Error running bundle install --gemfile #{gemfile_path} in #{gem_path}: #{$?.exitstatus}\nGemfile:\n#{IO.read(gemfile_path)}"
+        end
+        Array(commands).each do |command|
+          unless system({ 'BUNDLE_GEMFILE' => gemfile_path, 'RUBYOPT' => nil, 'GEMFILE_MOD' => nil }, "bundle exec #{command}")
+            raise "Error running bundle exec #{command} in #{gem_path} with BUNDLE_GEMFILE=#{gemfile_path}: #{$?.exitstatus}\nGemfile:\n#{IO.read(gemfile_path)}"
+          end
+        end
       end
     end
   ensure
-    File.delete(gemfile_path)
+    File.delete(gemfile_path) if File.exist?(gemfile_path)
   end
 end
 
 EXTERNAL_PROJECTS = {
-  "chef-zero"             => [ "rake spec", "rake pedant" ],
+  "chef-zero"             => [ "rake spec", "rake cheffs" ],
   "cheffish"              => "rake spec",
   "chef-provisioning"     => "rake spec",
   "chef-provisioning-aws" => "rake spec",

data/tasks/rspec.rb

@@ -30,7 +30,7 @@ begin
   task :component_specs do
     Dir.chdir("chef-config") do
       Bundler.with_clean_env do
-        sh("bundle install --local")
+        sh("bundle install")
         sh("bundle exec rake spec")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.5.1
+  version: 12.6.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.5.1
+        version: 12.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.5.1
+        version: 12.6.0
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -250,42 +250,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -342,6 +342,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: proxifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -409,6 +423,8 @@ files:
 - bin/chef-shell
 - bin/chef-solo
 - bin/knife
+- chef-windows.gemspec
+- chef.gemspec
 - distro/common/html/_sources/ctl_chef_client.txt
 - distro/common/html/_sources/ctl_chef_server.txt
 - distro/common/html/_sources/ctl_chef_shell.txt
@@ -693,7 +709,10 @@ files:
 - lib/chef/digester.rb
 - lib/chef/dsl.rb
 - lib/chef/dsl/audit.rb
+- lib/chef/dsl/chef_provisioning.rb
+- lib/chef/dsl/cheffish.rb
 - lib/chef/dsl/data_query.rb
+- lib/chef/dsl/declare_resource.rb
 - lib/chef/dsl/definitions.rb
 - lib/chef/dsl/include_attribute.rb
 - lib/chef/dsl/include_recipe.rb
@@ -942,10 +961,13 @@ files:
 - lib/chef/mixin/path_sanity.rb
 - lib/chef/mixin/powershell_out.rb
 - lib/chef/mixin/powershell_type_coercions.rb
+- lib/chef/mixin/properties.rb
 - lib/chef/mixin/provides.rb
+- lib/chef/mixin/proxified_socket.rb
 - lib/chef/mixin/recipe_definition_dsl_core.rb
 - lib/chef/mixin/securable.rb
 - lib/chef/mixin/shell_out.rb
+- lib/chef/mixin/subclass_directive.rb
 - lib/chef/mixin/template.rb
 - lib/chef/mixin/unformatter.rb
 - lib/chef/mixin/uris.rb
@@ -1053,7 +1075,9 @@ files:
 - lib/chef/provider/package/smartos.rb
 - lib/chef/provider/package/solaris.rb
 - lib/chef/provider/package/windows.rb
+- lib/chef/provider/package/windows/exe.rb
 - lib/chef/provider/package/windows/msi.rb
+- lib/chef/provider/package/windows/registry_uninstall_entry.rb
 - lib/chef/provider/package/yum-dump.py
 - lib/chef/provider/package/yum.rb
 - lib/chef/provider/package/zypper.rb
@@ -1142,6 +1166,7 @@ files:
 - lib/chef/resource/http_request.rb
 - lib/chef/resource/ifconfig.rb
 - lib/chef/resource/ips_package.rb
+- lib/chef/resource/ksh.rb
 - lib/chef/resource/link.rb
 - lib/chef/resource/log.rb
 - lib/chef/resource/lwrp_base.rb
@@ -1262,6 +1287,7 @@ files:
 - lib/chef/win32/eventlog.rb
 - lib/chef/win32/file.rb
 - lib/chef/win32/file/info.rb
+- lib/chef/win32/file/version_info.rb
 - lib/chef/win32/handle.rb
 - lib/chef/win32/memory.rb
 - lib/chef/win32/mutex.rb
@@ -1293,6 +1319,25 @@ files:
 - spec/data/apt/chef-integration-test-1.1/debian/files
 - spec/data/apt/chef-integration-test-1.1/debian/rules
 - spec/data/apt/chef-integration-test-1.1/debian/source/format
+- spec/data/apt/chef-integration-test2-1.0/debian/changelog
+- spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2.debhelper.log
+- spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2.substvars
+- spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/conffiles
+- spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/control
+- spec/data/apt/chef-integration-test2-1.0/debian/chef-integration-test2/DEBIAN/md5sums
+- spec/data/apt/chef-integration-test2-1.0/debian/compat
+- spec/data/apt/chef-integration-test2-1.0/debian/conffiles
+- spec/data/apt/chef-integration-test2-1.0/debian/control
+- spec/data/apt/chef-integration-test2-1.0/debian/copyright
+- spec/data/apt/chef-integration-test2-1.0/debian/files
+- spec/data/apt/chef-integration-test2-1.0/debian/rules
+- spec/data/apt/chef-integration-test2-1.0/debian/source/format
+- spec/data/apt/chef-integration-test2_1.0-1.debian.tar.gz
+- spec/data/apt/chef-integration-test2_1.0-1.dsc
+- spec/data/apt/chef-integration-test2_1.0-1_amd64.build
+- spec/data/apt/chef-integration-test2_1.0-1_amd64.changes
+- spec/data/apt/chef-integration-test2_1.0-1_amd64.deb
+- spec/data/apt/chef-integration-test2_1.0.orig.tar.gz
 - spec/data/apt/chef-integration-test_1.0-1_amd64.changes
 - spec/data/apt/chef-integration-test_1.0-1_amd64.deb
 - spec/data/apt/chef-integration-test_1.0.orig.tar.gz
@@ -1597,6 +1642,7 @@ files:
 - spec/functional/resource/cron_spec.rb
 - spec/functional/resource/deploy_revision_spec.rb
 - spec/functional/resource/directory_spec.rb
+- spec/functional/resource/dpkg_package_spec.rb
 - spec/functional/resource/dsc_resource_spec.rb
 - spec/functional/resource/dsc_script_spec.rb
 - spec/functional/resource/env_spec.rb
@@ -1619,6 +1665,7 @@ files:
 - spec/functional/resource/user/dscl_spec.rb
 - spec/functional/resource/user/useradd_spec.rb
 - spec/functional/resource/user/windows_spec.rb
+- spec/functional/resource/windows_package_spec.rb
 - spec/functional/resource/windows_service_spec.rb
 - spec/functional/rest_spec.rb
 - spec/functional/run_lock_spec.rb
@@ -1632,6 +1679,7 @@ files:
 - spec/functional/win32/security_spec.rb
 - spec/functional/win32/service_manager_spec.rb
 - spec/functional/win32/sid_spec.rb
+- spec/functional/win32/version_info_spec.rb
 - spec/functional/win32/versions_spec.rb
 - spec/integration/client/client_spec.rb
 - spec/integration/client/ipv6_spec.rb
@@ -1681,10 +1729,6 @@ files:
 - spec/support/matchers/leak.rb
 - spec/support/mock/constant.rb
 - spec/support/mock/platform.rb
-- spec/support/pedant/Gemfile
-- spec/support/pedant/pedant_config.rb
-- spec/support/pedant/run_pedant.rb
-- spec/support/pedant/stickywicket.pem
 - spec/support/platform_helpers.rb
 - spec/support/platforms/prof/gc.rb
 - spec/support/platforms/prof/win32.rb
@@ -1743,6 +1787,7 @@ files:
 - spec/unit/chef_fs/data_handler/group_handler_spec.rb
 - spec/unit/chef_fs/diff_spec.rb
 - spec/unit/chef_fs/file_pattern_spec.rb
+- spec/unit/chef_fs/file_system/cookbook_subdir_spec.rb
 - spec/unit/chef_fs/file_system/operation_failed_error_spec.rb
 - spec/unit/chef_fs/file_system_spec.rb
 - spec/unit/chef_fs/parallelizer.rb
@@ -1931,8 +1976,11 @@ files:
 - spec/unit/mixin/path_sanity_spec.rb
 - spec/unit/mixin/powershell_out_spec.rb
 - spec/unit/mixin/powershell_type_coercions_spec.rb
+- spec/unit/mixin/properties_spec.rb
+- spec/unit/mixin/proxified_socket_spec.rb
 - spec/unit/mixin/securable_spec.rb
 - spec/unit/mixin/shell_out_spec.rb
+- spec/unit/mixin/subclass_directive_spec.rb
 - spec/unit/mixin/template_spec.rb
 - spec/unit/mixin/unformatter_spec.rb
 - spec/unit/mixin/uris_spec.rb
@@ -2012,12 +2060,12 @@ files:
 - spec/unit/provider/package/rubygems_spec.rb
 - spec/unit/provider/package/smartos_spec.rb
 - spec/unit/provider/package/solaris_spec.rb
+- spec/unit/provider/package/windows/exe_spec.rb
 - spec/unit/provider/package/windows/msi_spec.rb
 - spec/unit/provider/package/windows_spec.rb
 - spec/unit/provider/package/yum_spec.rb
 - spec/unit/provider/package/zypper_spec.rb
 - spec/unit/provider/package_spec.rb
-- spec/unit/provider/package_spec.rbe
 - spec/unit/provider/powershell_script_spec.rb
 - spec/unit/provider/registry_key_spec.rb
 - spec/unit/provider/remote_directory_spec.rb
@@ -2094,6 +2142,7 @@ files:
 - spec/unit/resource/http_request_spec.rb
 - spec/unit/resource/ifconfig_spec.rb
 - spec/unit/resource/ips_package_spec.rb
+- spec/unit/resource/ksh_spec.rb
 - spec/unit/resource/link_spec.rb
 - spec/unit/resource/log_spec.rb
 - spec/unit/resource/macports_package_spec.rb