backupper 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6732c30468e86071392cbc1545ade2132f75f10fc10a5c5ef603309c1c8778a0
-  data.tar.gz: 6277da7cf00f5ce107dca80ac6a703f94890be3aa0d4c1eb920cd3bb59826b88
+  metadata.gz: d7ad805ded2b476fa15ab93e4d7a30ee24706db16eedccd61dab6b3a19c6f44a
+  data.tar.gz: 9df2c9872eb1e5689c8c5b17b6709d5e7bb7321e2f3830137dd201183b7200a7
 SHA512:
-  metadata.gz: 37f1f3d7417ad9b7603eee7dcedbacd51efa4d9e5c9cf5df795cbedb9638421a9ed3fd02a658bc0e69bbcbcefd0e4ea9ec98b8f6f75e5a8f54be3729da5e8c4d
-  data.tar.gz: 132024ca21163d430a93f864fee2b97411041446955ef1834f2d79b7eaffdc848cc3ec1efa376a053a402f7401082f9d247bb6785b5a24f0385465fa8d8e9df3
+  metadata.gz: 1b76736afcd222f115641eb3821ac810ec7bb8969a5220967d55af69206ae027808a766db8a64a896cbffde2d1a415f0f922f68033f49263c9db1b95406be412
+  data.tar.gz: 5b77aea5a333d87b0461443fb4a83abca544aa0b8e8546b9de38ce10e8b08535fffbcf1c39ce2d81a5f4860b849c488e44042dd67b44f910fa977bf2fcfb0149

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    backupper (0.4.2)
+    backupper (0.5.1)
       mail (~> 2.7)
       sshkit (~> 1.15)
 
@@ -9,16 +9,30 @@ GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.0.1)
-    mail (2.7.1)
+    date (3.3.3)
+    mail (2.8.0)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     mini_mime (1.1.2)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-smtp (0.3.3)
+      net-protocol
+    net-ssh (7.0.1)
     rake (10.5.0)
-    sshkit (1.21.2)
+    sshkit (1.21.3)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    timeout (0.3.1)
 
 PLATFORMS
   ruby
@@ -26,8 +40,8 @@ PLATFORMS
 
 DEPENDENCIES
   backupper!
-  bundler
-  byebug
+  bundler (~> 2)
+  byebug (~> 11)
   rake (~> 10.0)
 
 BUNDLED WITH

data/backupper.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mail', '~> 2.7'
   spec.add_runtime_dependency 'sshkit', '~> 1.15'
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'bundler', '~> 2'
+  spec.add_development_dependency 'byebug', '~> 11'
   spec.add_development_dependency 'rake', '~> 10.0'
 end

data/bin/backupper

@@ -19,9 +19,8 @@ end
 
 begin
   parser.parse!
-  raise OptionParser::InvalidOption if ARGV.size != 1
 rescue OptionParser::InvalidOption
-  puts parser.banner
+  puts parser.help
   exit 1
 end
 
@@ -30,5 +29,10 @@ if options[:version]
   exit 0
 end
 
+if ARGV.size != 1
+  puts parser.help
+  exit 1
+end
+
 b = Backupper.new(ARGV.first)
 b.backup!(options[:only])

data/lib/backupper/backupper.rb

@@ -12,7 +12,8 @@ class Backupper
   SSHKit::Backend::Netssh.configure do |ssh|
     ssh.connection_timeout = 30
     ssh.ssh_options = {
-      auth_methods: %w[publickey password]
+      auth_methods: %w[publickey password],
+      keepalive: true
     }
   end
 
@@ -103,7 +104,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/mailer.rb

@@ -1,17 +1,16 @@
 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
+      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

data/lib/backupper/version.rb

@@ -1,3 +1,3 @@
 class Backupper
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backupper
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - pioz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Tool to backup databases
 test_files: []