chef-utils 16.10.17 → 17.10.19

data/lib/chef-utils/dsl/platform_version.rb

@@ -1,41 +1,41 @@
-# frozen_string_literal: true
-#
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# 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.
-#
-
-require_relative "../internal"
-
-module ChefUtils
-  module DSL
-    module PlatformVersion
-      include Internal
-
-      # Return the platform_version for the node. Acts like a String
-      # but also provides a mechanism for checking version constraints.
-      #
-      # @param [Chef::Node] node the node to check
-      # @since 15.8
-      #
-      # @return [ChefUtils::VersionString]
-      #
-      def platform_version(node = __getnode)
-        ChefUtils::VersionString.new(node["platform_version"])
-      end
-
-      extend self
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require_relative "../internal"
+
+module ChefUtils
+  module DSL
+    module PlatformVersion
+      include Internal
+
+      # Return the platform_version for the node. Acts like a String
+      # but also provides a mechanism for checking version constraints.
+      #
+      # @param [Chef::Node] node the node to check
+      # @since 15.8
+      #
+      # @return [ChefUtils::VersionString]
+      #
+      def platform_version(node = __getnode)
+        ChefUtils::VersionString.new(node["platform_version"])
+      end
+
+      extend self
+    end
+  end
+end

data/lib/chef-utils/dsl/service.rb

@@ -1,112 +1,112 @@
-# frozen_string_literal: true
-#
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# 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.
-#
-
-require_relative "../internal"
-require_relative "train_helpers"
-
-module ChefUtils
-  module DSL
-    # NOTE: these are mixed into the service resource+providers specifically and deliberately not
-    # injected into the global namespace
-    module Service
-      include Internal
-      include TrainHelpers
-      include Introspection
-
-      # Returns if debian's old rc.d manager is installed (not necessarily the primary init system).
-      #
-      # @since 15.5
-      #
-      # @return [Boolean]
-      #
-      def debianrcd?
-        file_exist?("/usr/sbin/update-rc.d")
-      end
-
-      # Returns if debian's old invoke rc.d manager is installed (not necessarily the primary init system).
-      #
-      # @since 15.5
-      #
-      # @return [Boolean]
-      #
-      def invokercd?
-        file_exist?("/usr/sbin/invoke-rc.d")
-      end
-
-      # Returns if upstart is installed (not necessarily the primary init system).
-      #
-      # @since 15.5
-      #
-      # @return [Boolean]
-      #
-      def upstart?
-        file_exist?("/sbin/initctl")
-      end
-
-      # Returns if insserv is installed (not necessarily the primary init system).
-      #
-      # @since 15.5
-      #
-      # @return [Boolean]
-      #
-      def insserv?
-        file_exist?("/sbin/insserv")
-      end
-
-      # Returns if redhat's init system is installed (not necessarily the primary init system).
-      #
-      # @since 15.5
-      #
-      # @return [Boolean]
-      #
-      def redhatrcd?
-        file_exist?("/sbin/chkconfig")
-      end
-
-      #
-      # Returns if a particular service exists for a particular service init system. Init systems may be :initd, :upstart, :etc_rcd, :xinetd, and :systemd. Example: service_script_exist?(:systemd, 'ntpd')
-      #
-      # @param [Symbol] type The type of init system. :initd, :upstart, :xinetd, :etc_rcd, or :systemd
-      # @param [String] script The name of the service
-      # @since 15.5
-      #
-      # @return [Boolean]
-      #
-      def service_script_exist?(type, script)
-        case type
-        when :initd
-          file_exist?("/etc/init.d/#{script}")
-        when :upstart
-          file_exist?("/etc/init/#{script}.conf")
-        when :xinetd
-          file_exist?("/etc/xinetd.d/#{script}")
-        when :etc_rcd
-          file_exist?("/etc/rc.d/#{script}")
-        when :systemd
-          file_exist?("/etc/init.d/#{script}") ||
-            has_systemd_service_unit?(script) ||
-            has_systemd_unit?(script)
-        else
-          raise ArgumentError, "type of service must be one of :initd, :upstart, :xinetd, :etc_rcd, or :systemd"
-        end
-      end
-
-      extend self
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require_relative "../internal"
+require_relative "train_helpers"
+
+module ChefUtils
+  module DSL
+    # NOTE: these are mixed into the service resource+providers specifically and deliberately not
+    # injected into the global namespace
+    module Service
+      include Internal
+      include TrainHelpers
+      include Introspection
+
+      # Returns if debian's old rc.d manager is installed (not necessarily the primary init system).
+      #
+      # @since 15.5
+      #
+      # @return [Boolean]
+      #
+      def debianrcd?
+        file_exist?("/usr/sbin/update-rc.d")
+      end
+
+      # Returns if debian's old invoke rc.d manager is installed (not necessarily the primary init system).
+      #
+      # @since 15.5
+      #
+      # @return [Boolean]
+      #
+      def invokercd?
+        file_exist?("/usr/sbin/invoke-rc.d")
+      end
+
+      # Returns if upstart is installed (not necessarily the primary init system).
+      #
+      # @since 15.5
+      #
+      # @return [Boolean]
+      #
+      def upstart?
+        file_exist?("/sbin/initctl")
+      end
+
+      # Returns if insserv is installed (not necessarily the primary init system).
+      #
+      # @since 15.5
+      #
+      # @return [Boolean]
+      #
+      def insserv?
+        file_exist?("/sbin/insserv")
+      end
+
+      # Returns if redhat's init system is installed (not necessarily the primary init system).
+      #
+      # @since 15.5
+      #
+      # @return [Boolean]
+      #
+      def redhatrcd?
+        file_exist?("/sbin/chkconfig")
+      end
+
+      #
+      # Returns if a particular service exists for a particular service init system. Init systems may be :initd, :upstart, :etc_rcd, :xinetd, and :systemd. Example: service_script_exist?(:systemd, 'ntpd')
+      #
+      # @param [Symbol] type The type of init system. :initd, :upstart, :xinetd, :etc_rcd, or :systemd
+      # @param [String] script The name of the service
+      # @since 15.5
+      #
+      # @return [Boolean]
+      #
+      def service_script_exist?(type, script)
+        case type
+        when :initd
+          file_exist?("/etc/init.d/#{script}")
+        when :upstart
+          file_exist?("/etc/init/#{script}.conf")
+        when :xinetd
+          file_exist?("/etc/xinetd.d/#{script}")
+        when :etc_rcd
+          file_exist?("/etc/rc.d/#{script}")
+        when :systemd
+          file_exist?("/etc/init.d/#{script}") ||
+            has_systemd_service_unit?(script) ||
+            has_systemd_unit?(script)
+        else
+          raise ArgumentError, "type of service must be one of :initd, :upstart, :xinetd, :etc_rcd, or :systemd"
+        end
+      end
+
+      extend self
+    end
+  end
+end

data/lib/chef-utils/dsl/train_helpers.rb

@@ -1,87 +1,87 @@
-# frozen_string_literal: true
-#
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# 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.
-
-require "stringio" unless defined?(StringIO)
-require_relative "../internal"
-
-module ChefUtils
-  module DSL
-    module TrainHelpers
-      include Internal
-
-      #
-      # FIXME: generally these helpers all use the pattern of checking for target_mode?
-      # and then if it is we use train.  That approach should likely be flipped so that
-      # even when we're running without target mode we still use train in its local
-      # mode.  A prerequisite for that will be better CI testing of train against
-      # chef-client though, and ensuring that the APIs are entirely compatible.  This
-      # will be particularly problematic for shell_out APIs and eventual file-creating
-      # APIs which are unlikely to be as sophisticated as the exiting code in chef-client
-      # for locally shelling out and creating files, and just dropping inspec local mode
-      # into chef-client would break the world.
-      #
-
-      # Train wrapper around File.exist? to make it local mode aware.
-      #
-      # @param filename filename to check
-      # @return [Boolean] if it exists
-      #
-      def file_exist?(filename)
-        if __transport_connection
-          __transport_connection.file(filename).exist?
-        else
-          File.exist?(filename)
-        end
-      end
-
-      # XXX: modifications to the StringIO won't get written back
-      # FIXME: this is very experimental and may be a bad idea and may break at any time
-      # @api private
-      #
-      def file_open(*args, &block)
-        if __transport_connection
-          content = __transport_connection.file(args[0]).content
-          string_io = StringIO.new content
-          yield string_io if block_given?
-          string_io
-        else
-          File.open(*args, &block)
-        end
-      end
-
-      # Alias to easily convert IO.read / File.read to file_read
-      def file_read(path)
-        file_open(path).read
-      end
-
-      def file_directory?(path)
-        if __transport_connection
-          __transport_connection.file(filename).directory?
-        else
-          File.directory?(path)
-        end
-      end
-
-      # Alias to easily convert Dir.exist to dir_exist
-      def dir_exist?(path)
-        file_directory?(path)
-      end
-
-      extend self
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+
+require "stringio" unless defined?(StringIO)
+require_relative "../internal"
+
+module ChefUtils
+  module DSL
+    module TrainHelpers
+      include Internal
+
+      #
+      # FIXME: generally these helpers all use the pattern of checking for target_mode?
+      # and then if it is we use train.  That approach should likely be flipped so that
+      # even when we're running without target mode we still use train in its local
+      # mode.  A prerequisite for that will be better CI testing of train against
+      # chef-client though, and ensuring that the APIs are entirely compatible.  This
+      # will be particularly problematic for shell_out APIs and eventual file-creating
+      # APIs which are unlikely to be as sophisticated as the exiting code in chef-client
+      # for locally shelling out and creating files, and just dropping inspec local mode
+      # into chef-client would break the world.
+      #
+
+      # Train wrapper around File.exist? to make it local mode aware.
+      #
+      # @param filename filename to check
+      # @return [Boolean] if it exists
+      #
+      def file_exist?(filename)
+        if __transport_connection
+          __transport_connection.file(filename).exist?
+        else
+          File.exist?(filename)
+        end
+      end
+
+      # XXX: modifications to the StringIO won't get written back
+      # FIXME: this is very experimental and may be a bad idea and may break at any time
+      # @api private
+      #
+      def file_open(*args, &block)
+        if __transport_connection
+          content = __transport_connection.file(args[0]).content
+          string_io = StringIO.new content
+          yield string_io if block_given?
+          string_io
+        else
+          File.open(*args, &block)
+        end
+      end
+
+      # Alias to easily convert IO.read / File.read to file_read
+      def file_read(path)
+        file_open(path).read
+      end
+
+      def file_directory?(path)
+        if __transport_connection
+          __transport_connection.file(filename).directory?
+        else
+          File.directory?(path)
+        end
+      end
+
+      # Alias to easily convert Dir.exist to dir_exist
+      def dir_exist?(path)
+        file_directory?(path)
+      end
+
+      extend self
+    end
+  end
+end