diff options
author | Tim Smith <tsmith84@gmail.com> | 2019-12-25 16:22:00 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-01-03 11:20:15 -0800 |
commit | efcbfb58f6ecc0d1dd3b14ad2c86765d45b68ccc (patch) | |
tree | cf1eb876bce5b9f9a9c3f4153aaf9f72db725a1c | |
parent | 0f944f3fbb0ccd318c0ca2580b8f03144d192911 (diff) | |
download | chef-efcbfb58f6ecc0d1dd3b14ad2c86765d45b68ccc.tar.gz |
Expand chef-utils yard comments and make consistentyard_cleanup
I'm using these to generate the vscode snippets now so the comment is what we display to the end user. I aligned everything that was platform_family to be a platform family check. Some of them are kinda silly since they almost entirely 1:1 match, but this way it's all consistent. I'm not too concerned about someone with omnios in vscode at this point, but it's all done.
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | chef-utils/lib/chef-utils/dsl/architecture.rb | 4 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/dsl/introspection.rb | 12 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/dsl/platform_family.rb | 40 |
3 files changed, 32 insertions, 24 deletions
diff --git a/chef-utils/lib/chef-utils/dsl/architecture.rb b/chef-utils/lib/chef-utils/dsl/architecture.rb index b3e9235b16..ec1d8424b1 100644 --- a/chef-utils/lib/chef-utils/dsl/architecture.rb +++ b/chef-utils/lib/chef-utils/dsl/architecture.rb @@ -63,7 +63,7 @@ module ChefUtils %w{sun4u sun4v}.include?(node["kernel"]["machine"]) end - # Determine if the current architecture is Powerpc64 Big Endian + # Determine if the current architecture is PowerPC 64bit Big Endian # # @return [Boolean] # @@ -71,7 +71,7 @@ module ChefUtils %w{ppc64}.include?(node["kernel"]["machine"]) end - # Determine if the current architecture is Powerpc64 Little Endian + # Determine if the current architecture is PowerPC 64bit Little Endian # # @return [Boolean] # diff --git a/chef-utils/lib/chef-utils/dsl/introspection.rb b/chef-utils/lib/chef-utils/dsl/introspection.rb index f4025d5773..6fb06107d2 100644 --- a/chef-utils/lib/chef-utils/dsl/introspection.rb +++ b/chef-utils/lib/chef-utils/dsl/introspection.rb @@ -28,7 +28,7 @@ module ChefUtils module Introspection include TrainHelpers - # Returns whether the node is a docker container. + # Determine if the node is a docker container. # # @param [Chef::Node] node # @@ -40,6 +40,8 @@ module ChefUtils !!(node && node.read("virtualization", "systems", "docker") == "guest") end + # Determine if the node uses the systemd init system. + # # @param [Chef::Node] node # # @return [Boolean] @@ -48,6 +50,8 @@ module ChefUtils file_exist?("/proc/1/comm") && file_open("/proc/1/comm").gets.chomp == "systemd" end + # Determine if the node is running in Test Kitchen. + # # @param [Chef::Node] node # # @return [Boolean] @@ -56,6 +60,8 @@ module ChefUtils ENV.key?("TEST_KITCHEN") end + # Determine if the node is running in a CI system that sets the CI env var. + # # @param [Chef::Node] node # # @return [Boolean] @@ -64,6 +70,8 @@ module ChefUtils ENV.key?("CI") end + # Determine if the a systemd service unit is present on the system. + # # @param [String] svc_name # # @return [Boolean] @@ -76,6 +84,8 @@ module ChefUtils end end + # Determine if the a systemd unit of any type is present on the system. + # # @param [String] svc_name # # @return [Boolean] diff --git a/chef-utils/lib/chef-utils/dsl/platform_family.rb b/chef-utils/lib/chef-utils/dsl/platform_family.rb index 55ca6196c9..468665728d 100644 --- a/chef-utils/lib/chef-utils/dsl/platform_family.rb +++ b/chef-utils/lib/chef-utils/dsl/platform_family.rb @@ -22,7 +22,7 @@ module ChefUtils module PlatformFamily include Internal - # Determine if the current node is arch linux. + # Determine if the current node is a member of the 'arch' family. # # @param [Chef::Node] node # @@ -34,7 +34,7 @@ module ChefUtils # chef-sugar backcompat methods alias_method :arch_linux?, :arch? - # Determine if the current node is aix + # Determine if the current node is a member of the 'aix' platform family. # # @param [Chef::Node] node # @@ -44,7 +44,7 @@ module ChefUtils node["platform_family"] == "aix" end - # Determine if the current node is a member of the debian family. + # Determine if the current node is a member of the 'debian' platform family (Debian, Ubuntu and derivatives). # # @param [Chef::Node] node # @@ -54,7 +54,7 @@ module ChefUtils node["platform_family"] == "debian" end - # Determine if the current node is a member of the fedora family. + # Determine if the current node is a member of the 'fedora' platform family (Fedora and Arist). # # @param [Chef::Node] node # @@ -64,7 +64,7 @@ module ChefUtils node["platform_family"] == "fedora" end - # Determine if the current node is a member of the OSX family. + # Determine if the current node is a member of the 'mac_os_x' platform family. # # @param [Chef::Node] node # @@ -77,9 +77,7 @@ module ChefUtils alias_method :mac?, :macos? alias_method :mac_os_x?, :macos? - # Determine if the current node is a member of the rhel family (RHEL, CentOS, Oracle or Scientific Linux, no Amazon or Fedora). - # - # The platform_versions for these operating systems must match (rhel7 == centos7 == oracle7 == scientfic7), modulo additional packages + # Determine if the current node is a member of the 'rhel' platform family (Red Hat, CentOS, Oracle or Scientific Linux, but NOT Amazon Linux or Fedora). # # @param [Chef::Node] node # @@ -90,7 +88,7 @@ module ChefUtils end alias_method :el?, :rhel? - # Determine if the current node is a rhel6 compatible build (RHEL, CentOS, Oracle or Scientific Linux) + # Determine if the current node is a rhel6 compatible build (Red Hat, CentOS, Oracle or Scientific Linux) # # @param [Chef::Node] node # @@ -100,7 +98,7 @@ module ChefUtils node["platform_family"] == "rhel" && node["platform_version"].to_f >= 6.0 && node["platform_version"].to_f < 7.0 end - # Determine if the current node is a rhel7 compatible build (RHEL, CentOS, Oracle or Scientific Linux) + # Determine if the current node is a rhel7 compatible build (Red Hat, CentOS, Oracle or Scientific Linux) # # @param [Chef::Node] node # @@ -110,7 +108,7 @@ module ChefUtils node["platform_family"] == "rhel" && node["platform_version"].to_f >= 7.0 && node["platform_version"].to_f < 8.0 end - # Determine if the current node is a rhel8 compatible build (RHEL, CentOS, Oracle or Scientific Linux) + # Determine if the current node is a rhel8 compatible build (Red Hat, CentOS, Oracle or Scientific Linux) # # @param [Chef::Node] node # @@ -120,7 +118,7 @@ module ChefUtils node["platform_family"] == "rhel" && node["platform_version"].to_f >= 8.0 && node["platform_version"].to_f < 9.0 end - # Determine if the current node is a member of the amazon family. + # Determine if the current node is a member of the 'amazon' platform family. # # @param [Chef::Node] node # @@ -131,7 +129,7 @@ module ChefUtils end alias_method :amazon_linux?, :amazon? - # Determine if the current node is solaris2 + # Determine if the current node is a member of the 'solaris2' platform family. # # @param [Chef::Node] node # @@ -143,7 +141,7 @@ module ChefUtils # chef-sugar backcompat methods alias_method :solaris?, :solaris2? - # Determine if the current node is smartos + # Determine if the current node is a member of the 'smartos' platform family. # # @param [Chef::Node] node # @@ -153,7 +151,7 @@ module ChefUtils node["platform_family"] == "smartos" end - # Determine if the current node is a member of the suse family. + # Determine if the current node is a member of the 'suse' platform family (openSUSE, SLES, and SLED). # # @param [Chef::Node] node # @@ -163,7 +161,7 @@ module ChefUtils node["platform_family"] == "suse" end - # Determine if the current node is a member of the gentoo family. + # Determine if the current node is a member of the 'gentoo' platform family. # # @param [Chef::Node] node # @@ -173,7 +171,7 @@ module ChefUtils node["platform_family"] == "gentoo" end - # Determine if the current node is freebsd + # Determine if the current node is a member of the 'freebsd' platform family. # # @param [Chef::Node] node # @@ -183,7 +181,7 @@ module ChefUtils node["platform_family"] == "freebsd" end - # Determine if the current node is openbsd + # Determine if the current node is a member of the 'openbsd' platform family. # # @param [Chef::Node] node # @@ -193,7 +191,7 @@ module ChefUtils node["platform_family"] == "openbsd" end - # Determine if the current node is netbsd + # Determine if the current node is a member of the 'netbsd' platform family. # # @param [Chef::Node] node # @@ -203,7 +201,7 @@ module ChefUtils node["platform_family"] == "netbsd" end - # Determine if the current node is dragonflybsd + # Determine if the current node is a member of the 'dragonflybsd' platform family. # # @param [Chef::Node] node # @@ -213,7 +211,7 @@ module ChefUtils node["platform_family"] == "dragonflybsd" end - # Determine if the current node is a member of the windows family. + # Determine if the current node is a member of the 'windows' platform family. # # @param [Chef::Node] node # |