Merge pull request #7989 from chef/require_which

Make sure which mixin requires chef_class

3 files changed, 18 insertions, 14 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 3c7418c092..1102b46ecd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: 2cde15d109a992903ef5d2d63837d579e59ae233
+  revision: af633604e28442884b131dd51a09738251d5f2b6
   branch: master
   specs:
-    ohai (15.0.10)
+    ohai (15.0.12)
       chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -114,7 +114,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     appbundler (0.11.6)
       mixlib-cli (~> 1.4)
       mixlib-shellout (~> 2.0)
@@ -143,7 +144,7 @@ GEM
     erubis (2.7.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
@@ -244,6 +245,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
+    public_suffix (3.0.3)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
diff --git a/lib/chef/mixin/which.rb b/lib/chef/mixin/which.rb
index 8a825f55c9..ffa324c911 100644
--- a/lib/chef/mixin/which.rb
+++ b/lib/chef/mixin/which.rb
@@ -1,6 +1,6 @@
 #--
 # Author:: Lamont Granquist <lamont@chef.io>
-# Copyright:: Copyright 2010-2017, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,8 @@
 class Chef
   module Mixin
     module Which
+      require "chef/chef_class"
+
       def which(*cmds, extra_path: nil, &block)
         where(*cmds, extra_path: extra_path, &block).first || false
       end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b0a3f8007b..3e3c2ee7f8 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: dfb28a83c3cbce42e6e5bbc4985930067e206362
+  revision: ca035f744ece299cbdf81f52edb997b4ba1693b2
   branch: master
   specs:
-    omnibus (6.0.6)
+    omnibus (6.0.7)
       aws-sdk-s3 (~> 1)
       chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
@@ -32,21 +32,21 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.115.0)
-    aws-sdk-core (3.39.0)
+    aws-partitions (1.117.0)
+    aws-sdk-core (3.40.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.12.0)
+    aws-sdk-kms (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.25.0)
+    aws-sdk-s3 (1.27.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
-    berkshelf (7.0.6)
+    berkshelf (7.0.7)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -156,7 +156,7 @@ GEM
     debug_inspector (0.0.3)
     diff-lcs (1.3)
     erubis (2.7.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     ffi (1.9.25-x64-mingw32)
@@ -181,7 +181,7 @@ GEM
     kitchen-vagrant (1.3.6)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
-    license_scout (1.0.16)
+    license_scout (1.0.18)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
       toml-rb (~> 1.0)