chef-sugar-ng 5.1.11 → 5.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f3a0d73198f6a95304bffb888e71b8a1cd8624deda4b8d26d72fc8a471d5b0c
-  data.tar.gz: ab5ec28695feaeabb309a0512b8abc9ba2040373466a24f8bd586baa1afb9cb1
+  metadata.gz: 7d73ddc0e538ed51271f55531558fdc8c7748ac7df018b37f9f912fad99b852b
+  data.tar.gz: 51ea5a46956cf3b068c7e9218aae7ca04324fae9ebb535cb77634e8e6e8fb047
 SHA512:
-  metadata.gz: 0f43ba45941a1656b841bc262593d62a42a8b9171de825b20fc299f2e03d5ecc358b7406ccb021bf00e60904704df264c5c1a9c750d0dc7411135aae1486f2ae
-  data.tar.gz: 1f5f043631164b7c7b68d30c0fa4b41a39281e8dcb75e44cd668af608245a2d8ad44f51e2401184dfb131f26d9572d34da512c140b02c71f5ceb44970856b52e
+  metadata.gz: 61d31094e15498f631a694e2c59f1ab5a0f640ce7906a858ac014291e48dbf3d4570218506b0a4bc160a44806d97eaed9a385bab00a8b1aca12b03ac04760047
+  data.tar.gz: e514dae7702488d82585af62f6239cb0c503a4faed0745de156c2bb1fed1df3f5c56fc24bbeee92f4225c22d3f7d8be22bab365a89a96575185ce8fa470761e0

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-ng
 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