chef 12.6.0 → 12.7.2

data/lib/chef/win32/security/token.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright 2011 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-require 'chef/win32/security'
-require 'chef/win32/api/security'
-require 'chef/win32/unicode'
-require 'ffi'
+require "chef/win32/security"
+require "chef/win32/api/security"
+require "chef/win32/unicode"
+require "ffi"
 
 class Chef
   module ReservedNames::Win32

data/lib/chef/win32/system.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Salim Alam (<salam@chef.io>)
-# Copyright:: Copyright 2015 Opscode, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'chef/win32/api/system'
-require 'chef/win32/error'
-require 'ffi'
+require "chef/win32/api/system"
+require "chef/win32/error"
+require "ffi"
 
 class Chef
   module ReservedNames::Win32

data/lib/chef/win32/unicode.rb

@@ -1,7 +1,7 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright 2011 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/wide_string'
-require 'chef/win32/api/unicode'
+require "chef/mixin/wide_string"
+require "chef/win32/api/unicode"
 
 class Chef
   module ReservedNames::Win32
@@ -40,13 +40,13 @@ module FFI
         last_char = nil
         while last_char != "\000\000" do
           length += 1
-          last_char = self.get_bytes(0,length * 2)[-2..-1]
+          last_char = self.get_bytes(0, length * 2)[-2..-1]
         end
 
         num_wchars = length
       end
 
-      wide_to_utf8(self.get_bytes(0, num_wchars*2))
+      wide_to_utf8(self.get_bytes(0, num_wchars * 2))
     end
   end
 end

data/lib/chef/win32/version.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'chef/win32/api'
-require 'chef/win32/api/system'
-require 'wmi-lite/wmi'
+require "chef/win32/api"
+require "chef/win32/api/system"
+require "wmi-lite/wmi"
 
 class Chef
   module ReservedNames::Win32
@@ -48,21 +48,21 @@ class Chef
       private_class_method :method_name_from_marketing_name
 
       WIN_VERSIONS = {
-        "Windows 10" => {:major => 6, :minor => 4, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},
-        "Windows Server 10" => {:major => 6, :minor => 4, :callable => lambda {|product_type, suite_mask| product_type != VER_NT_WORKSTATION }},
-        "Windows 8.1" => {:major => 6, :minor => 3, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},
-        "Windows Server 2012 R2" => {:major => 6, :minor => 3, :callable => lambda {|product_type, suite_mask| product_type != VER_NT_WORKSTATION }},
-        "Windows 8" => {:major => 6, :minor => 2, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},
-        "Windows Server 2012" => {:major => 6, :minor => 2, :callable => lambda{ |product_type, suite_mask| product_type != VER_NT_WORKSTATION }},
-        "Windows 7" => {:major => 6, :minor => 1, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},
-        "Windows Server 2008 R2" => {:major => 6, :minor => 1, :callable => lambda{ |product_type, suite_mask| product_type != VER_NT_WORKSTATION }},
-        "Windows Server 2008" => {:major => 6, :minor => 0, :callable => lambda{ |product_type, suite_mask| product_type != VER_NT_WORKSTATION }},
-        "Windows Vista" => {:major => 6, :minor => 0, :callable => lambda{ |product_type, suite_mask| product_type == VER_NT_WORKSTATION }},
-        "Windows Server 2003 R2" => {:major => 5, :minor => 2, :callable => lambda{ |product_type, suite_mask| get_system_metrics(SM_SERVERR2) != 0 }},
-        "Windows Home Server" => {:major => 5, :minor => 2, :callable => lambda{ |product_type, suite_mask| (suite_mask & VER_SUITE_WH_SERVER) == VER_SUITE_WH_SERVER }},
-        "Windows Server 2003" => {:major => 5, :minor => 2, :callable => lambda{ |product_type, suite_mask| get_system_metrics(SM_SERVERR2) == 0 }},
-        "Windows XP" => {:major => 5, :minor => 1},
-        "Windows 2000" => {:major => 5, :minor => 0}
+        "Windows 10" => { :major => 10, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2016" => { :major => 10, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows 8.1" => { :major => 6, :minor => 3, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2012 R2" => { :major => 6, :minor => 3, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows 8" => { :major => 6, :minor => 2, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2012" => { :major => 6, :minor => 2, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows 7" => { :major => 6, :minor => 1, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2008 R2" => { :major => 6, :minor => 1, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows Server 2008" => { :major => 6, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows Vista" => { :major => 6, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2003 R2" => { :major => 5, :minor => 2, :callable => lambda { |product_type, suite_mask| get_system_metrics(SM_SERVERR2) != 0 } },
+        "Windows Home Server" => { :major => 5, :minor => 2, :callable => lambda { |product_type, suite_mask| (suite_mask & VER_SUITE_WH_SERVER) == VER_SUITE_WH_SERVER } },
+        "Windows Server 2003" => { :major => 5, :minor => 2, :callable => lambda { |product_type, suite_mask| get_system_metrics(SM_SERVERR2) == 0 } },
+        "Windows XP" => { :major => 5, :minor => 1 },
+        "Windows 2000" => { :major => 5, :minor => 0 },
       }
 
       def initialize
@@ -88,12 +88,12 @@ class Chef
       marketing_names = Array.new
 
       # General Windows checks
-      WIN_VERSIONS.each do |k,v|
+      WIN_VERSIONS.each do |k, v|
         method_name = method_name_from_marketing_name(k)
         define_method(method_name) do
           (@major_version == v[:major]) &&
-          (@minor_version == v[:minor]) &&
-          (v[:callable] ? v[:callable].call(@product_type, @suite_mask) : true)
+            (@minor_version == v[:minor]) &&
+            (v[:callable] ? v[:callable].call(@product_type, @suite_mask) : true)
         end
         marketing_names << [k, method_name]
       end
@@ -123,13 +123,13 @@ class Chef
         # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724439(v=vs.85).aspx
 
         wmi = WmiLite::Wmi.new
-        os_info = wmi.first_of('Win32_OperatingSystem')
-        os_version = os_info['version']
+        os_info = wmi.first_of("Win32_OperatingSystem")
+        os_version = os_info["version"]
 
         # The operating system version is a string in the following form
         # that can be split into components based on the '.' delimiter:
         # MajorVersionNumber.MinorVersionNumber.BuildNumber
-        os_version.split('.').collect { | version_string | version_string.to_i }
+        os_version.split(".").collect { |version_string| version_string.to_i }
       end
 
       def get_version_ex

data/lib/chef/workstation_config_loader.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef-config/workstation_config_loader'
+require "chef-config/workstation_config_loader"
 
 class Chef
   WorkstationConfigLoader = ChefConfig::WorkstationConfigLoader

data/spec/data/apt/chef-integration-test-1.0/debian/copyright

@@ -8,7 +8,7 @@ Upstream Author(s):
 
 Copyright:
 
-    Copyright (C) 2010 Opscode, Inc
+    Copyright 2010-2016, Chef Software Inc.
 
 License:
 
@@ -26,7 +26,7 @@ License:
 
 The Debian packaging is:
 
-    Copyright (C) 2010 Opscode, Inc (<legal@opscode.com>)
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
 
 
 and is licensed under the Apache 2.0 license.

data/spec/data/apt/chef-integration-test-1.1/debian/copyright

@@ -8,7 +8,7 @@ Upstream Author(s):
 
 Copyright:
 
-    Copyright (C) 2010 Opscode, Inc
+    Copyright 2010-2016, Chef Software Inc.
 
 License:
 
@@ -26,7 +26,7 @@ License:
 
 The Debian packaging is:
 
-    Copyright (C) 2010 Opscode, Inc (<legal@opscode.com>)
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
 
 
 and is licensed under the Apache 2.0 license.

data/spec/data/apt/chef-integration-test2-1.0/debian/copyright

@@ -8,7 +8,7 @@ Upstream Author(s):
 
 Copyright:
 
-    Copyright (C) 2010 Opscode, Inc
+    Copyright 2010-2016, Chef Software Inc.
 
 License:
 
@@ -26,7 +26,7 @@ License:
 
 The Debian packaging is:
 
-    Copyright (C) 2010 Opscode, Inc (<legal@opscode.com>)
+    Copyright 2010-2016, Chef Software Inc. (<legal@chef.io>)
 
 
 and is licensed under the Apache 2.0 license.

data/spec/data/cookbooks/name-mismatch-versionnumber/recipes/default.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: name-mismatch
 # Recipe:: default
 #
-# Copyright (C) 2014 
+# Copyright 2014-2016, 
 #
 # 
 #

data/spec/data/cookbooks/supports-platform-constraints/metadata.rb

@@ -0,0 +1,5 @@
+name 'supports-platform-constraints'
+version '0.1.0'
+
+supports 'centos', '>= 6'
+supports 'freebsd', '> 10.1-fake-p12'

data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/recipes/default.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: incomplete-metadata
 # Recipe:: default
 #
-# Copyright (C) 2014 
+# Copyright 2014-2016, 
 #
 # 
 #

data/spec/data/invalid-metadata-chef-repo/invalid-metadata/metadata.rb

@@ -1,5 +1,3 @@
-raise "THIS METADATA HAS A BUG"
-
 name             'invalid-metadata'
 maintainer       ''
 maintainer_email ''
@@ -8,3 +6,4 @@ description      'Installs/Configures invalid-metadata'
 long_description 'Installs/Configures invalid-metadata'
 version          '0.1.0'
 
+raise "THIS METADATA HAS A BUG"

data/spec/data/invalid-metadata-chef-repo/invalid-metadata/recipes/default.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: invalid-metadata
 # Recipe:: default
 #
-# Copyright (C) 2014 
+# Copyright 2014-2016, 
 #
 # 
 #

data/spec/functional/application_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef/mixin/shell_out'
+require "spec_helper"
+require "chef/mixin/shell_out"
 
 describe Chef::Application do
   include Chef::Mixin::ShellOut
@@ -47,10 +47,10 @@ describe Chef::Application do
 
     it "saves built proxy to ENV which shell_out can use" do
       so = if windows?
-        shell_out("echo %http_proxy%")
-      else
-        shell_out("echo $http_proxy")
-      end
+             shell_out("echo %http_proxy%")
+           else
+             shell_out("echo $http_proxy")
+           end
 
       expect(so.stdout.chomp).to eq("http://proxy.example.org:8080")
     end

data/spec/functional/audit/rspec_formatter_spec.rb

@@ -1,8 +1,8 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
-# Author:: Claire McQuin (<claire@getchef.com>)
+# Author:: Claire McQuin (<claire@chef.io>)
 #
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,12 +18,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'rspec/core/sandbox'
-require 'chef/audit/runner'
-require 'rspec/support/spec/in_sub_process'
-require 'rspec/support/spec/stderr_splitter'
-require 'chef/audit/rspec_formatter'
+require "spec_helper"
+require "rspec/core/sandbox"
+require "chef/audit/runner"
+require "rspec/support/spec/in_sub_process"
+require "rspec/support/spec/stderr_splitter"
+require "chef/audit/rspec_formatter"
 
 describe Chef::Audit::RspecFormatter do
   include RSpec::Support::InSubProcess

data/spec/functional/audit/runner_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'rspec/core/sandbox'
-require 'chef/audit/runner'
-require 'rspec/support/spec/in_sub_process'
-require 'rspec/support/spec/stderr_splitter'
-require 'tempfile'
+require "spec_helper"
+require "rspec/core/sandbox"
+require "chef/audit/runner"
+require "rspec/support/spec/in_sub_process"
+require "rspec/support/spec/stderr_splitter"
+require "tempfile"
 
 ##
 # This functional test ensures that our runner can be setup to not interfere with existing RSpec
@@ -63,7 +63,7 @@ describe Chef::Audit::Runner do
             expect(2 - 2).to eq(0)
           end
         end
-        { control_group_name => Struct.new(:args, :block).new([control_group_name], should_pass)}
+        { control_group_name => Struct.new(:args, :block).new([control_group_name], should_pass) }
       end
     end
 
@@ -74,7 +74,7 @@ describe Chef::Audit::Runner do
             expect(2 - 1).to eq(0)
           end
         end
-        { control_group_name => Struct.new(:args, :block).new([control_group_name], should_fail)}
+        { control_group_name => Struct.new(:args, :block).new([control_group_name], should_fail) }
       end
     end
 

data/spec/functional/dsl/reboot_pending_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,17 +22,12 @@ require "spec_helper"
 
 describe Chef::DSL::RebootPending, :windows_only do
   def run_ohai
-    ohai = Ohai::System.new
-    # Would be nice to limit this to platform/kernel/arch etc for Ohai 7
-    ohai.all_plugins
-    node.consume_external_attrs(ohai.data,{})
-
-    ohai
+    node.consume_external_attrs(OHAI_SYSTEM.data, {})
   end
 
   let(:node) { Chef::Node.new }
-  let(:events) { Chef::EventDispatch::Dispatcher.new }
   let!(:ohai) { run_ohai } # Ensure we have necessary node data
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:recipe) { Chef::Recipe.new("a windows cookbook", "the windows recipe", run_context) }
   let(:registry) { Chef::Win32::Registry.new(run_context) }
@@ -47,19 +42,19 @@ describe Chef::DSL::RebootPending, :windows_only do
 
     describe 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\PendingFileRenameOperations' do
       let(:reg_key) { 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager' }
-      let(:original_set) { registry.value_exists?(reg_key, { :name => 'PendingFileRenameOperations' }) }
+      let(:original_set) { registry.value_exists?(reg_key, { :name => "PendingFileRenameOperations" }) }
 
       it "returns true if the registry value exists" do
-        skip 'found existing registry key' if original_set
+        skip "found existing registry key" if original_set
         registry.set_value(reg_key,
-            { :name => 'PendingFileRenameOperations', :type => :multi_string, :data => ['\??\C:\foo.txt|\??\C:\bar.txt'] })
+            { :name => "PendingFileRenameOperations", :type => :multi_string, :data => ['\??\C:\foo.txt|\??\C:\bar.txt'] })
 
         expect(recipe.reboot_pending?).to be_truthy
       end
 
       after do
         unless original_set
-          registry.delete_value(reg_key, { :name => 'PendingFileRenameOperations' })
+          registry.delete_value(reg_key, { :name => "PendingFileRenameOperations" })
         end
       end
     end
@@ -69,7 +64,7 @@ describe Chef::DSL::RebootPending, :windows_only do
       let(:original_set) { registry.key_exists?(reg_key) }
 
       it "returns true if the registry key exists" do
-        skip 'found existing registry key' if original_set
+        skip "found existing registry key" if original_set
         pending "Permissions are limited to 'TrustedInstaller' by default"
         registry.create_key(reg_key, false)
 
@@ -88,7 +83,7 @@ describe Chef::DSL::RebootPending, :windows_only do
       let(:original_set) { registry.key_exists?(reg_key) }
 
       it "returns true if the registry key exists" do
-        skip 'found existing registry key' if original_set
+        skip "found existing registry key" if original_set
         registry.create_key(reg_key, false)
 
         expect(recipe.reboot_pending?).to be_truthy
@@ -103,7 +98,7 @@ describe Chef::DSL::RebootPending, :windows_only do
 
     describe "when there is nothing to indicate a reboot is pending" do
       it "should return false" do
-        skip 'reboot pending' if @any_flag.any? { |_,v| v == true }
+        skip "reboot pending" if @any_flag.any? { |_, v| v == true }
         expect(recipe.reboot_pending?).to be_falsey
       end
     end