train-core 3.8.6 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677b8d64465040ada12f33f5c2fe7689b81922b10482ca7c78e0b57e10b5139a
-  data.tar.gz: 8c3f7518f0453329897de457e4ea4e6f24d6262dd77f5731b42b5cd44ea706c5
+  metadata.gz: 2d3eabbefcf1adac9f0d1142143709c390d4bac2b480ea26ab2b54b290d4c94b
+  data.tar.gz: dd7f3e0edf4f7c0fad07582d2bf895578b31ebd1cba881bb6e5e7b32c9f312fb
 SHA512:
-  metadata.gz: 8998652d978144993b1768c71d25d8b06f6501c661e827576ecbb06d3e2d8748296d26d68578d6c451a2a20617c1750a5cb66c096adb020b5bc3c0e2ad6bfb4e
-  data.tar.gz: 68cad9574d5282fea0d90fc00104506d0d33ecfd5e5d6879f33f88109aec9b881d0c9d49748e178c4b8ca05896827425d4bb283bb7d52aedbcc722d2817b6b27
+  metadata.gz: 91b758fd870fd5c4f32672a7e671d468fced308acc7f58754204e4e9beaa4baba6c798c25215c8112ed438ef0a5910725af4dcff1764a322d917f343af38996c
+  data.tar.gz: 48ccaea241788cf7d9aa7a682348781755a4e3cefcf95ae7134c8ede4b273acdc95eb2de109a5a169a00fc527364d74757c0506a98bef75cff44f786957f52c9

data/lib/train/errors.rb

@@ -38,6 +38,9 @@ module Train
   # Exception for when no platform can be detected.
   class PlatformDetectionFailed < Error; end
 
+  # Exception for when no uuid for the platform can be detected.
+  class PlatformUuidDetectionFailed < Error; end
+
   # Exception for when a invalid cache type is passed.
   class UnknownCacheType < Error; end
 

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

@@ -97,6 +97,12 @@ module Train::Platforms::Detect::Helpers
         return @cache[:cisco] = { version: m[2], model: m[1], type: "ios-xe" }
       end
 
+      # CSR 1000V (for example) does not specify model
+      m = res.match(/Cisco IOS XE Software, Version (\d+\.\d+\.\d+[A-Z]*)/)
+      unless m.nil?
+        return @cache[:cisco] = { version: m[1], type: "ios-xe" }
+      end
+
       m = res.match(/Cisco Nexus Operating System \(NX-OS\) Software/)
       unless m.nil?
         v = res[/^\s*system:\s+version (\d+\.\d+)/, 1]
@@ -122,7 +128,6 @@ module Train::Platforms::Detect::Helpers
     end
 
     def unix_uuid_from_machine_file
-      # require 'pry';binding.pry
       %W{
         /etc/chef/chef_guid
         #{ENV["HOME"]}/.chef/chef_guid

data/lib/train/platforms/detect/uuid.rb

@@ -20,12 +20,13 @@ module Train::Platforms::Detect
       elsif @platform.windows?
         windows_uuid
       else
-        if @platform[:uuid_command]
+        # Checking "unknown" :uuid_command which is set for mock transport.
+        if @platform[:uuid_command] && !@platform[:uuid_command] == "unknown"
           result = @backend.run_command(@platform[:uuid_command])
           return uuid_from_string(result.stdout.chomp) if result.exit_status == 0 && !result.stdout.empty?
         end
 
-        raise "Could not find platform uuid! Please set a uuid_command for your platform."
+        raise Train::PlatformUuidDetectionFailed.new("Could not find platform uuid! Please set a uuid_command for your platform.")
       end
     end
   end

data/lib/train/transports/ssh_connection.rb

@@ -326,7 +326,16 @@ class Train::Transports::SSH
         cmd = @cmd_wrapper.run(cmd) if @cmd_wrapper
 
         # Timeout the command if requested and able
-        cmd = "timeout #{timeout}s #{cmd}" if timeout && timeoutable?(cmd)
+        if timeout && timeoutable?(cmd)
+          # if cmd start with sudo then we need to make sure the timeout should be prepend with sudo else actual timeout is not working.
+          if cmd.strip.split[0] == "sudo"
+            split_cmd = cmd.strip.split
+            split_cmd[0] = "sudo timeout #{timeout}s"
+            cmd = split_cmd.join(" ")
+          else
+            cmd = "timeout #{timeout}s #{cmd}"
+          end
+        end
 
         logger.debug("[SSH] #{self} cmd = #{cmd}")
 

data/lib/train/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.8.6
+  version: 3.9.2
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable