Merge pull request #1494 from brettcave/CHEF-5365_master

CHEF-5365 - chef local crashes if home directory is not set

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index a908fb83d4..0ac82cc5ac 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -552,8 +552,8 @@ class Chef
       windows_home_path = env['SYSTEMDRIVE'] + env['HOMEPATH'] if env['SYSTEMDRIVE'] && env['HOMEPATH']
     end
 
-    # returns a platform specific path to the user home dir
-    default( :user_home ) { env['HOME'] || windows_home_path || env['USERPROFILE'] }
+    # returns a platform specific path to the user home dir if set, otherwise default to current directory.
+    default( :user_home ) { env['HOME'] || windows_home_path || env['USERPROFILE'] || Dir.pwd }
 
     # Enable file permission fixup for selinux. Fixup will be done
     # only if selinux is enabled in the system.
diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
index c467d7d553..37527c04c4 100644
--- a/spec/unit/config_spec.rb
+++ b/spec/unit/config_spec.rb
@@ -341,6 +341,11 @@ describe Chef::Config do
       Chef::Config.stub(:env).and_return({ 'USERPROFILE' => "/users/kitten" })
       Chef::Config[:user_home].should == "/users/kitten"
     end
+
+    it "falls back to the current working directory when HOME and USERPROFILE is not set" do
+      Chef::Config.stub(:env).and_return({})
+      Chef::Config[:user_home].should == Dir.pwd
+    end
   end
 
   describe "Chef::Config[:encrypted_data_bag_secret]" do