Merge pull request #3535 from mitchellh/winrm-command-filters-code-review-feedback

Winrm command filters code review feedback

plugins/communicators/winrm/command_filter.rb

@@ -1,9 +1,7 @@
 module VagrantPlugins
   module CommunicatorWinRM
-   
     # Handles loading and applying all available WinRM command filters
     class CommandFilter
-
       @@cmd_filters = [
         "cat",
         "chmod",
@@ -12,7 +10,7 @@ module VagrantPlugins
         "rm",
         "test",
         "uname",
-        "which"
+        "which",
       ]
 
       # Filter the given Vagrant command to ensure compatibility with Windows
@@ -42,7 +40,6 @@ module VagrantPlugins
           end
         end
       end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/cat.rb

@@ -1,10 +1,8 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
       # Handles the special case of determining the guest OS using cat
       class Cat
-
         def filter(command)
           # cat /etc/release | grep -i OmniOS
           # cat /etc/redhat-release
@@ -19,9 +17,7 @@ module VagrantPlugins
           # grep command
           command.start_with?('cat /etc/')
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/chmod.rb

@@ -1,21 +1,17 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
+      # Converts a *nix 'chmod' command to a PowerShell equivalent (none)
-      # Converts a *nix 'chmod' command to a PowerShell equivalent
       class Chmod
-
         def filter(command)
-          # Not support on Windows, the communicator will skip this command
+          # Not supported on Windows, the communicator should skip this command
           ''
         end
 
         def accept?(command)
           command.start_with?('chmod ')
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/chown.rb

@@ -1,21 +1,17 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
+      # Converts a *nix 'chown' command to a PowerShell equivalent (none)
-      # Converts a *nix 'chown' command to a PowerShell equivalent
       class Chown
-
         def filter(command)
-          # Not support on Windows, the communicator will skip this command
+          # Not supported on Windows, the communicator should skip this command
           ''
         end
 
         def accept?(command)
           command.start_with?('chown ')
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/grep.rb

@@ -1,8 +1,7 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
+      # Converts a *nix 'grep' command to a PowerShell equivalent (none)
-      # Converts a *nix 'grep' command to a PowerShell equivalent
       class Grep
 
         def filter(command)
@@ -18,9 +17,7 @@ module VagrantPlugins
         def accept?(command)
           command.start_with?('grep ')
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/rm.rb

@@ -1,10 +1,8 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
       # Converts a *nix 'rm' command to a PowerShell equivalent
       class Rm
-
         def filter(command)
           # rm -Rf /some/dir
           # rm /some/dir
@@ -20,9 +18,7 @@ module VagrantPlugins
         def accept?(command)
           command.start_with?('rm ')
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/test.rb

@@ -1,10 +1,8 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
       # Converts a *nix 'test' command to a PowerShell equivalent
       class Test
-
         def filter(command)
           # test -d /tmp/dir
           # test -f /tmp/afile
@@ -28,7 +26,6 @@ module VagrantPlugins
           command.start_with?("test ")
         end
 
-
         private
 
         def check_for_directory(path)
@@ -60,9 +57,7 @@ module VagrantPlugins
             exit 1
           EOH
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/uname.rb

@@ -1,10 +1,8 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
+      # Converts a *nix 'uname' command to a PowerShell equivalent (none)
-      # Converts a *nix 'uname' command to a PowerShell equivalent
       class Uname
-
         def filter(command)
           # uname -s | grep 'Darwin'
           # uname -s | grep VMkernel
@@ -23,9 +21,7 @@ module VagrantPlugins
         def accept?(command)
           command.start_with?('uname ')
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/command_filters/which.rb

@@ -1,10 +1,8 @@
 module VagrantPlugins
   module CommunicatorWinRM
     module CommandFilters
-
       # Converts a *nix 'which' command to a PowerShell equivalent
       class Which
-
         def filter(command)
           executable = command.strip.split(/\s+/)[1]
           return <<-EOH
@@ -18,9 +16,7 @@ module VagrantPlugins
         def accept?(command)
           command.start_with?('which ')
         end
-
+      end
-      end
-
     end
   end
 end

plugins/communicators/winrm/communicator.rb

@@ -17,10 +17,10 @@ module VagrantPlugins
       end
 
       def initialize(machine)
+        @cmd_filter = CommandFilter.new()
+        @logger     = Log4r::Logger.new("vagrant::communication::winrm")
         @machine    = machine
         @shell      = nil
-        @logger     = Log4r::Logger.new("vagrant::communication::winrm")
-        @cmd_filter = CommandFilter.new()
 
         @logger.info("Initializing WinRMCommunicator")
       end

plugins/communicators/winrm/file_manager.rb

@@ -2,11 +2,9 @@ require "log4r"
 
 module VagrantPlugins
   module CommunicatorWinRM
-
     # Manages the file system on the remote guest allowing for file tranfer
     # between the guest and host.
     class FileManager
-
       def initialize(shell)
         @logger = Log4r::Logger.new("vagrant::communication::filemanager")
         @shell = shell
@@ -39,7 +37,6 @@ module VagrantPlugins
         IO.binwrite(host_dest_file_path, out)
       end
 
-
       private
 
       # Recursively uploads the given directory from the host to the guest
@@ -160,7 +157,6 @@ module VagrantPlugins
           :to => to,
           :message => out.inspect if out[:exitcode] != 0
       end
-    
+    end
-    end #class
   end
 end