chef 11.18.12 → 12.0.0.alpha.0

data/lib/chef/user.rb

@@ -73,7 +73,7 @@ class Chef
     end
 
     def to_json(*a)
-      Chef::JSONCompat.to_json(to_hash, *a)
+      to_hash.to_json(*a)
     end
 
     def destroy

data/lib/chef/util/path_helper.rb

@@ -32,7 +32,7 @@ class Chef
             Chef::Log.error(msg)
             raise Chef::Exceptions::ValidationFailed, msg
           end
-
+            
           if windows_max_length_exceeded?(path)
             Chef::Log.debug("Path '#{path}' is longer than #{WIN_MAX_PATH}, prefixing with'\\\\?\\'")
             path.insert(0, "\\\\?\\")
@@ -50,7 +50,7 @@ class Chef
             return true
           end
         end
-
+        
         false
       end
 

data/lib/chef/version.rb

@@ -1,3 +1,4 @@
+
 # Author:: Daniel DeLeo (<dan@opscode.com>)
 # Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -16,7 +17,14 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.18.12'
+  VERSION = '12.0.0.alpha.0'
 end
 
+#
 # NOTE: the Chef::Version class is defined in version_class.rb
+#
+# NOTE: DO NOT Use the Chef::Version class on Chef::VERSIONs.  The
+#       Chef::Version class is for _cookbooks_ only, and cannot handle
+#       pre-release chef-client versions like "10.14.0.rc.2".  Please
+#       use Rubygem's Gem::Version class instead.
+#

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

@@ -200,15 +200,6 @@ LRESULT WINAPI SendMessageTimeout(
         safe_attach_function :SendMessageTimeoutW, [:HWND, :UINT, :WPARAM, :LPARAM, :UINT, :UINT, :PDWORD_PTR], :LRESULT
         safe_attach_function :SendMessageTimeoutA, [:HWND, :UINT, :WPARAM, :LPARAM, :UINT, :UINT, :PDWORD_PTR], :LRESULT
 
-=begin
-DWORD WINAPI ExpandEnvironmentStrings(
-  _In_       LPCTSTR lpSrc,
-  _Out_opt_  LPTSTR lpDst,
-  _In_       DWORD nSize
-);
-=end
-        safe_attach_function :ExpandEnvironmentStringsW, [:pointer, :pointer, :DWORD], :DWORD
-        safe_attach_function :ExpandEnvironmentStringsA, [:pointer, :pointer, :DWORD], :DWORD
       end
     end
   end

data/spec/data/bootstrap/test-hints.erb

@@ -6,7 +6,7 @@ mkdir -p /etc/chef/ohai/hints
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
 cat <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>

data/spec/data/bootstrap/test.erb

@@ -1 +1 @@
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>

data/spec/functional/dsl/reboot_pending_spec.rb

@@ -30,11 +30,11 @@ describe Chef::DSL::RebootPending, :windows_only do
     ohai
   end
 
-  def registry_unsafe?
-    registry.value_exists?('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' }) ||
-      registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired')
-    registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired') ||
-      registry.key_exists?('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile')
+  def registry_safe?
+    !registry.value_exists?('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' }) ||
+    !registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired') ||
+    !registry.key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired') ||
+    !registry.key_exists?('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile')
   end
 
   let(:node) { Chef::Node.new }
@@ -44,78 +44,73 @@ describe Chef::DSL::RebootPending, :windows_only do
   let(:recipe) { Chef::Recipe.new("a windows cookbook", "the windows recipe", run_context) }
   let(:registry) { Chef::Win32::Registry.new(run_context) }
 
-  pending "Can't safely test Registry entries" do
-    describe "reboot_pending?" do
+  describe "reboot_pending?" do
 
-      describe "when there is nothing to indicate a reboot is pending" do
-        it "should return false" do
-          pending "Found existing registry keys" if registry_unsafe?
-          expect(recipe.reboot_pending?).to be_false
-        end
-      end
+    context "when there is nothing to indicate a reboot is pending" do
+      it { expect(recipe.reboot_pending?).to be_false }
+    end
 
-      describe 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\PendingFileRenameOperations' do
-        it "returns true if the registry value exists" do
-          pending "Found existing registry keys" if registry_unsafe?
-          registry.set_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager',
-                             { :name => 'PendingFileRenameOperations', :type => :multi_string, :data => ['\??\C:\foo.txt|\??\C:\bar.txt'] })
+    describe 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\PendingFileRenameOperations' do
+      it "returns true if the registry value exists" do
+        pending "Found existing registry keys" unless registry_safe?
+        registry.set_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', 
+            { :name => 'PendingFileRenameOperations', :type => :multi_string, :data => ['\??\C:\foo.txt|\??\C:\bar.txt'] })
 
-          expect(recipe.reboot_pending?).to be_true
-        end
+        expect(recipe.reboot_pending?).to be_true
+      end
 
-        after do
-          unless registry_unsafe?
-            registry.delete_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' })
-          end
+      after do
+        if registry_safe?
+          registry.delete_value('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { :name => 'PendingFileRenameOperations' })
         end
       end
+    end
 
-      describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' do
-        it "returns true if the registry key exists" do
-          pending "Found existing registry keys" if registry_unsafe?
-          registry.create_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired', false)
+    describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' do
+      it "returns true if the registry key exists" do
+        pending "Found existing registry keys" unless registry_safe?
+        registry.create_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired', false)
 
-          expect(recipe.reboot_pending?).to be_true
-        end
+        expect(recipe.reboot_pending?).to be_true
+      end
 
-        after do
-          unless registry_unsafe?
-            registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired', false)
-          end
+      after do
+        if registry_safe?
+          registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired', false)
         end
       end
+    end
 
-      describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired' do
-        it "returns true if the registry key exists" do
-          pending "Permissions are limited to 'TrustedInstaller' by default"
-          pending "Found existing registry keys" if registry_unsafe?
-          registry.create_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired', false)
+    describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired' do
+      it "returns true if the registry key exists" do
+        pending "Permissions are limited to 'TrustedInstaller' by default"
+        pending "Found existing registry keys" unless registry_safe?
+        registry.create_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired', false)
 
-          expect(recipe.reboot_pending?).to be_true
-        end
+        expect(recipe.reboot_pending?).to be_true
+      end
 
-        after do
-          unless registry_unsafe?
-            registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired', false)
-          end
+      after do
+        if registry_safe?
+          registry.delete_key('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired', false)
         end
       end
+    end
 
-      describe 'HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile\Flags' do
-        it "returns true if the registry key exists" do
-          pending "Found existing registry keys" if registry_unsafe?
-          registry.create_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', true)
-          registry.set_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile',
-                             { :name => 'Flags', :type => :dword, :data => 3 })
+    describe 'HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile\Flags' do
+      it "returns true if the registry key exists" do
+        pending "Found existing registry keys" unless registry_safe?
+        registry.create_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', true)
+        registry.set_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile',
+                    { :name => 'Flags', :type => :dword, :data => 3 })
 
-          expect(recipe.reboot_pending?).to be_true
-        end
+        expect(recipe.reboot_pending?).to be_true
+      end
 
-        after do
-          unless registry_unsafe?
-            registry.delete_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', { :name => 'Flags' })
-            registry.delete_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', false)
-          end
+      after do
+        if registry_safe?
+          registry.delete_value('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', { :name => 'Flags' })
+          registry.delete_key('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile', false)
         end
       end
     end

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Knife::CookbookDelete do
       Chef::Log.level = :debug
 
       @knife.name_args = %w{no-such-cookbook}
-      @api.get("/cookbooks/no-such-cookbook", 404, Chef::JSONCompat.to_json({'error'=>'dear Tim, no. -Sent from my iPad'}))
+      @api.get("/cookbooks/no-such-cookbook", 404, {'error'=>'dear Tim, no. -Sent from my iPad'}.to_json)
     end
 
     it "logs an error and exits" do
@@ -62,7 +62,7 @@ describe Chef::Knife::CookbookDelete do
     before do
       @knife.name_args = %w{obsolete-cookbook}
       @cookbook_list = {'obsolete-cookbook' => { 'versions' => ['version' => '1.0.0']} }
-      @api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
+      @api.get("/cookbooks/obsolete-cookbook", 200, @cookbook_list.to_json)
     end
 
     it "asks for confirmation, then deletes the cookbook" do
@@ -105,7 +105,7 @@ describe Chef::Knife::CookbookDelete do
       versions = ['1.0.0', '1.1.0', '1.2.0']
       with_version = lambda { |version| { 'version' => version } }
       @cookbook_list = {'obsolete-cookbook' => { 'versions' => versions.map(&with_version) } }
-      @api.get("/cookbooks/obsolete-cookbook", 200, Chef::JSONCompat.to_json(@cookbook_list))
+      @api.get("/cookbooks/obsolete-cookbook", 200, @cookbook_list.to_json)
     end
 
     it "deletes all versions of a cookbook when given the '-a' flag" do

data/spec/functional/knife/exec_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Knife::Exec do
     @node = Chef::Node.new
     @node.name("ohai-world")
     response = {"rows" => [@node],"start" => 0,"total" => 1}
-    @api.get(%r{^/search/node}, 200, Chef::JSONCompat.to_json(response))
+    @api.get(%r{^/search/node}, 200, response.to_json)
     code = "$output.puts nodes.all"
     @knife.config[:exec] = code
     @knife.run

data/spec/functional/mixin/shell_out_spec.rb

@@ -0,0 +1,48 @@
+#
+# Copyright:: Copyright (c) 2014 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 'spec_helper'
+
+describe Chef::Mixin::ShellOut do
+  include Chef::Mixin::ShellOut
+
+  describe "shell_out_with_systems_locale" do
+    describe "when environment['LC_ALL'] is not set" do
+      it "should use the default shell_out setting" do
+        cmd = if windows?
+          shell_out_with_systems_locale('echo %LC_ALL%')
+        else
+          shell_out_with_systems_locale('echo $LC_ALL')
+        end
+
+        cmd.stdout.chomp.should match_environment_variable('LC_ALL')
+      end
+    end
+
+    describe "when environment['LC_ALL'] is set" do
+      it "should use the option's setting" do
+        cmd = if windows?
+          shell_out_with_systems_locale('echo %LC_ALL%', :environment => {'LC_ALL' => 'POSIX'})
+        else
+          shell_out_with_systems_locale('echo $LC_ALL', :environment => {'LC_ALL' => 'POSIX'})
+        end
+
+        cmd.stdout.chomp.should eq 'POSIX'
+      end
+    end
+  end
+end

data/spec/functional/resource/base.rb

@@ -16,16 +16,6 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-
-def ohai
-  # provider is platform-dependent, we need platform ohai data:
-  @OHAI_SYSTEM ||= begin
-    ohai = Ohai::System.new
-    ohai.all_plugins("platform")
-    ohai
-  end
-end
 
 def run_context
   @run_context ||= begin

data/spec/functional/resource/group_spec.rb

@@ -40,11 +40,6 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte
     when "windows"
       user_sid = sid_string_from_user(user)
       user_sid.nil? ? false : Chef::Util::Windows::NetGroup.new(group_name).local_get_members.include?(user_sid)
-    when "mac_os_x"
-      membership_info = shell_out("dscl . -read /Groups/#{group_name}").stdout
-      members = membership_info.split(" ")
-      members.shift # Get rid of GroupMembership: string
-      members.include?(user)
     else
       Etc::getgrnam(group_name).mem.include?(user)
     end
@@ -425,3 +420,4 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" }
     end
   end
 end
+

data/spec/functional/resource/link_spec.rb

@@ -377,6 +377,14 @@ describe Chef::Resource::Link do
           include_context 'create symbolic link succeeds'
           include_context 'delete is noop'
         end
+        context 'and the link already exists and points to a different directory' do
+          before(:each) do
+            other_dir = File.join(test_file_dir, make_tmpname("other_dir"))
+            Dir.mkdir(other_dir)
+            symlink(other_dir, target_file)
+          end
+          include_context 'create symbolic link succeeds'
+        end
       end
       context "when the link destination is a symbolic link" do
         context 'to a file that exists' do

data/spec/functional/resource/{user/useradd_spec.rb → user_spec.rb}

@@ -25,7 +25,7 @@ metadata = { :unix_only => true,
   :provider => {:user => Chef::Provider::User::Useradd}
 }
 
-describe Chef::Provider::User::Useradd, metadata do
+describe Chef::Resource::User, metadata do
 
   include Chef::Mixin::ShellOut
 

data/spec/integration/knife/chef_fs_data_store_spec.rb

@@ -22,7 +22,7 @@ require 'chef/knife/show'
 require 'chef/knife/raw'
 require 'chef/knife/cookbook_upload'
 
-describe 'ChefFSDataStore tests', :workstation do
+describe 'ChefFSDataStore tests' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -141,7 +141,7 @@ EOM
       end
 
       it 'knife cookbook upload works' do
-        knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} x").should_succeed <<EOM
+        knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} x").should_succeed :stderr => <<EOM
 Uploading x              [1.0.0]
 Uploaded 1 cookbook.
 EOM
@@ -199,7 +199,7 @@ EOM
       end
 
       it 'knife cookbook upload works' do
-        knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} z").should_succeed <<EOM
+        knife("cookbook upload -z --cookbook-path #{path_to('cookbooks_to_upload')} z").should_succeed :stderr => <<EOM
 Uploading z            [1.0.0]
 Uploaded 1 cookbook.
 EOM

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -20,7 +20,7 @@ require 'support/shared/context/config'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'chef_repo_path tests', :workstation do
+describe 'chef_repo_path tests' do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -287,7 +287,6 @@ EOM
             knife('show --local /clients/blah.json').should_succeed <<EOM
 /clients/blah.json:
 {
-
 }
 EOM
           end
@@ -375,7 +374,6 @@ EOM
             knife('show --local /environments/blah.json').should_succeed <<EOM
 /environments/blah.json:
 {
-
 }
 EOM
           end
@@ -388,7 +386,6 @@ EOM
             knife('show --local /nodes/blah.json').should_succeed <<EOM
 /nodes/blah.json:
 {
-
 }
 EOM
           end
@@ -401,7 +398,6 @@ EOM
             knife('show --local /roles/blah.json').should_succeed <<EOM
 /roles/blah.json:
 {
-
 }
 EOM
           end
@@ -414,7 +410,6 @@ EOM
             knife('show --local /users/blah.json').should_succeed <<EOM
 /users/blah.json:
 {
-
 }
 EOM
           end