r-train 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7575ec657025aa3a654b3027981d2ced614549be
-  data.tar.gz: 667d45c23b863cc86fa69c9adc364af790c320ca
+  metadata.gz: 4ecdabc0165badec2fd8ff58e1fa04bb12dcd0ca
+  data.tar.gz: 7d3100e5f0f9ad7c35087010f34e7027c5d6ced2
 SHA512:
-  metadata.gz: e6b12280fcd7d238ed3c0fb7ae9716b4752b07ddcfbadb77bc0d8b2c9fbd7d721caef426e1f37c99a68d119c8b3d1f7e1ae395ef776a72a47419a24d2ebf8508
-  data.tar.gz: 589e2fa5193099b0d5f0f4146e3f0a6c19c677607387e01984d1febbeee6a643e6970407dea8e1f7c9caea5fb45c4476c878df772a5a47f05d94f1052f761432
+  metadata.gz: 9d5ca60694e074a0e75358b37f13481a9e1c548d097270e1457f92f14e32bae154360fffb08828527d15d4153c3ba21f9da91668de139962eb2e597cc8f5a91a
+  data.tar.gz: d5690275ba08a1a50bfa1348746f92eb2d8d06e27b8e97569dc31479fd01dce3c06f2118a659358a4aff15a24ebf879318ba5393745a13f24864ba27019cfb0d

data/CHANGELOG.md

@@ -1,10 +1,23 @@
 # Change Log
 
-## [0.9.5](https://github.com/chef/train/tree/0.9.5) (2016-01-29)
-[Full Changelog](https://github.com/chef/train/compare/v0.9.5...0.9.5)
+## [0.9.7](https://github.com/chef/train/tree/0.9.7) (2016-02-05)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.6...0.9.7)
+
+**Implemented enhancements:**
+
+- add `requiretty` workaround measures [\#63](https://github.com/chef/train/pull/63) ([srenatus](https://github.com/srenatus))
+
+**Merged pull requests:**
+
+- ensure bundler is installed on travis [\#66](https://github.com/chef/train/pull/66) ([chris-rock](https://github.com/chris-rock))
+- feature: add file.basename [\#64](https://github.com/chef/train/pull/64) ([arlimus](https://github.com/arlimus))
+
+## [v0.9.6](https://github.com/chef/train/tree/v0.9.6) (2016-01-29)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.5...v0.9.6)
 
 **Merged pull requests:**
 
+- 0.9.6 [\#62](https://github.com/chef/train/pull/62) ([chris-rock](https://github.com/chris-rock))
 - add solaris support [\#61](https://github.com/chef/train/pull/61) ([chris-rock](https://github.com/chris-rock))
 
 ## [v0.9.5](https://github.com/chef/train/tree/v0.9.5) (2016-01-25)

data/lib/train/extras/command_wrapper.rb

@@ -50,13 +50,18 @@ module Train::Extras
       return nil if res.exit_status == 0
       rawerr = res.stdout + ' ' + res.stderr
 
-      rawerr = 'Wrong sudo password.' if rawerr.include? 'Sorry, try again'
-      if rawerr.include? 'sudo: no tty present and no askpass program specified'
-        rawerr = 'Sudo requires a password, please configure it.'
-      end
-      if rawerr.include? 'sudo: command not found'
-        rawerr = "Can't find sudo command. Please either install and "\
-                 'configure it on the target or deactivate sudo.'
+      {
+        'Sorry, try again' => 'Wrong sudo password.',
+        'sudo: no tty present and no askpass program specified' =>
+          'Sudo requires a password, please configure it.',
+        'sudo: command not found' =>
+          "Can't find sudo command. Please either install and "\
+            'configure it on the target or deactivate sudo.',
+        'sudo: sorry, you must have a tty to run sudo' =>
+          'Sudo requires a TTY. Please see the README on how to configure '\
+            'sudo to allow for non-interactive usage.',
+      }.each do |sudo, human|
+        rawerr = human if rawerr.include? sudo
       end
 
       rawerr

data/lib/train/extras/file_common.rb

@@ -6,7 +6,7 @@ require 'digest/sha2'
 require 'digest/md5'
 
 module Train::Extras
-  class FileCommon
+  class FileCommon # rubocop:disable Metrics/ClassLength
     # interface methods: these fields should be implemented by every
     # backend File
     %w{
@@ -106,10 +106,23 @@ module Train::Extras
       !mounted.nil? && !mounted.stdout.nil? && !mounted.stdout.empty?
     end
 
+    def basename(suffix = nil, sep = '/')
+      fail 'Not yet supported: Suffix in file.basename' unless suffix.nil?
+      @basename ||= detect_filename(path, sep || '/')
+    end
+
     # helper methods provided to any implementing class
 
     private
 
+    def detect_filename(path, sep)
+      idx = path.rindex(sep)
+      return path if idx.nil?
+      idx += 1
+      return detect_filename(path[0..-2], sep) if idx == path.length
+      path[idx..-1]
+    end
+
     def target_type
       # Just return the type unless this is a symlink
       return type unless type == :symlink

data/lib/train/extras/file_windows.rb

@@ -2,6 +2,7 @@
 # author: Dominik Richter
 # author: Christoph Hartmann
 
+require 'shellwords'
 require 'train/extras/stat'
 
 # PS C:\Users\Administrator> Get-Item -Path C:\test.txt | Select-Object -Property BaseName, FullName, IsReadOnly, Exists,
@@ -16,6 +17,10 @@ module Train::Extras
       @spath = Shellwords.escape(@path)
     end
 
+    def basename(suffix = nil, sep = '\\')
+      super(suffix, sep)
+    end
+
     def content
       return @content if defined?(@content)
       @content = @backend.run_command(

data/lib/train/version.rb

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

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

@@ -26,7 +26,7 @@ execute 'test ssh connection' do
 end
 
 # prepare a few users
-%w{ nopasswd passwd nosudo }.each do |name|
+%w{ nopasswd passwd nosudo reqtty }.each do |name|
   user name do
     password '$1$7MCNTXPI$r./jqCEoVlLlByYKSL3sZ.'
     manage_home true
@@ -37,12 +37,20 @@ end
   sudo name do
     user '%'+name
     nopasswd true
+    defaults ['!requiretty']
   end
 end
 
 sudo 'passwd' do
   user 'passwd'
   nopasswd false
+  defaults ['!requiretty']
+end
+
+sudo 'reqtty' do
+  user 'reqtty'
+  nopasswd true
+  defaults ['requiretty']
 end
 
 # execute tests
@@ -61,10 +69,26 @@ execute 'run ssh tests' do
   cwd '/tmp/kitchen/data'
 end
 
-%w{passwd nopasswd}.each do |name|
+%w{passwd nopasswd reqtty}.each do |name|
   execute "run local sudo tests as #{name}" do
     command "/opt/chef/embedded/bin/ruby -I lib test/integration/sudo/#{name}.rb"
     cwd '/tmp/kitchen/data'
     user name
   end
 end
+
+execute 'fix sudoers for reqtty' do
+  command 'chef-apply contrib/fixup_requiretty.rb'
+  cwd '/tmp/kitchen/data'
+  environment(
+    'TRAIN_SUDO_USER' => 'reqtty',
+    'TRAIN_SUDO_VERY_MUCH' => 'yes',
+  )
+end
+
+# if it's fixed, it should behave like user 'nopasswd'
+execute "run local sudo tests as reqtty, no longer requiring a tty" do
+  command "/opt/chef/embedded/bin/ruby -I lib test/integration/sudo/nopasswd.rb"
+  cwd '/tmp/kitchen/data'
+  user 'reqtty'
+end

data/test/integration/sudo/reqtty.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+# author: Stephan Renatus
+
+require_relative 'run_as'
+
+describe 'run_command' do
+  it 'is running as non-root without sudo' do
+    run_as('whoami').stdout.wont_match /root/i
+  end
+
+  it 'is throwing an error trying to use sudo' do
+    err = ->{ run_as('whoami', { sudo: true }) }.must_raise Train::UserError
+    err.message.must_match /Sudo failed: Sudo requires a TTY. Please see the README/i
+  end
+end

data/test/unit/extras/file_common_test.rb

@@ -130,4 +130,50 @@ describe 'file common' do
       fc.unix_mode_mask('all', 'r').must_equal 0444
     end
   end
+
+  describe 'basename helper' do
+    def fc(path)
+      mockup(type: :file, path: path)
+    end
+
+    it 'works with an empty path' do
+      fc('').basename.must_equal ''
+    end
+
+    it 'separates a simple path (defaults to unix mode)' do
+      fc('/dir/file').basename.must_equal 'file'
+    end
+
+    it 'separates a simple path (Unix mode)' do
+      fc('/dir/file').basename(nil, '/').must_equal 'file'
+    end
+
+    it 'separates a simple path (Windows mode)' do
+      fc('C:\dir\file').basename(nil, '\\').must_equal 'file'
+    end
+
+    it 'identifies a folder name (Unix mode)' do
+      fc('/dir/file/').basename(nil, '/').must_equal 'file'
+    end
+
+    it 'identifies a folder name (Windows mode)' do
+      fc('C:\dir\file\\').basename(nil, '\\').must_equal 'file'
+    end
+
+    it 'ignores tailing separators (Unix mode)' do
+      fc('/dir/file///').basename(nil, '/').must_equal 'file'
+    end
+
+    it 'ignores tailing separators (Windows mode)' do
+      fc('C:\dir\file\\\\\\').basename(nil, '\\').must_equal 'file'
+    end
+
+    it 'doesnt work with backward slashes (Unix mode)' do
+      fc('C:\dir\file').basename(nil, '/').must_equal 'C:\\dir\file'
+    end
+
+    it 'doesnt work with forward slashes (Windows mode)' do
+      fc('/dir/file').basename(nil, '\\').must_equal '/dir/file'
+    end
+  end
 end

data/test/unit/extras/linux_file_test.rb

@@ -18,6 +18,14 @@ describe 'file common' do
     )
   end
 
+  it 'provides the full path' do
+    cls.new(backend, '/dir/file').path.must_equal '/dir/file'
+  end
+
+  it 'provides the basename to a unix path' do
+    cls.new(backend, '/dir/file').basename.must_equal 'file'
+  end
+
   it 'reads file contents' do
     out = rand.to_s
     backend.mock_command('cat path || echo -n', out)

data/test/unit/extras/windows_file_test.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require 'helper'
+require 'train/transports/mock'
+require 'train/extras'
+
+describe 'file common' do
+  let(:cls) { Train::Extras::WindowsFile }
+  let(:backend) {
+    backend = Train::Transports::Mock.new.connection
+    backend.mock_os({ family: 'windows' })
+    backend
+  }
+
+  it 'provides the full path' do
+    cls.new(backend, 'C:\dir\file').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'
+  end
+
+  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
+  end
+
+  # TODO: add all missing file tests!!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-train
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -276,6 +276,7 @@ files:
 - test/integration/helper.rb
 - test/integration/sudo/nopasswd.rb
 - test/integration/sudo/passwd.rb
+- test/integration/sudo/reqtty.rb
 - test/integration/sudo/run_as.rb
 - test/integration/test-runner.yaml
 - test/integration/test_local.rb
@@ -295,6 +296,7 @@ files:
 - test/unit/extras/os_common_test.rb
 - test/unit/extras/os_detect_linux_test.rb
 - test/unit/extras/stat_test.rb
+- test/unit/extras/windows_file_test.rb
 - test/unit/helper.rb
 - test/unit/plugins/connection_test.rb
 - test/unit/plugins/transport_test.rb
@@ -396,6 +398,7 @@ test_files:
 - test/integration/helper.rb
 - test/integration/sudo/nopasswd.rb
 - test/integration/sudo/passwd.rb
+- test/integration/sudo/reqtty.rb
 - test/integration/sudo/run_as.rb
 - test/integration/test-runner.yaml
 - test/integration/test_local.rb
@@ -415,6 +418,7 @@ test_files:
 - test/unit/extras/os_common_test.rb
 - test/unit/extras/os_detect_linux_test.rb
 - test/unit/extras/stat_test.rb
+- test/unit/extras/windows_file_test.rb
 - test/unit/helper.rb
 - test/unit/plugins/connection_test.rb
 - test/unit/plugins/transport_test.rb