No longer strip whitespace/newlines in capture method on Netssh backend

CHANGELOG.md

@@ -7,6 +7,9 @@ appear at the top.
 
   * Add your entries below here, remember to credit yourself however you want
     to be credited!
+  * No longer strip whitespace or newlines in `capture` method on Netssh backend. @robd
+    * This is to make the `Local` and `Netssh` backends consistent (they diverged at 7d15a9a)    
+    * If you need the old behaviour back, call `.strip` (or `.chomp`) on the captured string i.e. `capture(:my_command).strip`  
   * Simplified backend hierarchy. @robd
     * Moved duplicate implementations of `make`, `rake`, `test`, `capture`, `background` on to `Abstract` backend.
     * Backend implementations now only need to implement `execute_command`, `upload!` and `download!`

lib/sshkit/backends/netssh.rb

@@ -28,12 +28,6 @@ def ssh_options
         end
       end
 
-      def capture(*args)
-        # The behaviour to strip the full stdout was removed from the local backend in commit 7d15a9a,
-        # but was left in for the net ssh backend.
-        super(*args).strip
-      end
-
       def upload!(local, remote, options = {})
         summarizer = transfer_summarizer('Uploading')
         with_ssh do |ssh|

test/functional/backends/test_netssh.rb

@@ -55,8 +55,7 @@ def test_capture
               captured_command_result = capture(:uname)
             end.run
 
-            assert captured_command_result
-            assert_match captured_command_result, /Linux|Darwin/
+            assert_includes %W(Linux\n Darwin\n), captured_command_result
           end
         end
       end
@@ -87,17 +86,17 @@ def test_test_does_not_raise_on_non_zero_exit_status
         end.run
       end
 
-      def test_upload_file
-        file_contents = ""
+      def test_upload_and_then_capture_file_contents
+        actual_file_contents = ""
         file_name = File.join("/tmp", SecureRandom.uuid)
         File.open file_name, 'w+' do |f|
-          f.write 'example_file'
+          f.write "Some Content\nWith a newline and trailing spaces    \n "
         end
         Netssh.new(a_host) do
           upload!(file_name, file_name)
-          file_contents = capture(:cat, file_name)
+          actual_file_contents = capture(:cat, file_name)
         end.run
-        assert_equal "example_file", file_contents
+        assert_equal "Some Content\nWith a newline and trailing spaces    \n ", actual_file_contents
       end
 
       def test_upload_string_io