chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/lib/chef/tasks/chef_repo.rake

@@ -6,9 +6,9 @@
 # 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.
@@ -51,7 +51,7 @@ task :update do
       pull = true if line =~ /\[remote "origin"\]/
     end
     if pull
-      sh %{git pull} 
+      sh %{git pull}
     else
       puts "* Skipping git pull, no origin specified"
     end
@@ -86,14 +86,14 @@ end
 def create_cookbook(dir)
   raise "Must provide a COOKBOOK=" unless ENV["COOKBOOK"]
   puts "** Creating cookbook #{ENV["COOKBOOK"]}"
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "attributes")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "recipes")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "definitions")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "libraries")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "resources")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "providers")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "files", "default")}" 
-  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "templates", "default")}" 
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "attributes")}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "recipes")}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "definitions")}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "libraries")}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "resources")}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "providers")}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "files", "default")}"
+  sh "mkdir -p #{File.join(dir, ENV["COOKBOOK"], "templates", "default")}"
   unless File.exists?(File.join(dir, ENV["COOKBOOK"], "recipes", "default.rb"))
     open(File.join(dir, ENV["COOKBOOK"], "recipes", "default.rb"), "w") do |file|
       file.puts <<-EOH
@@ -110,9 +110,9 @@ EOH
 # 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.
@@ -156,7 +156,7 @@ end
 def create_metadata(dir)
   raise "Must provide a COOKBOOK=" unless ENV["COOKBOOK"]
   puts "** Creating metadata for cookbook: #{ENV["COOKBOOK"]}"
-  
+
   case NEW_COOKBOOK_LICENSE
   when :apachev2
     license = "Apache 2.0"
@@ -188,8 +188,8 @@ task :ssl_cert do
   fqdn =~ /^(.+?)\.(.+)$/
   hostname = $1
   domain = $2
-  keyfile = fqdn.gsub("*", "wildcard")
   raise "Must provide FQDN!" unless fqdn && hostname && domain
+  keyfile = fqdn.gsub("*", "wildcard")
   puts "** Creating self signed SSL Certificate for #{fqdn}"
   sh("(cd #{CADIR} && openssl genrsa 2048 > #{keyfile}.key)")
   sh("(cd #{CADIR} && chmod 644 #{keyfile}.key)")
@@ -288,7 +288,7 @@ namespace :databag do
         end
       end
     else
-      puts "ERROR: Could not find any databags, skipping it"  
+      puts "ERROR: Could not find any databags, skipping it"
     end
   end
 
@@ -327,7 +327,7 @@ EOH
       end
     else
       puts "ERROR: Could not find your databag (#{databag}), skipping it"
-    end   
+    end
   end
 
 end

data/lib/chef/util/backup.rb

@@ -47,7 +47,8 @@ class Chef
       def backup_filename
         @backup_filename ||= begin
           time = Time.now
-          savetime = time.strftime("%Y%m%d%H%M%S")
+          nanoseconds = sprintf("%6f", time.to_f).split('.')[1]
+          savetime = time.strftime("%Y%m%d%H%M%S.#{nanoseconds}")
           backup_filename = "#{path}.chef-#{savetime}"
           backup_filename = backup_filename.sub(/^([A-Za-z]:)/, "") #strip drive letter on Windows
         end

data/lib/chef/util/diff.rb

@@ -14,14 +14,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-require 'chef/mixin/shell_out'
+# Some portions of this file are derived from material in the diff-lcs
+# project licensed under the terms of the MIT license, provided below.
+#
+# Copyright:: Copyright (c) 2004-2013 Austin Ziegler
+# License:: MIT
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of this Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'diff/lcs'
+require 'diff/lcs/hunk'
 
 class Chef
   class Util
     class Diff
-      include Chef::Mixin::ShellOut
-
       # @todo: to_a, to_s, to_json, inspect defs, accessors for @diff and @error
       # @todo: move coercion to UTF-8 into to_json
       # @todo: replace shellout to diff -u with diff-lcs gem
@@ -58,6 +82,43 @@ class Chef
           end
         end
       end
+      
+      # produces a unified-output-format diff with 3 lines of context
+      # ChefFS uses udiff() directly
+      def udiff(old_file, new_file)
+        diff_str = ""
+        file_length_difference = 0
+
+        old_data = IO.readlines(old_file).map { |e| e.chomp }
+        new_data = IO.readlines(new_file).map { |e| e.chomp }
+        diff_data = ::Diff::LCS.diff(old_data, new_data)
+
+        return diff_str if old_data.empty? && new_data.empty?
+        return "No differences encountered\n" if diff_data.empty?
+
+        # write diff header (standard unified format)
+        ft = File.stat(old_file).mtime.localtime.strftime('%Y-%m-%d %H:%M:%S.%N %z')
+        diff_str << "--- #{old_file}\t#{ft}\n"
+        ft = File.stat(new_file).mtime.localtime.strftime('%Y-%m-%d %H:%M:%S.%N %z')
+        diff_str << "+++ #{new_file}\t#{ft}\n"
+
+        # loop over diff hunks. if a hunk overlaps with the last hunk,
+        # join them. otherwise, print out the old one.
+        old_hunk = hunk = nil
+        diff_data.each do |piece|
+          begin
+            hunk = ::Diff::LCS::Hunk.new(old_data, new_data, piece, 3, file_length_difference)
+            file_length_difference = hunk.file_length_difference
+            next unless old_hunk
+            next if hunk.merge(old_hunk)
+            diff_str << old_hunk.diff(:unified) << "\n"
+          ensure
+            old_hunk = hunk
+          end
+        end
+        diff_str << old_hunk.diff(:unified) << "\n"
+        return diff_str
+      end
 
       private
 
@@ -78,13 +139,8 @@ class Chef
         return "(new content is binary, diff output suppressed)" if is_binary?(new_file)
 
         begin
-          # -u: Unified diff format
-          # LC_ALL: in ruby 1.9 we want to set nil which is a magic option to mixlib-shellout to
-          #         pass through the LC_ALL locale.  in ruby 1.8 we force to 7-bit 'C' locale
-          #         (which is the mixlib-shellout default for all rubies all the time).
           Chef::Log.debug("running: diff -u #{old_file} #{new_file}")
-          locale = ( Object.const_defined? :Encoding ) ? nil : 'C'
-          result = shell_out("diff -u #{old_file} #{new_file}", :env => {'LC_ALL' => locale})
+          diff_str = udiff(old_file, new_file)
 
         rescue Exception => e
           # Should *not* receive this, but in some circumstances it seems that
@@ -92,34 +148,14 @@ class Chef
           return "Could not determine diff. Error: #{e.message}"
         end
 
-        # diff will set a non-zero return code even when there's
-        # valid stdout results, if it encounters something unexpected
-        # So as long as we have output, we'll show it.
-        #
-        # Also on some platforms (Solaris) diff outputs a single line
-        # when there are no differences found. Look for this line
-        # before analyzing diff output.
-        if !result.stdout.empty? && result.stdout != "No differences encountered\n"
-          if result.stdout.length > diff_output_threshold
+        if !diff_str.empty? && diff_str != "No differences encountered\n"
+          if diff_str.length > diff_output_threshold
             return "(long diff of over #{diff_output_threshold} characters, diff output suppressed)"
           else
-            diff_str = result.stdout
-            if  Object.const_defined? :Encoding  # ruby >= 1.9
-              if ( diff_str.encoding == Encoding::ASCII_8BIT &&
-                diff_str.encoding != Encoding.default_external &&
-                RUBY_VERSION.to_f < 2.0 )
-                # @todo mixlib-shellout under ruby 1.9 hands back an ASCII-8BIT encoded string, which needs to
-                # be fixed to the default external encoding -- this should be moved into mixlib-shellout
-                diff_str = diff_str.force_encoding(Encoding.default_external)
-              end
-              diff_str.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
-            end
+            diff_str = encode_diff_for_json(diff_str)
             @diff = diff_str.split("\n")
-            @diff.delete("\")
             return "(diff available)"
           end
-        elsif !result.stderr.empty?
-          return "Could not determine diff. Error: #{result.stderr}"
         else
           return "(no diff)"
         end
@@ -139,6 +175,13 @@ class Chef
         end
       end
 
+      def encode_diff_for_json(diff_str)
+        if Object.const_defined? :Encoding
+          diff_str.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
+        end
+        return diff_str
+      end
+
     end
   end
 end

data/lib/chef/util/windows.rb

@@ -6,9 +6,9 @@
 # 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.

data/lib/chef/util/windows/net_group.rb

@@ -6,9 +6,9 @@
 # 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.

data/lib/chef/util/windows/net_use.rb

@@ -6,9 +6,9 @@
 # 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.

data/lib/chef/util/windows/net_user.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -198,7 +198,7 @@ class Chef::Util::Windows::NetUser < Chef::Util::Windows
   def enable_account
     user_modify do |user|
       user[:flags] &= ~UF_ACCOUNTDISABLE
-      #This does not set the password to nil. It (for some reason) means to ignore updating the field.      
+      #This does not set the password to nil. It (for some reason) means to ignore updating the field.
       #See similar behavior for the logon_hours field documented at
       #http://msdn.microsoft.com/en-us/library/windows/desktop/aa371338%28v=vs.85%29.aspx
       user[:password] = nil

data/lib/chef/util/windows/volume.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -35,7 +35,7 @@ class Chef::Util::Windows::Volume < Chef::Util::Windows
     name += "\\" unless name =~ /\\$/ #trailing slash required
     @name = name
   end
-  
+
   def device
     buffer = 0.chr * 256
     if GetVolumeNameForVolumeMountPoint(@name, buffer, buffer.size)

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.6.2'
+  VERSION = '11.8.0.rc.1'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/lib/chef/win32/api/file.rb

@@ -474,7 +474,7 @@ BOOL WINAPI DeviceIoControl(
             # Workaround for CHEF-4419:
             # Make sure paths starting with "/" has a drive letter
             # assigned from the current working diretory.
-            # Note: In chef 11.8 and beyond this issue will be fixed with a
+            # Note: With CHEF-4427 this issue will be fixed with a
             # broader fix to map all the paths starting with "/" to
             # SYSTEM_DRIVE on windows.
             path = ::File.expand_path(path) if path.start_with? "/"

data/lib/chef/win32/api/synchronization.rb

@@ -0,0 +1,89 @@
+#
+# Author:: Serdar Sutay (<serdar@opscode.com>)
+# Copyright:: Copyright 2011 Opscode, 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 'chef/win32/api'
+
+class Chef
+  module ReservedNames::Win32
+    module API
+      module Synchronization
+        extend Chef::ReservedNames::Win32::API
+
+        ffi_lib 'kernel32'
+
+        # Constant synchronization functions use to indicate wait
+        # forever.
+        INFINITE = 0xFFFFFFFF
+
+        # Return codes
+        # http://msdn.microsoft.com/en-us/library/windows/desktop/ms687032(v=vs.85).aspx
+        WAIT_FAILED = 0xFFFFFFFF
+        WAIT_TIMEOUT = 0x00000102
+        WAIT_OBJECT_0 = 0x00000000
+        WAIT_ABANDONED = 0x00000080
+
+        # Security and access rights for synchronization objects
+        # http://msdn.microsoft.com/en-us/library/windows/desktop/ms686670(v=vs.85).aspx
+        DELETE = 0x00010000
+        READ_CONTROL = 0x00020000
+        SYNCHRONIZE = 0x00100000
+        WRITE_DAC = 0x00040000
+        WRITE_OWNER = 0x00080000
+
+        # Mutex specific rights
+        MUTEX_ALL_ACCESS = 0x001F0001
+        MUTEX_MODIFY_STATE = 0x00000001
+
+=begin
+HANDLE WINAPI CreateMutex(
+  _In_opt_  LPSECURITY_ATTRIBUTES lpMutexAttributes,
+  _In_      BOOL bInitialOwner,
+  _In_opt_  LPCTSTR lpName
+);
+=end
+        safe_attach_function :CreateMutexW, [ :LPSECURITY_ATTRIBUTES, :BOOL, :LPCTSTR ], :HANDLE
+        safe_attach_function :CreateMutexA, [ :LPSECURITY_ATTRIBUTES, :BOOL, :LPCTSTR ], :HANDLE
+
+=begin
+DWORD WINAPI WaitForSingleObject(
+  _In_  HANDLE hHandle,
+  _In_  DWORD dwMilliseconds
+);
+=end
+        safe_attach_function :WaitForSingleObject, [ :HANDLE, :DWORD ], :DWORD
+
+=begin
+BOOL WINAPI ReleaseMutex(
+  _In_  HANDLE hMutex
+);
+=end
+        safe_attach_function :ReleaseMutex, [ :HANDLE ], :BOOL
+
+=begin
+HANDLE WINAPI OpenMutex(
+  _In_  DWORD dwDesiredAccess,
+  _In_  BOOL bInheritHandle,
+  _In_  LPCTSTR lpName
+);
+=end
+        safe_attach_function :OpenMutexW, [ :DWORD, :BOOL, :LPCTSTR ], :HANDLE
+        safe_attach_function :OpenMutexA, [ :DWORD, :BOOL, :LPCTSTR ], :HANDLE
+      end
+    end
+  end
+end

data/lib/chef/win32/handle.rb

@@ -29,7 +29,7 @@ class Chef
       # See http://msdn.microsoft.com/en-us/library/windows/desktop/ms683179(v=vs.85).aspx
       # The handle value returned by the GetCurrentProcess function is the pseudo handle (HANDLE)-1 (which is 0xFFFFFFFF)
       CURRENT_PROCESS_HANDLE = 4294967295
-      
+
       def initialize(handle)
         @handle = handle
         ObjectSpace.define_finalizer(self, Handle.close_handle_finalizer(handle))