r-train 0.10.8 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32ff41b8ff5978a069895749aa4552622ce66f83
-  data.tar.gz: aee9c30afa4e65ad9ecce338aeb2b331a53fd35f
+  metadata.gz: 32041a577502de9c77d37eb40ff8fc7110693b7f
+  data.tar.gz: 8202709105de66980ebd1901ec4106ab32d9899e
 SHA512:
-  metadata.gz: 672801e1cd8849041f0736eb53d52f473b027e9f046f9669d351b36804c6ea6a3ae956552f393e8df9fbfca6bee980f7a54da64bdb147899d178243bbb36c6e3
-  data.tar.gz: 9fd2658924b66145474edb62497f5bab9790e00a1b0793f7f058a3cb2dca8bc7ea2694d77b20cfe2bbb06368cfaeea3ac8ca9d0f7e9477d1fbd9e3374c691fa9
+  metadata.gz: f19534cf0741a0c400eff0c151f9f056bdb1df3f6043ed9c61e968c7ff0a99c8f07b5a24376f95e52d321dc27619fe72476b66657ea3d6a29b7ec0e83fb03c9e
+  data.tar.gz: d758c0e2af5abbad797f94d93f7c0ada74dea5ab070d785fea79ac72ee53d0c67cd7013d98107e11625cf411c0572a13b1dfa01be45f681ffa29a254bb426c9e

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [0.10.8](https://github.com/chef/train/tree/0.10.8) (2016-04-25)
-[Full Changelog](https://github.com/chef/train/compare/v0.10.7...0.10.8)
+## [0.11.0](https://github.com/chef/train/tree/0.11.0) (2016-04-28)
+[Full Changelog](https://github.com/chef/train/compare/v0.10.8...0.11.0)
+
+**Implemented enhancements:**
+
+- Overhault file\(...\) and stat\(...\); point to destination of symlinks [\#92](https://github.com/chef/train/pull/92) ([arlimus](https://github.com/arlimus))
+
+**Fixed bugs:**
+
+- validate the backend configuration [\#91](https://github.com/chef/train/pull/91) ([arlimus](https://github.com/arlimus))
+
+## [v0.10.8](https://github.com/chef/train/tree/v0.10.8) (2016-04-25)
+[Full Changelog](https://github.com/chef/train/compare/v0.10.7...v0.10.8)
 
 **Implemented enhancements:**
 

data/lib/train.rb

@@ -62,6 +62,7 @@ module Train
 
     return conf if conf[:target].to_s.empty?
 
+    # split up the target's host/scheme configuration
     uri = URI.parse(conf[:target].to_s)
     unless uri.host.nil? and uri.scheme.nil?
       conf[:backend]  ||= uri.scheme
@@ -79,6 +80,24 @@ module Train
     conf
   end
 
+  def self.validate_backend(conf, default = :local)
+    return default if conf.nil?
+    res = conf[:backend]
+    return res if !res.nil?
+
+    if !conf[:target].nil?
+      fail Train::UserError, 'Cannot determine backend from target '\
+           "configuration #{conf[:target].inspect}. Valid example: ssh://192.168.0.1."
+    end
+
+    if !conf[:host].nil?
+      fail Train::UserError, 'Host configured, but no backend was provided. Please '\
+           'specify how you want to connect. Valid example: ssh://192.168.0.1.'
+    end
+
+    conf[:backend] = default
+  end
+
   def self.group_keys_and_keyfiles(conf)
     # in case the user specified a key-file, register it that way
     # we will clear the list of keys and put keys and key_files separately

data/lib/train/extras/file_common.rb

@@ -10,14 +10,20 @@ module Train::Extras
     # interface methods: these fields should be implemented by every
     # backend File
     %w{
-      exist? mode owner group link_target link_path content mtime size
-      selinux_label product_version file_version path
+      exist? mode owner group uid gid content mtime size selinux_label path
+      product_version file_version
     }.each do |m|
       define_method m.to_sym do
         fail NotImplementedError, "File must implement the #{m}() method."
       end
     end
 
+    def initialize(backend, path, follow_symlink = true)
+      @backend = backend
+      @path = path
+      @follow_symlink = follow_symlink
+    end
+
     def type
       :unknown
     end
@@ -44,31 +50,39 @@ module Train::Extras
     # Additional methods for convenience
 
     def file?
-      target_type == :file
+      type == :file
     end
 
     def block_device?
-      target_type == :block_device
+      type == :block_device
     end
 
     def character_device?
-      target_type == :character_device
+      type == :character_device
     end
 
     def socket?
-      target_type == :socket
+      type == :socket
     end
 
     def directory?
-      target_type == :directory
+      type == :directory
     end
 
     def symlink?
-      type == :symlink
+      source.type == :symlink
+    end
+
+    def source
+      if @follow_symlink
+        self.class.new(@backend, @path, false)
+      else
+        self
+      end
     end
 
     def pipe?
-      target_type == :pipe
+      type == :pipe
     end
 
     def mode?(sth)
@@ -87,6 +101,10 @@ module Train::Extras
       link_path == dst
     end
 
+    def link_path
+      symlink? ? path : nil
+    end
+
     def version?(version)
       product_version == version or
         file_version == version
@@ -123,15 +141,6 @@ module Train::Extras
       path[idx..-1]
     end
 
-    def target_type
-      # Just return the type unless this is a symlink
-      return type unless type == :symlink
-      # Get the link's target type, i.e. the real destination's type
-      return link_target.type unless link_target.nil?
-      # Return unknown if we don't know where this is pointing to
-      :unknown
-    end
-
     UNIX_MODE_OWNERS = {
       all:   00777,
       owner: 00700,

data/lib/train/extras/file_unix.rb

@@ -8,9 +8,8 @@ require 'train/extras/stat'
 module Train::Extras
   class UnixFile < FileCommon
     attr_reader :path
-    def initialize(backend, path)
-      @backend = backend
-      @path = path
+    def initialize(backend, path, follow_symlink = true)
+      super(backend, path, follow_symlink)
       @spath = Shellwords.escape(@path)
     end
 
@@ -27,21 +26,15 @@ module Train::Extras
 
     def exist?
       @exist ||= (
-        @backend.run_command("test -e #{@spath}")
+        f = @follow_symlink ? '' : " || test -L #{@spath}"
+        @backend.run_command("test -e #{@spath}"+f)
                 .exit_status == 0
       )
     end
 
-    def link_target
-      return @link_target if defined? @link_target
-      return @link_target = nil if link_path.nil?
-      @link_target = @backend.file(link_path)
-    end
-
-    def link_path
-      return nil unless symlink?
-      @link_path ||=
-        @backend.run_command("readlink #{@spath}").stdout.chomp
+    def path
+      return @path unless @follow_symlink && symlink?
+      @link_path ||= read_target_path
     end
 
     def mounted
@@ -50,7 +43,7 @@ module Train::Extras
     end
 
     %w{
-      type mode owner group mtime size selinux_label
+      type mode owner group uid gid mtime size selinux_label
     }.each do |field|
       define_method field.to_sym do
         stat[field.to_sym]
@@ -67,7 +60,20 @@ module Train::Extras
 
     def stat
       return @stat if defined?(@stat)
-      @stat = Train::Extras::Stat.stat(@spath, @backend)
+      @stat = Train::Extras::Stat.stat(@spath, @backend, @follow_symlink)
+    end
+
+    private
+
+    # Returns full path of a symlink target(real dest) or '' on symlink loop
+    def read_target_path
+      full_path = @backend.run_command("readlink -n #{@spath} -f").stdout
+      # Needed for some OSes like OSX that returns relative path
+      # when the link and target are in the same directory
+      if !full_path.start_with?('/') && full_path != ''
+        full_path = File.expand_path("../#{full_path}", @spath)
+      end
+      full_path
     end
   end
 end

data/lib/train/extras/file_windows.rb

@@ -11,9 +11,8 @@ require 'train/extras/stat'
 module Train::Extras
   class WindowsFile < FileCommon
     attr_reader :path
-    def initialize(backend, path)
-      @backend = backend
-      @path = path
+    def initialize(backend, path, follow_symlink)
+      super(backend, path, follow_symlink)
       @spath = sanitize_filename(@path)
     end
 
@@ -44,10 +43,6 @@ module Train::Extras
         "(Test-Path -Path \"#{@spath}\").ToString()").stdout.chomp == 'True'
     end
 
-    def link_target
-      nil
-    end
-
     def link_path
       nil
     end
@@ -57,11 +52,16 @@ module Train::Extras
     end
 
     def type
+      if attributes.include?('Archive')
+        return :file
+      elsif attributes.include?('Directory')
+        return :directory
+      end
       :unknown
     end
 
     %w{
-      mode owner group mtime size selinux_label
+      mode owner group uid gid mtime size selinux_label
     }.each do |field|
       define_method field.to_sym do
         nil
@@ -85,16 +85,7 @@ module Train::Extras
     def attributes
       return @attributes if defined?(@attributes)
       @attributes = @backend.run_command(
-        "(Get-ItemProperty -Path \"#{@spath}\").attributes.ToString()").stdout.chomp.split(',')
-    end
-
-    def target_type
-      if attributes.include?('Archive')
-        return :file
-      elsif attributes.include?('Directory')
-        return :directory
-      end
-      :unknown
+        "(Get-ItemProperty -Path \"#{@spath}\").attributes.ToString()").stdout.chomp.split(/\s*,\s*/)
     end
   end
 end

data/lib/train/extras/stat.rb

@@ -19,22 +19,23 @@ module Train::Extras
       res.nil? ? :unknown : res[0]
     end
 
-    def self.stat(shell_escaped_path, backend)
+    def self.stat(shell_escaped_path, backend, follow_symlink)
       # use perl scripts for aix and solaris 10
       if backend.os.aix? || (backend.os.solaris? && backend.os[:release].to_i < 11)
-        return aix_stat(shell_escaped_path, backend)
+        return aix_stat(shell_escaped_path, backend, follow_symlink)
       end
-      return bsd_stat(shell_escaped_path, backend) if backend.os.bsd?
+      return bsd_stat(shell_escaped_path, backend, follow_symlink) if backend.os.bsd?
       # linux and solaris 11 will use standard linux stats
-      return linux_stat(shell_escaped_path, backend) if backend.os.unix?
+      return linux_stat(shell_escaped_path, backend, follow_symlink) if backend.os.unix?
       # all other cases we don't handle
       # TODO: print an error if we get here, as it shouldn't be invoked
       # on non-unix
       {}
     end
 
-    def self.linux_stat(shell_escaped_path, backend)
-      res = backend.run_command("stat #{shell_escaped_path} 2>/dev/null --printf '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'")
+    def self.linux_stat(shell_escaped_path, backend, follow_symlink)
+      lstat = follow_symlink ? ' -L' : ''
+      res = backend.run_command("stat#{lstat} #{shell_escaped_path} 2>/dev/null --printf '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'")
 
       # ignore the exit_code: it is != 0 if selinux labels are not supported
       # on the system.
@@ -47,17 +48,19 @@ module Train::Extras
       selinux = nil if selinux == '?' or selinux == '(null)'
 
       {
-        type: find_type(tmask),
-        mode: tmask & 07777,
+        type:  find_type(tmask),
+        mode:  tmask & 07777,
         owner: fields[2],
+        uid:   fields[3].to_i,
         group: fields[4],
+        gid:   fields[5].to_i,
         mtime: fields[7].to_i,
-        size: fields[0].to_i,
+        size:  fields[0].to_i,
         selinux_label: selinux,
       }
     end
 
-    def self.bsd_stat(shell_escaped_path, backend)
+    def self.bsd_stat(shell_escaped_path, backend, follow_symlink)
       # From stat man page on FreeBSD:
       # z       The size of file in bytes (st_size).
       # p       File type and permissions (st_mode).
@@ -72,8 +75,9 @@ module Train::Extras
       # in combination with:
       #      ...
       #      gu      Display group or user name.
+      lstat = follow_symlink ? ' -L' : ''
       res = backend.run_command(
-        "stat -f '%z\n%p\n%Su\n%u\n%Sg\n%g\n%a\n%m' "\
+        "stat#{lstat} -f '%z\n%p\n%Su\n%u\n%Sg\n%g\n%a\n%m' "\
         "#{shell_escaped_path}")
 
       return {} if res.exit_status != 0
@@ -84,24 +88,27 @@ module Train::Extras
       tmask = fields[1].to_i(8)
 
       {
-        type: find_type(tmask),
-        mode: tmask & 07777,
+        type:  find_type(tmask),
+        mode:  tmask & 07777,
         owner: fields[2],
+        uid:   fields[3].to_i,
         group: fields[4],
+        gid:   fields[5].to_i,
         mtime: fields[7].to_i,
-        size: fields[0].to_i,
+        size:  fields[0].to_i,
         selinux_label: fields[8],
       }
     end
 
-    def self.aix_stat(shell_escaped_path, backend)
+    def self.aix_stat(shell_escaped_path, backend, follow_symlink)
       # Perl here b/c it is default on AIX
+      lstat = follow_symlink ? 'lstat' : 'stat'
       stat_cmd = <<-EOP
       perl -e '
-      @a = lstat(shift) or exit 2;
+      @a = #{lstat}(shift) or exit 2;
       $u = getpwuid($a[4]);
       $g = getgrgid($a[5]);
-      printf("0%o\\n%s\\n%s\\n%d\\n%d\\n", $a[2], $u, $g, $a[9], $a[7])
+      printf("0%o\\n%s\\n%d\\n%s\\n%d\\n%d\\n%d\\n", $a[2], $u, $a[4], $u, $a[5], $a[9], $a[7])
       ' #{shell_escaped_path}
       EOP
 
@@ -115,9 +122,11 @@ module Train::Extras
         type:  find_type(tmask),
         mode:  tmask & 07777,
         owner: fields[1],
-        group: fields[2],
-        mtime: fields[3].to_i,
-        size:  fields[4].to_i,
+        uid:   fields[2].to_i,
+        group: fields[3],
+        gid:   fields[4].to_i,
+        mtime: fields[5].to_i,
+        size:  fields[6].to_i,
         selinux_label: nil,
       }
     end

data/lib/train/transports/local_file.rb

@@ -23,7 +23,12 @@ class Train::Transports::Local::Connection
 
     def link_path
       return nil unless symlink?
-      @link_path ||= ::File.readlink(@path)
+      begin
+        @link_path ||= ::File.realpath(@path)
+      rescue Errno::ELOOP => _
+        # Leave it blank on symbolic loop, same as readlink
+        @link_path = ''
+      end
     end
 
     def block_device?
@@ -52,7 +57,12 @@ class Train::Transports::Local::Connection
       return @stat if defined? @stat
 
       begin
-        file_stat = ::File.lstat(@path)
+        file_stat =
+          if @follow_symlink
+            ::File.stat(@path)
+          else
+            ::File.lstat(@path)
+          end
       rescue StandardError => _err
         return @stat = {}
       end
@@ -63,10 +73,13 @@ class Train::Transports::Local::Connection
         mtime: file_stat.mtime.to_i,
         size: file_stat.size,
         owner: pw_username(file_stat.uid),
+        uid: file_stat.uid,
         group: pw_groupname(file_stat.gid),
+        gid: file_stat.gid,
       }
 
-      res = @backend.run_command("stat #{@spath} 2>/dev/null --printf '%C'")
+      lstat = @follow_symlink ? ' -L' : ''
+      res = @backend.run_command("stat#{lstat} #{@spath} 2>/dev/null --printf '%C'")
       if res.exit_status == 0 && !res.stdout.empty? && res.stdout != '?'
         @stat[:selinux_label] = res.stdout.strip
       end

data/lib/train/transports/mock.rb

@@ -127,22 +127,21 @@ end
 class Train::Transports::Mock::Connection
   class File < FileCommon
     %w{
-      exist? mode owner group link_target link_path content mtime size
+      exist? mode owner group link_path content mtime size
       selinux_label product_version file_version path type
     }.each do |m|
       attr_accessor m.tr('?', '').to_sym
     end
 
-    def initialize(runtime, path)
-      @path = path
+    def initialize(backend, path, follow_symlink = true)
+      super(backend, path, follow_symlink)
       @type = :unknown
       @exist = false
-      @runtime = runtime
     end
 
     def mounted
       @mounted ||=
-        @runtime.run_command("mount | grep -- ' on #{@path}'")
+        @backend.run_command("mount | grep -- ' on #{@path}'")
     end
   end
 end

data/lib/train/version.rb

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

data/test/integration/tests/path_symlink_test.rb

@@ -22,8 +22,8 @@ describe 'file interface' do
       file.directory?.must_equal(false)
     end
 
-    it 'has type :symlink' do
-      file.type.must_equal(:symlink)
+    it 'has type :file' do
+      file.type.must_equal(:file)
     end
 
     it 'has content' do
@@ -34,16 +34,28 @@ describe 'file interface' do
       file.owner.must_equal('root')
     end
 
+    it 'has uid 0' do
+      file.uid.must_equal(0)
+    end
+
     it 'has group name' do
       file.group.must_equal(Test.root_group(backend.os))
     end
 
+    it 'has gid 0' do
+      file.gid.must_equal(0)
+    end
+
     it 'has mode 0777' do
-      file.mode.must_equal(00777)
+      file.source.mode.must_equal(00777)
+    end
+
+    it 'has mode 0765' do
+      file.mode.must_equal(00765)
     end
 
-    it 'checks mode? 0777' do
-      file.mode?(00777).must_equal(true)
+    it 'checks mode? 0765' do
+      file.mode?(00765).must_equal(true)
     end
 
     it 'has link_path' do

data/test/unit/extras/file_common_test.rb

@@ -5,6 +5,7 @@ require 'train/extras/file_common'
 
 describe 'file common' do
   let(:cls) { Train::Extras::FileCommon }
+  let(:new_cls) { cls.new(nil, nil, false) }
 
   def mockup(stubs)
     Class.new(cls) do
@@ -13,35 +14,35 @@ describe 'file common' do
           v
         end
       end
-    end.new
+    end.new(nil, nil, false)
   end
 
   it 'has the default type of unknown' do
-    cls.new.type.must_equal :unknown
+    new_cls.type.must_equal :unknown
   end
 
   it 'calculates md5sum from content' do
     content = 'hello world'
-    cls.new.stub :content, content do |i|
+    new_cls.stub :content, content do |i|
       i.md5sum.must_equal '5eb63bbbe01eeed093cb22bb8f5acdc3'
     end
   end
 
   it 'sets md5sum of nil content to nil' do
-    cls.new.stub :content, nil do |i|
+    new_cls.stub :content, nil do |i|
       i.md5sum.must_be_nil
     end
   end
 
   it 'calculates md5sum from content' do
     content = 'hello world'
-    cls.new.stub :content, content do |i|
+    new_cls.stub :content, content do |i|
       i.sha256sum.must_equal 'b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9'
     end
   end
 
   it 'sets sha256sum of nil content to nil' do
-    cls.new.stub :content, nil do |i|
+    new_cls.stub :content, nil do |i|
       i.sha256sum.must_be_nil
     end
   end

data/test/unit/extras/linux_file_test.rb

@@ -11,9 +11,9 @@ describe 'file common' do
     backend
   }
 
-  def mock_stat(path, out, err = '', code = 0)
+  def mock_stat(args, out, err = '', code = 0)
     backend.mock_command(
-      "stat path 2>/dev/null --printf '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'",
+      "stat #{args} 2>/dev/null --printf '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'",
       out, err, code,
     )
   end
@@ -34,7 +34,7 @@ describe 'file common' do
 
   it 'reads file contents' do
     backend.mock_command('cat path || echo -n', '')
-    mock_stat('path', '', 'some error...', 1)
+    mock_stat('-L path', '', 'some error...', 1)
     cls.new(backend, 'path').content.must_equal nil
   end
 
@@ -51,16 +51,8 @@ describe 'file common' do
   it 'retrieves the link path' do
     out = rand.to_s
     mock_stat('path', "13\na1ff\nz\n1001\nz\n1001\n1444573475\n1444573475\n?")
-    backend.mock_command('readlink path', out)
-    cls.new(backend, 'path').link_path.must_equal out
-  end
-
-  it 'retrieves the linked file' do
-    out = rand.to_s
-    mock_stat('path', "13\na1ff\nz\n1001\nz\n1001\n1444573475\n1444573475\n?")
-    backend.mock_command('readlink path', out)
-    f = backend.file(out)
-    cls.new(backend, 'path').link_target.must_equal f
+    backend.mock_command('readlink -n path -f', out)
+    cls.new(backend, 'path').link_path.must_equal File.join(Dir.pwd, out)
   end
 
   it 'checks a mounted path' do
@@ -77,30 +69,84 @@ describe 'file common' do
   end
 
   describe 'stat on a file' do
-    before { mock_stat('path', "13\na1ff\nz\n1001\nz\n1001\n1444573475\n1444573475\nlabels") }
+    before { mock_stat('-L path', "13\na1ff\nz\n1001\nz2\n1002\n1444573475\n1444573475\nlabels") }
+    let(:f) { cls.new(backend, 'path') }
+
+    it 'retrieves the file type' do
+      f.type.must_equal :symlink
+    end
+
+    it 'retrieves the file mode' do
+      f.mode.must_equal 00777
+    end
+
+    it 'retrieves the file owner' do
+      f.owner.must_equal 'z'
+    end
+
+    it 'retrieves the file uid' do
+      f.uid.must_equal 1001
+    end
+
+    it 'retrieves the file group' do
+      f.group.must_equal 'z2'
+    end
+
+    it 'retrieves the file gid' do
+      f.gid.must_equal 1002
+    end
+
+    it 'retrieves the file mtime' do
+      f.mtime.must_equal 1444573475
+    end
+
+    it 'retrieves the file size' do
+      f.size.must_equal 13
+    end
+
+    it 'retrieves the file selinux_label' do
+      f.selinux_label.must_equal 'labels'
+    end
+  end
+
+  describe 'stat on the source file' do
+    before { mock_stat('path', "13\na1ff\nz\n1001\nz2\n1002\n1444573475\n1444573475\nlabels") }
+    let(:f) { cls.new(backend, 'path').source }
 
     it 'retrieves the file type' do
-      cls.new(backend, 'path').type.must_equal :symlink
+      f.type.must_equal :symlink
     end
 
     it 'retrieves the file mode' do
-      cls.new(backend, 'path').mode.must_equal 00777
+      f.mode.must_equal 00777
     end
 
     it 'retrieves the file owner' do
-      cls.new(backend, 'path').owner.must_equal 'z'
+      f.owner.must_equal 'z'
+    end
+
+    it 'retrieves the file uid' do
+      f.uid.must_equal 1001
+    end
+
+    it 'retrieves the file group' do
+      f.group.must_equal 'z2'
+    end
+
+    it 'retrieves the file gid' do
+      f.gid.must_equal 1002
     end
 
     it 'retrieves the file mtime' do
-      cls.new(backend, 'path').mtime.must_equal 1444573475
+      f.mtime.must_equal 1444573475
     end
 
     it 'retrieves the file size' do
-      cls.new(backend, 'path').size.must_equal 13
+      f.size.must_equal 13
     end
 
     it 'retrieves the file selinux_label' do
-      cls.new(backend, 'path').selinux_label.must_equal 'labels'
+      f.selinux_label.must_equal 'labels'
     end
   end
 end

data/test/unit/extras/stat_test.rb

@@ -48,19 +48,21 @@ describe 'stat' do
       res = Minitest::Mock.new
       res.expect :stdout, ''
       backend.expect :run_command, res, [String]
-      cls.linux_stat('/path', backend).must_equal({})
+      cls.linux_stat('/path', backend, false).must_equal({})
     end
 
     it 'reads correct stat results' do
       res = Minitest::Mock.new
       # 43ff is 41777; linux_stat strips the 4
-      res.expect :stdout, "360\n43ff\nroot\n0\nroot\n0\n1444520846\n1444522445\n?"
+      res.expect :stdout, "360\n43ff\nroot\n0\nrootz\n1\n1444520846\n1444522445\n?"
       backend.expect :run_command, res, [String]
-      cls.linux_stat('/path', backend).must_equal({
+      cls.linux_stat('/path', backend, false).must_equal({
         type: :directory,
         mode: 01777,
         owner: 'root',
-        group: 'root',
+        uid: 0,
+        group: 'rootz',
+        gid: 1,
         mtime: 1444522445,
         size: 360,
         selinux_label: nil,
@@ -76,7 +78,7 @@ describe 'stat' do
       res.expect :stdout, '.....'
       res.expect :exit_status, 1
       backend.expect :run_command, res, [String]
-      cls.bsd_stat('/path', backend).must_equal({})
+      cls.bsd_stat('/path', backend, false).must_equal({})
     end
 
     it 'ignores wrong stat results' do
@@ -84,19 +86,21 @@ describe 'stat' do
       res.expect :stdout, ''
       res.expect :exit_status, 0
       backend.expect :run_command, res, [String]
-      cls.bsd_stat('/path', backend).must_equal({})
+      cls.bsd_stat('/path', backend, false).must_equal({})
     end
 
     it 'reads correct stat results' do
       res = Minitest::Mock.new
-      res.expect :stdout, "360\n41777\nroot\n0\nroot\n0\n1444520846\n1444522445"
+      res.expect :stdout, "360\n41777\nroot\n0\nrootz\n1\n1444520846\n1444522445"
       res.expect :exit_status, 0
       backend.expect :run_command, res, [String]
-      cls.bsd_stat('/path', backend).must_equal({
+      cls.bsd_stat('/path', backend, false).must_equal({
         type: :directory,
         mode: 01777,
         owner: 'root',
-        group: 'root',
+        uid: 0,
+        group: 'rootz',
+        gid: 1,
         mtime: 1444522445,
         size: 360,
         selinux_label: nil,

data/test/unit/extras/windows_file_test.rb

@@ -12,15 +12,15 @@ describe 'file common' do
   }
 
   it 'provides the full path' do
-    cls.new(backend, 'C:\dir\file').path.must_equal 'C:\dir\file'
+    cls.new(backend, 'C:\dir\file', false).path.must_equal 'C:\dir\file'
   end
 
   it 'provides the basename to a unix path' do
-    cls.new(backend, 'C:\dir\file').basename.must_equal 'file'
+    cls.new(backend, 'C:\dir\file', false).basename.must_equal 'file'
   end
 
   it 'provides the full path with whitespace' do
-    wf = cls.new(backend, 'C:\Program Files\file name')
+    wf = cls.new(backend, 'C:\Program Files\file name', false)
     wf.path.must_equal 'C:\Program Files\file name'
     wf.basename.must_equal 'file name'
   end
@@ -28,11 +28,11 @@ describe 'file common' do
   it 'reads file contents' do
     out = rand.to_s
     backend.mock_command('Get-Content("path") | Out-String', out)
-    cls.new(backend, 'path').content.must_equal out
+    cls.new(backend, 'path', false).content.must_equal out
   end
 
   it 'check escaping of invalid chars in path' do
-    wf = cls.new(nil, nil)
+    wf = cls.new(nil, nil, false)
     wf.sanitize_filename('c:/test') .must_equal 'c:/test'
     wf.sanitize_filename('c:/test directory') .must_equal 'c:/test directory'
     %w{ < > " * ?}.each do |char|

data/test/unit/train_test.rb

@@ -129,4 +129,28 @@ describe Train do
       res.must_equal nu
     end
   end
+
+  describe '#validate_backend' do
+    it 'just returns the backend if it is provided' do
+      x = rand
+      Train.validate_backend({ backend: x }).must_equal x
+    end
+
+    it 'returns the local backend if nothing was provided' do
+      Train.validate_backend({}).must_equal :local
+    end
+
+    it 'returns the default backend if nothing was provided' do
+      x = rand
+      Train.validate_backend({}, x).must_equal x
+    end
+
+    it 'fails if no backend was given but a target is provided' do
+      proc { Train.validate_backend({ target: rand }) }.must_raise Train::UserError
+    end
+
+    it 'fails if no backend was given but a host is provided' do
+      proc { Train.validate_backend({ host: rand }) }.must_raise Train::UserError
+    end
+  end
 end

data/test/unit/transports/local_file_test.rb

@@ -42,7 +42,7 @@ describe 'local file transport' do
 
   it 'checks a file\'s link path' do
     out = rand.to_s
-    File.stub :readlink, out do
+    File.stub :realpath, out do
       File.stub :symlink?, true do
         connection.file(rand.to_s).link_path.must_equal out
       end
@@ -51,7 +51,9 @@ describe 'local file transport' do
 
   describe 'file metadata' do
     let(:stat) { Struct.new(:mode, :size, :mtime, :uid, :gid) }
-    let(:statres) { stat.new(00140755, rand, (rand*100).to_i, rand, rand) }
+    let(:uid) { rand }
+    let(:gid) { rand }
+    let(:statres) { stat.new(00140755, rand, (rand*100).to_i, uid, gid) }
 
     def meta_stub(method, param, &block)
       pwres = Struct.new(:name)
@@ -63,43 +65,55 @@ describe 'local file transport' do
     end
 
     it 'recognizes type' do
-      meta_stub :lstat, statres do
+      meta_stub :stat, statres do
         connection.file(rand.to_s).type.must_equal :socket
       end
     end
 
     it 'recognizes mode' do
-      meta_stub :lstat, statres do
+      meta_stub :stat, statres do
         connection.file(rand.to_s).mode.must_equal 00755
       end
     end
 
     it 'recognizes mtime' do
-      meta_stub :lstat, statres do
+      meta_stub :stat, statres do
         connection.file(rand.to_s).mtime.must_equal statres.mtime
       end
     end
 
     it 'recognizes size' do
-      meta_stub :lstat, statres do
+      meta_stub :stat, statres do
         connection.file(rand.to_s).size.must_equal statres.size
       end
     end
 
     it 'recognizes owner' do
-      meta_stub :lstat, statres do
+      meta_stub :stat, statres do
         connection.file(rand.to_s).owner.must_equal 'owner'
       end
     end
 
+    it 'recognizes uid' do
+      meta_stub :stat, statres do
+        connection.file(rand.to_s).uid.must_equal uid
+      end
+    end
+
     it 'recognizes group' do
-      meta_stub :lstat, statres do
+      meta_stub :stat, statres do
         connection.file(rand.to_s).group.must_equal 'group'
       end
     end
 
+    it 'recognizes gid' do
+      meta_stub :stat, statres do
+        connection.file(rand.to_s).gid.must_equal gid
+      end
+    end
+
     it 'recognizes selinux label' do
-      meta_stub :lstat, statres do
+      meta_stub :stat, statres do
         label = rand.to_s
         res = Train::Extras::CommandResult.new(label, nil, 0)
         connection.stub :run_command, res do
@@ -107,6 +121,64 @@ describe 'local file transport' do
         end
       end
     end
+
+    it 'recognizes source type' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.type.must_equal :socket
+      end
+    end
+
+    it 'recognizes source mode' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.mode.must_equal 00755
+      end
+    end
+
+    it 'recognizes source mtime' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.mtime.must_equal statres.mtime
+      end
+    end
+
+    it 'recognizes source size' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.size.must_equal statres.size
+      end
+    end
+
+    it 'recognizes source owner' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.owner.must_equal 'owner'
+      end
+    end
+
+    it 'recognizes source uid' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.uid.must_equal uid
+      end
+    end
+
+    it 'recognizes source owner' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.owner.must_equal 'owner'
+      end
+    end
+
+    it 'recognizes source gid' do
+      meta_stub :lstat, statres do
+        connection.file(rand.to_s).source.gid.must_equal gid
+      end
+    end
+
+    it 'recognizes source selinux label' do
+      meta_stub :lstat, statres do
+        label = rand.to_s
+        res = Train::Extras::CommandResult.new(label, nil, 0)
+        connection.stub :run_command, res do
+          connection.file(rand.to_s).source.selinux_label.must_equal label
+        end
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-train
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.11.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Transport interface to talk to different backends.