chef 14.0.190-universal-mingw32 → 14.0.202-universal-mingw32

data/lib/chef/util/powershell/cmdlet_result.rb

@@ -1,61 +1,61 @@
-#
-# Author:: Adam Edwards (<adamed@chef.io>)
-#
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
-#
-# 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 "chef/json_compat"
-
-class Chef
-  class Util
-    class Powershell
-      class CmdletResult
-        attr_reader :output_format
-
-        def initialize(status, streams, output_format)
-          @status = status
-          @output_format = output_format
-          @streams = streams
-        end
-
-        def stdout
-          @status.stdout
-        end
-
-        def stderr
-          @status.stderr
-        end
-
-        def stream(name)
-          @streams[name].read
-        end
-
-        def return_value
-          if output_format == :object
-            Chef::JSONCompat.parse(stream(:json))
-          elsif output_format == :json
-            stream(:json)
-          else
-            @status.stdout
-          end
-        end
-
-        def succeeded?
-          @succeeded = @status.status.exitstatus == 0
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Edwards (<adamed@chef.io>)
+#
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+#
+# 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 "chef/json_compat"
+
+class Chef
+  class Util
+    class Powershell
+      class CmdletResult
+        attr_reader :output_format
+
+        def initialize(status, streams, output_format)
+          @status = status
+          @output_format = output_format
+          @streams = streams
+        end
+
+        def stdout
+          @status.stdout
+        end
+
+        def stderr
+          @status.stderr
+        end
+
+        def stream(name)
+          @streams[name].read
+        end
+
+        def return_value
+          if output_format == :object
+            Chef::JSONCompat.parse(stream(:json))
+          elsif output_format == :json
+            stream(:json)
+          else
+            @status.stdout
+          end
+        end
+
+        def succeeded?
+          @succeeded = @status.status.exitstatus == 0
+        end
+      end
+    end
+  end
+end

data/lib/chef/util/powershell/ps_credential.rb

@@ -1,41 +1,41 @@
-#
-# Author:: Jay Mundrawala (<jdm@chef.io>)
-#
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
-#
-# 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 "chef/win32/crypto" if Chef::Platform.windows?
-
-class Chef::Util::Powershell
-  class PSCredential
-    def initialize(username, password)
-      @username = username
-      @password = password
-    end
-
-    def to_psobject
-      "New-Object System.Management.Automation.PSCredential('#{@username}',('#{encrypt(@password)}' | ConvertTo-SecureString))"
-    end
-
-    alias to_s to_psobject
-    alias to_text to_psobject
-
-    private
-
-    def encrypt(str)
-      Chef::ReservedNames::Win32::Crypto.encrypt(str)
-    end
-  end
-end
+#
+# Author:: Jay Mundrawala (<jdm@chef.io>)
+#
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+#
+# 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 "chef/win32/crypto" if Chef::Platform.windows?
+
+class Chef::Util::Powershell
+  class PSCredential
+    def initialize(username, password)
+      @username = username
+      @password = password
+    end
+
+    def to_psobject
+      "New-Object System.Management.Automation.PSCredential('#{@username}',('#{encrypt(@password)}' | ConvertTo-SecureString))"
+    end
+
+    alias to_s to_psobject
+    alias to_text to_psobject
+
+    private
+
+    def encrypt(str)
+      Chef::ReservedNames::Win32::Crypto.encrypt(str)
+    end
+  end
+end

data/lib/chef/util/selinux.rb

@@ -1,93 +1,93 @@
-#
-# Author:: Sean O'Meara
-# Author:: Kevin Keane
-# Author:: Lamont Granquist (<lamont@chef.io>)
-#
-# Copyright:: Copyright 2011-2016, Chef Software Inc.
-# Copyright:: Copyright 2013-2016, North County Tech Center, LLC
-#
-# 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 "chef/mixin/shell_out"
-require "chef/mixin/which"
-
-class Chef
-  class Util
-    #
-    # IMPORTANT: We assume that selinux utilities are installed on an
-    # selinux enabled server. Provisioning an selinux enabled server
-    # without selinux utilities is not supported.
-    #
-    module Selinux
-
-      include Chef::Mixin::ShellOut
-      include Chef::Mixin::Which
-
-      # We want to initialize below variables once during a
-      # chef-client run therefore they are class variables.
-      @@selinux_enabled = nil
-      @@restorecon_path = nil
-      @@selinuxenabled_path = nil
-
-      def selinux_enabled?
-        @@selinux_enabled = check_selinux_enabled? if @@selinux_enabled.nil?
-        @@selinux_enabled
-      end
-
-      def restore_security_context(file_path, recursive = false)
-        if restorecon_path
-          restorecon_flags = [ "-R" ]
-          restorecon_flags << "-r" if recursive
-          restorecon_flags << file_path
-          Chef::Log.trace("Restoring selinux security content with #{restorecon_path}")
-          shell_out_compact!(restorecon_path, restorecon_flags)
-        else
-          Chef::Log.warn "Can not find 'restorecon' on the system. Skipping selinux security context restore."
-        end
-      end
-
-      private
-
-      def restorecon_path
-        @@restorecon_path = which("restorecon") if @@restorecon_path.nil?
-        @@restorecon_path
-      end
-
-      def selinuxenabled_path
-        @@selinuxenabled_path = which("selinuxenabled") if @@selinuxenabled_path.nil?
-        @@selinuxenabled_path
-      end
-
-      def check_selinux_enabled?
-        if selinuxenabled_path
-          cmd = shell_out!(selinuxenabled_path, :returns => [0, 1])
-          case cmd.exitstatus
-          when 1
-            return false
-          when 0
-            return true
-          else
-            raise "Unknown exit code from command #{selinuxenabled_path}: #{cmd.exitstatus}"
-          end
-        else
-          # We assume selinux is not enabled if selinux utils are not
-          # installed.
-          false
-        end
-      end
-
-    end
-  end
-end
+#
+# Author:: Sean O'Meara
+# Author:: Kevin Keane
+# Author:: Lamont Granquist (<lamont@chef.io>)
+#
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2016, North County Tech Center, LLC
+#
+# 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 "chef/mixin/shell_out"
+require "chef/mixin/which"
+
+class Chef
+  class Util
+    #
+    # IMPORTANT: We assume that selinux utilities are installed on an
+    # selinux enabled server. Provisioning an selinux enabled server
+    # without selinux utilities is not supported.
+    #
+    module Selinux
+
+      include Chef::Mixin::ShellOut
+      include Chef::Mixin::Which
+
+      # We want to initialize below variables once during a
+      # chef-client run therefore they are class variables.
+      @@selinux_enabled = nil
+      @@restorecon_path = nil
+      @@selinuxenabled_path = nil
+
+      def selinux_enabled?
+        @@selinux_enabled = check_selinux_enabled? if @@selinux_enabled.nil?
+        @@selinux_enabled
+      end
+
+      def restore_security_context(file_path, recursive = false)
+        if restorecon_path
+          restorecon_flags = [ "-R" ]
+          restorecon_flags << "-r" if recursive
+          restorecon_flags << file_path
+          Chef::Log.trace("Restoring selinux security content with #{restorecon_path}")
+          shell_out_compact!(restorecon_path, restorecon_flags)
+        else
+          Chef::Log.warn "Can not find 'restorecon' on the system. Skipping selinux security context restore."
+        end
+      end
+
+      private
+
+      def restorecon_path
+        @@restorecon_path = which("restorecon") if @@restorecon_path.nil?
+        @@restorecon_path
+      end
+
+      def selinuxenabled_path
+        @@selinuxenabled_path = which("selinuxenabled") if @@selinuxenabled_path.nil?
+        @@selinuxenabled_path
+      end
+
+      def check_selinux_enabled?
+        if selinuxenabled_path
+          cmd = shell_out!(selinuxenabled_path, :returns => [0, 1])
+          case cmd.exitstatus
+          when 1
+            return false
+          when 0
+            return true
+          else
+            raise "Unknown exit code from command #{selinuxenabled_path}: #{cmd.exitstatus}"
+          end
+        else
+          # We assume selinux is not enabled if selinux utils are not
+          # installed.
+          false
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/util/threaded_job_queue.rb

@@ -1,61 +1,61 @@
-# Copyright:: Copyright 2014-2016, 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 "thread"
-
-class Chef
-  class Util
-    # A simple threaded job queue
-    #
-    # Create a queue:
-    #
-    #     queue = ThreadedJobQueue.new
-    #
-    # Add jobs:
-    #
-    #     queue << lambda { |lock| foo.the_bar }
-    #
-    # A job is a callable that optionally takes a Mutex instance as its only
-    # parameter.
-    #
-    # Then start processing jobs with +n+ threads:
-    #
-    #     queue.process(n)
-    #
-    class ThreadedJobQueue
-      def initialize
-        @queue = Queue.new
-        @lock = Mutex.new
-      end
-
-      def <<(job)
-        @queue << job
-      end
-
-      def process(concurrency = 10)
-        workers = (1..concurrency).map do
-          Thread.new do
-            loop do
-              fn = @queue.pop
-              fn.arity == 1 ? fn.call(@lock) : fn.call
-            end
-          end
-        end
-        workers.each { |worker| self << Thread.method(:exit) }
-        workers.each { |worker| worker.join }
-      end
-    end
-  end
-end
+# Copyright:: Copyright 2014-2016, 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 "thread"
+
+class Chef
+  class Util
+    # A simple threaded job queue
+    #
+    # Create a queue:
+    #
+    #     queue = ThreadedJobQueue.new
+    #
+    # Add jobs:
+    #
+    #     queue << lambda { |lock| foo.the_bar }
+    #
+    # A job is a callable that optionally takes a Mutex instance as its only
+    # parameter.
+    #
+    # Then start processing jobs with +n+ threads:
+    #
+    #     queue.process(n)
+    #
+    class ThreadedJobQueue
+      def initialize
+        @queue = Queue.new
+        @lock = Mutex.new
+      end
+
+      def <<(job)
+        @queue << job
+      end
+
+      def process(concurrency = 10)
+        workers = (1..concurrency).map do
+          Thread.new do
+            loop do
+              fn = @queue.pop
+              fn.arity == 1 ? fn.call(@lock) : fn.call
+            end
+          end
+        end
+        workers.each { |worker| self << Thread.method(:exit) }
+        workers.each { |worker| worker.join }
+      end
+    end
+  end
+end