train 2.1.13 → 2.1.19

data/lib/train/platforms/family.rb

@@ -19,8 +19,13 @@ module Train::Platforms
 
     def title(title = nil)
       return @title if title.nil?
+
       @title = title
       self
     end
+
+    def inspect
+      "%p[%s]" % [self.class, name]
+    end
   end
 end

data/lib/train/platforms/platform.rb

@@ -65,6 +65,7 @@ module Train::Platforms
 
     def title(title = nil)
       return @title if title.nil?
+
       @title = title
       self
     end
@@ -73,10 +74,6 @@ module Train::Platforms
       @platform
     end
 
-    def cisco_ios? # TODO: kinda a hack. needed to prevent tests from corrupting.
-      false
-    end
-
     # Add generic family? and platform methods to an existing platform
     #
     # This is done later to add any custom
@@ -88,8 +85,11 @@ module Train::Platforms
       # Add in family methods
       family_list = Train::Platforms.families
       family_list.each_value do |k|
-        next if respond_to?(k.name + "?")
-        define_singleton_method(k.name + "?") do
+        name = "#{k.name}?"
+
+        next if respond_to?(name)
+
+        define_singleton_method(name) do
           family_hierarchy.include?(k.name)
         end
       end
@@ -97,6 +97,7 @@ module Train::Platforms
       # Helper methods for direct platform info
       @platform.each_key do |m|
         next if respond_to?(m)
+
         define_singleton_method(m) do
           @platform[m]
         end
@@ -105,6 +106,7 @@ module Train::Platforms
       # Create method for name if its not already true
       m = name + "?"
       return if respond_to?(m)
+
       define_singleton_method(m) do
         true
       end

data/lib/train/plugins.rb

@@ -31,9 +31,9 @@ module Train
   def self.plugin(version = 1)
     if version != 1
       raise ClientError,
-           "Only understand train plugin version 1. You are trying to "\
-           "initialize a train plugin #{version}, which is not supported "\
-           "in the current release of train."
+        "Only understand train plugin version 1. You are trying to "\
+        "initialize a train plugin #{version}, which is not supported "\
+        "in the current release of train."
     end
     ::Train::Plugins::Transport
   end

data/lib/train/plugins/base_connection.rb

@@ -65,11 +65,13 @@ class Train::Plugins::Transport
     # :api_call, :file and :command types
     def enable_cache(type)
       raise Train::UnknownCacheType, "#{type} is not a valid cache type" unless @cache_enabled.keys.include?(type.to_sym)
+
       @cache_enabled[type.to_sym] = true
     end
 
     def disable_cache(type)
       raise Train::UnknownCacheType, "#{type} is not a valid cache type" unless @cache_enabled.keys.include?(type.to_sym)
+
       @cache_enabled[type.to_sym] = false
       clear_cache(type.to_sym)
     end
@@ -101,6 +103,10 @@ class Train::Plugins::Transport
       plat
     end
 
+    def inspect
+      "%s[%s]" % [self.class, (@options[:backend] || "Unknown")]
+    end
+
     alias direct_platform force_platform!
 
     # Get information on the operating system which this transport connects to.

data/lib/train/transports/cisco_ios_connection.rb

@@ -69,6 +69,7 @@ class Train::Transports::SSH
         if @buf =~ /Bad (secrets|password)|Access denied/
           raise BadEnablePassword
         end
+
         session.connection.process(0)
       end
 
@@ -123,6 +124,7 @@ class Train::Transports::SSH
 
         ch.send_channel_request("shell") do |_, success|
           raise "Failed to open SSH shell" unless success
+
           logger.debug("[SSH] shell opened")
         end
       end

data/lib/train/transports/docker.rb

@@ -88,7 +88,8 @@ class Train::Transports::Docker
       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/gcp.rb

@@ -84,6 +84,7 @@ module Train::Transports
       # Let's allow for other clients too
       def gcp_client(klass)
         return klass.new unless cache_enabled?(:api_call)
+
         @cache[:api_call][klass.to_s.to_sym] ||= klass.new
       end
 

data/lib/train/transports/helpers/azure/file_credentials.rb

@@ -12,6 +12,7 @@ module Train::Transports
         def self.parse(subscription_id: nil, credentials_file: nil, **_)
           return {} if credentials_file.nil?
           return {} unless ::File.readable?(credentials_file)
+
           credentials     = IniFile.load(::File.expand_path(credentials_file))
           subscription_id = parser(subscription_id, ENV["AZURE_SUBSCRIPTION_NUMBER"], credentials).subscription_id
           creds(subscription_id, credentials)

data/lib/train/transports/local.rb

@@ -42,7 +42,7 @@ module Train::Transports
         if os.windows?
           # Force a 64 bit poweshell if needed
           if RUBY_PLATFORM == "i386-mingw32" && os.arch == "x86_64"
-            powershell_cmd = "#{ENV['SystemRoot']}\\sysnative\\WindowsPowerShell\\v1.0\\powershell.exe"
+            powershell_cmd = "#{ENV["SystemRoot"]}\\sysnative\\WindowsPowerShell\\v1.0\\powershell.exe"
           else
             powershell_cmd = "powershell"
           end

data/lib/train/transports/mock.rb

@@ -40,10 +40,12 @@ module Train::Transports
             interface_methods[classname.to_s].include?(id)
           next
         end
+
         # kindly borrowed from the wonderful simple-tracer by matugm
         arg_names = eval(
           "method(__method__).parameters.map { |arg| arg[1].to_s }",
-          binding)
+          binding
+        )
         args = eval("#{arg_names}.map { |arg| eval(arg) }", binding).join(", ")
         prefix = "-" * (classname.to_s.count(":") - 2) + "> "
         puts("#{prefix}#{id} #{args}")
@@ -141,8 +143,8 @@ class Train::Transports::Mock::Connection
   class File < Train::File
     def self.from_json(json)
       res = new(json["backend"],
-                json["path"],
-                json["follow_symlink"])
+        json["path"],
+        json["follow_symlink"])
       res.type = json["type"]
       Train::File::DATA_FIELDS.each do |f|
         m = (f.tr("?", "") + "=").to_sym

data/lib/train/transports/ssh.rb

@@ -104,7 +104,7 @@ module Train::Transports
       if options[:auth_methods] == ["none"]
         if ssh_known_identities.empty?
           raise Train::ClientError,
-               "Your SSH Agent has no keys added, and you have not specified a password or a key file"
+            "Your SSH Agent has no keys added, and you have not specified a password or a key file"
         else
           logger.debug("[SSH] Using Agent keys as no password or key file have been specified")
           options[:auth_methods].push("publickey")

data/lib/train/transports/ssh_connection.rb

@@ -56,6 +56,7 @@ class Train::Transports::SSH
     # (see Base::Connection#close)
     def close
       return if @session.nil?
+
       logger.debug("[SSH] closing connection to #{self}")
       session.close
     ensure
@@ -84,6 +85,7 @@ class Train::Transports::SSH
 
     def generate_proxy_command
       return @proxy_command unless @proxy_command.nil?
+
       args = %w{ ssh }
       args += ssh_opts
       args += %W{ #{@bastion_user}@#{@bastion_host} }

data/lib/train/transports/winrm.rb

@@ -176,7 +176,7 @@ module Train::Transports
         " `gem 'winrm-fs', '#{spec_version}'`."
       )
       raise Train::UserError,
-            "Could not load or activate WinRM::FS (#{e.message})"
+        "Could not load or activate WinRM::FS (#{e.message})"
     end
 
     # Load WinRM::Transport code.

data/lib/train/transports/winrm_connection.rb

@@ -42,6 +42,7 @@ class Train::Transports::WinRM
     # (see Base::Connection#close)
     def close
       return if @session.nil?
+
       session.close
     ensure
       @session = nil
@@ -58,8 +59,8 @@ class Train::Transports::WinRM
         login_command_for_linux
       else
         raise ActionFailed,
-             "Remote login not supported in #{self.class} " \
-             "from host OS '#{RbConfig::CONFIG['host_os']}'."
+          "Remote login not supported in #{self.class} " \
+          "from host OS '#{RbConfig::CONFIG["host_os"]}'."
       end
     end
 
@@ -98,6 +99,7 @@ class Train::Transports::WinRM
 
     def run_command_via_connection(command, &data_handler)
       return if command.nil?
+
       logger.debug("[WinRM] #{self} (#{command})")
       out = ""
 

data/lib/train/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.19
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json