scalingo_backups_manager 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec014dcdbd0fe4aa8a6e646b131b43f7af832aa3a13d22f24900d9dcfeff857
-  data.tar.gz: 1758ce4b459fe4448ddeaeda52302e94b48083685148d398061bc4be96211574
+  metadata.gz: 9eecdc10b8f73d2a91d42fc47b3c53656f6089d0b3272fc6c40bb05b4239ed42
+  data.tar.gz: 97a79403c485891560862c3e3f9181a5e9df0c30f7fa6eb190303ee21137f466
 SHA512:
-  metadata.gz: 7b7a1f1f853aa11ea8135effcc15df970aedf269145cccb471a430705f1130e71919116f93ed1f9b2c2062a141191f214d9c99bfe5bc5f3a806abf591453b3a0
-  data.tar.gz: d313ddc959d7757050d9276e79a516395e119dc32de69278736d350a31a0ac1581a1c41b1b490ba1b842801710ba93e4985dd469312a7a0e5c88448b2494fe98
+  metadata.gz: 0b476dc2a1651226d6ef0c11961ce4815d5250c76657167c4081e5bc25091282f176be3406c9c7c7fdf237ba3483fe4f73430a47e9323020697e43a7c8625fc8
+  data.tar.gz: 339c818aecf115a985df7ae57bce015880abe5b4527a80f17ff8dbedb4cef2f7650720cf48423bf2c1fbdd0cfc8a31a25fe28a7928684d9426f898485a29b88b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scalingo_backups_manager (0.6.0)
+    scalingo_backups_manager (0.6.6)
       httparty (~> 0.18)
       net-sftp (~> 3.0.0)
       scalingo (~> 3.0)
@@ -10,27 +10,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    faraday (1.0.1)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (1.0.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -51,15 +72,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    scalingo (3.0.0)
-      activesupport (>= 5, < 7)
-      faraday (~> 1.0.1)
-      faraday_middleware (~> 1.0.0)
+    ruby2_keywords (0.0.5)
+    scalingo (3.1.0)
+      activesupport (>= 5, < 8)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
       multi_json (~> 1.0, >= 1.0.3)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -70,4 +92,4 @@ DEPENDENCIES
   scalingo_backups_manager!
 
 BUNDLED WITH
-   2.1.4
+   2.2.28

data/lib/scalingo_backups_manager/cli.rb

@@ -89,7 +89,7 @@ module ScalingoBackupsManager
           if File.exist?(path)
             puts "Backup already download, skipping..."
           else
-            system "curl #{download_link} -o #{path} --create-dirs"
+            system "curl #{download_link} -o #{path} --create-dirs -k"
           end
         else
           puts "No download link found for #{addon.addon_provider[:id]}, Skipping..."
@@ -164,6 +164,7 @@ module ScalingoBackupsManager
           when "daily"
             sftp.upload_file(path, remote_path, options: opts)
             files = sftp.list_files(remote_path)
+            p files.length
             puts "#{step} - Checking daily backups"
             step += 1
             if files.size > retention_config[:ttl]

data/lib/scalingo_backups_manager/restore/mysql.rb

@@ -63,7 +63,7 @@ module ScalingoBackupsManager
         puts "*** Restoring backup to mysql database ***"
         puts "Command: #{restore_cmd}"
         system(restore_cmd)
-        #FileUtils.rm_r destination_path unless opts[:skip_rm]
+        FileUtils.rm_r destination_path unless opts[:skip_rm]
       end
 
     end

data/lib/scalingo_backups_manager/restore/postgres.rb

@@ -33,22 +33,32 @@ module ScalingoBackupsManager
           password: rails_db_config["password"],
           user: rails_db_config["user"],
         }
+        restore_cmd = ""
+        if config[:password].present?
+          restore_cmd = "PGPASSWORD=#{config[:password]} "
+        end
+        restore_cmd << "/usr/bin/env"
+        restore_cmd << " pg_restore"
 
-        restore_cmd = "/usr/bin/env psql #{config[:database]} -h #{opts[:host] || config[:host]}"
+        file_path = Dir["#{destination_path}*.pgsql"]
+        if file_path.empty?
+          puts "*** No SQL file found in tar ***"
+          return
+        end
+        restore_cmd << " #{file_path.first}"
 
+        if config[:host].present?
+          restore_cmd << " -h #{opts[:host] || config[:host] || 'localhost'}"
+        end
         if config[:user].present?
-          restore_cmd << " --u #{config[:user]}"
-          if config[:password].present?
-            restore_cmd << " --password"
-            restore_cmd << " #{config[:password]}"
-          end
+          restore_cmd << " -U #{config[:user]}"
         end
 
-        if opts[:port].present? && config[:port].present?
+        if opts[:port].present? || config[:port].present?
           restore_cmd << " -p #{opts[:port] || config[:port] || 5432}"
         end
 
-        restore_cmd << " < #{destination_path}"
+        restore_cmd << " -d #{config[:database]} --no-owner"
 
         puts "*** Restoring backup to Postgres database ***"
         system(restore_cmd)

data/lib/scalingo_backups_manager/sftp_tools.rb

@@ -10,16 +10,25 @@ module ScalingoBackupsManager
     end
 
     def start
-      Net::SFTP.start(@ftp_host[:host], @ftp_host[:user], password: @ftp_host[:password], port: @ftp_host[:port]) do |sftp|
-        yield(sftp) if block_given?
+      if @ftp_host[:password]
+        Net::SFTP.start(@ftp_host[:host], @ftp_host[:user], password: @ftp_host[:password], port: @ftp_host[:port]) do |sftp|
+          yield(sftp) if block_given?
+        end
+      elsif @ftp_host[:private_key_path]
+        Net::SFTP.start(@ftp_host[:host], @ftp_host[:user], key_data: [], keys: @ftp_host[:private_key_path], keys_only: true, port: @ftp_host[:port]) do |sftp|
+          yield(sftp) if block_given?
+        end
       end
     end
 
     def list_files(path)
       files = []
       start do |sftp|
-        sftp.dir.glob("#{path}", "*.tar.gz").each do |file|
-          files << file
+        begin
+          sftp.dir.glob("#{path}", "*.tar.gz").each do |file|
+            files << file
+          end
+        rescue
         end
       end
       files
@@ -36,7 +45,6 @@ module ScalingoBackupsManager
         folder_tree = []
         path.split("/").each do |folder_name|
           next if folder_name.blank?
-
           folder_tree << folder_name
           begin
             sftp.mkdir!(folder_tree.join("/"))

data/lib/scalingo_backups_manager/version.rb

@@ -1,3 +1,3 @@
 module ScalingoBackupsManager
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_backups_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Kevin Clercin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Gem allowing to download backups from scalingo