chef-sugar 5.1.11 → 5.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 690f59ffaeb7464fa9481cb0c30dee73950e32c86012ecf5c6a44c944cb695c2
-  data.tar.gz: b76c63eeb5479c9af859397c1b0bc10d2f7f7082586013462b8d63ecccb9fb33
+  metadata.gz: 94b5873d50542962ae3acca1cec3b6048571e37006eac04fc67c293bb1ee6124
+  data.tar.gz: cf7ed6690f5c776cbcd74cd9c24d7835648f969249639b95aceb4abf92e14393
 SHA512:
-  metadata.gz: 2d2d0f8894504caeacff01c363300b300ffd776bb71ba0005ff316cc312c4c5726bee7fd2c0afa81cac6b30c2c62eb666a1acd14bb681ae30f736fcb777796c5
-  data.tar.gz: 5962221ffaacb4ec6fcb56234aad9d850b324db2d94c1ddffc012e64cf44ede469942ccdce336ac7844a7510f1a26ffd9e76052e7d0e385f0566067162b262a0
+  metadata.gz: cdd5ae08d1a99bbc636ccf8a4a9883fb88517c07c1a0b16331769ce336ec62a86ab3238bfe6d44ef1afc7276bca331086ba9d9ee332878cdfdc5e293fffabe71
+  data.tar.gz: 0a2e1e8b50db3258aec7b4cd482345059da8bb66c912eaf5bb9a7ac12ec0705c10ddf35f48082a58dbfebc4497c2ed7e79f09b5d140b4105d10b66e32eb8f061

data/lib/chef/sugar/shell.rb

@@ -22,26 +22,29 @@ class Chef
     module Shell
       extend self
 
-      #
-      # Finds a command in $PATH
-      #
-      # @param [String] cmd
-      #   the command to find
-      #
-      # @return [String, nil]
-      #
-      def which(cmd)
-        if Pathname.new(cmd).absolute?
-          File.executable?(cmd) ? cmd : nil
-        else
-          paths = ENV['PATH'].split(::File::PATH_SEPARATOR) + %w(/bin /usr/bin /sbin /usr/sbin)
-
-          paths.each do |path|
-            possible = File.join(path, cmd)
-            return possible if File.executable?(possible)
+      # this helper has been moved to core chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 16.0.257").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        #
+        # Finds a command in $PATH
+        #
+        # @param [String] cmd
+        #   the command to find
+        #
+        # @return [String, nil]
+        #
+        def which(cmd)
+          if Pathname.new(cmd).absolute?
+            File.executable?(cmd) ? cmd : nil
+          else
+            paths = ENV['PATH'].split(::File::PATH_SEPARATOR) + %w(/bin /usr/bin /sbin /usr/sbin)
+
+            paths.each do |path|
+              possible = File.join(path, cmd)
+              return possible if File.executable?(possible)
+            end
+
+            nil
           end
-
-          nil
         end
       end
 
@@ -128,8 +131,11 @@ class Chef
     end
 
     module DSL
-      # @see Chef::Sugar::Shell#which
-      def which(cmd); Chef::Sugar::Shell.which(cmd); end
+      # this helper has been moved to core chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 16.0.257").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        # @see Chef::Sugar::Shell#which
+        def which(cmd); Chef::Sugar::Shell.which(cmd); end
+      end
 
       # @see Chef::Sugar::Shell#dev_null
       def dev_null; Chef::Sugar::Shell.dev_null(node); end

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = "5.1.11"
+    VERSION = "5.1.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 5.1.11
+  version: 5.1.12
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies: []
 description: A series of helpful sugar of the Chef core and other resources to make
   a cleaner, more lean recipe DSL, enforce DRY principles, and make writing Chef recipes