chef-sugar-ng 5.0.2 → 5.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdae87d2e69fb4009ed24d40f26826f24257777832a5e5b6d1de73af3e803718
-  data.tar.gz: 75f4699115e707e427066907a4b91a6741faac07b171cc4b50e6ecaa06b47cf6
+  metadata.gz: 6f3a0d73198f6a95304bffb888e71b8a1cd8624deda4b8d26d72fc8a471d5b0c
+  data.tar.gz: ab5ec28695feaeabb309a0512b8abc9ba2040373466a24f8bd586baa1afb9cb1
 SHA512:
-  metadata.gz: 330f5adfbf5d476f4f7afe141bb9a38419e7e17a3430a95f02cf6f8f5076018ddb568f3f61238816f424c3d0da3201a9f84af3419b67b5d3705a5e99a6e21cb3
-  data.tar.gz: ebc06325792ddfed441512dc5fbd1ddf190e3480b0f50a2c60bb71d8a23d435b7d9eb8c9ae851846e517e8f937e84fb40827ecb94205690d46b51724a4e0fc3c
+  metadata.gz: 0f43ba45941a1656b841bc262593d62a42a8b9171de825b20fc299f2e03d5ecc358b7406ccb021bf00e60904704df264c5c1a9c750d0dc7411135aae1486f2ae
+  data.tar.gz: 1f5f043631164b7c7b68d30c0fa4b41a39281e8dcb75e44cd668af608245a2d8ad44f51e2401184dfb131f26d9572d34da512c140b02c71f5ceb44970856b52e

data/lib/chef/sugar/architecture.rb

@@ -19,153 +19,158 @@ class Chef
     module Architecture
       extend self
 
-      #
-      # Determine if the current architecture is 64-bit
-      #
-      # @return [Boolean]
-      #
-      def _64_bit?(node)
-        %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64 sun4v sun4u s390x)
-          .include?(node['kernel']['machine']) || ( node['kernel']['bits'] == '64' )
-      end
-
-      #
-      # Determine if the current architecture is 32-bit
-      #
-      # @todo Make this more than "not 64-bit"
-      #
-      # @return [Boolean]
-      #
-      def _32_bit?(node)
-        !_64_bit?(node)
-      end
-
-      #
-      # Determine if the current architecture is i386
-      #
-      # @return [Boolean]
-      #
-      def i386?(node)
-        _32_bit?(node) && intel?(node)
-      end
-
-      #
-      # Determine if the current architecture is Intel.
-      #
-      # @return [Boolean]
-      #
-      def intel?(node)
-        %w(i86pc i386 x86_64 amd64 i686)
-          .include?(node['kernel']['machine'])
-      end
-
-      #
-      # Determine if the current architecture is SPARC.
-      #
-      # @return [Boolean]
-      #
-      def sparc?(node)
-        %w(sun4u sun4v)
-          .include?(node['kernel']['machine'])
-      end
-
-      #
-      # Determine if the current architecture is Powerpc64 Big Endian
-      #
-      # @return [Boolean]
-      #
-      def ppc64?(node)
-        %w(ppc64)
-          .include?(node['kernel']['machine'])
-      end
-
-      #
-      # Determine if the current architecture is Powerpc64 Little Endian
-      #
-      # @return [Boolean]
-      #
-      def ppc64le?(node)
-        %w(ppc64le)
-          .include?(node['kernel']['machine'])
-      end
-
-      #
-      # Determine if the current architecture is PowerPC
-      #
-      # @return [Boolean]
-      #
-      def powerpc?(node)
-        %w(powerpc)
-          .include?(node['kernel']['machine'])
-      end
-
-      #
-      # Determine if the current architecture is ARM with Hard Float
-      #
-      # @return [Boolean]
-      #
-      def armhf?(node)
-        # Add more arm variants as needed here
-        %w(armv6l armv7l)
-          .include?(node['kernel']['machine'])
-      end
-
-      #
-      # Determine if the current architecture is AArch64
-      #
-      # @return [Boolean]
-      #
-      def aarch64?(node)
-        # Add more arm variants as needed here
-        %w(aarch64)
-          .include?(node['kernel']['machine'])
-      end
-
-      #
-      # Determine if the current architecture is s390x
-      #
-      # @return [Boolean]
-      #
-      def s390x?(node)
-        %w(s390x)
-          .include?(node['kernel']['machine'])
+      # these helpers have been moved to core-chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        #
+        # Determine if the current architecture is 64-bit
+        #
+        # @return [Boolean]
+        #
+        def _64_bit?(node)
+          %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64 sun4v sun4u s390x)
+            .include?(node['kernel']['machine']) || ( node['kernel']['bits'] == '64' )
+        end
+
+        #
+        # Determine if the current architecture is 32-bit
+        #
+        # @todo Make this more than "not 64-bit"
+        #
+        # @return [Boolean]
+        #
+        def _32_bit?(node)
+          !_64_bit?(node)
+        end
+
+        #
+        # Determine if the current architecture is i386
+        #
+        # @return [Boolean]
+        #
+        def i386?(node)
+          _32_bit?(node) && intel?(node)
+        end
+
+        #
+        # Determine if the current architecture is Intel.
+        #
+        # @return [Boolean]
+        #
+        def intel?(node)
+          %w(i86pc i386 x86_64 amd64 i686)
+            .include?(node['kernel']['machine'])
+        end
+
+        #
+        # Determine if the current architecture is SPARC.
+        #
+        # @return [Boolean]
+        #
+        def sparc?(node)
+          %w(sun4u sun4v)
+            .include?(node['kernel']['machine'])
+        end
+
+        #
+        # Determine if the current architecture is Powerpc64 Big Endian
+        #
+        # @return [Boolean]
+        #
+        def ppc64?(node)
+          %w(ppc64)
+            .include?(node['kernel']['machine'])
+        end
+
+        #
+        # Determine if the current architecture is Powerpc64 Little Endian
+        #
+        # @return [Boolean]
+        #
+        def ppc64le?(node)
+          %w(ppc64le)
+            .include?(node['kernel']['machine'])
+        end
+
+        #
+        # Determine if the current architecture is PowerPC
+        #
+        # @return [Boolean]
+        #
+        def powerpc?(node)
+          %w(powerpc)
+            .include?(node['kernel']['machine'])
+        end
+
+        #
+        # Determine if the current architecture is ARM with Hard Float
+        #
+        # @return [Boolean]
+        #
+        def armhf?(node)
+          # Add more arm variants as needed here
+          %w(armv6l armv7l)
+            .include?(node['kernel']['machine'])
+        end
+
+        #
+        # Determine if the current architecture is AArch64
+        #
+        # @return [Boolean]
+        #
+        def aarch64?(node)
+          # Add more arm variants as needed here
+          %w(aarch64)
+            .include?(node['kernel']['machine'])
+        end
+
+        #
+        # Determine if the current architecture is s390x
+        #
+        # @return [Boolean]
+        #
+        def s390x?(node)
+          %w(s390x)
+            .include?(node['kernel']['machine'])
+        end
       end
     end
 
     module DSL
-      # @see Chef::Sugar::Architecture#_64_bit?
-      def _64_bit?; Chef::Sugar::Architecture._64_bit?(node); end
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        # @see Chef::Sugar::Architecture#_64_bit?
+        def _64_bit?; Chef::Sugar::Architecture._64_bit?(node); end
 
-      # @see Chef::Sugar::Architecture#_32_bit?
-      def _32_bit?; Chef::Sugar::Architecture._32_bit?(node); end
+        # @see Chef::Sugar::Architecture#_32_bit?
+        def _32_bit?; Chef::Sugar::Architecture._32_bit?(node); end
 
-      # @see Chef::Sugar::Architecture#intel?
-      def i386?; Chef::Sugar::Architecture.i386?(node); end
+        # @see Chef::Sugar::Architecture#intel?
+        def i386?; Chef::Sugar::Architecture.i386?(node); end
 
-      # @see Chef::Sugar::Architecture#intel?
-      def intel?; Chef::Sugar::Architecture.intel?(node); end
+        # @see Chef::Sugar::Architecture#intel?
+        def intel?; Chef::Sugar::Architecture.intel?(node); end
 
-      # @see Chef::Sugar::Architecture#sparc?
-      def sparc?; Chef::Sugar::Architecture.sparc?(node); end
+        # @see Chef::Sugar::Architecture#sparc?
+        def sparc?; Chef::Sugar::Architecture.sparc?(node); end
 
-      # @see Chef::Sugar::Architecture#ppc64?
-      def ppc64?; Chef::Sugar::Architecture.ppc64?(node); end
+        # @see Chef::Sugar::Architecture#ppc64?
+        def ppc64?; Chef::Sugar::Architecture.ppc64?(node); end
 
-      # @see Chef::Sugar::Architecture#ppc64le?
-      def ppc64le?; Chef::Sugar::Architecture.ppc64le?(node); end
+        # @see Chef::Sugar::Architecture#ppc64le?
+        def ppc64le?; Chef::Sugar::Architecture.ppc64le?(node); end
 
-      # @see Chef::Sugar::Architecture#powerpc?
-      def powerpc?; Chef::Sugar::Architecture.powerpc?(node); end
+        # @see Chef::Sugar::Architecture#powerpc?
+        def powerpc?; Chef::Sugar::Architecture.powerpc?(node); end
 
-      # @see Chef::Sugar::Architecture#arm?
-      def armhf?; Chef::Sugar::Architecture.armhf?(node); end
+        # @see Chef::Sugar::Architecture#arm?
+        def armhf?; Chef::Sugar::Architecture.armhf?(node); end
 
-      # @see Chef::Sugar::Architecture#aarch64?
-      def aarch64?; Chef::Sugar::Architecture.aarch64?(node); end
+        # @see Chef::Sugar::Architecture#aarch64?
+        def aarch64?; Chef::Sugar::Architecture.aarch64?(node); end
 
-      # @see Chef::Sugar::Architecture#s390x?
-      def s390x?; Chef::Sugar::Architecture.s390x?(node); end
+        # @see Chef::Sugar::Architecture#s390x?
+        def s390x?; Chef::Sugar::Architecture.s390x?(node); end
 
+      end
     end
   end
 end

data/lib/chef/sugar/deprecation.rb

@@ -0,0 +1,45 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if defined?(Chef::Deprecated::Base)
+  class Chef
+    class Deprecated
+      class ChefSugar < Base
+        def id
+          28
+        end
+        def target
+          "chef_sugar.html"
+        end
+      end
+    end
+  end
+end
+
+class Chef
+  module Sugar
+    module Deprecation
+      if defined?(Chef::Deprecated::Base)
+        def deprecated(message)
+          Chef.deprecated(:chef_sugar, message)
+        end
+      else
+        def deprecated(message)
+          Chef::Log.warn(message)
+        end
+      end
+      extend self
+    end
+  end
+end

data/lib/chef/sugar/docker.rb

@@ -19,22 +19,27 @@ class Chef
     module Docker
       extend self
 
-      #
-      # Returns true if the current node is a docker container.
-      #
-      # @param [Chef::Node] node
-      #   the node to check
-      #
-      # @return [Boolean]
-      #
-      def docker?(node)
-        File.exist?('/.dockerinit') || File.exist?('/.dockerenv')
+      # these helpers have been moved to core chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        #
+        # Returns true if the current node is a docker container.
+        #
+        # @param [Chef::Node] node
+        #   the node to check
+        #
+        # @return [Boolean]
+        #
+        def docker?(node)
+          File.exist?('/.dockerinit') || File.exist?('/.dockerenv')
+        end
       end
     end
 
     module DSL
-      # @see Chef::Sugar::Docker#docker?
-      def docker?; Chef::Sugar::Docker.docker?(node); end
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        # @see Chef::Sugar::Docker#docker?
+        def docker?; Chef::Sugar::Docker.docker?(node); end
+      end
     end
   end
 end

data/lib/chef/sugar/kitchen.rb

@@ -19,22 +19,27 @@ class Chef
     module Kitchen
       extend self
 
-      #
-      # Returns true if the current node is provisioned by Test Kitchen.
-      #
-      # @param [Chef::Node] node
-      #   the node to check
-      #
-      # @return [Boolean]
-      #
-      def kitchen?(node)
-        !ENV['TEST_KITCHEN'].nil?
+      # these helpers have been moved to core-chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        #
+        # Returns true if the current node is provisioned by Test Kitchen.
+        #
+        # @param [Chef::Node] node
+        #   the node to check
+        #
+        # @return [Boolean]
+        #
+        def kitchen?(node)
+          !ENV['TEST_KITCHEN'].nil?
+        end
       end
     end
 
     module DSL
-      # @see Chef::Sugar::Kitchen#kitchen?
-      def kitchen?; Chef::Sugar::Kitchen.kitchen?(node); end
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        # @see Chef::Sugar::Kitchen#kitchen?
+        def kitchen?; Chef::Sugar::Kitchen.kitchen?(node); end
+      end
     end
   end
 end

data/lib/chef/sugar/node.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require_relative "deprecation"
+
 class Chef
   class Node
     class AttributeDoesNotExistError < StandardError
@@ -36,6 +38,7 @@ EOH
     # @return [Boolean]
     #
     def in?(environment)
+      Chef::Sugar::Deprecation.deprecated "the chef-sugar node.in? method is deprecated"
       environment === chef_environment
     end
 
@@ -49,6 +52,7 @@ EOH
     # @see [Node#deep_fetch!]
     #
     def deep_fetch(*keys)
+      Chef::Sugar::Deprecation.deprecated "the chef-sugar deep_fetch method is deprecated and should be replaced by node.read"
       deep_fetch!(*keys)
     rescue NoMethodError, AttributeDoesNotExistError
       nil
@@ -71,6 +75,7 @@ EOH
     # @return [Object]
     #
     def deep_fetch!(*keys)
+      Chef::Sugar::Deprecation.deprecated "the chef-sugar deep_fetch method is deprecated and should be replaced by node.read!"
       keys.map!(&:to_s)
 
       keys.inject(attributes.to_hash) do |hash, key|
@@ -133,6 +138,7 @@ EOH
     #   to prevent accidential method chaining if the block isn't closed
     #
     def namespace(*args, &block)
+      Chef::Sugar::Deprecation.deprecated "the chef-sugar attribute namespace setting is deprecated, please use traditional chef attribute notation"
       @namespace_options = namespace_options.merge(args.last.is_a?(Hash) ? args.pop : {})
 
       keys = args.map(&:to_s)

data/lib/chef/sugar/platform.rb

@@ -121,186 +121,190 @@ class Chef
         end
       end
 
-      #
-      # Determine if the current node is linux mint.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def linux_mint?(node)
-        node['platform'] == 'linuxmint'
-      end
-      alias_method :mint?, :linux_mint?
+      # these helpers have been moved to core chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
+        #
+        # Determine if the current node is linux mint.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def linux_mint?(node)
+          node['platform'] == 'linuxmint'
+        end
+        alias_method :mint?, :linux_mint?
 
-      #
-      # Determine if the current node is ubuntu.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def ubuntu?(node)
-        node['platform'] == 'ubuntu'
-      end
+        #
+        # Determine if the current node is ubuntu.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def ubuntu?(node)
+          node['platform'] == 'ubuntu'
+        end
 
-      #
-      # Determine if the current node is debian (platform, not platform_family).
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def debian_platform?(node)
-        node['platform'] == 'debian'
-      end
+        #
+        # Determine if the current node is debian (platform, not platform_family).
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def debian_platform?(node)
+          node['platform'] == 'debian'
+        end
 
-      #
-      # Determine if the current node is amazon linux.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def amazon_linux?(node)
-        node['platform'] == 'amazon'
-      end
-      alias_method :amazon?, :amazon_linux?
+        #
+        # Determine if the current node is amazon linux.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def amazon_linux?(node)
+          node['platform'] == 'amazon'
+        end
+        alias_method :amazon?, :amazon_linux?
 
-      #
-      # Determine if the current node is centos.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def centos?(node)
-        node['platform'] == 'centos'
-      end
+        #
+        # Determine if the current node is centos.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def centos?(node)
+          node['platform'] == 'centos'
+        end
 
-      #
-      # Determine if the current node is oracle linux.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def oracle_linux?(node)
-        node['platform'] == 'oracle'
-      end
-      alias_method :oracle?, :oracle_linux?
+        #
+        # Determine if the current node is oracle linux.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def oracle_linux?(node)
+          node['platform'] == 'oracle'
+        end
+        alias_method :oracle?, :oracle_linux?
 
-      #
-      # Determine if the current node is scientific linux.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def scientific_linux?(node)
-        node['platform'] == 'scientific'
-      end
-      alias_method :scientific?, :scientific_linux?
+        #
+        # Determine if the current node is scientific linux.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def scientific_linux?(node)
+          node['platform'] == 'scientific'
+        end
+        alias_method :scientific?, :scientific_linux?
 
-      #
-      # Determine if the current node is redhat enterprise.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def redhat_enterprise_linux?(node)
-        node['platform'] == 'redhat'
-      end
-      alias_method :redhat_enterprise?, :redhat_enterprise_linux?
+        #
+        # Determine if the current node is redhat enterprise.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def redhat_enterprise_linux?(node)
+          node['platform'] == 'redhat'
+        end
+        alias_method :redhat_enterprise?, :redhat_enterprise_linux?
 
-      #
-      # Determine if the current node is fedora (platform, not platform_family).
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def fedora_platform?(node)
-        node['platform'] == 'fedora'
-      end
+        #
+        # Determine if the current node is fedora (platform, not platform_family).
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def fedora_platform?(node)
+          node['platform'] == 'fedora'
+        end
 
-      #
-      # Determine if the current node is solaris2
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def solaris2?(node)
-        node['platform'] == 'solaris2'
-      end
-      alias_method :solaris?, :solaris2?
+        #
+        # Determine if the current node is solaris2
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def solaris2?(node)
+          node['platform'] == 'solaris2'
+        end
+        alias_method :solaris?, :solaris2?
 
-      #
-      # Determine if the current node is aix
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def aix?(node)
-        node['platform'] == 'aix'
-      end
+        #
+        # Determine if the current node is aix
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def aix?(node)
+          node['platform'] == 'aix'
+        end
 
-      #
-      # Determine if the current node is smartos
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def smartos?(node)
-        node['platform'] == 'smartos'
-      end
+        #
+        # Determine if the current node is smartos
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def smartos?(node)
+          node['platform'] == 'smartos'
+        end
 
-      #
-      # Determine if the current node is omnios
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def omnios?(node)
-        node['platform'] == 'omnios'
-      end
+        #
+        # Determine if the current node is omnios
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def omnios?(node)
+          node['platform'] == 'omnios'
+        end
 
-      #
-      # Determine if the current node is raspbian
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def raspbian?(node)
-        node['platform'] == 'raspbian'
-      end
+        #
+        # Determine if the current node is raspbian
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def raspbian?(node)
+          node['platform'] == 'raspbian'
+        end
 
-      #
-      # Determine if the current node is a Cisco nexus device
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def nexus?(node)
-        node['platform'] == 'nexus'
-      end
+        #
+        # Determine if the current node is a Cisco nexus device
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def nexus?(node)
+          node['platform'] == 'nexus'
+        end
+
+        #
+        # Determine if the current node is a Cisco IOS-XR device
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def ios_xr?(node)
+          node['platform'] == 'ios_xr'
+        end
 
-      #
-      # Determine if the current node is a Cisco IOS-XR device
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def ios_xr?(node)
-        node['platform'] == 'ios_xr'
       end
 
       #

data/lib/chef/sugar/platform_family.rb

@@ -19,152 +19,157 @@ class Chef
     module PlatformFamily
       extend self
 
-      #
-      # Determine if the current node is a member of the arch family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def arch_linux?(node)
-        node['platform_family'] == 'arch'
-      end
-      alias_method :arch?, :arch_linux?
-
-      #
-      # Determine if the current node is a member of the debian family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def debian?(node)
-        node['platform_family'] == 'debian'
-      end
+      # these helpers have been moved to core chef
+      if !defined?(Chef::VERSION) || Gem::Requirement.new("< 15.4.70").satisfied_by?(Gem::Version.new(Chef::VERSION))
 
-      #
-      # Determine if the current node is a member of the fedora family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def fedora?(node)
-        node['platform_family'] == 'fedora'
-      end
+        #
+        # Determine if the current node is a member of the arch family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def arch_linux?(node)
+          node['platform_family'] == 'arch'
+        end
+        alias_method :arch?, :arch_linux?
 
-      #
-      # Determine if the current node is a member of the freebsd family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def freebsd?(node)
-        node['platform_family'] == 'freebsd'
-      end
+        #
+        # Determine if the current node is a member of the debian family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def debian?(node)
+          node['platform_family'] == 'debian'
+        end
 
-      #
-      # Determine if the current node is a member of the arch family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def gentoo?(node)
-        node['platform_family'] == 'gentoo'
-      end
+        #
+        # Determine if the current node is a member of the fedora family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def fedora?(node)
+          node['platform_family'] == 'fedora'
+        end
 
-      #
-      # Determine if the current node is a member of the OSX family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def mac_os_x?(node)
-        node['platform_family'] == 'mac_os_x'
-      end
-      alias_method :osx?, :mac_os_x?
-      alias_method :mac?, :mac_os_x?
-
-      #
-      # Determine if the current node is a member of the openbsd family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def openbsd?(node)
-        node['platform_family'] == 'openbsd'
-      end
+        #
+        # Determine if the current node is a member of the freebsd family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def freebsd?(node)
+          node['platform_family'] == 'freebsd'
+        end
 
-      #
-      # Determine if the current node is a member of the redhat family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def rhel?(node)
-        node['platform_family'] == 'rhel'
-      end
-      alias_method :redhat?, :rhel?
-      alias_method :el?,     :rhel?
-
-      #
-      # Determine if the current node is a member of the slackware family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def slackware?(node)
-        node['platform_family'] == 'slackware'
-      end
+        #
+        # Determine if the current node is a member of the arch family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def gentoo?(node)
+          node['platform_family'] == 'gentoo'
+        end
 
-      #
-      # Determine if the current node is a member of the suse family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def suse?(node)
-        node['platform_family'] == 'suse'
-      end
+        #
+        # Determine if the current node is a member of the OSX family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def mac_os_x?(node)
+          node['platform_family'] == 'mac_os_x'
+        end
+        alias_method :osx?, :mac_os_x?
+        alias_method :mac?, :mac_os_x?
 
-      #
-      # Determine if the current node is a member of the windows family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def windows?(node)
-        node['platform_family'] == 'windows'
-      end
+        #
+        # Determine if the current node is a member of the openbsd family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def openbsd?(node)
+          node['platform_family'] == 'openbsd'
+        end
 
-      #
-      # Determine if the current node is a member of the wrlinux family.
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def wrlinux?(node)
-        node['platform_family'] == 'wrlinux'
-      end
+        #
+        # Determine if the current node is a member of the redhat family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def rhel?(node)
+          node['platform_family'] == 'rhel'
+        end
+        alias_method :redhat?, :rhel?
+        alias_method :el?,     :rhel?
+
+        #
+        # Determine if the current node is a member of the slackware family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def slackware?(node)
+          node['platform_family'] == 'slackware'
+        end
+
+        #
+        # Determine if the current node is a member of the suse family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def suse?(node)
+          node['platform_family'] == 'suse'
+        end
+
+        #
+        # Determine if the current node is a member of the windows family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def windows?(node)
+          node['platform_family'] == 'windows'
+        end
+
+        #
+        # Determine if the current node is a member of the wrlinux family.
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def wrlinux?(node)
+          node['platform_family'] == 'wrlinux'
+        end
+
+        #
+        # Determine if the current system is a linux derivative
+        #
+        # @param [Chef::Node] node
+        #
+        # @return [Boolean]
+        #
+        def linux?(node)
+          node['os'] == 'linux'
+        end
 
-      #
-      # Determine if the current system is a linux derivative
-      #
-      # @param [Chef::Node] node
-      #
-      # @return [Boolean]
-      #
-      def linux?(node)
-        node['os'] == 'linux'
       end
     end
 

data/lib/chef/sugar/shell.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require 'mixlib/shellout'
-require 'pathname'
+require 'mixlib/shellout' unless defined?(Mixlib::ShellOut)
+require 'pathname' unless defined?(Pathname)
 
 class Chef
   module Sugar
@@ -51,7 +51,11 @@ class Chef
       # @return [String]
       #
       def dev_null(node)
-        Chef::Sugar::PlatformFamily.windows?(node) ? 'NUL' : '/dev/null'
+        if defined?(ChefUtils)
+          ChefUtils.windows?(node) ? 'NUL' : '/dev/null'
+        else
+          Chef::Sugar::PlatformFamily.windows?(node) ? 'NUL' : '/dev/null'
+        end
       end
 
       #

data/lib/chef/sugar/version.rb

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

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar-ng
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.11
 platform: ruby
 authors:
-- Chef Software, Inc.
+- Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chefspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-kitchen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kitchen-vagrant
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2020-08-14 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
   an awesome experience!
@@ -100,6 +30,7 @@ files:
 - lib/chef/sugar/core_extensions/object.rb
 - lib/chef/sugar/core_extensions/string.rb
 - lib/chef/sugar/data_bag.rb
+- lib/chef/sugar/deprecation.rb
 - lib/chef/sugar/docker.rb
 - lib/chef/sugar/filters.rb
 - lib/chef/sugar/init.rb
@@ -115,9 +46,9 @@ files:
 - lib/chef/sugar/vagrant.rb
 - lib/chef/sugar/version.rb
 - lib/chef/sugar/virtualization.rb
-homepage: https://github.com/sethvargo/chef-sugar
+homepage: https://github.com/chef/chef-sugar
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -127,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="