train 0.29.1 → 0.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f08c1d5dc97551bd522b203489d60896b2d12a3
-  data.tar.gz: dc98c76bf9a16796e8ff4873ca6976fbfdb8a2fe
+  metadata.gz: 91f83eccb563ed719ca19fd8be06d9616afc4eae
+  data.tar.gz: 740ba4a80a9b4690b36dec69dd2e752659032033
 SHA512:
-  metadata.gz: d5c09fc411b4359394bb34e875f8db1e9255b8e86e61db758254f1d748d060a2b2adefb9b40968ed0b5ed348fbf9eb738b830eafbdd83f8619402c6003be80bc
-  data.tar.gz: b5fbd002908a670d9352782d5455feffb3595816cce1fb86d0e41e118f7fcd3702a1379c93534dba7608b1d68e99b132d71f67dc85efffeaabda28045a7019b8
+  metadata.gz: 96eda4528ad55102f10ff705b13a639dec7405f693f67f72d6d8d1b11c35439210ca92ee172d3f18ae564097271de3aa88671f2c8528a8a5b84604dd1ec0344d
+  data.tar.gz: b4260ea407f3cf12614d222d5304a85091830972aade03e10491f1b897f5e01c99e3dc7ff45a7314cdd30e7224d46cd0b460538d34a0454f0601136ff8343db8

data/lib/train/file/local/unix.rb

@@ -54,6 +54,16 @@ module Train
           group == sth
         end
 
+        def unix_mode_mask(owner, type)
+          o = UNIX_MODE_OWNERS[owner.to_sym]
+          return nil if o.nil?
+
+          t = UNIX_MODE_TYPES[type.to_sym]
+          return nil if t.nil?
+
+          t & o
+        end
+
         private
 
         def pw_username(uid)
@@ -67,6 +77,19 @@ module Train
         rescue ArgumentError => _
           nil
         end
+
+        UNIX_MODE_OWNERS = {
+          all:   00777,
+          owner: 00700,
+          group: 00070,
+          other: 00007,
+        }.freeze
+
+        UNIX_MODE_TYPES = {
+          r: 00444,
+          w: 00222,
+          x: 00111,
+        }.freeze
       end
     end
   end

data/lib/train/file/remote/linux.rb

@@ -8,7 +8,7 @@ module Train
       class Linux < Train::File::Remote::Unix
         def content
           return @content if defined?(@content)
-          @content = @backend.run_command("cat #{@path} || echo -n").stdout
+          @content = @backend.run_command("cat #{@spath} || echo -n").stdout
           return @content unless @content.empty?
           @content = nil if directory? or size.nil? or size > 0
           @content

data/lib/train/version.rb

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

data/test/integration/bootstrap.sh

@@ -12,6 +12,8 @@ chmod 0765 /tmp/file
 echo -n 'hello suid/sgid/sticky' > /tmp/sfile
 chmod 7765 /tmp/sfile
 
+echo -n 'hello space' > /tmp/spaced\ file
+
 test ! -e /tmp/pipe && \
   mkfifo /tmp/pipe
 

data/test/integration/cookbooks/test/recipes/prep_files.rb

@@ -21,6 +21,10 @@ file '/tmp/sfile' do
   content 'hello suid/sgid/sticky'
 end
 
+file '/tmp/spaced file' do
+  content 'hello space'
+end
+
 directory '/tmp/folder' do
   mode '0567'
   owner 'root'

data/test/integration/tests/path_file_test.rb

@@ -89,4 +89,11 @@ describe 'file interface' do
       file.mode.must_equal(07765)
     end
   end
+
+  describe 'regular file' do
+    let(:file) { backend.file('/tmp/spaced file') }
+    it 'has content' do
+      file.content.must_equal('hello space')
+    end
+  end
 end

data/test/unit/file/local/unix_test.rb

@@ -5,7 +5,7 @@ require 'train/transports/local'
 
 describe Train::File::Local::Unix do
   let(:cls) { Train::File::Local::Unix }
-  
+
   let(:backend) {
     backend = Train::Transports::Mock.new.connection
     backend.mock_os({ family: 'linux' })
@@ -86,8 +86,8 @@ describe Train::File::Local::Unix do
     it 'grouped_into' do
       meta_stub :stat, statres do
         connection.file(rand.to_s).grouped_into?('group').must_equal true
-      end  
-    end  
+      end
+    end
 
     it 'recognizes selinux label' do
       meta_stub :stat, statres do
@@ -109,4 +109,38 @@ describe Train::File::Local::Unix do
       end
     end
   end
+
+  describe '#unix_mode_mask' do
+    let(:file_tester) do
+      Class.new(cls) do
+        define_method :type do
+          :file
+        end
+      end.new(nil, nil, false)
+    end
+
+    it 'check owner mode calculation' do
+      file_tester.unix_mode_mask('owner', 'x').must_equal 0100
+      file_tester.unix_mode_mask('owner', 'w').must_equal 0200
+      file_tester.unix_mode_mask('owner', 'r').must_equal 0400
+    end
+
+    it 'check group mode calculation' do
+      file_tester.unix_mode_mask('group', 'x').must_equal 0010
+      file_tester.unix_mode_mask('group', 'w').must_equal 0020
+      file_tester.unix_mode_mask('group', 'r').must_equal 0040
+    end
+
+    it 'check other mode calculation' do
+      file_tester.unix_mode_mask('other', 'x').must_equal 0001
+      file_tester.unix_mode_mask('other', 'w').must_equal 0002
+      file_tester.unix_mode_mask('other', 'r').must_equal 0004
+    end
+
+    it 'check all mode calculation' do
+      file_tester.unix_mode_mask('all', 'x').must_equal 0111
+      file_tester.unix_mode_mask('all', 'w').must_equal 0222
+      file_tester.unix_mode_mask('all', 'r').must_equal 0444
+    end
+  end
 end

data/test/unit/file/remote/linux_test.rb

@@ -42,6 +42,12 @@ describe Train::File::Remote::Linux do
     cls.new(backend, 'path').content.must_be_nil
   end
 
+  it 'reads file contents' do
+    out = rand.to_s
+    backend.mock_command('cat /spaced\\ path || echo -n', out)
+    cls.new(backend, '/spaced path').content.must_equal out
+  end
+
   it 'checks for file existance' do
     backend.mock_command('test -e path', true)
     cls.new(backend, 'path').exist?.must_equal true
@@ -164,4 +170,4 @@ describe Train::File::Remote::Linux do
       f.selinux_label.must_equal 'labels'
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.29.2
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json