smart_proxy_remote_execution_ssh 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85a2ca1f26e8131d2f97bf6dd977b6270fe91c03
-  data.tar.gz: 1d60a395021b6b5262faa9b8115a2e6a6cb34a6b
+  metadata.gz: 638dd025cee7176c1140d55daad36647756d2c86
+  data.tar.gz: a3bf4cd13dfaa4011f187fd2c14b2581aef6c317
 SHA512:
-  metadata.gz: 8e029bc607624b5be779d11dd67ca7447d1de32f9a868250d5a1352d775e29ffe1633635ff152b445c6a039f69be4d1cd2fc6f4124acb30a7c4423d6d6da1d87
-  data.tar.gz: d240755257e994a5fb412d71dd3663f37490de1367f1470462566483c8992959e52e812defdd79639dd70da3d7301bc7d747461f5ff0a2a1bb9325180811d30b
+  metadata.gz: cb4cc423186ca8dcd71cee29466be2c635219ac26eee9d36e6614471cc3c5f2eb33f6cd66f807db1d3d29e14517e5cd07632539d3f3fd98d70ae3d6db60aed94
+  data.tar.gz: 793edc8274aba67e83e4575fbb0cf1e724e8c79c7d16820e7ce338a7166993e5a3487f0537eb090987534fe74b02810815fef8d8ab466a08d6b957424a9e309a

data/lib/smart_proxy_remote_execution_ssh/command_update.rb

@@ -32,6 +32,7 @@ module Proxy::RemoteExecution::Ssh
 
       def initialize(data, timestamp = Time.now)
         @data = data
+        @data = @data.force_encoding('UTF-8') if @data.is_a? String
         @timestamp = timestamp
       end
 

data/lib/smart_proxy_remote_execution_ssh/connector.rb

@@ -22,9 +22,9 @@ module Proxy::RemoteExecution::Ssh
     def async_run(command)
       started = false
       session.open_channel do |channel|
-        channel.on_data { |ch, data| yield CommandUpdate::StdoutData.new(handle_encoding(data)) }
+        channel.on_data { |ch, data| yield CommandUpdate::StdoutData.new(data) }
 
-        channel.on_extended_data { |ch, type, data| yield CommandUpdate::StderrData.new(handle_encoding(data)) }
+        channel.on_extended_data { |ch, type, data| yield CommandUpdate::StderrData.new(data) }
 
         # standard exit of the command
         channel.on_request("exit-status") { |ch, data| yield CommandUpdate::StatusData.new(data.read_long) }
@@ -120,14 +120,6 @@ module Proxy::RemoteExecution::Ssh
 
     private
 
-    def handle_encoding(data)
-      if data.is_a? String
-        data.force_encoding('UTF-8')
-      else
-        data
-      end
-    end
-
     def session
       @session ||= begin
                      @logger.debug("opening session to #{@user}@#{@host}")

data/lib/smart_proxy_remote_execution_ssh/dispatcher.rb

@@ -35,8 +35,8 @@ module Proxy::RemoteExecution::Ssh
       @session_args = { :logger => @logger,
                         :clock => @clock,
                         :connector_class => options[:connector_class] || Connector,
-                        :local_working_dir => options[:local_working_dir] || '/tmp/foreman-proxy-ssh/server',
-                        :remote_working_dir => options[:remote_working_dir] || '/tmp/foreman-proxy-ssh/client',
+                        :local_working_dir => options[:local_working_dir] || ::Proxy::RemoteExecution::Ssh::Plugin.settings.local_working_dir,
+                        :remote_working_dir => options[:remote_working_dir] || ::Proxy::RemoteExecution::Ssh::Plugin.settings.remote_working_dir,
                         :client_private_key_file => Proxy::RemoteExecution::Ssh.private_key_file,
                         :refresh_interval => options[:refresh_interval] || 1 }
 

data/lib/smart_proxy_remote_execution_ssh/plugin.rb

@@ -5,7 +5,10 @@ module Proxy::RemoteExecution::Ssh
 
     settings_file "remote_execution_ssh.yml"
     default_settings :ssh_identity_key_file => '~/.ssh/id_rsa_foreman_proxy',
-                     :ssh_user => 'root'
+                     :ssh_user              => 'root',
+                     :remote_working_dir    => '/var/tmp',
+                     :local_working_dir     => '/var/tmp'
+
     plugin :ssh, Proxy::RemoteExecution::Ssh::VERSION
   end
 end

data/lib/smart_proxy_remote_execution_ssh/session.rb

@@ -9,8 +9,8 @@ module Proxy::RemoteExecution::Ssh
       @clock = options[:clock] || Dynflow::Clock.spawn('proxy-dispatcher-clock')
       @logger = options[:logger] || Logger.new($stderr)
       @connector_class = options[:connector_class] || Connector
-      @local_working_dir = options[:local_working_dir] || '/tmp/foreman-proxy-ssh/server'
-      @remote_working_dir = options[:remote_working_dir] || '/tmp/foreman-proxy-ssh/client'
+      @local_working_dir = options[:local_working_dir] || ::Proxy::RemoteExecution::Ssh::Plugin.settings.local_working_dir
+      @remote_working_dir = options[:remote_working_dir] || ::Proxy::RemoteExecution::Ssh::Plugin.settings.remote_working_dir
       @refresh_interval = options[:refresh_interval] || 1
       @client_private_key_file = Proxy::RemoteExecution::Ssh.private_key_file
       @command = options[:command]
@@ -113,7 +113,7 @@ module Proxy::RemoteExecution::Ssh
     end
 
     def local_command_dir
-      File.join(@local_working_dir, @command.id)
+      File.join(@local_working_dir, 'foreman-proxy', "foreman-ssh-cmd-#{@command.id}")
     end
 
     def local_command_file(filename)
@@ -121,7 +121,7 @@ module Proxy::RemoteExecution::Ssh
     end
 
     def remote_command_dir
-      File.join(@remote_working_dir, @command.id)
+      File.join(@remote_working_dir, "foreman-ssh-cmd-#{@command.id}")
     end
 
     def remote_command_file(filename)

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.0.7'
+      VERSION = '0.0.8'
     end
   end
 end

data/settings.d/remote_execution_ssh.yml.example

@@ -1,3 +1,5 @@
 ---
 :enabled: true
 :ssh_identity_key_file: '~/.ssh/id_rsa_foreman_proxy'
+:local_working_dir: '/var/tmp'
+:remote_working_dir: '/var/tmp'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler