chef-sugar 4.2.1 → 5.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa1a33f83e2bea5058d88c52bcba91d40efe2a8983572b72f2a78af957c32e34
-  data.tar.gz: ca6ada3aba96848baa7fb136a87a2d58a79c3c1994cad3c2790940c1612dc387
+  metadata.gz: 690f59ffaeb7464fa9481cb0c30dee73950e32c86012ecf5c6a44c944cb695c2
+  data.tar.gz: b76c63eeb5479c9af859397c1b0bc10d2f7f7082586013462b8d63ecccb9fb33
 SHA512:
-  metadata.gz: f01a47a1e0de0bf0c121fdfd119b4f9127c64615b6de6c54e281b2670917c3dc0ad40a7a7fcb7b687843d74e5f37e3907b8c2246654b96323d83386a0010243f
-  data.tar.gz: 648cb71624cb4d94003dafe8efaa556c688b71d5fb50c72c9d95ddb039857561dab678ec875b94d2ddd8056552408e41c0bcd8fe117ba4be7463f6dc5ce09bea
+  metadata.gz: 2d2d0f8894504caeacff01c363300b300ffd776bb71ba0005ff316cc312c4c5726bee7fd2c0afa81cac6b30c2c62eb666a1acd14bb681ae30f736fcb777796c5
+  data.tar.gz: 5962221ffaacb4ec6fcb56234aad9d850b324db2d94c1ddffc012e64cf44ede469942ccdce336ac7844a7510f1a26ffd9e76052e7d0e385f0566067162b262a0

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/{recipes/default.rb → lib/chef/sugar/deprecation.rb}

@@ -1,9 +1,4 @@
 #
-# Cookbook Name:: chef-sugar
-# Recipe:: default
-#
-# Copyright 2013-2015, Seth Vargo <sethvargo@gmail.com>
-#
 # 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
@@ -17,4 +12,34 @@
 # limitations under the License.
 #
 
-Chef::Log.warn('chef-sugar::default no longer needs to be included in your runlist. Instead simply depend on the chef-sugar cookbook and the gem will be intalled and loaded automatically.')
+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/init.rb

@@ -25,8 +25,7 @@ class Chef
       # @return [Boolean]
       #
       def systemd?(node)
-        file = '/proc/1/comm'
-        File.exist?(file) && IO.read(file).chomp == 'systemd'
+        File.exist?('/bin/systemctl')
       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)