train-core 3.3.13 → 3.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d500e3ff1e260a0879ff7da716c7407934e53deef0f15df171c03cd26c9dff
-  data.tar.gz: 54d6e4b4907efcccc7c99cae92c6e81b7d34c172d8601faa8b9a725a2edb9590
+  metadata.gz: 731da693988617c1fba632079b251048ff772e266341a405f9d7fa668081c460
+  data.tar.gz: e2f44528bdaeab154923632381ea82ab7393b58800c92ed2ce34665b5c87922e
 SHA512:
-  metadata.gz: 846c9daf8a830259f3919a44fe6e12f5e5911a01c63d6a3362ec7dc05bd644e332189c94e878435ca622c697d2cfd33e903f599e41cfd5b42fb6c346d81705f3
-  data.tar.gz: 105276a39b26b161a41cefc2b9f1ebaa989055d08d08d246927dfe1f2843c66cdaa5f4520b1ded0478d88b8d13e3b381daa9f4674fd4e1fcf8ffe1e96cbf08dc
+  metadata.gz: 4faaad47791222859169e2e7eaca6e641b1b0645b206966200ab303da77565a54fc052640583317f6505f74816fe141284d0f06eff45c5d7c638e6580aa6d26f
+  data.tar.gz: 87fe382ff4951bad855289e72e4687d69a71c70733d7240edbde19d773e6b5caee446a17b3aef2c621f33e403badb8ee68aaaa8583fca17f0c08f86fdaea0d7e

data/lib/train.rb

@@ -6,7 +6,7 @@ require_relative "train/options"
 require_relative "train/plugins"
 require_relative "train/errors"
 require_relative "train/platforms"
-require "addressable/uri"
+require "addressable/uri" unless defined?(Addressable::URI)
 
 module Train
   # Create a new transport instance, with the plugin indicated by the

data/lib/train/file/local/unix.rb

@@ -1,4 +1,4 @@
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 require_relative "../../extras/stat"
 
 module Train

data/lib/train/file/remote/unix.rb

@@ -1,4 +1,4 @@
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 
 module Train
   class File

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

@@ -1,6 +1,6 @@
 require_relative "os_linux"
 require_relative "os_windows"
-require "rbconfig"
+require "rbconfig" unless defined?(RbConfig)
 
 module Train::Platforms::Detect::Helpers
   module OSCommon
@@ -37,8 +37,8 @@ module Train::Platforms::Detect::Helpers
       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
+      # When you try to execute command using ssh connection as root user and you have provided ssh user identity file
+      # it gives standard output to login as authorized user other than root. To show this standard output 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"
         if stdout =~ /Please login as the user/
@@ -165,7 +165,7 @@ module Train::Platforms::Detect::Helpers
     def json_cmd(cmd)
       cmd = @backend.run_command(cmd)
       if cmd.exit_status == 0 && !cmd.stdout.empty?
-        require "json"
+        require "json" unless defined?(JSON)
         eos_ver = JSON.parse(cmd.stdout)
         @platform[:release] = eos_ver["version"]
         @platform[:arch] = eos_ver["architecture"]

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

@@ -128,7 +128,7 @@ module Train::Platforms::Detect::Specifications
 
       declare_lsb("scientific", "Scientific Linux", "redhat", /scientific/i)
 
-      declare_lsb("xenserver", "Xenserer Linux", "redhat", /xenserver/i)
+      declare_lsb("xenserver", "Xenserver Linux", "redhat", /xenserver/i)
 
       declare_instance("parallels-release", "Parallels Linux", "redhat") do
         if (raw = unix_file_contents("/etc/parallels-release"))

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

@@ -1,6 +1,6 @@
 require "digest/sha1"
-require "securerandom"
-require "json"
+require "securerandom" unless defined?(SecureRandom)
+require "json" unless defined?(JSON)
 
 module Train::Platforms::Detect
   class UUID

data/lib/train/platforms/platform.rb

@@ -45,7 +45,7 @@ module Train::Platforms
       @uuid ||= Train::Platforms::Detect::UUID.new(self).find_or_create_uuid.downcase
     end
 
-    # This is for backwords compatability with
+    # This is for backwards compatibility with
     # the current inspec os resource.
     def[](name)
       if respond_to?(name)

data/lib/train/plugin_test_helper.rb

@@ -13,13 +13,13 @@ require "minitest/spec"
 require "minitest/autorun"
 
 # Data formats commonly used in testing
-require "json"
-require "ostruct"
+require "json" unless defined?(JSON)
+require "ostruct" unless defined?(OpenStruct)
 
 # Utilities often needed
-require "fileutils"
-require "tmpdir"
-require "pathname"
+require "fileutils" unless defined?(FileUtils)
+require "tmpdir" unless defined?(Dir.mktmpdir)
+require "pathname" unless defined?(Pathname)
 
 # You might want to put some debugging tools here.  We run tests to find bugs,
 # after all.

data/lib/train/plugins.rb

@@ -23,7 +23,7 @@ module Train
   # Create a versioned plugin by providing the transport layer plugin version
   # to this method. It will then select the correct class to inherit from.
   #
-  # The plugin version determins what methods will be available to your plugin.
+  # The plugin version determines what methods will be available to your plugin.
   #
   # @param [Int] version = 1 the plugin version to use
   # @return [Transport] the versioned transport base class

data/lib/train/plugins/base_connection.rb

@@ -158,7 +158,7 @@ class Train::Plugins::Transport
     # service is preferred to simply waiting on a socket to become
     # available.
     def wait_until_ready
-      # this method may be left unimplemented if that is applicablelog
+      # this method may be left unimplemented if that is applicable log
     end
 
     private

data/lib/train/transports/local.rb

@@ -4,7 +4,7 @@
 
 require_relative "../plugins"
 require_relative "../errors"
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module Train::Transports
   class Local < Train.plugin(1)
@@ -111,7 +111,7 @@ module Train::Transports
       end
 
       class WindowsShellRunner
-        require "json"
+        require "json" unless defined?(JSON)
         require "base64"
 
         def initialize(powershell_cmd = "powershell")
@@ -135,9 +135,9 @@ module Train::Transports
       end
 
       class WindowsPipeRunner
-        require "json"
+        require "json" unless defined?(JSON)
         require "base64"
-        require "securerandom"
+        require "securerandom" unless defined?(SecureRandom)
 
         def initialize(powershell_cmd = "powershell")
           @powershell_cmd = powershell_cmd
@@ -146,7 +146,7 @@ module Train::Transports
         end
 
         # @param  cmd The command to execute
-        # @return Local::ComandResult with stdout, stderr and exitstatus
+        # @return Local::CommandResult with stdout, stderr and exitstatus
         #         Note that exitstatus ($?) in PowerShell is boolean, but we use a numeric exit code.
         #         A command that succeeds without setting an exit code will have exitstatus 0
         #         A command that exits with an exit code will have that value as exitstatus

data/lib/train/transports/ssh.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/ssh"
+require "net/ssh" unless defined?(Net::SSH)
 require "net/scp"
 require_relative "../errors"
 
@@ -237,7 +237,7 @@ module Train::Transports
     # Creates a new SSH Connection instance and save it for potential future
     # reuse.
     #
-    # @param options [Hash] conneciton options
+    # @param options [Hash] connection options
     # @return [Ssh::Connection] an SSH Connection instance
     # @api private
     def create_new_connection(options, &block)

data/lib/train/transports/ssh_connection.rb

@@ -17,9 +17,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/ssh"
+require "net/ssh" unless defined?(Net::SSH)
 require "net/scp"
-require "timeout"
+require "timeout" unless defined?(Timeout)
 
 class Train::Transports::SSH
   # A Connection instance can be generated and re-generated, given new

data/lib/train/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.3.13
+  version: 3.3.16
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable