scalingo_backups_manager 0.6.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1183b7232fbf6ee4b1706d3491c96b893815ec0af2d4752c8ad37681754ca2
-  data.tar.gz: e93a2443de456f28c6f4389f487e14d7140fd52bc53b3ea99d161cd8c25fe0fb
+  metadata.gz: 22aae190ac267f91679c59c01c34a385d7d31b8859c05c106e280bd8c449bc32
+  data.tar.gz: 4db5340d871f30d632067a274178837561716c289fe57fa72b1cc7a7af6a38cc
 SHA512:
-  metadata.gz: 4a0c53e2c044c77c3e5343aa9f9a3cb427e2300d3fa9619c060e8c3d2e080e313d66664b09896cf5159a225bd53e6bdf7462fa0b5093d4a55a882b10d2d687f8
-  data.tar.gz: 8939a178fce0cc48fbd15822b9189a0bd11a77de27735a87588124e73669eb68bb32b5454fa5f50f2b6c50dae0d0af9d41aff8691a590c7203129437df15c397
+  metadata.gz: 50c9ee867cfbb4f09c14cc82a7675ebd43c561d87fdaea720cf4ad0455be6aec87dcb022103e82638bc722c2c09f07fe29386c621e05338e30cafd43074eb8a2
+  data.tar.gz: af4e44b07ad73739b00fdb2e77be8c7dd80e8a0fdff376e87cfaf73c3a1e2618e90761adc46c5d61477b78c1730f2c0c3fadf705b2ed8cb5822008230b559bf6

data/.gitignore

@@ -11,4 +11,5 @@
 .rspec_status
 scalingo-backups-config.yml
 /backups/
-.idea
+.idea
+.rbenv-vars

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scalingo_backups_manager (0.6.4)
+    scalingo_backups_manager (0.7.0)
       httparty (~> 0.18)
       net-sftp (~> 3.0.0)
       scalingo (~> 3.0)
@@ -10,41 +10,50 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
-    faraday (1.4.3)
+    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.1)
-      multipart-post (>= 1.2, < 3)
+      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-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    faraday_middleware (1.0.0)
+    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)
+    multipart-post (2.2.0)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
@@ -62,16 +71,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
-    scalingo (3.0.1)
-      activesupport (>= 5, < 7)
+    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)
 
 PLATFORMS
   ruby
@@ -82,4 +90,4 @@ DEPENDENCIES
   scalingo_backups_manager!
 
 BUNDLED WITH
-   2.1.4
+   2.3.13

data/lib/scalingo_backups_manager/cli.rb

@@ -79,20 +79,24 @@ module ScalingoBackupsManager
       end
 
       configuration.for_each_addons(searched_application, searched_addon) do |application, addon|
-        backups = addon.backups
-        next unless backups.size > 0
-        backup = backups.first
-        download_link = backup.download_link
-        if download_link
+        begin
           puts "Downloading #{application.name} last backup"
-          path = ("#{addon.config[:path]}" || "backups/#{addon.addon_provider[:id]}") + "/#{Time.now.strftime("%Y%m%d")}.tar.gz"
-          if File.exist?(path)
-            puts "Backup already download, skipping..."
+          backups = addon.backups
+          next unless backups.size > 0
+          backup = backups.first
+          download_link = backup.download_link
+          if download_link
+            path = ("#{addon.config[:path]}" || "backups/#{addon.addon_provider[:id]}") + "/#{Time.now.strftime("%Y%m%d")}.tar.gz"
+            if File.exist?(path)
+              puts "Backup already download, skipping..."
+            else
+              system "curl #{download_link} -o #{path} --create-dirs -k"
+            end
           else
-            system "curl #{download_link} -o #{path} --create-dirs -k"
+            puts "No download link found for #{addon.addon_provider[:id]}, Skipping..."
           end
-        else
-          puts "No download link found for #{addon.addon_provider[:id]}, Skipping..."
+        rescue
+          puts "Issue with configuration of #{application.name}"
         end
       end
     end
@@ -164,6 +168,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/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.5"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_backups_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Kevin Clercin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: 
+description:
 email:
 - kevin@9troisquarts.com
 executables:
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -106,7 +107,7 @@ metadata:
   homepage_uri: https://github.com/9troisquarts/scalingo_backups_manager
   source_code_uri: https://github.com/9troisquarts/scalingo_backups_manager
   changelog_uri: https://github.com/9troisquarts/scalingo_backups_manager/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Gem allowing to download backups from scalingo
 test_files: []