smart_proxy_remote_execution_ssh 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWNiMzQ5YmI2NGRmYjg3MGNiMzkyNzdkN2RjZDk0OWM1NmE1NDRkNw==
+    ZjdmZmFmMmM4MTJkMGFiYzQzNThkM2ZmMmE0YTVkM2IxNWZjNTYyZg==
   data.tar.gz: !binary |-
-    ZWNjNzg4NjFkODY2MTkwZmM4ZWMzMTJlOTY4MzFmZjIwZDA3ZGM2ZQ==
+    MGM5M2MwYWEzOTI5Zjk0NzBiZDQ5N2IyZjFlMTQwYWQzNzUyNDM4Mw==
 SHA512:
   metadata.gz: !binary |-
-    NTdmZDEzMjJlYzViOGU4MjhiMzFjODA2YzVhM2FjMTg5MWE0ODI0OWI1YWFl
-    YjI4OTZmMTg5ZmUwYjgyYmE2NGNmM2ZkMTQ0NjY3YWQwYTZlNmNiMWU1ZWE1
-    YTgyY2EzOWJkZDJmNTU1Y2I4YTBhM2JjOTY1ZTkwODA0YjM2YWY=
+    N2Q3ZTUwNTdmOTA2ZGNhYjYxYjY1Nzc3YmIwY2U0OWE2NTE5M2JiMjRkYzUz
+    MjM5NzI3MmQ4Y2I3ZmU0MDZiY2JjN2Y5ZDliZjUwYWI4NWY2MGUzMjhkZjg5
+    NzFkNWJhYzNiOGY1ZDc4YjYwMWE2NTRjYjgyMGViYzIyNjAxOTc=
   data.tar.gz: !binary |-
-    ZjQyMDM1ZWQ4YjVmNTBiOWM2Y2YwMzZhNzZmNDNjNzdiODZmNzViMGVmZTQ0
-    NzU3YzcyMDVlOTU2ODQ3OTVjZWQ5MjVmYjQ4ODBlMWZiNTFiMWNkNjgzNGFi
-    YTcyZWY3NjFjODkzMWYzODU3YjdjNTRmZGEzMzlhMjA4ZDNmODk=
+    NzkxYmY2NzViOGNkMzYyZjJkZWY4ZTJiYmJkNzk3YTA2MTBlMGQ4NmIwYTgw
+    ODI3ZjUyMzZmN2E2MjVkYzk4ZTQ1YmVhMzBkYjk0ODkyNzczZWMyOGRkZTAz
+    OGY5YzY2ZDE4NzNiOTI0MzkwOGUxZDFkYTBmZDQ3OGFlNzViNzk=

data/lib/smart_proxy_remote_execution_ssh/command_action.rb

@@ -31,6 +31,10 @@ module Proxy::RemoteExecution::Ssh
       else
         raise "Unexpected event #{event.inspect}"
       end
+    rescue => e
+      action_logger.error e
+      output[:result] << Connector::DebugData.new("#{e.class}: #{e.message}").to_hash
+      output[:exit_status] = "PROXY_ERROR"
     end
 
     def finalize

data/lib/smart_proxy_remote_execution_ssh/connector.rb

@@ -17,6 +17,12 @@ module Proxy::RemoteExecution::Ssh
       def data_type
         raise NotImplemented
       end
+
+      def to_hash
+        { :output_type => data_type,
+          :output      => data,
+          :timestamp   => timestamp.to_f }
+      end
     end
 
     class StdoutData < Data

data/lib/smart_proxy_remote_execution_ssh/dispatcher.rb

@@ -38,11 +38,7 @@ module Proxy::RemoteExecution::Ssh
       end
 
       def buffer_to_hash
-        buffer.map do |buffer_data|
-          { :output_type => buffer_data.data_type,
-            :output      => buffer_data.data,
-            :timestamp   => buffer_data.timestamp.to_f }
-        end
+        buffer.map(&:to_hash)
       end
     end
 

data/lib/smart_proxy_remote_execution_ssh/plugin.rb

@@ -7,9 +7,5 @@ module Proxy::RemoteExecution::Ssh
     default_settings :ssh_identity_key_file => '~/.ssh/id_rsa_foreman_proxy',
                      :ssh_user => 'root'
     plugin :ssh, Proxy::RemoteExecution::Ssh::VERSION
-
-    after_activation do
-      Proxy::RemoteExecution::Ssh.initialize
-    end
   end
 end

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh.rb

@@ -11,8 +11,6 @@ require 'smart_proxy_remote_execution_ssh/api'
 module Proxy::RemoteExecution
   module Ssh
     class << self
-      attr_reader :dispatcher
-
       def initialize
         unless private_key_file
           raise "settings for `ssh_identity_key` not set"
@@ -32,6 +30,10 @@ module Proxy::RemoteExecution
                                                                     :logger => Proxy::Dynflow.instance.world.logger)
       end
 
+      def dispatcher
+        @dispatcher || initialize
+      end
+
       def private_key_file
         File.expand_path(Ssh::Plugin.settings.ssh_identity_key_file)
       end
@@ -42,3 +44,5 @@ module Proxy::RemoteExecution
     end
   end
 end
+
+Proxy::Dynflow.after_initialize { Proxy::RemoteExecution::Ssh.initialize }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement