depengine 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 243086852abf27d809e0a80eb8ece84024e3d2ee
-  data.tar.gz: 0b457bfa98ca4a7b841ca1098f710bef55ed9147
+  metadata.gz: 1973af1ae5ec0c527e493873a7d7c4d9d8f77cd8
+  data.tar.gz: ea5525a0662d01b95b7451601a7c195be4e0981a
 SHA512:
-  metadata.gz: 0808aa28c38b2d8bc695b621a0f6570d145e7ae185c25d794c37dc87d3cc6e8eedd4cb2c767049119b183cbf8c753fa7f1db0cdbd3fbaf4d3ac8674bd3efd439
-  data.tar.gz: 0eac33b0e2f0b9af9fe522af0b484a8e110d24038222903f810f487ae82bb9dcc94c018b2f16d525400cd1ffcca0e3bb812b5085d992193becc5a8cb20c29d5e
+  metadata.gz: 2b49ab018be3c446ff28fa5472fab70af05fee5237f7ab0c204b920c69b8bf8929b9e4abd803e24d4ec0d813d8bb32178d684dd8badd8d519d801388807d564e
+  data.tar.gz: 6ca99c2654ee22fea1885dc2629a7ee245f630439ea47d3f5698264cf3e9303e7532eb9180cecadac93c08a48de7d333008d1a5da2c2637d5088e6c618853157

data/lib/depengine/dsl/publisher.rb

@@ -25,10 +25,11 @@ module Deployment
         publisher = ::Publisher::Sftp.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
-        publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
-
-        publisher.ssh_key_file = File.join(File.dirname($exec_file_path), \
-                                           publisher.ssh_key_file)
+        if $recipe_config and ($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home])
+          publisher.ssh_key_file = File.join($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home], options[:ssh_key_file] || @cdb['ssh_key_file'])
+        else
+          publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
+        end
 
         Helper.validates_presence_of publisher.remote_host, "Remote host not set"
         Helper.validates_presence_of publisher.remote_user, "Remote user not set"
@@ -45,13 +46,11 @@ module Deployment
         publisher = ::Publisher::Sftp.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
-        publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
-
-        publisher.ssh_key_file = File.join(File.dirname($exec_file_path), \
-                                           publisher.ssh_key_file)
-
-        Helper.validates_presence_of publisher.remote_host, "Remote host not set"
-        Helper.validates_presence_of publisher.remote_user, "Remote user not set"
+        if $recipe_config and ($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home])
+          publisher.ssh_key_file = File.join($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home], options[:ssh_key_file] || @cdb['ssh_key_file'])
+        else
+          publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
+        end
 
         publisher.chmod(path, permissions, options)
       end

data/lib/depengine/dsl/remote.rb

@@ -9,7 +9,12 @@ module Deployment
         publisher = ::Publisher::Ssh.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
-        publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
+        if $recipe_config and ($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home])
+          publisher.ssh_key_file = File.join($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home], options[:ssh_key_file] || @cdb['ssh_key_file'])
+        else
+          publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
+        end
+
         publisher.remote_execute(command)
       end
 
@@ -23,10 +28,11 @@ module Deployment
         publisher = ::Publisher::Rsync.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
-        publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
-
-        # publisher.ssh_key_file = File.join(File.dirname($exec_file_path), \
-        #                                    publisher.ssh_key_file)
+        if $recipe_config and ($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home])
+          publisher.ssh_key_file = File.join($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home], options[:ssh_key_file] || @cdb['ssh_key_file'])
+        else
+          publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
+        end
 
         if options[:local].nil? or options[:local] == false
           Helper.validates_presence_of publisher.remote_host, "Remote host not set"
@@ -50,7 +56,11 @@ module Deployment
         publisher = ::Publisher::Ssh.new
         publisher.remote_host  = options[:remote_host]  || @cdb['remote_host']
         publisher.remote_user  = options[:remote_user]  || @cdb['remote_user']
-        publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
+        if $recipe_config and ($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home])
+          publisher.ssh_key_file = File.join($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home], options[:ssh_key_file] || @cdb['ssh_key_file'])
+        else
+          publisher.ssh_key_file = options[:ssh_key_file] || @cdb['ssh_key_file']
+        end
         publisher.remove_old_releases(path, num_of_releases_to_keep, release_name_shema)
       end
 

data/lib/depengine/publisher/ssh.rb

@@ -9,9 +9,6 @@ module Publisher
       Helper.validates_presence_of command,      "No valid remote command given"
 
       result            = ''
-      if $recipe_config and ($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home])
-        @ssh_key_file = File.join($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home], ssh_key_file)
-      end
 
       if not File.file? @ssh_key_file
         $log.writer.error "Can not find SSH keyfile #{@ssh_key_file}"

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "3.0.9"
+  VERSION = "3.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Team Automatisierung