r-train 0.9.7 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ecdabc0165badec2fd8ff58e1fa04bb12dcd0ca
-  data.tar.gz: 7d3100e5f0f9ad7c35087010f34e7027c5d6ced2
+  metadata.gz: 0fd25048f1db2b7fe16bbdfc8cbbf0bc37378a07
+  data.tar.gz: 1aa813741c5d080c00e74790af38d1fee7b23a9a
 SHA512:
-  metadata.gz: 9d5ca60694e074a0e75358b37f13481a9e1c548d097270e1457f92f14e32bae154360fffb08828527d15d4153c3ba21f9da91668de139962eb2e597cc8f5a91a
-  data.tar.gz: d5690275ba08a1a50bfa1348746f92eb2d8d06e27b8e97569dc31479fd01dce3c06f2118a659358a4aff15a24ebf879318ba5393745a13f24864ba27019cfb0d
+  metadata.gz: 109add699ff0d357e8d930d792434f0787778d5447b34771a879e389e7ff42930251fa29fa0d54a0c04551226992e08a210b41a6d21266bd4b199cc5aaa13ec8
+  data.tar.gz: 4b564895054b589201d8021ca735c21174350516a97a1c799332ca7b0ee9038b84b7100dd2f2b5545be99331f0282ba57e0eaf46be8c9cf66e8d488f5bc84b3f

data/.rubocop.yml

@@ -16,14 +16,18 @@ HashSyntax:
   Enabled: true
 LineLength:
   Enabled: false
+EmptyLinesAroundBlockBody:
+  Enabled: false
 MethodLength:
   Max: 40
+NumericLiterals:
+  MinDigits: 10
 Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/PerceivedComplexity:
   Max: 10
 Metrics/AbcSize:
-  Max: 29
+  Max: 33
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%':  '{}'
@@ -35,11 +39,33 @@ Style/PercentLiteralDelimiters:
     '%w': '{}'
     '%W': ()
     '%x': ()
+Style/AlignHash:
+  Enabled: false
+Style/PredicateName:
+  Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/ConditionalAssignment:
+  Enabled: false
+Style/BracesAroundHashParameters:
+  Enabled: false
 Style/AndOr:
   Enabled: false
-Style/TrailingComma:
+Style/Not:
+  Enabled: false
+Style/FileName:
+  Enabled: false
+Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+Style/NegatedIf:
+  Enabled: false
+Style/UnlessElse:
+  Enabled: false
+BlockDelimiters:
+  Enabled: false
 Style/SpaceAroundOperators:
-  MultiSpaceAllowedForOperators: [ "=", "=>", "||=" ]
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: false

data/CHANGELOG.md

@@ -1,24 +1,43 @@
 # Change Log
 
-## [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)
+## [0.10.0](https://github.com/chef/train/tree/0.10.0) (2016-02-19)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.7...0.10.0)
 
 **Implemented enhancements:**
 
+- show mock failures for commands [\#69](https://github.com/chef/train/pull/69) ([arlimus](https://github.com/arlimus))
+- update gems and rubocop [\#68](https://github.com/chef/train/pull/68) ([arlimus](https://github.com/arlimus))
+
+**Fixed bugs:**
+
+- complete rewrite of windows version detection [\#70](https://github.com/chef/train/pull/70) ([chris-rock](https://github.com/chris-rock))
+
+## [v0.9.7](https://github.com/chef/train/tree/v0.9.7) (2016-02-05)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.6...v0.9.7)
+
+**Implemented enhancements:**
+
+- feature: add file.basename [\#64](https://github.com/chef/train/pull/64) ([arlimus](https://github.com/arlimus))
 - add `requiretty` workaround measures [\#63](https://github.com/chef/train/pull/63) ([srenatus](https://github.com/srenatus))
 
-**Merged pull requests:**
+**Fixed bugs:**
 
 - 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))
+
+**Merged pull requests:**
+
+- 0.9.7 [\#67](https://github.com/chef/train/pull/67) ([chris-rock](https://github.com/chris-rock))
 
 ## [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)
 
+**Implemented enhancements:**
+
+- add solaris support [\#61](https://github.com/chef/train/pull/61) ([chris-rock](https://github.com/chris-rock))
+
 **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)
 [Full Changelog](https://github.com/chef/train/compare/v0.9.4...v0.9.5)

data/Gemfile

@@ -4,9 +4,9 @@ gemspec
 
 group :test do
   gem 'bundler', '~> 1.5'
-  gem 'minitest', '~> 5.5'
+  gem 'minitest', '~> 5.8'
   gem 'rake', '~> 10'
-  gem 'rubocop', '~> 0.33.0'
+  gem 'rubocop', '~> 0.36.0'
   gem 'simplecov', '~> 0.10'
   gem 'concurrent-ruby', '~> 0.9'
 end

data/Rakefile

@@ -82,7 +82,7 @@ def train_version(target = nil)
 
   unless target.nil?
     raw = File.read(path)
-    nu = raw.sub(/VERSION.*/, "VERSION = '#{target}'")
+    nu = raw.sub(/VERSION.*/, "VERSION = '#{target}'.freeze")
     File.write(path, nu)
     load(path)
   end

data/lib/train.rb

@@ -79,8 +79,6 @@ module Train
     conf
   end
 
-  private
-
   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/command_wrapper.rb

@@ -3,6 +3,7 @@
 # author: Christoph Hartmann
 
 require 'base64'
+require 'winrm'
 require 'train/errors'
 
 module Train::Extras

data/lib/train/extras/file_aix.rb

@@ -7,15 +7,14 @@ module Train::Extras
   class AixFile < UnixFile
     def link_path
       return nil unless symlink?
-      @link_path ||= (
-        @backend.run_command("perl -e 'print readlink shift' #{@spath}").stdout.chomp
-      )
+      @link_path ||=
+        @backend.run_command("perl -e 'print readlink shift' #{@spath}")
+                .stdout.chomp
     end
 
     def mounted
-      @mounted ||= (
+      @mounted ||=
         @backend.run_command("lsfs -c #{@spath}")
-      )
     end
   end
 end

data/lib/train/extras/file_common.rb

@@ -137,12 +137,12 @@ module Train::Extras
       owner: 00700,
       group: 00070,
       other: 00007,
-    }
+    }.freeze
 
     UNIX_MODE_TYPES = {
       r: 00444,
       w: 00222,
       x: 00111,
-    }
+    }.freeze
   end
 end

data/lib/train/extras/file_unix.rb

@@ -40,15 +40,13 @@ module Train::Extras
 
     def link_path
       return nil unless symlink?
-      @link_path ||= (
+      @link_path ||=
         @backend.run_command("readlink #{@spath}").stdout.chomp
-      )
     end
 
     def mounted
-      @mounted ||= (
+      @mounted ||=
         @backend.run_command("mount | grep -- ' on #{@spath}'")
-      )
     end
 
     %w{

data/lib/train/extras/os_common.rb

@@ -34,7 +34,7 @@ module Train::Extras
       @platform
     end
 
-    OS = {
+    OS = { # rubocop:disable Style/MutableConstant
       'redhat' => %w{
         redhat oracle centos fedora amazon scientific xenserver wrlinux
       },
@@ -58,8 +58,7 @@ module Train::Extras
       },
     }
 
-    OS['linux'] = %w{linux alpine arch coreos exherbo gentoo slackware} +
-                  OS['redhat'] + OS['debian'] + OS['suse']
+    OS['linux'] = %w{linux alpine arch coreos exherbo gentoo slackware} + OS['redhat'] + OS['debian'] + OS['suse']
 
     OS['unix'] = %w{unix aix} + OS['linux'] + OS['solaris'] + OS['bsd']
 

data/lib/train/extras/os_detect_linux.rb

@@ -80,7 +80,7 @@ module Train::Extras
         meta = lsb_config(raw)
         @platform[:release] = meta[:release]
       elsif !(os_info = fetch_os_release).nil?
-        if os_info['ID_LIKE'].match('wrlinux')
+        if os_info['ID_LIKE'] =~ /wrlinux/
           @platform[:family]  = 'wrlinux'
           @platform[:release] = os_info['VERSION']
         end

data/lib/train/extras/os_detect_unix.rb

@@ -50,7 +50,7 @@ module Train::Extras
       # read specific os name
       # DEPRECATED: os[:family] is going to be deprecated, use os.solaris?
       rel = get_config('/etc/release')
-      if /^.*(SmartOS).*$/.match(rel)
+      if /^.*(SmartOS).*$/ =~ rel
         @platform[:name] = 'smartos'
         @platform[:family] = 'smartos'
       elsif !(m = /^\s*(OmniOS).*r(\d+).*$/.match(rel)).nil?
@@ -61,7 +61,7 @@ module Train::Extras
         @platform[:name] = 'openindiana'
         @platform[:family] = 'openindiana'
         @platform[:release] = m[2]
-      elsif /^\s*(OpenSolaris).*snv_(\d+).*$/.match(rel)
+      elsif /^\s*(OpenSolaris).*snv_(\d+).*$/ =~ rel
         @platform[:name] = 'opensolaris'
         @platform[:family] = 'opensolaris'
         @platform[:release] = m[2]
@@ -70,10 +70,10 @@ module Train::Extras
         @platform[:release] = m[1]
         @platform[:name] = 'solaris'
         @platform[:family] = 'solaris'
-      elsif /^\s*(Solaris)\s.*$/.match(rel)
+      elsif /^\s*(Solaris)\s.*$/ =~ rel
         @platform[:name] = 'solaris'
         @platform[:family] = 'solaris'
-      elsif /^\s*(NexentaCore)\s.*$/.match(rel)
+      elsif /^\s*(NexentaCore)\s.*$/ =~ rel
         @platform[:name] = 'nexentacore'
         @platform[:family] = 'nexentacore'
       else

data/lib/train/extras/os_detect_windows.rb

@@ -7,78 +7,51 @@
 #   OHAI https://github.com/chef/ohai
 #   by Adam Jacob, Chef Software Inc
 #
-
-require 'json'
-require 'winrm'
-
 module Train::Extras
   module DetectWindows
-    # See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832%28v=vs.85%29.aspx
-    # Product Type:
-    # Work Station (1)
-    # Domain Controller (2)
-    # Server (3)
-    WINDOWS_VERSIONS = {
-      '0' => '3.1',
-      '140' => '95',
-      '1410' => '98',
-      '1490' => 'ME',
-      '1351' => 'NT 3.51',
-      '3351' => 'NT 3.51 Server',
-      '1240' => 'NT 4.0',
-      '3240' => 'NT 4.0 Server',
-      '1250' => '2000',
-      '1251' => 'XP',
-      '3252' => 'Server 2003',
-      '1252' => 'Vista',
-      '3260' => 'Server 2008',
-      '1261' => '7',
-      '3261' => 'Server 2008 R2',
-      '1262' => '8',
-      '3262' => 'Server 2012',
-      '1263' => '8.1',
-      '3263' => 'Server 2012 R2',
-      '12100' => '10',
-      '32100' => 'Server 2016',
-    }
-
-    def windows_version(json)
-      producttype = json['OS']['ProductType'].to_s
-      # do not distigush between domain controller and server
-      producttype = '3' if producttype == '2'
-      platform = json['OSVersion']['Platform'].to_s
-      major = json['OSVersion']['Version']['Major'].to_s
-      minor = json['OSVersion']['Version']['Minor'].to_s
-      # construct it
-      producttype + platform + major + minor
-    end
-
     def detect_windows
-      cmd = 'New-Object -Type PSObject | Add-Member -MemberType NoteProperty '\
-            '-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
+      res = @backend.run_command('cmd /c ver')
       return false if res.exit_status != 0 or res.stdout.empty?
 
-      json = JSON.parse(res.stdout)
-      return false if json.nil? or json.empty?
-      version = windows_version(json)
-
+      # if the ver contains `Windows`, we know its a Windows system
+      version = res.stdout.strip
+      return false unless version.downcase =~ /windows/
       @platform[:family] = 'windows'
-      @platform[:release] = WINDOWS_VERSIONS[version]
+
+      # try to extract release from eg. `Microsoft Windows [Version 6.3.9600]`
+      release = /\[(?<name>.*)\]/.match(version)
+      unless release[:name].nil?
+        # release is 6.3.9600 now
+        @platform[:release] = release[:name].downcase.gsub('version', '').strip
+        # fallback, if we are not able to extract the name from wmic later
+        @platform[:name] = "Windows #{@platform[:release]}"
+      end
+
+      # try to use wmic, but lets keep it optional
+      read_wmic
 
       true
     end
+
+    # reads os name and version from wmic
+    # @see https://msdn.microsoft.com/en-us/library/bb742610.aspx#EEAA
+    # Thanks to Matt Wrock (https://github.com/mwrock) for this hint
+    def read_wmic
+      res = @backend.run_command('wmic os get * /format:list')
+      if res.exit_status == 0
+        sys_info = {}
+        res.stdout.lines.each { |line|
+          m = /^\s*([^=]*?)\s*=\s*(.*?)\s*$/.match(line)
+          sys_info[m[1].to_sym] = m[2] unless m.nil? || m[1].nil?
+        }
+
+        @platform[:release] = sys_info[:Version]
+        # additional info on windows
+        @platform[:build] = sys_info[:BuildNumber]
+        @platform[:name] = sys_info[:Caption]
+        @platform[:name] = @platform[:name].gsub('Microsoft', '').strip unless @platform[:name].empty?
+        @platform[:arch] = sys_info[:OSArchitecture]
+      end
+    end
   end
 end

data/lib/train/extras/stat.rb

@@ -12,7 +12,7 @@ module Train::Extras
       directory:        00040000,
       character_device: 00020000,
       pipe:             00010000,
-    }
+    }.freeze
 
     def self.find_type(mode)
       res = TYPES.find { |_, mask| mask & mode == mask }

data/lib/train/transports/docker.rb

@@ -80,9 +80,10 @@ class Train::Transports::Docker
 
     def run_command(cmd)
       cmd = @cmd_wrapper.run(cmd) unless @cmd_wrapper.nil?
-      stdout, stderr, exit_status = @container.exec([
-        '/bin/sh', '-c', cmd
-      ])
+      stdout, stderr, exit_status = @container.exec(
+        [
+          '/bin/sh', '-c', cmd
+        ])
       CommandResult.new(stdout.join, stderr.join, exit_status)
     rescue ::Docker::Error::DockerError => _
       raise

data/lib/train/transports/mock.rb

@@ -12,11 +12,11 @@ module Train::Transports
 
     def initialize(conf = nil)
       @conf = conf || {}
-      trace_calls if @conf[:verbose]
+      trace_calls if @conf[:trace]
     end
 
     def connection
-      @connection ||= Connection.new
+      @connection ||= Connection.new(@conf)
     end
 
     def to_s
@@ -27,9 +27,14 @@ module Train::Transports
 
     def trace_calls
       interface_methods = {
-        'Train::Transports::Mock' => Train::Transports::Mock.instance_methods(false),
-        'Train::Transports::Mock::File' => FileCommon.instance_methods(false),
-        'Train::Transports::Mock::OS' => OSCommon.instance_methods(false),
+        'Train::Transports::Mock' =>
+          Train::Transports::Mock.instance_methods(false),
+        'Train::Transports::Mock::Connection' =>
+          Connection.instance_methods(false),
+        'Train::Transports::Mock::Connection::File' =>
+          Connection::FileCommon.instance_methods(false),
+        'Train::Transports::Mock::Connection::OS' =>
+          Connection::OSCommon.instance_methods(false),
       }
 
       # rubocop:disable Metrics/ParameterLists
@@ -63,7 +68,6 @@ class Train::Transports::Mock
       @files = {}
       @os = OS.new(self, family: 'unknown')
       @commands = {}
-      trace_calls if @conf[:verbose]
     end
 
     def mock_os(value)
@@ -74,14 +78,28 @@ class Train::Transports::Mock
       @commands[cmd] = Command.new(stdout || '', stderr || '', exit_status)
     end
 
+    def command_not_found(cmd)
+      if @conf[:verbose]
+        STDERR.puts('Command not mocked:')
+        STDERR.puts('    '+cmd.split("\n").join("\n    "))
+        STDERR.puts('    SHA: ' + Digest::SHA256.hexdigest(cmd))
+      end
+      mock_command(cmd)
+    end
+
     def run_command(cmd)
       @commands[cmd] ||
         @commands[Digest::SHA256.hexdigest cmd] ||
-        mock_command(cmd)
+        command_not_found(cmd)
+    end
+
+    def file_not_found(path)
+      STDERR.puts('File not mocked: '+path.to_s) if @conf[:verbose]
+      File.new(self, path)
     end
 
     def file(path)
-      @files[path] ||= File.new(self, path)
+      @files[path] ||= file_not_found(path)
     end
 
     def to_s
@@ -123,9 +141,8 @@ class Train::Transports::Mock::Connection
     end
 
     def mounted
-      @mounted ||= (
+      @mounted ||=
         @runtime.run_command("mount | grep -- ' on #{@path}'")
-      )
     end
   end
 end

data/lib/train/transports/ssh.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
@@ -94,7 +94,7 @@ module Train::Transports
         options[:key_files] = key_files
       end
 
-      unless options[:password].nil? # rubocop:disable Style/IfUnlessModifier
+      unless options[:password].nil?
         options[:auth_methods].push('password')
       end
 

data/lib/train/transports/ssh_connection.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)

data/lib/train/transports/winrm.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 #
 # Author:: Salim Afiune (<salim@afiunemaya.com.mx>)
 # Author:: Matt Wrock (<matt@mattwrock.com>)
@@ -174,7 +174,8 @@ module Train::Transports
     end
 
     def silence_warnings
-      old_verbose, $VERBOSE = $VERBOSE, nil
+      old_verbose = $VERBOSE
+      $VERBOSE = nil
       yield
     ensure
       $VERBOSE = old_verbose

data/lib/train/transports/winrm_connection.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 #
 # Author:: Salim Afiune (<salim@afiunemaya.com.mx>)
 # Author:: Matt Wrock (<matt@mattwrock.com>)

data/lib/train/version.rb

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

data/test/unit/extras/os_detect_linux_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'helper'
 require 'train/extras'
 

data/test/unit/extras/os_detect_windows_test.rb

@@ -0,0 +1,99 @@
+require 'train/extras'
+
+class OsDetectWindowsTester
+  attr_reader :platform, :backend
+  include Train::Extras::DetectWindows
+
+  def initialize
+    @platform = {}
+    @backend = Train::Transports::Mock.new.connection
+    @backend.mock_os({ family: 'windows' })
+  end
+end
+
+describe 'os_detect_windows' do
+  describe 'windows 2012' do
+    let(:detector) {
+      detector = OsDetectWindowsTester.new
+      detector.backend.mock_command('cmd /c ver', "\r\nMicrosoft Windows [Version 6.3.9600]\r\n", '', 0)
+      detector.backend.mock_command('wmic os get * /format:list',"\r\r\nBuildNumber=9600\r\r\nCaption=Microsoft Windows Server 2012 R2 Standard\r\r\nOSArchitecture=64-bit\r\r\nVersion=6.3.9600\r\r\n" , '', 0)
+      detector
+    }
+
+    it 'sets the correct family/release for windows' do
+      detector.detect_windows
+      detector.platform[:family].must_equal('windows')
+      detector.platform[:name].must_equal('Windows Server 2012 R2 Standard')
+      detector.platform[:arch].must_equal('64-bit')
+      detector.platform[:release].must_equal('6.3.9600')
+    end
+  end
+
+  describe 'windows 2008' do
+    let(:detector) {
+      detector = OsDetectWindowsTester.new
+      detector.backend.mock_command('cmd /c ver', "\r\nMicrosoft Windows [Version 6.1.7601]\r\n", '', 0)
+      detector.backend.mock_command('wmic os get * /format:list',"\r\r\nBuildNumber=7601\r\r\nCaption=Microsoft Windows Server 2008 R2 Standard \r\r\nOSArchitecture=64-bit\r\r\nVersion=6.1.7601\r\r\n" , '', 0)
+      detector
+    }
+
+    it 'sets the correct family/release for windows' do
+      detector.detect_windows
+      detector.platform[:family].must_equal('windows')
+      detector.platform[:name].must_equal('Windows Server 2008 R2 Standard')
+      detector.platform[:arch].must_equal('64-bit')
+      detector.platform[:release].must_equal('6.1.7601')
+    end
+  end
+
+  describe 'windows 7' do
+    let(:detector) {
+      detector = OsDetectWindowsTester.new
+      detector.backend.mock_command('cmd /c ver', "\r\nMicrosoft Windows [Version 6.1.7601]\r\n", '', 0)
+      detector.backend.mock_command('wmic os get * /format:list',"\r\r\nBuildNumber=7601\r\r\nCaption=Microsoft Windows 7 Enterprise \r\r\nOSArchitecture=32-bit\r\r\nVersion=6.1.7601\r\r\n\r\r\n" , '', 0)
+      detector
+    }
+
+    it 'sets the correct family/release for windows' do
+      detector.detect_windows
+      detector.platform[:family].must_equal('windows')
+      detector.platform[:name].must_equal('Windows 7 Enterprise')
+      detector.platform[:arch].must_equal('32-bit')
+      detector.platform[:release].must_equal('6.1.7601')
+    end
+  end
+
+  describe 'windows 10' do
+    let(:detector) {
+      detector = OsDetectWindowsTester.new
+      detector.backend.mock_command('cmd /c ver', "\r\nMicrosoft Windows [Version 10.0.10240]\r\n", '', 0)
+      detector.backend.mock_command('wmic os get * /format:list',"\r\r\nBuildNumber=10240\r\r\nCaption=Microsoft Windows 10 Pro\r\r\nOSArchitecture=64-bit\r\r\nVersion=10.0.10240\r\r\n\r\r\n" , '', 0)
+      detector
+    }
+
+    it 'sets the correct family/release for windows' do
+      detector.detect_windows
+      detector.platform[:family].must_equal('windows')
+      detector.platform[:name].must_equal('Windows 10 Pro')
+      detector.platform[:arch].must_equal('64-bit')
+      detector.platform[:release].must_equal('10.0.10240')
+    end
+  end
+
+  describe 'windows 98' do
+    let(:detector) {
+      detector = OsDetectWindowsTester.new
+      detector.backend.mock_command('cmd /c ver', "\r\nMicrosoft Windows [Version 4.10.1998]\r\n", '', 0)
+      detector.backend.mock_command('wmic os get * /format:list', nil , '', 1)
+      detector
+    }
+
+    it 'fallback to version number if wmic is not available' do
+      detector.detect_windows
+      detector.platform[:family].must_equal('windows')
+      detector.platform[:name].must_equal('Windows 4.10.1998')
+      detector.platform[:arch].must_equal(nil)
+      detector.platform[:release].must_equal('4.10.1998')
+    end
+  end
+end

data/test/windows/local_test.rb

@@ -21,10 +21,10 @@ describe 'windows local command' do
 
   it 'verify os' do
     os = conn.os
-    os[:name].must_equal nil
+    os[:name].must_equal 'Windows Server 2012 R2 Datacenter'
     os[:family].must_equal "windows"
-    os[:release].must_equal "Server 2012 R2"
-    os[:arch].must_equal nil
+    os[:release].must_equal '6.3.9600'
+    os[:arch].must_equal '64-bit'
   end
 
   it 'run echo test' do

data/test/windows/winrm_test.rb

@@ -27,10 +27,10 @@ describe 'windows local command' do
 
   it 'verify os' do
     os = conn.os
-    os[:name].must_equal nil
-    os[:family].must_equal "windows"
-    os[:release].must_equal "Server 2012 R2"
-    os[:arch].must_equal nil
+    os[:name].must_equal 'Windows Server 2012 R2 Datacenter'
+    os[:family].must_equal 'windows'
+    os[:release].must_equal '6.3.9600'
+    os[:arch].must_equal '64-bit'
   end
 
   it 'run echo test' do

data/train.gemspec

@@ -33,8 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'winrm-fs', '~> 0.3'
   spec.add_dependency 'docker-api', '~> 1.22'
 
-  spec.add_development_dependency 'rake',     '~> 10.4'
-  spec.add_development_dependency 'minitest', '~> 5.8'
-  spec.add_development_dependency 'mocha',    '~> 1.1'
-  spec.add_development_dependency 'rubocop',  '~> 0.34'
+  spec.add_development_dependency 'mocha', '~> 1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-train
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -114,34 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.22'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +128,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.34'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.34'
 description: Transport interface to talk to different backends.
 email:
 - dominik.richter@gmail.com
@@ -295,6 +253,7 @@ files:
 - 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/os_detect_windows_test.rb
 - test/unit/extras/stat_test.rb
 - test/unit/extras/windows_file_test.rb
 - test/unit/helper.rb
@@ -417,6 +376,7 @@ test_files:
 - 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/os_detect_windows_test.rb
 - test/unit/extras/stat_test.rb
 - test/unit/extras/windows_file_test.rb
 - test/unit/helper.rb