Resolved conflicts after rebasing master and updated qnx file support…

… changes as per new structure

Signed-off-by: Vasu1105 <vasundhara.jagdale@msystechnologies.com>

lib/train/file.rb

@@ -1,4 +1,7 @@
 # encoding: utf-8
+#
+# author: Christoph Hartmann
+# author: Dominik Richter
 
 require 'train/file/local'
 require 'train/file/local/unix'

lib/train/file/remote/qnx.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+#
+# author: Christoph Hartmann
+# author: Dominik Richter
+
+require 'train/file/remote/unix'
+
+module Train
+  class File
+    class Remote
+      class Aix < Train::File::Remote::Unix
+        def content
+          cat = 'cat'
+          cat = '/proc/boot/cat' if @backend.os[:release].to_i >= 7
+          @content ||= if !exist?
+                         nil
+                       else
+                         @backend.run_command("#{cat} #{@spath}").stdout || ''
+                       end
+        end
+
+        def type
+          if @backend.run_command("file #{@spath}").stdout.include?('directory')
+            return :directory
+          else
+            return :file
+          end
+        end
+
+        %w{
+          mode owner group uid gid mtime size selinux_label link_path mounted stat
+        }.each do |field|
+          define_method field.to_sym do
+            fail NotImplementedError, "QNX does not implement the #{m}() method yet."
+          end
+        end
+      end
+    end
+  end
+end

lib/train/transports/ssh_connection.rb

@@ -66,9 +66,7 @@ def file(path)
         elsif os.solaris?
           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)
+          Train::File::Remote::Qnx.new(self, path)
         else
           Train::File::Remote::Linux.new(self, path)
         end