train 2.0.12 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b864f7e732e0a08d245b288c18f5df9a10696c6e2979473d54909ca84a79ce67
-  data.tar.gz: 00a31194954f447b75e01b77df706f8839fca54eed741a2a3937b8919cdafd22
+  metadata.gz: 90606b9da5cf017c956f327cb396f116ff8ad54ef0de4784468c72f9506f0b00
+  data.tar.gz: 2e81ee280b43149f6de7961bb1526e15755b28579701a0f5375e1a6c4d579d23
 SHA512:
-  metadata.gz: 50d8ba9889bd642223c7cde279aff18646fd6130066c57318ed9e1c127ce1b91192b616fe366d6623fb21dc1690e3ed141da1d798cbcb2afade8a4eb451dfa5a
-  data.tar.gz: 7b527da5c001a7363f13154f5c6c1be0398e2abe4b57a0e6989e2b554194f5c8f20b7ba4932212544accbb5655ba62716f013044a2abea9bd14ce972e04fc5d5
+  metadata.gz: 10d9080f2d815d036875196894b81696e2db49dd3104f9942a95d1864b8721b226ae78f82934a41f80c032aae599f6a73ecaaeefc52decc6d66403ec459a7eae
+  data.tar.gz: f38b76b0c269fe39ca22b3d2a4324b3f7026eb0e5121c5ff7e8270cab47571c41bc6a741f78fd15eef1c9a257f75f055e80ce9264f47bda0a185336c5bac35b8

data/lib/train/extras/command_wrapper.rb

@@ -121,8 +121,45 @@ module Train::Extras
     end
   end
 
+  # Wrap windows commands.
+  class WindowsCommand < CommandWrapperBase
+    Train::Options.attach(self)
+
+    option :shell_command, default: nil
+
+    def initialize(backend, options)
+      @backend = backend
+      validate_options(options)
+
+      @shell_command = options[:shell_command] # e.g. 'powershell'
+    end
+
+    # (see CommandWrapperBase::run)
+    def run(command)
+      powershell_wrap(command)
+    end
+
+    private
+
+    # Wrap the cmd in an encoded command to allow pipes and quotes
+    def powershell_wrap(cmd)
+      shell = @shell_command || 'powershell'
+
+      # Prevent progress stream from leaking into stderr
+      script = "$ProgressPreference='SilentlyContinue';" + cmd
+
+      # Encode script so PowerShell can use it
+      script = script.encode('UTF-16LE', 'UTF-8')
+      base64_script = Base64.strict_encode64(script)
+
+      cmd = "#{shell} -NoProfile -EncodedCommand #{base64_script}"
+      cmd
+    end
+  end
+
   class CommandWrapper
     include_options LinuxCommand
+    include_options WindowsCommand
 
     def self.load(transport, options)
       if transport.os.unix?
@@ -134,6 +171,9 @@ module Train::Extras
           raise Train::UserError.new("Sudo failed: #{msg}", reason)
         end
         res
+      elsif transport.os.windows?
+        res = WindowsCommand.new(transport, options)
+        res
       end
     end
   end

data/lib/train/platforms/detect/helpers/os_windows.rb

@@ -3,7 +3,8 @@
 module Train::Platforms::Detect::Helpers
   module Windows
     def detect_windows
-      res = @backend.run_command('cmd /c ver')
+      # try to detect windows, use cmd.exe to also support Microsoft OpenSSH
+      res = @backend.run_command('cmd.exe /c ver')
       return false if res.exit_status != 0 or res.stdout.empty?
 
       # if the ver contains `Windows`, we know its a Windows system

data/lib/train/platforms/detect/specifications/os.rb

@@ -25,6 +25,11 @@ module Train::Platforms::Detect::Specifications
               is_windows = true if ruby_host_os(/mswin|mingw32|windows/)
             end
 
+            # Try to detect windows even for ssh transport
+            if !is_windows && detect_windows == true
+              is_windows = true
+            end
+
             is_windows
           }
       # windows platform

data/lib/train/transports/cisco_ios_connection.rb

@@ -46,7 +46,8 @@ class Train::Transports::SSH
         # This verifies we are not in privileged exec mode before running the
         # enable command. Otherwise, the password will be in history.
         if run_command_via_connection('show privilege').stdout.split[-1] != '15'
-          run_command_via_connection("enable\r\n#{@enable_password}")
+          # Extra newlines to get back to prompt if incorrect password is used
+          run_command_via_connection("enable\n#{@enable_password}\n\n\n")
         end
       end
 
@@ -65,7 +66,9 @@ class Train::Transports::SSH
 
       logger.debug('[SSH] waiting for prompt')
       until @buf =~ @prompt
-        raise BadEnablePassword if @buf =~ /Bad secrets/
+        if @buf =~ /Bad (secrets|password)|Access denied/
+          raise BadEnablePassword
+        end
         session.connection.process(0)
       end
 

data/lib/train/transports/ssh_connection.rb

@@ -202,6 +202,8 @@ class Train::Transports::SSH
         Train::File::Remote::Unix.new(self, path)
       elsif os[:name] == 'qnx'
         Train::File::Remote::Qnx.new(self, path)
+      elsif os.windows?
+        Train::File::Remote::Windows.new(self, path)
       else
         Train::File::Remote::Linux.new(self, path)
       end

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = '2.0.12'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.1.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json