Merge pull request #1019 from bruno-/tweak_revision_log

Update dsl#local_user method

CHANGELOG.md

@@ -7,6 +7,7 @@ Reverse Chronological Order:
 https://github.com/capistrano/capistrano/compare/v3.2.0...HEAD
 
 * Minor changes:
+  * Update dsl#local_user method and add test for it. (@bruno-)
   * Revert short sha1 revision with git. (@blaugueux)
   * Changed asking question to more standard format (like common unix commandline tools) (@sponomarev)
   * Fixed typos in the README. (@sponomarev)

lib/capistrano/dsl.rb

@@ -1,3 +1,4 @@
+require 'etc'
 require 'capistrano/dsl/task_enhancements'
 require 'capistrano/dsl/paths'
 require 'capistrano/dsl/stages'
@@ -41,7 +42,7 @@ def rollback_log_message
     end
 
     def local_user
-      `whoami`
+      Etc.getlogin
     end
 
     def lock(locked_version)

spec/lib/capistrano/dsl_spec.rb

@@ -48,5 +48,16 @@ class DummyDSL
         dsl.sudo(:my, :command)
       end
     end
+
+    describe '#local_user' do
+
+      before do
+        Etc.expects(:getlogin)
+      end
+
+      it 'delegates to Etc#getlogin' do
+        dsl.local_user
+      end
+    end
   end
 end