r-train 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 382b9412d20998cdc5f4b82977e9fac2a28512e4
-  data.tar.gz: ef1abbc6f67151829501d9ceefd17631b8f87cd9
+  metadata.gz: 4bc131b14e564505bfb4b0fe6600a1cb65683ef6
+  data.tar.gz: 7c1e8fe171c13417699bac9e79331e2e5106e9d6
 SHA512:
-  metadata.gz: 272fbbdb46cd93991fa1e577fd8124d37d521c3aefeeab2f7ab8f269f39b52ce636afcd79c47d0ceb417fa16b9db3dfb8a03f2c2121b749ce2d27975144f182c
-  data.tar.gz: 764a07756e3810a0a64934a7fb951adb1021f7e46615b10168bc0dedeb7598435c25cf86067b856f317007e329c6d4183fffe66f4f3593284fd37310bb80eac6
+  metadata.gz: cb2560766fb6136b92589b9b0add7f689a7732583168b1453693552986bd7829d5531e0bf431fb85e5c168b2f03e9fb60bdba34d48aa2ab22da09ccf8191776b
+  data.tar.gz: 14fd0c7b1d9c9e68dec01cec7ee0f75a7337760ccbfbbe4caf234200b1638dff93b475841755096692db13adb962d1b46aeb5df6f37ef3126a31bd32f798dba0

data/.gitignore

@@ -1 +1,4 @@
 train-*.gem
+r-train-*.gem
+Gemfile.lock
+.kitchen/

data/.travis.yml

@@ -1,7 +1,15 @@
 ---
+sudo: required
 language: ruby
 cache: bundler
 
+# necessary for docker to work
+dist: trusty
+services:
+  - docker
+
+bundler_args: --without integration tools
+
 matrix:
   include:
   - rvm: 1.9.3
@@ -10,3 +18,6 @@ matrix:
     gemfile: Gemfile
   - rvm: 2.2
     gemfile: Gemfile
+  - rvm: 2.2
+    gemfile: Gemfile
+    script: bundle exec rake test:docker config=test/integration/test-runner.yaml

data/CHANGELOG.md

@@ -0,0 +1,81 @@
+# Change Log
+
+## [0.9.3](https://github.com/chef/train/tree/0.9.3) (2016-01-02)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.2...0.9.3)
+
+**Implemented enhancements:**
+
+- Support for local transport on Windows [\#43](https://github.com/chef/train/pull/43) ([chris-rock](https://github.com/chris-rock))
+- Split integration test preparation from executing [\#42](https://github.com/chef/train/pull/42) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- introduce `mounted` as a separate method to retrieve the content [\#44](https://github.com/chef/train/pull/44) ([chris-rock](https://github.com/chris-rock))
+- Support for AIX and targeted SSH testing [\#41](https://github.com/chef/train/pull/41) ([foobarbam](https://github.com/foobarbam))
+
+## [v0.9.2](https://github.com/chef/train/tree/v0.9.2) (2015-12-11)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.1...v0.9.2)
+
+**Implemented enhancements:**
+
+- add changelog [\#38](https://github.com/chef/train/pull/38) ([chris-rock](https://github.com/chris-rock))
+- activate integration tests in travis [\#37](https://github.com/chef/train/pull/37) ([chris-rock](https://github.com/chris-rock))
+- Adding support for Wind River Linux in support of Cisco devices [\#33](https://github.com/chef/train/pull/33) ([adamleff](https://github.com/adamleff))
+
+**Fixed bugs:**
+
+- Integration test failures [\#34](https://github.com/chef/train/issues/34)
+- Implemented WindowsFile\#exist? [\#36](https://github.com/chef/train/pull/36) ([docwhat](https://github.com/docwhat))
+- adapt integration test to changes in command\_wrapper [\#35](https://github.com/chef/train/pull/35) ([srenatus](https://github.com/srenatus))
+
+**Closed issues:**
+
+- WinRM plaintext transport is hardcoded \(cannot use SSL\) [\#29](https://github.com/chef/train/issues/29)
+
+**Merged pull requests:**
+
+- 0.9.2 [\#40](https://github.com/chef/train/pull/40) ([arlimus](https://github.com/arlimus))
+- add rake version helpers [\#39](https://github.com/chef/train/pull/39) ([arlimus](https://github.com/arlimus))
+
+## [v0.9.1](https://github.com/chef/train/tree/v0.9.1) (2015-11-03)
+[Full Changelog](https://github.com/chef/train/compare/0.9.0...v0.9.1)
+
+**Implemented enhancements:**
+
+- R train [\#27](https://github.com/chef/train/pull/27) ([arlimus](https://github.com/arlimus))
+- Update style of readme [\#26](https://github.com/chef/train/pull/26) ([chris-rock](https://github.com/chris-rock))
+- Add Apache 2.0 License [\#25](https://github.com/chef/train/pull/25) ([jamesc](https://github.com/jamesc))
+
+## [0.9.0](https://github.com/chef/train/tree/0.9.0) (2015-11-03)
+**Implemented enhancements:**
+
+- set windows name in :release [\#23](https://github.com/chef/train/pull/23) ([arlimus](https://github.com/arlimus))
+- basic file transport via winrm [\#21](https://github.com/chef/train/pull/21) ([chris-rock](https://github.com/chris-rock))
+- dont return nil on command errors stdout/stderr [\#20](https://github.com/chef/train/pull/20) ([arlimus](https://github.com/arlimus))
+- skip .delivery in gemspec [\#19](https://github.com/chef/train/pull/19) ([arlimus](https://github.com/arlimus))
+- Verify sudo is working and fail with error messages if it isn't [\#18](https://github.com/chef/train/pull/18) ([arlimus](https://github.com/arlimus))
+- improve file eposure [\#16](https://github.com/chef/train/pull/16) ([chris-rock](https://github.com/chris-rock))
+- add delivery [\#13](https://github.com/chef/train/pull/13) ([arlimus](https://github.com/arlimus))
+- Sudo [\#12](https://github.com/chef/train/pull/12) ([arlimus](https://github.com/arlimus))
+- Extract options handling for transport [\#11](https://github.com/chef/train/pull/11) ([arlimus](https://github.com/arlimus))
+- don't let mock commands return nil on stdout or stderr [\#10](https://github.com/chef/train/pull/10) ([arlimus](https://github.com/arlimus))
+- allow mock command to support sha256 mocking of commands [\#9](https://github.com/chef/train/pull/9) ([arlimus](https://github.com/arlimus))
+- register plugins with both names and symbols [\#8](https://github.com/chef/train/pull/8) ([arlimus](https://github.com/arlimus))
+- split of mock into transport and connection [\#7](https://github.com/chef/train/pull/7) ([arlimus](https://github.com/arlimus))
+- bugfix: add docker dependency to gemspec [\#6](https://github.com/chef/train/pull/6) ([arlimus](https://github.com/arlimus))
+- move train/plugins/common to train/extras [\#2](https://github.com/chef/train/pull/2) ([arlimus](https://github.com/arlimus))
+- add Travis [\#1](https://github.com/chef/train/pull/1) ([arlimus](https://github.com/arlimus))
+
+**Fixed bugs:**
+
+- bugfix: prevent debugging info to stdout on winrm [\#22](https://github.com/chef/train/pull/22) ([arlimus](https://github.com/arlimus))
+- bugfix: fail ssh connections correctly [\#17](https://github.com/chef/train/pull/17) ([arlimus](https://github.com/arlimus))
+- bugfix: initialize mock transport to correct family [\#14](https://github.com/chef/train/pull/14) ([arlimus](https://github.com/arlimus))
+
+**Merged pull requests:**
+
+- bump train version to 0.9.0 [\#24](https://github.com/chef/train/pull/24) ([chris-rock](https://github.com/chris-rock))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -8,15 +8,17 @@ group :test do
   gem 'rake', '~> 10'
   gem 'rubocop', '~> 0.33.0'
   gem 'simplecov', '~> 0.10'
+  gem 'concurrent-ruby', '~> 0.9'
 end
 
 group :integration do
+  gem 'berkshelf', '~> 4.0'
   gem 'test-kitchen', '~> 1.4'
   gem 'kitchen-vagrant'
-  gem 'concurrent-ruby', '~> 0.9'
 end
 
 group :tools do
   gem 'pry', '~> 0.10'
   gem 'license_finder'
+  gem 'github_changelog_generator', '~> 1'
 end

data/Rakefile

@@ -1,6 +1,8 @@
 #!/usr/bin/env rake
 # encoding: utf-8
 
+require 'bundler'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rubocop/rake_task'
 
@@ -36,4 +38,110 @@ namespace :test do
     path = File.join(File.dirname(__FILE__), 'test', 'integration')
     sh('sh', '-c', "cd #{path} && kitchen test -c #{concurrency}")
   end
+
+  # Target required:
+  #   rake "test:ssh[user@server]"
+  #   sh -c cd /home/foobarbam/src/gems/train/test/integration \
+  #     && target=user@server ruby -I ../../lib test_ssh.rb tests/*
+  #   ...
+  # Turn debug logging back on:
+  #   debug=1 rake "test:ssh[user@server]"
+  # Use a different ssh key:
+  #   key_files=/home/foobarbam/.ssh/id_rsa2 rake "test:ssh[user@server]"
+  # Run with a specific test:
+  #   test=path_block_device_test.rb rake "test:ssh[user@server]"
+  task :ssh, [:target] do |t, args|
+    path = File.join(File.dirname(__FILE__), 'test', 'integration')
+    key_files = ENV['key_files'] || File.join(ENV['HOME'], '.ssh', 'id_rsa')
+
+    sh_cmd    =  "cd #{path} && target=#{args[:target]} key_files=#{key_files}"
+
+    sh_cmd += " debug=#{ENV['debug']}" if ENV['debug']
+    sh_cmd += ' ruby -I ../../lib test_ssh.rb tests/'
+    sh_cmd += ENV['test'] || '*'
+
+    sh('sh', '-c', sh_cmd)
+  end
+end
+
+# Print the current version of this gem or update it.
+#
+# @param [Type] target the new version you want to set, or nil if you only want to show
+def train_version(target = nil)
+  path = 'lib/train/version.rb'
+  require_relative path.sub(/.rb$/, '')
+
+  nu_version = target.nil? ? '' : " -> #{target}"
+  puts "Train: #{Train::VERSION}#{nu_version}"
+
+  unless target.nil?
+    raw = File.read(path)
+    nu = raw.sub(/VERSION.*/, "VERSION = '#{target}'")
+    File.write(path, nu)
+    load(path)
+  end
+end
+
+# Automatically generate a changelog for this project. Only loaded if
+# the necessary gem is installed.
+begin
+  require 'github_changelog_generator/task'
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    require_relative 'lib/train/version'
+    config.future_release = Train::VERSION
+  end
+rescue LoadError
+end
+
+# Check if a command is available
+#
+# @param [Type] x the command you are interested in
+# @param [Type] msg the message to display if the command is missing
+def require_command(x, msg = nil)
+  return if system("command -v #{x} || exit 1")
+  msg ||= 'Please install it first!'
+  puts "\033[31;1mCan't find command #{x.inspect}. #{msg}\033[0m"
+  exit 1
+end
+
+# Check if a required environment variable has been set
+#
+# @param [String] x the variable you are interested in
+# @param [String] msg the message you want to display if the variable is missing
+def require_env(x, msg = nil)
+  exists = `env | grep "^#{x}="`
+  return unless exists.empty?
+  puts "\033[31;1mCan't find environment variable #{x.inspect}. #{msg}\033[0m"
+  exit 1
+end
+
+# Check the requirements for running an update of this repository.
+def check_update_requirements
+  require_command 'git'
+  require_command 'github_changelog_generator', "\n"\
+    "For more information on how to install it see:\n"\
+    "  https://github.com/skywinder/github-changelog-generator\n"
+  require_env 'CHANGELOG_GITHUB_TOKEN', "\n"\
+    "Please configure this token to make sure you can run all commands\n"\
+    "against GitHub.\n\n"\
+    "See github_changelog_generator homepage for more information:\n"\
+    "  https://github.com/skywinder/github-changelog-generator\n"
+end
+
+# Show the current version of this gem.
+desc 'Show the version of this gem'
+task :version do
+  train_version
+end
+
+# Update the version of this gem and create an updated
+# changelog. It covers everything short of actually releasing
+# the gem.
+desc 'Bump the version of this gem'
+task :bump_version, [:version] do |_, args|
+  v = args[:version] || ENV['to']
+  fail "You must specify a target version!  rake bump_version to=1.2.3" if v.empty?
+  check_update_requirements
+  train_version(v)
+  Rake::Task['changelog'].invoke
 end

data/lib/train/extras.rb

@@ -6,6 +6,7 @@ module Train::Extras
   autoload :CommandWrapper, 'train/extras/command_wrapper'
   autoload :FileCommon,     'train/extras/file_common'
   autoload :LinuxFile,      'train/extras/linux_file'
+  autoload :AixFile,        'train/extras/aix_file'
   autoload :WindowsFile,    'train/extras/windows_file'
   autoload :OSCommon,       'train/extras/os_common'
   autoload :Stat,           'train/extras/stat'

data/lib/train/extras/aix_file.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require 'shellwords'
+require 'train/extras/stat'
+
+module Train::Extras
+  class AixFile < LinuxFile
+    def initialize(backend, path)
+      super(backend, path)
+    end
+
+    def content
+      return @content if defined?(@content)
+      @content = case
+                 when !exist?, directory?
+                   nil
+                 when size.nil?, size == 0
+                   ''
+                 else
+                   @backend.run_command("cat #{@spath}").stdout || ''
+                 end
+    end
+
+    def link_path
+      return nil unless symlink?
+      @link_path ||= (
+        @backend.run_command("perl -e 'print readlink shift' #{@spath}").stdout.chomp
+      )
+    end
+
+    def mounted
+      @mounted ||= (
+        @backend.run_command("lsfs -c #{@spath}")
+      )
+    end
+  end
+end

data/lib/train/extras/command_wrapper.rb

@@ -90,16 +90,44 @@ module Train::Extras
     end
   end
 
+  # this is required if you run locally on windows,
+  # winrm connections provide a PowerShell shell automatically
+  # TODO: only activate in local mode
+  class PowerShellCommand < CommandWrapperBase
+    Train::Options.attach(self)
+
+    def initialize(backend, options)
+      @backend = backend
+      validate_options(options)
+
+      @prefix = 'powershell '
+    end
+
+    def run(command)
+      @prefix + command
+    end
+
+    def to_s
+      'PowerShell CommandWrapper'
+    end
+  end
+
   class CommandWrapper
     include_options LinuxCommand
 
     def self.load(transport, options)
-      return nil unless LinuxCommand.active?(options)
-      return nil unless transport.os.unix?
-      res = LinuxCommand.new(transport, options)
-      msg = res.verify
-      fail Train::UserError, "Sudo failed: #{msg}" unless msg.nil?
-      res
+      if transport.os.unix?
+        return nil unless LinuxCommand.active?(options)
+        res = LinuxCommand.new(transport, options)
+        msg = res.verify
+        fail Train::UserError, "Sudo failed: #{msg}" unless msg.nil?
+        res
+      # only use powershell command for local transport. winrm transport
+      # uses powershell as default
+      elsif transport.os.windows? && transport.class == Train::Transports::Local::Connection
+        PowerShellCommand.new(transport, options)
+      end
+      nil
     end
   end
 end

data/lib/train/extras/file_common.rb

@@ -102,6 +102,10 @@ module Train::Extras
       t & o
     end
 
+    def mounted?
+      !mounted.nil? && !mounted.stdout.nil? && !mounted.stdout.empty?
+    end
+
     # helper methods provided to any implementing class
 
     private

data/lib/train/extras/linux_file.rb

@@ -43,10 +43,9 @@ module Train::Extras
       )
     end
 
-    def mounted?
+    def mounted
       @mounted ||= (
-        !@backend.run_command("mount | grep -- ' on #{@spath}'")
-                 .stdout.empty?
+        @backend.run_command("mount | grep -- ' on #{@spath}'")
       )
     end
 

data/lib/train/extras/os_common.rb

@@ -36,7 +36,7 @@ module Train::Extras
 
     OS = {
       'redhat' => %w{
-        redhat oracle centos fedora amazon scientific xenserver
+        redhat oracle centos fedora amazon scientific xenserver wrlinux
       },
       'debian' => %w{
         debian ubuntu linuxmint raspbian
@@ -53,6 +53,9 @@ module Train::Extras
       'windows' => %w{
         windows
       },
+      'aix' => %w{
+        aix
+      },
     }
 
     OS['linux'] = %w{linux alpine arch coreos exherbo gentoo slackware} +

data/lib/train/extras/os_detect_linux.rb

@@ -11,7 +11,7 @@
 require 'train/extras/linux_lsb'
 
 module Train::Extras
-  module DetectLinux
+  module DetectLinux # rubocop:disable Metrics/ModuleLength
     include Train::Extras::LinuxLSB
 
     def detect_linux_via_config # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
@@ -21,7 +21,7 @@ module Train::Extras
       elsif !(raw = get_config('/etc/enterprise-release')).nil?
         @platform[:family] = 'oracle'
         @platform[:release] = redhatish_version(raw)
-      elsif !(_raw = get_config('/etc/debian_version')).nil?
+      elsif !(raw = get_config('/etc/debian_version')).nil?
         case lsb[:id]
         when /ubuntu/i
           @platform[:family] = 'ubuntu'
@@ -30,11 +30,8 @@ module Train::Extras
           @platform[:family] = 'linuxmint'
           @platform[:release] = lsb[:release]
         else
-          @platform[:family] = 'debian'
-          @platform[:family] = 'raspbian' if unix_file?('/usr/bin/raspi-config')
-          unless (rel = get_config('/etc/debian_version')).nil?
-            @platform[:release] = rel.chomp
-          end
+          @platform[:family] = unix_file?('/usr/bin/raspi-config') ? 'raspbian' : 'debian'
+          @platform[:release] = raw.chomp
         end
       elsif !(raw = get_config('/etc/parallels-release')).nil?
         @platform[:family] = redhatish_platform(raw)
@@ -82,12 +79,14 @@ module Train::Extras
         @platform[:family] = 'coreos'
         meta = lsb_config(raw)
         @platform[:release] = meta[:release]
-      else
-        # in all other cases we didn't detect it
-        return false
+      elsif !(os_info = fetch_os_release).nil?
+        if os_info['ID_LIKE'].match('wrlinux')
+          @platform[:family]  = 'wrlinux'
+          @platform[:release] = os_info['VERSION']
+        end
       end
-      # when we get here the detection returned a result
-      true
+
+      !@platform[:family].nil? && !@platform[:release].nil?
     end
 
     def uname_s
@@ -122,5 +121,28 @@ module Train::Extras
       # in all other cases we failed the detection
       @platform[:family] = 'unknown'
     end
+
+    def fetch_os_release
+      data = get_config('/etc/os-release')
+      return if data.nil?
+
+      os_info = parse_os_release_info(data)
+      cisco_info_file = os_info['CISCO_RELEASE_INFO']
+      if cisco_info_file
+        os_info.merge!(parse_os_release_info(get_config(cisco_info_file)))
+      end
+
+      os_info
+    end
+
+    def parse_os_release_info(raw)
+      return {} if raw.nil?
+
+      raw.lines.each_with_object({}) do |line, memo|
+        line.strip!
+        key, value = line.split('=', 2)
+        memo[key] = value.gsub(/\A"|"\Z/, '') unless value.empty?
+      end
+    end
   end
 end

data/lib/train/extras/os_detect_windows.rb

@@ -9,6 +9,7 @@
 #
 
 require 'json'
+require 'winrm'
 
 module Train::Extras
   module DetectWindows
@@ -57,7 +58,16 @@ module Train::Extras
             '-Name OS -Value (Get-WmiObject -Class Win32_OperatingSystem) '\
             '-PassThru | Add-Member -MemberType NoteProperty -Name OSVersion '\
             '-Value ([Environment]::OSVersion) -PassThru | ConvertTo-Json'
+
+      # wrap the script to ensure we always run it via powershell
+      # especially in local mode, we cannot be sure that we get a Powershell
+      # we may just get a `cmd`. os detection and powershell command wrapper is
+      # not available when this code is executed
+      script = WinRM::PowershellScript.new(cmd)
+      cmd = "powershell -encodedCommand #{script.encoded}"
+
       res = @backend.run_command(cmd)
+
       # TODO: error as this shouldnt be happening at this point
       return false if res.exit_status != 0 or res.stdout.empty?
 
@@ -67,6 +77,7 @@ module Train::Extras
 
       @platform[:family] = 'windows'
       @platform[:release] = WINDOWS_VERSIONS[version]
+
       true
     end
   end

data/lib/train/extras/stat.rb

@@ -20,6 +20,7 @@ module Train::Extras
     end
 
     def self.stat(shell_escaped_path, backend)
+      return aix_stat(shell_escaped_path, backend) if backend.os.aix?
       return bsd_stat(shell_escaped_path, backend) if backend.os.bsd?
       return linux_stat(shell_escaped_path, backend) if backend.os.unix?
       # all other cases we don't handle
@@ -88,5 +89,33 @@ module Train::Extras
         selinux_label: fields[8],
       }
     end
+
+    def self.aix_stat(shell_escaped_path, backend)
+      # Perl here b/c it is default on AIX
+      stat_cmd = <<-EOP
+      perl -e '
+      @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])
+      ' #{shell_escaped_path}
+      EOP
+
+      res = backend.run_command(stat_cmd)
+      return {} if res.exit_status != 0
+
+      fields = res.stdout.split("\n")
+      tmask  = fields[0].to_i(8)
+
+      {
+        type:  find_type(tmask),
+        mode:  tmask & 00777,
+        owner: fields[1],
+        group: fields[2],
+        mtime: fields[3].to_i,
+        size:  fields[4].to_i,
+        selinux_label: nil,
+      }
+    end
   end
 end

data/lib/train/extras/windows_file.rb

@@ -26,7 +26,9 @@ module Train::Extras
     end
 
     def exist?
-      nil
+      return @exist if defined?(@exist)
+      @exist = @backend.run_command(
+        "(Test-Path -Path \"#{@spath}\").ToString()").stdout.chomp == 'True'
     end
 
     def link_target
@@ -37,7 +39,7 @@ module Train::Extras
       nil
     end
 
-    def mounted?
+    def mounted
       nil
     end
 

data/lib/train/transports/mock.rb

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

data/lib/train/transports/ssh_connection.rb

@@ -58,7 +58,13 @@ class Train::Transports::SSH
     end
 
     def file(path)
-      @files[path] ||= LinuxFile.new(self, path)
+      @files[path] ||= \
+        case os[:family]
+        when 'aix'
+          AixFile.new(self, path)
+        else
+          LinuxFile.new(self, path)
+        end
     end
 
     # (see Base::Connection#run_command)

data/lib/train/version.rb

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

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

@@ -9,38 +9,7 @@
 # Finally (for now), it actually executes the all tests with
 # the local execution backend
 
-gid = 'root'
-gid = 'wheel' if node['platform_family'] == 'freebsd'
-
-file '/tmp/file' do
-  mode '0765'
-  owner 'root'
-  group gid
-  content 'hello world'
-end
-
-directory '/tmp/folder' do
-  mode '0567'
-  owner 'root'
-  group gid
-end
-
-link '/tmp/symlink'do
-  to '/tmp/file'
-  owner 'root'
-  group gid
-  mode '0777'
-end
-
-execute 'create pipe/fifo' do
-  command 'mkfifo /tmp/pipe'
-  not_if 'test -e /tmp/pipe'
-end
-
-execute 'create block_device' do
-  command "mknod /tmp/block_device b 7 7 && chmod 0666 /tmp/block_device && chown root:#{gid} /tmp/block_device"
-  not_if 'test -e /tmp/block_device'
-end
+include_recipe('test::prep_files')
 
 # prepare ssh for backend
 execute 'create ssh key' do
@@ -78,7 +47,7 @@ end
 
 # execute tests
 execute 'bundle install' do
-  command '/opt/chef/embedded/bin/bundle install'
+  command '/opt/chef/embedded/bin/bundle install --without integration tools'
   cwd '/tmp/kitchen/data'
 end
 

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

@@ -0,0 +1,40 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+#
+# Helper recipe to create create a few files in the operating
+# systems, which the runner will test against.
+
+gid = 'root'
+gid = 'wheel' if node['platform_family'] == 'freebsd'
+gid = 'system' if node['platform_family'] == 'aix'
+
+file '/tmp/file' do
+  mode '0765'
+  owner 'root'
+  group gid
+  content 'hello world'
+end
+
+directory '/tmp/folder' do
+  mode '0567'
+  owner 'root'
+  group gid
+end
+
+link '/tmp/symlink'do
+  to '/tmp/file'
+  owner 'root'
+  group gid
+  mode '0777'
+end
+
+execute 'create pipe/fifo' do
+  command 'mkfifo /tmp/pipe'
+  not_if 'test -e /tmp/pipe'
+end
+
+execute 'create block_device' do
+  command "mknod /tmp/block_device b 7 7 && chmod 0666 /tmp/block_device && chown root:#{gid} /tmp/block_device"
+  not_if 'test -e /tmp/block_device'
+end

data/test/integration/helper.rb

@@ -20,8 +20,11 @@ module Test
     end
 
     def root_group(os)
-      if os[:family] == 'freebsd'
+      case os[:family]
+      when 'freebsd'
         'wheel'
+      when 'aix'
+        'system'
       else
         'root'
       end

data/test/integration/sudo/passwd.rb

@@ -10,8 +10,8 @@ describe 'run_command' do
   end
 
   it 'is not running sudo without password' do
-    run_as('whoami', { sudo: true })
-      .exit_status.wont_equal 0
+    err = ->{Train.create('local', { sudo: true }).connection}.must_raise Train::UserError
+    err.message.must_match /Sudo requires a password/
   end
 
   it 'is running passwd sudo' do

data/test/integration/test_ssh.rb

@@ -3,13 +3,28 @@
 
 require_relative 'helper'
 require 'train'
+require 'logger'
 
 backends = {}
 backend_conf = {
-  'target' => 'ssh://vagrant@localhost',
-  'key_files' => '/root/.ssh/id_rsa',
+  'target'    => ENV['target']    || 'vagrant@localhost',
+  'key_files' => ENV['key_files'] || '/root/.ssh/id_rsa',
+  'logger'    => Logger.new(STDOUT),
 }
 
+backend_conf['target'] = 'ssh://' + backend_conf['target']
+backend_conf['logger'].level = \
+  if ENV.key?('debug')
+    case ENV['debug'].to_s
+    when /^false$/i, /^0$/i
+      Logger::INFO
+    else
+      Logger::DEBUG
+    end
+  else
+    Logger::INFO
+  end
+
 backends[:ssh] = proc { |*args|
   conf = Train.target_config(backend_conf)
   Train.create('ssh', conf).connection(args[0])

data/test/integration/tests/path_folder_test.rb

@@ -18,7 +18,8 @@ describe 'file interface' do
       file.type.must_equal(:directory)
     end
 
-    if get_backend.call.os[:family] == 'freebsd'
+    case get_backend.call.os[:family]
+    when 'freebsd'
       it 'has freebsd folder content behavior' do
         file.content.must_equal("\u0003\u0000")
       end
@@ -30,6 +31,7 @@ describe 'file interface' do
       it 'has an sha256sum' do
         file.sha256sum.must_equal('9b4fb24edd6d1d8830e272398263cdbf026b97392cc35387b991dc0248a628f9')
       end
+
     else
       it 'has no content' do
         file.content.must_equal(nil)

data/test/unit/extras/command_wrapper_test.rb

@@ -39,3 +39,18 @@ describe 'linux command' do
     lc.run(cmd).must_equal "echo #{bpw} | base64 -d | sudo -S #{cmd}"
   end
 end
+
+describe 'powershell command' do
+  let(:cls) { Train::Extras::PowerShellCommand }
+  let(:cmd) { rand.to_s }
+  let(:backend) {
+    backend = Train::Transports::Mock.new.connection
+    backend.mock_os({ family: 'windows' })
+    backend
+  }
+
+  it 'wraps commands in powershell' do
+    lc = cls.new(backend, {})
+    lc.run(cmd).must_equal "powershell #{cmd}"
+  end
+end

data/test/unit/extras/os_common_test.rb

@@ -172,6 +172,15 @@ describe 'os common plugin' do
     it { os.unix?.must_equal(true) }
   end
 
+  describe 'with platform set to wrlinux' do
+    let(:os) { mock_platform('wrlinux') }
+    it { os.redhat?.must_equal(true) }
+    it { os.debian?.must_equal(false) }
+    it { os.suse?.must_equal(false) }
+    it { os.linux?.must_equal(true) }
+    it { os.unix?.must_equal(true) }
+  end
+
   describe 'with platform set to linux' do
     let(:os) { mock_platform('linux') }
     it { os.linux?.must_equal(true) }

data/test/unit/extras/os_detect_linux_test.rb

@@ -0,0 +1,188 @@
+require 'helper'
+require 'train/extras'
+
+class OsDetectLinuxTester
+  attr_reader :platform
+  include Train::Extras::DetectLinux
+
+  def initialize
+    @platform = {}
+  end
+end
+
+describe 'os_detect_linux' do
+  let(:detector) { OsDetectLinuxTester.new }
+
+  describe '#detect_linux_via_config' do
+
+    before do
+      detector.stubs(:get_config)
+      detector.stubs(:fetch_os_release)
+      detector.stubs(:redhatish_version).returns('redhat-version')
+    end
+
+    describe '/etc/enterprise-release' do
+      it 'sets the correct family/release for oracle' do
+        detector.stubs(:get_config).with('/etc/enterprise-release').returns('data')
+
+        detector.detect_linux_via_config.must_equal(true)
+        detector.platform[:family].must_equal('oracle')
+        detector.platform[:release].must_equal('redhat-version')
+      end
+    end
+
+    describe '/etc/debian_version' do
+
+      before { detector.stubs(:get_config).with('/etc/debian_version').returns('deb-version') }
+
+      describe 'ubuntu' do
+        it 'sets the correct family/release for ubuntu' do
+          detector.stubs(:lsb).returns({ id: 'ubuntu', release: 'ubuntu-release' })
+
+          detector.detect_linux_via_config.must_equal(true)
+          detector.platform[:family].must_equal('ubuntu')
+          detector.platform[:release].must_equal('ubuntu-release')
+        end
+      end
+
+      describe 'linuxmint' do
+        it 'sets the correct family/release for ubuntu' do
+          detector.stubs(:lsb).returns({ id: 'linuxmint', release: 'mint-release' })
+
+          detector.detect_linux_via_config.must_equal(true)
+          detector.platform[:family].must_equal('linuxmint')
+          detector.platform[:release].must_equal('mint-release')
+        end
+      end
+
+      describe 'raspbian' do
+        it 'sets the correct family/release for raspbian ' do
+          detector.stubs(:lsb).returns({ id: 'something_else', release: 'some_release' })
+          detector.expects(:unix_file?).with('/usr/bin/raspi-config').returns(true)
+
+          detector.detect_linux_via_config.must_equal(true)
+          detector.platform[:family].must_equal('raspbian')
+          detector.platform[:release].must_equal('deb-version')
+        end
+      end
+
+      describe 'everything else' do
+        it 'sets the correct family/release for debian ' do
+          detector.stubs(:lsb).returns({ id: 'something_else', release: 'some_release' })
+          detector.expects(:unix_file?).with('/usr/bin/raspi-config').returns(false)
+
+          detector.detect_linux_via_config.must_equal(true)
+          detector.platform[:family].must_equal('debian')
+          detector.platform[:release].must_equal('deb-version')
+        end
+      end
+    end
+
+    describe '/etc/os-release' do
+      describe 'when not on a wrlinux build' do
+        it 'does not set a platform family/release' do
+          detector.stubs(:fetch_os_release).returns({ 'ID_LIKE' => 'something_else' })
+
+          detector.detect_linux_via_config.must_equal(false)
+          detector.platform[:family].must_equal(nil)
+          detector.platform[:release].must_equal(nil)
+        end
+      end
+
+      describe 'when on a wrlinux build' do
+        let(:data) do
+          {
+            'ID_LIKE' => 'cisco-wrlinux',
+            'VERSION' => 'cisco123'
+          }
+        end
+
+        it 'sets the correct family/release for wrlinux' do
+          detector.stubs(:fetch_os_release).returns(data)
+
+          detector.detect_linux_via_config.must_equal(true)
+          detector.platform[:family].must_equal('wrlinux')
+          detector.platform[:release].must_equal('cisco123')
+        end
+      end
+    end
+  end
+
+  describe '#fetch_os_release' do
+    describe 'when no os-release data is available' do
+      it 'returns nil' do
+        detector.expects(:get_config).with('/etc/os-release').returns(nil)
+        detector.fetch_os_release.must_equal(nil)
+      end
+    end
+
+    describe 'when os-release data exists with no CISCO_RELEASE_INFO' do
+      let(:os_release) { { 'KEY1' => 'VALUE1' } }
+
+      it 'returns a correct hash' do
+        detector.expects(:get_config).with('/etc/os-release').returns('os-release data')
+        detector.expects(:parse_os_release_info).with('os-release data').returns(os_release)
+        detector.fetch_os_release['KEY1'].must_equal('VALUE1')
+      end
+    end
+
+    describe 'when os-release data exists with CISCO_RELEASE_INFO' do
+      let(:os_release)    { { 'KEY1' => 'VALUE1', 'CISCO_RELEASE_INFO' => 'cisco_file' } }
+      let(:cisco_release) { { 'KEY1' => 'NEWVALUE1', 'KEY2' => 'VALUE2' } }
+
+      it 'returns a correct hash' do
+        detector.expects(:get_config).with('/etc/os-release').returns('os-release data')
+        detector.expects(:get_config).with('cisco_file').returns('cisco data')
+        detector.expects(:parse_os_release_info).with('os-release data').returns(os_release)
+        detector.expects(:parse_os_release_info).with('cisco data').returns(cisco_release)
+
+        os_info = detector.fetch_os_release
+        os_info['KEY1'].must_equal('NEWVALUE1')
+        os_info['KEY2'].must_equal('VALUE2')
+      end
+    end
+  end
+
+  describe '#parse_os_release_info' do
+    describe 'when nil is supplied' do
+      it 'returns an empty hash' do
+        detector.parse_os_release_info(nil).must_equal({})
+      end
+    end
+
+    describe 'when unexpectedly-formatted data is supplied' do
+      let(:data) do
+        <<-EOL
+blah blah
+no good data here
+        EOL
+      end
+
+      it 'returns an empty hash' do
+        detector.parse_os_release_info(nil).must_equal({})
+      end
+    end
+
+    describe 'when properly-formatted data is supplied' do
+      let(:data) do
+        <<-EOL
+KEY1=value1
+KEY2=
+KEY3=value3
+KEY4="value4 with spaces"
+KEY5="value5 with a = sign"
+        EOL
+      end
+
+      it 'parses the data correctly' do
+        parsed_data = detector.parse_os_release_info(data)
+
+        parsed_data['KEY1'].must_equal('value1')
+        parsed_data.key?('KEY2').must_equal(false)
+        parsed_data['KEY3'].must_equal('value3')
+        parsed_data['KEY4'].must_equal('value4 with spaces')
+        parsed_data['KEY5'].must_equal('value5 with a = sign')
+      end
+    end
+  end
+end

data/test/unit/helper.rb

@@ -2,5 +2,6 @@
 
 require 'minitest/autorun'
 require 'minitest/spec'
+require 'mocha/setup'
 
 require 'train'

data/test/unit/transports/local_test.rb

@@ -6,6 +6,20 @@
 require 'helper'
 require 'train/transports/local'
 
+# overwrite os detection to simplify mock tests, otherwise run_command tries to
+# determine the OS first and fails the tests
+class Train::Transports::Local::Connection
+  class OS < OSCommon
+    def initialize(backend)
+      super(backend, { family: 'train_mock_os' })
+    end
+
+    def detect_family
+      # no op, we do not need to detect the os
+    end
+  end
+end
+
 describe 'local transport' do
   let(:transport) { Train::Transports::Local.new }
   let(:connection) { transport.connection }
@@ -31,11 +45,11 @@ describe 'local transport' do
   end
 
   describe 'when running a local command' do
-    let(:mock) { Minitest::Mock.new }
+    let(:cmd_runner) { Minitest::Mock.new }
 
     def mock_run_cmd(cmd, &block)
-      mock.expect :run_command, nil
-      Mixlib::ShellOut.stub :new, mock do |*args|
+      cmd_runner.expect :run_command, nil
+      Mixlib::ShellOut.stub :new, cmd_runner do |*args|
         block.call()
       end
     end
@@ -43,9 +57,9 @@ describe 'local transport' do
     it 'gets stdout' do
       mock_run_cmd(rand) do
         x = rand
-        mock.expect :stdout, x
-        mock.expect :stderr, nil
-        mock.expect :exitstatus, nil
+        cmd_runner.expect :stdout, x
+        cmd_runner.expect :stderr, nil
+        cmd_runner.expect :exitstatus, nil
         connection.run_command(rand).stdout.must_equal x
       end
     end
@@ -53,9 +67,9 @@ describe 'local transport' do
     it 'gets stderr' do
       mock_run_cmd(rand) do
         x = rand
-        mock.expect :stdout, nil
-        mock.expect :stderr, x
-        mock.expect :exitstatus, nil
+        cmd_runner.expect :stdout, nil
+        cmd_runner.expect :stderr, x
+        cmd_runner.expect :exitstatus, nil
         connection.run_command(rand).stderr.must_equal x
       end
     end
@@ -63,9 +77,9 @@ describe 'local transport' do
     it 'gets exit_status' do
       mock_run_cmd(rand) do
         x = rand
-        mock.expect :stdout, nil
-        mock.expect :stderr, nil
-        mock.expect :exitstatus, x
+        cmd_runner.expect :stdout, nil
+        cmd_runner.expect :stderr, nil
+        cmd_runner.expect :exitstatus, x
         connection.run_command(rand).exit_status.must_equal x
       end
     end

data/test/unit/transports/ssh_test.rb

@@ -2,6 +2,20 @@
 require 'helper'
 require 'train/transports/ssh'
 
+# overwrite os detection to simplify mock tests, otherwise run_command tries to
+# determine the OS first and fails the tests
+class Train::Transports::SSH::Connection
+  class OS < OSCommon
+    def initialize(backend)
+      super(backend, { family: 'train_mock_os' })
+    end
+
+    def detect_family
+      # no op, we do not need to detect the os
+    end
+  end
+end
+
 describe 'ssh transport' do
   let(:cls) { Train::Transports::SSH }
   let(:conf) {{

data/train.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'winrm-transport', '~> 1.0'
   spec.add_dependency 'docker-api', '~> 1.22'
 
-  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'rake',     '~> 10.4'
   spec.add_development_dependency 'minitest', '~> 5.8'
-  spec.add_development_dependency 'rubocop', '~> 0.34'
+  spec.add_development_dependency 'mocha',    '~> 1.1'
+  spec.add_development_dependency 'rubocop',  '~> 0.34'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-train
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +174,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -167,6 +182,7 @@ files:
 - lib/train.rb
 - lib/train/errors.rb
 - lib/train/extras.rb
+- lib/train/extras/aix_file.rb
 - lib/train/extras/command_wrapper.rb
 - lib/train/extras/file_common.rb
 - lib/train/extras/linux_file.rb
@@ -198,6 +214,7 @@ files:
 - test/integration/chefignore
 - test/integration/cookbooks/test/metadata.rb
 - test/integration/cookbooks/test/recipes/default.rb
+- test/integration/cookbooks/test/recipes/prep_files.rb
 - test/integration/docker_run.rb
 - test/integration/docker_test.rb
 - test/integration/docker_test_container.rb
@@ -220,6 +237,7 @@ files:
 - test/unit/extras/file_common_test.rb
 - test/unit/extras/linux_file_test.rb
 - test/unit/extras/os_common_test.rb
+- test/unit/extras/os_detect_linux_test.rb
 - test/unit/extras/stat_test.rb
 - test/unit/helper.rb
 - test/unit/plugins/connection_test.rb
@@ -263,6 +281,7 @@ test_files:
 - test/integration/chefignore
 - test/integration/cookbooks/test/metadata.rb
 - test/integration/cookbooks/test/recipes/default.rb
+- test/integration/cookbooks/test/recipes/prep_files.rb
 - test/integration/docker_run.rb
 - test/integration/docker_test.rb
 - test/integration/docker_test_container.rb
@@ -285,6 +304,7 @@ test_files:
 - test/unit/extras/file_common_test.rb
 - test/unit/extras/linux_file_test.rb
 - test/unit/extras/os_common_test.rb
+- test/unit/extras/os_detect_linux_test.rb
 - test/unit/extras/stat_test.rb
 - test/unit/helper.rb
 - test/unit/plugins/connection_test.rb
@@ -296,4 +316,3 @@ test_files:
 - test/unit/transports/mock_test.rb
 - test/unit/transports/ssh_test.rb
 - test/unit/version_test.rb
-has_rdoc: