backup-remote 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4379e0693acbedd3bcb5c275a10470cb5959ebb
-  data.tar.gz: 729a39f66fd3a3cf07f670025309fd00bb148c80
+  metadata.gz: 2f73d688f49424946ba926eff0541054f9946dae
+  data.tar.gz: b0d632be9cfca6dd4355aba0019307b894daea1b
 SHA512:
-  metadata.gz: 11e8f455c85912b2903901cac87cbb2b1a115b8c7bb6b44c6ac523c4301f220a05f0c9b0af8264ff157b5439623b3933721881bebc05085bd64f147b1fe80a52
-  data.tar.gz: 6cae404e2d3fa1f8078b4502b15b3c5f98ca08ef7d45ee0c35dd4edf5526ff4fe959d014aca584399ce3821ffbef35fe35c7f15fd6e8f74842b6a2056674110f
+  metadata.gz: 99987d967fdc2c3010b9d9608c3eedf42a193daf80315a1132830e26392e4b89dbc6b650d3cbf25e8889d30e5902cb7b9de6ef08bf94e06bc748cce3be304930
+  data.tar.gz: 0a2ddf605d64b30b500b9a36b03d39035300369efacedc3dce4160747e62d3881254673de99ea595b6c88e70bb69351de89d183e5afef54b0e53faeb1dffa125

data/lib/backup/database/remote_mysql.rb

@@ -145,7 +145,9 @@ module Backup
       private
 
       def mysqldump
-        "#{ utility(:mysqldump) } #{ user_options } #{ credential_options } " +
+        #"#{ utility(:mysqldump) } #{ user_options } #{ credential_options } " +
+        u = utility_remote(:mysqldump, server_host, server_ssh_user, server_ssh_password)
+        "#{u} #{ user_options } #{ credential_options } " +
         "#{ connectivity_options } #{ name_option } " +
         "#{ tables_to_dump } #{ tables_to_skip }"
       end

data/lib/backup/remote/command.rb

@@ -6,60 +6,66 @@ require 'sshkit/sudo'
 
 module Backup
   module Remote
-
     class Command
 
-  include SSHKit::DSL
+      include SSHKit::DSL
 
 
-  def run_ssh_cmd(hostname, ssh_user, ssh_pass, cmd)
-    host = SSHKit::Host.new({hostname: hostname, user: ssh_user})
-    host.password = ssh_pass
+      def run_ssh_cmd(hostname, ssh_user, ssh_pass, cmd)
+        host = SSHKit::Host.new({hostname: hostname, user: ssh_user})
+        host.password = ssh_pass
 
-    #srv = ssh_user+'@'+hostname
-    all_servers = [host]
+        #srv = ssh_user+'@'+hostname
+        all_servers = [host]
 
-    output = ''
+        output = ''
 
-    on all_servers do |srv|
-    #SSHKit::Coordinator.new(host).each in: :sequence do
-      as(user: ssh_user) do
-        #execute(cmd)
-        output = capture(cmd)
-      end
-    end
+        on all_servers do |srv|
+        #SSHKit::Coordinator.new(host).each in: :sequence do
+          as(user: ssh_user) do
+            #execute(cmd)
+            output = capture(cmd)
+          end
+        end
 
-    #
-    return {     res: 1,      output: output   }
-  end
+        #
+        return {     res: 1,      output: output   }
 
-  def run_ssh_cmd_sudo(hostname, ssh_user, ssh_pass, cmd, handler=nil)
-    host = SSHKit::Host.new("#{ssh_user}@#{hostname}")
-    host.password = ssh_pass
+      rescue => e
+        {
+            res: 0,
+            output: output,
+            error: e.message
+        }
+      end
 
-    on host do |host|
-      execute("#{cmd}", interaction_handler: handler)
-    end
+      def run_ssh_cmd_sudo(hostname, ssh_user, ssh_pass, cmd, handler=nil)
+        host = SSHKit::Host.new("#{ssh_user}@#{hostname}")
+        host.password = ssh_pass
 
-    #
-    return {res: 1, output: ""}
+        on host do |host|
+          execute("#{cmd}", interaction_handler: handler)
+        end
 
-  rescue => e
-    {
-        res: 0,
-        error: e.message
-    }
-  end
+        #
+        return {res: 1, output: ""}
 
-  def self.interaction_handler_pwd(user, pwd, host='')
-    {
-        "#{user}@#{host}'s password:" => "#{pwd}\n",
-        /#{user}@#{host}'s password: */ => "#{pwd}\n",
-        "password: " => "#{pwd}\n",
-        "password:" => "#{pwd}\n",
-        "Password: " => "#{pwd}\n",
-    }
-  end
+      rescue => e
+        {
+            res: 0,
+            error: e.message
+        }
+      end
+
+      def self.interaction_handler_pwd(user, pwd, host='')
+        {
+            "#{user}@#{host}'s password:" => "#{pwd}\n",
+            /#{user}@#{host}'s password: */ => "#{pwd}\n",
+            "password: " => "#{pwd}\n",
+            "password:" => "#{pwd}\n",
+            "Password: " => "#{pwd}\n",
+        }
+      end
 
 
 

data/lib/backup/utilities.rb

@@ -115,6 +115,9 @@ module Backup
         @gnu_tar = !!run("#{ utility(:tar) } --version").match(/GNU/)
       end
 
+
+
+
       private
 
       ##
@@ -135,6 +138,8 @@ module Backup
         UTILITY[name].dup
       end
 
+
+
       ##
       # Returns the name of the command name from the given command line.
       # This is only used to simplify log messages.
@@ -217,6 +222,33 @@ module Backup
         define_method name, lambda {|arg| Utilities.send(name, arg) }
         private name
       end
+
+      ##
+      # Returns the full path to the specified utility.
+      # Raises an error if utility can not be found in the system's $PATH
+      def utility_remote(name, hostname, server_ssh_user, server_ssh_password)
+        name = name.to_s.strip
+        raise Error, 'Utility Name Empty' if name.empty?
+
+        req = Backup::Remote::Command.new
+        cmd = %Q(which '#{ name }' 2>/dev/null)
+        res = req.run_ssh_cmd(server_host, server_ssh_user, server_ssh_password, cmd)
+        output = res[:output].chomp
+
+        raise Error, <<-EOS if res[:res]==0 || output.empty?
+          Could not locate '#{ name }'.
+          Make sure the specified utility is installed
+          and available in your system's $PATH, or specify it's location
+          in your 'config.rb' file using Backup::Utilities.configure
+        EOS
+
+
+        UTILITY[name] ||= output
+
+
+        UTILITY[name].dup
+      end
+
       private
       def gnu_tar?; Utilities.gnu_tar?; end
     end

data/lib/backup/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backup
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup-remote
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Max Ivak, Michael van Rooijen