train-core 3.3.4 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d1528d472a38847644b9b12d7e7ebfd304e696bdfc50f7562b4b5bf387f5059
-  data.tar.gz: 4913341d6670668289ccc69ab4d67335d4529da28fb449a0f9fcb1dc191b571b
+  metadata.gz: b6481551d7379b4a6cdee61568a1252e7feae2dc2d83def688417945eced8776
+  data.tar.gz: 3bec9acaea41dba70ed5c55cb7d6460d40e1c900002a172356419c80da222f7e
 SHA512:
-  metadata.gz: 2ab551ae2ab9e8ef40628edb76cf77f5ce0391483a2ae3aaf9ade688244817286d48bf4d92f0f3ca78e488dcf71c6783808e98a56a226df0a09867b0a281fff9
-  data.tar.gz: df2cc712d56b9e91239e6e10dd537b9233b0d97cfb8cb29771bb3539915f81df61523b222875791dd5dc8a9d0edbfa9f71f789cf7be74ee0164e0f504eba9c27
+  metadata.gz: '09b0f40e16fc0533bb474a460d3526fd767cacd2e2c18e35a6f9aa825e953adc7de241116d12a832c179c6e7383afbb7357ecf31bdeb75347854083fee328caa'
+  data.tar.gz: c1bcbb41f3c7e3e832f1adf70b5f02634906e6f40d8ed989ff7aafb56b2e5008ba4cab5ce483dc39badaf8142e8e685a7f262c1f154d28c078ce0d899d9561fc

data/lib/train/platforms/detect/helpers/os_common.rb

@@ -34,16 +34,24 @@ module Train::Platforms::Detect::Helpers
     end
 
     def command_output(cmd)
-      res = @backend.run_command(cmd).stdout
+      res = @backend.run_command(cmd)
+      stdout = res.stdout
+      stderr = res.stderr
       # When you try to execute command using ssh connction as root user and you have provided ssh user identity file
       # it gives standard output to login as authorised user other than root. To show this standard ouput as an error
       # to user we are matching the string of stdout and raising the error here so that user gets exact information.
-      if @backend.class.to_s == "Train::Transports::SSH::Connection" && res =~ /Please login as the user/
-        raise Train::UserError, "SSH failed: #{res}"
+      if @backend.class.to_s == "Train::Transports::SSH::Connection"
+        if stdout =~ /Please login as the user/
+          raise Train::UserError, "SSH failed: #{stdout}"
+        end
+
+        if stderr =~ /WARNING: Your password has expired/
+          raise Train::UserError, "SSH failed: #{stderr}"
+        end
       end
 
-      res.strip! unless res.nil?
-      res
+      stdout.strip! unless stdout.nil?
+      stdout
     end
 
     def unix_uname_s

data/lib/train/platforms/detect/specifications/os.rb

@@ -357,7 +357,7 @@ module Train::Platforms::Detect::Specifications
       declare_instance("mac_os_x", "macOS X", "darwin") do
         cmd = unix_file_contents("/System/Library/CoreServices/SystemVersion.plist")
         @platform[:uuid_command] = "system_profiler SPHardwareDataType | awk '/UUID/ { print $3; }'"
-        cmd =~ /Mac OS X/i
+        cmd =~ /Mac OS X|macOS/i
       end
 
       declare_instance("darwin", "Darwin", "darwin") do

data/lib/train/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.6
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable