scalingo_backups_manager 0.6.1 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ad746fbff41863b29fd1397102a5f002db68ba2e162e56a4b680dd32bb03b0d
-  data.tar.gz: 0d2a17507863261fa862657a32b0263a78f48be9b5e71c2bc9cd6bbaac476a92
+  metadata.gz: 8d1183b7232fbf6ee4b1706d3491c96b893815ec0af2d4752c8ad37681754ca2
+  data.tar.gz: e93a2443de456f28c6f4389f487e14d7140fd52bc53b3ea99d161cd8c25fe0fb
 SHA512:
-  metadata.gz: 6d7eb018cb31fc1b3ac6a24d8f6ff13d216045864157949489554dbe63b432169a36209a3febaa2c5c617f96d4900cad5b3caff62a889912156396cb6ad66495
-  data.tar.gz: 41187c900181fb75e102f4883057a6fc80ff3741af463c08dcaed9d631495dccecc690e2c7dcb2be895b4bf715371fd71a8726e3f8599b55f8dc464f9a254488
+  metadata.gz: 4a0c53e2c044c77c3e5343aa9f9a3cb427e2300d3fa9619c060e8c3d2e080e313d66664b09896cf5159a225bd53e6bdf7462fa0b5093d4a55a882b10d2d687f8
+  data.tar.gz: 8939a178fce0cc48fbd15822b9189a0bd11a77de27735a87588124e73669eb68bb32b5454fa5f50f2b6c50dae0d0af9d41aff8691a590c7203129437df15c397

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scalingo_backups_manager (0.6.0)
+    scalingo_backups_manager (0.6.4)
       httparty (~> 0.18)
       net-sftp (~> 3.0.0)
       scalingo (~> 3.0)
@@ -10,16 +10,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (6.1.4)
       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.4.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     httparty (0.18.1)
@@ -51,10 +62,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    scalingo (3.0.0)
+    ruby2_keywords (0.0.4)
+    scalingo (3.0.1)
       activesupport (>= 5, < 7)
-      faraday (~> 1.0.1)
-      faraday_middleware (~> 1.0.0)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
       multi_json (~> 1.0, >= 1.0.3)
     thor (1.1.0)
     tzinfo (2.0.4)

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..."

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 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/version.rb

@@ -1,3 +1,3 @@
 module ScalingoBackupsManager
-  VERSION = "0.6.1"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_backups_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.5
 platform: ruby
 authors:
 - Kevin Clercin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2022-01-06 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