smart_proxy_remote_execution_ssh_core 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 596c8e37a9ec57f666acd9297a29fec7498adbdb
-  data.tar.gz: 4cb5757f3fafaefb953c66a34f6df6f1e7c921fd
+  metadata.gz: a3d03a9b6dc59a61f903a45baa7de869c42060ae
+  data.tar.gz: 256ba3b25ba7507b321d72c4cf33bf60b2da216d
 SHA512:
-  metadata.gz: 7b2e406e3fcbd73dfbb5184e27ffd221f920c7d7b15b568b90aa7b2cd4d07021e89434a8d0f732cb97bb7ae854eae5fba2db3550bb73e85713e1a9c9da932a77
-  data.tar.gz: 04be83589282710e525409b0b1ac71cf77995ca586c1ba2da7893180d996d50284f8945c9279ded877d406aef7a372400301788a1b8fd412e78bd3b4c3b171d8
+  metadata.gz: 52be50f0fc05bbf3cb49ac669a0b7d3c09fbb42e095dad1754b343e26640f39d4bdd77c630186d8644eaf09e71efc866edfae2f6060fd74cb6f064c3aa5fa587
+  data.tar.gz: 98c556a55dcd3bf886cea75afcff3970158ab3dd240c1c6af77cb46656cee9568cd3259b55089bf98dbd4afc45591e44739c1ac30e2b60e3f3c4d93576a149de

data/lib/smart_proxy_remote_execution_ssh_core/command_action.rb

@@ -20,9 +20,9 @@ module Proxy
             init_run
           when CommandUpdate
             process_update(event)
-          when Dynflow::Action::Cancellable::Cancel
+          when ::Dynflow::Action::Cancellable::Cancel
             kill_run
-          when Dynflow::Action::Skip
+          when ::Dynflow::Action::Skip
             # do nothing
           else
             raise "Unexpected event #{event.inspect}"
@@ -38,13 +38,14 @@ module Proxy
         end
 
         def rescue_strategy_for_self
-          Dynflow::Action::Rescue::Skip
+          ::Dynflow::Action::Rescue::Skip
         end
 
         def command
           @command ||= Dispatcher::Command.new(:id                    => input[:task_id],
                                                :host                  => input[:hostname],
                                                :ssh_user              => input[:ssh_user] || 'root',
+                                               :ssh_port              => input[:ssh_port] || 22,
                                                :effective_user        => input[:effective_user],
                                                :script                => input[:script],
                                                :effective_user_method => input[:effective_user_method],

data/lib/smart_proxy_remote_execution_ssh_core/connector.rb

@@ -12,6 +12,7 @@ module Proxy
 
         def initialize(host, user, options = {})
           @host = host
+          @port = options[:port] || 22
           @user = user
           @logger = options[:logger] || Logger.new($stderr)
           @client_private_key_file = options[:client_private_key_file]
@@ -136,6 +137,7 @@ module Proxy
 
         def ssh_options
           ssh_options = {}
+          ssh_options[:port] = @port if @port
           ssh_options[:keys] = [@client_private_key_file] if @client_private_key_file
           ssh_options[:user_known_hosts_file] = @known_hosts_file if @known_hosts_file
           ssh_options[:keys_only] = true

data/lib/smart_proxy_remote_execution_ssh_core/dispatcher.rb

@@ -9,7 +9,7 @@ module Proxy
       class Dispatcher < ::Dynflow::Actor
         # command comming from action
         class Command
-          attr_reader :id, :host, :ssh_user, :effective_user, :effective_user_method, :script, :host_public_key, :suspended_action
+          attr_reader :id, :host, :ssh_user, :ssh_port, :effective_user, :effective_user_method, :script, :host_public_key, :suspended_action
 
           def initialize(data)
             validate!(data)
@@ -17,6 +17,7 @@ module Proxy
             @id                    = data[:id]
             @host                  = data[:host]
             @ssh_user              = data[:ssh_user]
+            @ssh_port              = data[:ssh_port]
             @effective_user        = data[:effective_user]
             @effective_user_method = data[:effective_user_method] || 'su'
             @script                = data[:script]

data/lib/smart_proxy_remote_execution_ssh_core/session.rb

@@ -131,6 +131,7 @@ module Proxy
           options = { :logger => @logger }
           options[:known_hosts_file] = prepare_known_hosts
           options[:client_private_key_file] = @client_private_key_file
+          options[:port] = @command.ssh_port
           @connector = @connector_class.new(@command.host, @command.ssh_user, options)
         end
 

data/lib/smart_proxy_remote_execution_ssh_core/settings.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 module Proxy
   module RemoteExecution
     module Ssh
-      class Settings < OpenStruct
+      class Settings < SmartProxyDynflowCore::Settings
 
         DEFAULT_SETTINGS = {
           :enabled => true,

data/lib/smart_proxy_remote_execution_ssh_core/version.rb

@@ -2,7 +2,7 @@ module Proxy
   module RemoteExecution
     module Ssh
       module Core
-        VERSION = '0.1.2'
+        VERSION = '0.1.3'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh_core
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ssh remote execution provider for Foreman Smart-Proxy