tighten all require statements for dist implementation

Signed-off-by: Marc Chamberland <chamberland.marc@gmail.com>
Signed-off-by: Lance Albertson <lance@osuosl.org>

7 files changed, 7 insertions, 5 deletions

diff --git a/spec/functional/event_loggers/windows_eventlog_spec.rb b/spec/functional/event_loggers/windows_eventlog_spec.rb
index 0579728b47..b9f10fd4dc 100644
--- a/spec/functional/event_loggers/windows_eventlog_spec.rb
+++ b/spec/functional/event_loggers/windows_eventlog_spec.rb
@@ -19,6 +19,7 @@
 require "spec_helper"
 require "securerandom"
 require "chef/event_loggers/windows_eventlog"
+require "chef-utils"
 if ChefUtils.windows?
   require "win32/eventlog"
   include Win32
diff --git a/spec/functional/resource/windows_task_spec.rb b/spec/functional/resource/windows_task_spec.rb
index 3fe661a550..2347db5af1 100644
--- a/spec/functional/resource/windows_task_spec.rb
+++ b/spec/functional/resource/windows_task_spec.rb
@@ -18,7 +18,7 @@
 
 require "spec_helper"
 require "chef/provider/windows_task"
-require "chef-utils"
+require "chef-utils/dist/infra"
 
 describe Chef::Resource::WindowsTask, :windows_only do
   # resource.task.application_name will default to task_name unless resource.command is set
diff --git a/spec/functional/version_spec.rb b/spec/functional/version_spec.rb
index 5f4f9f79e0..5d0f0fce43 100644
--- a/spec/functional/version_spec.rb
+++ b/spec/functional/version_spec.rb
@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 require "chef/version"
 require "ohai/version"
-require "chef-utils"
+require "chef-utils/dist"
 
 describe "Chef Versions", :executables do
   include Chef::Mixin::ShellOut
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index b7455c4b80..71f517141e 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -3,7 +3,7 @@ require "support/shared/integration/integration_helper"
 require "chef/mixin/shell_out"
 require "tiny_server"
 require "tmpdir"
-require "chef-utils"
+require "chef-utils/dist"
 
 describe "chef-client" do
 
diff --git a/spec/integration/client/exit_code_spec.rb b/spec/integration/client/exit_code_spec.rb
index 3b0c7d5a8e..4a69d61a53 100644
--- a/spec/integration/client/exit_code_spec.rb
+++ b/spec/integration/client/exit_code_spec.rb
@@ -5,6 +5,7 @@ require "chef/mixin/shell_out"
 require "tiny_server"
 require "tmpdir"
 require "chef/platform"
+require "chef-utils/dist/infra"
 
 describe "chef-client" do
 
diff --git a/spec/integration/solo/solo_spec.rb b/spec/integration/solo/solo_spec.rb
index 6c9e2a6f9d..12a49dade6 100644
--- a/spec/integration/solo/solo_spec.rb
+++ b/spec/integration/solo/solo_spec.rb
@@ -5,8 +5,8 @@ require "chef/run_lock"
 require "chef/config"
 require "timeout"
 require "fileutils"
-require "chef/win32/security" if ChefUtils.windows?
 require "chef-utils"
+require "chef/win32/security" if ChefUtils.windows?
 
 describe ChefUtils::Dist::Solo::EXEC do
   include IntegrationSupport
diff --git a/spec/unit/cookbook/synchronizer_spec.rb b/spec/unit/cookbook/synchronizer_spec.rb
index 22dd211f5b..9a2b1448a7 100644
--- a/spec/unit/cookbook/synchronizer_spec.rb
+++ b/spec/unit/cookbook/synchronizer_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 require "chef/cookbook/synchronizer"
 require "chef/cookbook_version"
-require "chef-utils"
+require "chef-utils/dist/solo"
 
 describe Chef::CookbookCacheCleaner do
   describe "when cleaning up unused cookbook components" do