chef-sugar-ng 5.0.3 → 5.1.12

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