fulmar 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a5a9c3fcc0eac8bf2f866acb574bc6e26b3daf
-  data.tar.gz: b37c35df4992fa35e0b98338b8306d87da6b95b2
+  metadata.gz: f3dabbf5104350bdb4a7bb7855ac4571dc90ba1a
+  data.tar.gz: 592d608e5e2fe6cfc6d73125f9731a84bf23d87c
 SHA512:
-  metadata.gz: d1f91dc05ce99316148331c754ef94b195667f77d7a66736fdc335d13101b5b65e04c388252a85dee7065e46f4b88cb9f8180e317a660b9c5955a37f902e40df
-  data.tar.gz: 6d02384db532a177e53890693f17e33764be59bcec4dc19d4479cbda553dcddbc1a75798110809ad72ef0e94ebf5fe5d6708a2db8014295ab13dca50c5e0aac3
+  metadata.gz: c85ff037e699d0b28cc6e09ac6eddc5a35f073706a1c2a861e7f36eba4f989086281cf4035d6dd557f0a6337967e2fbe5998daa2fff474dc34977f68d164c699
+  data.tar.gz: 2c07c922fc33f6a966ec68a635d905002709dcf8a8aef4568812d0555059b58d23466f05cfd43ad5a8b7bd3155ca621a4319b5d69f60ef6f84b309a94a3e6cbb

data/lib/fulmar/infrastructure/service/copy_service.rb

@@ -9,7 +9,7 @@ module Fulmar
         # @param [String] remote_host SSH hostname
         # @param [String] remote_dir remote directory
         def self.upload(shell, local_file, remote_host, remote_dir)
-          if shell.run "scp -r #{local_file} #{remote_host}:#{remote_dir.chomp('/')}/"
+          if shell.run "scp -Cr #{local_file} #{remote_host}:#{remote_dir.chomp('/')}/"
             "#{remote_dir.chomp('/')}/#{File.basename(local_file)}"
           end
         end
@@ -20,7 +20,7 @@ module Fulmar
         # @param [String] remote_file remote directory
         # @param [String] local_dir local filename, should be absolute
         def self.download(shell, remote_host, remote_file, local_dir = '.')
-          if shell.run "scp -r #{remote_host}:#{remote_file} #{local_dir.chomp('/')}/"
+          if shell.run "scp -Cr #{remote_host}:#{remote_file} #{local_dir.chomp('/')}/"
             "#{local_dir.chomp('/')}/#{File.basename(remote_file)}"
           end
         end

data/lib/fulmar/infrastructure/service/database/database_service.rb

@@ -91,7 +91,7 @@ module Fulmar
           def download_dump(filename = backup_filename)
             local_path = filename[0, 1] == '/' ? filename : @config[:local_path] + '/' + filename
             remote_path = dump
-            copy = system("scp -q #{@config.ssh_user_and_host}:#{remote_path} #{local_path}")
+            copy = system("scp -Cq #{@config.ssh_user_and_host}:#{remote_path} #{local_path}")
             @shell.run "rm -f \"#{remote_path}\"" # delete temporary file
             if copy
               local_path

data/lib/fulmar/infrastructure/service/transfer/rsync.rb

@@ -1,4 +1,4 @@
-
+require 'pathname'
 require 'fulmar/infrastructure/service/transfer/base'
 
 module Fulmar
@@ -38,13 +38,12 @@ module Fulmar
           # Build the rsync command from the given options
           def rsync_command
             if @config[:rsync][:direction] == 'up'
-              from = @config[:local_path]
+              from = absolute_path(@config[:local_path])
               to = @config.ssh_user_and_host + ':' + @config[:remote_path]
             else
               from = @config.ssh_user_and_host + ':' + @config[:remote_path]
-              to = @config[:local_path]
+              to = absolute_path(@config[:local_path])
             end
-
             "rsync #{rsync_command_options.join(' ')} '#{from}/' '#{to}'"
           end
 
@@ -56,6 +55,15 @@ module Fulmar
 
           protected
 
+          # Get the absolute path of the given path
+          # @param [String] path
+          # @return [String] absolute path
+          def absolute_path(path)
+            path = Pathname.new(path)
+            return Pathname.new(@config.base_path) + path unless path.absolute?
+            path
+          end
+
           # Assembles all rsync command line parameters from the configuration options
           def rsync_command_options
             options = ['-rl']

data/lib/fulmar/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module Fulmar
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A deployment task manager.