backupper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e342e000d1463ab2e5acda75380d51b4234e15c10bc9926de642657ffadbbe02
-  data.tar.gz: c5b08c11facbf564daaf375ccff26e0e8ba4aa59b5d03a0981dc8f69ea5d5463
+  metadata.gz: 5a62ccacd902e965abc1f8ca3e2e3cd62c19f7d409a8ce518bb189e12200b026
+  data.tar.gz: 954a6ce0b31a61ff158e06fe6433c31eba02104f256e17f7cbd76e792475f071
 SHA512:
-  metadata.gz: c2c543a27f6f781700acded008b3629a19507da9b10b3851cf513edceac10bcaf8e8efdb771dfee04ae2ee208ba966c5134b03e71002df6d65d3851cbc658a26
-  data.tar.gz: caccc5dd3ec837854f29efa9e94f11a02543d67c4f6e659f9a5d037760ffe3e5eed577d39eed86151d9e9fb69e5d7ca93d5aaf416adc58386b82dcc49e280269
+  metadata.gz: d321d489e3ecd95d652c8e82dc33f691189af99b6ad797aa1f292822a6a1bbf97aa73b9eae2d1bf1260a7cb4b8ddf8eb9065a0d2b533a72e93e44bb8599b97f5
+  data.tar.gz: 8b05b87aab8fabedefc6b60a37edc235ab78c6f59aca215d7caae1bd650c9cbcc0efb45deefb5c89a137327a04af793f0f90c832b12cb6965623bb8e91703a87

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    backupper (0.4.0)
+    backupper (0.5.0)
       mail (~> 2.7)
       sshkit (~> 1.15)
 
@@ -11,12 +11,12 @@ GEM
     byebug (11.0.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
+    mini_mime (1.1.2)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
     rake (10.5.0)
-    sshkit (1.20.0)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
 
@@ -31,4 +31,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   2.0.2
+   2.3.8

data/bin/backupper

@@ -21,7 +21,7 @@ begin
   parser.parse!
   raise OptionParser::InvalidOption if ARGV.size != 1
 rescue OptionParser::InvalidOption
-  puts parser.banner
+  puts parser.help
   exit 1
 end
 

data/lib/backupper/backupper.rb

@@ -103,7 +103,7 @@ class Backupper
     def send_report_email!
       if @report.any? && @mailer['from'] && @mailer['to'] && @mailer['password']
         begin
-          Mailer.send(from: @mailer['from'], to: @mailer['to'], password: @mailer['password'], report: @report)
+          Mailer.send(@report, from: @mailer['from'], to: @mailer['to'], password: @mailer['password'], address: @mailer['address'] || 'smtp.gmail.com', port: @mailer['port'] || 587, authentication: @mailer['authentication'] || 'plain')
         rescue Net::SMTPAuthenticationError => e
           @logger.error e
         end

data/lib/backupper/dump_command.rb

@@ -2,17 +2,17 @@ module DumpCommand
   def self.mysql(database:, username: 'root', password: nil, dump_options: nil, outfile:)
     params = []
     params << "--databases '#{database}'"
-    params << "-u#{username}"
-    params << "-p#{password}" if password
+    params << "-u'#{username}'"
+    params << "-p'#{password}'" if password
     params << dump_options if dump_options
     return "mysqldump #{params.join(' ')} | bzip2 > '#{outfile}'"
   end
 
   def self.postgresql(database:, username: 'root', password: nil, dump_options: nil, outfile:)
     params = []
-    params << "-U #{username}"
+    params << "-U '#{username}'"
     params << "'#{database}'"
     params << dump_options if dump_options
-    return "PGPASSWORD=#{password} pg_dump #{params.join(' ')} | bzip2 > '#{outfile}'"
+    return "PGPASSWORD='#{password}' pg_dump #{params.join(' ')} | bzip2 > '#{outfile}'"
   end
 end

data/lib/backupper/mailer.rb

@@ -1,30 +1,24 @@
 require 'mail'
 
 class Mailer
-  def self.send(from:, to:, password:, report:)
-    options = {
-      address:              'smtp.gmail.com',
-      port:                 587,
-      user_name:            from,
-      password:             password,
-      authentication:       'plain',
-      enable_starttls_auto: true
-    }
+  def self.send(report, from:, to:, password:, address:, port:, authentication:)
     Mail.defaults do
-      delivery_method :smtp, options
-    end
-    Mail.deliver do
-      to to
-      from from
-      subject self.subject(report)
-      body self.body(report)
+      delivery_method :smtp, {
+        address:              address,
+        port:                 port,
+        user_name:            from,
+        password:             password,
+        authentication:       authentication,
+        enable_starttls_auto: true
+      }
     end
+    Mail.deliver(to: to, from: from, subject: generate_subject(report), body: generate_body(report))
   end
 
   class << self
     private
 
-      def body(report)
+      def generate_body(report)
         b = []
         report.each do |k, data|
           s = ''
@@ -51,7 +45,7 @@ class Mailer
         return "Report for backups (#{Time.now})\n\n#{b.join("\n\n")}"
       end
 
-      def subject(report)
+      def generate_subject(report)
         errors = report.select { |_k, v| v[:error] }.size
         icon = '✅'
         icon = '⚠️' if errors > 0

data/lib/backupper/version.rb

@@ -1,3 +1,3 @@
 class Backupper
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backupper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - pioz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Tool to backup databases