capistrano-ops 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff5391932b65811de3330a802d309df6d78dc1d2b6b04cc60b5c86dfe0de6e1
-  data.tar.gz: 769c58ef06c175441bc53a673ee379394fc343cfdfe37612999b204508db742d
+  metadata.gz: 2e6ea5cb2553a8bedbdff2a067fc0eebc9084fad7da2034dc27ca544de536b84
+  data.tar.gz: bd22e1378dd96b52b06de1d5c1c048400e4a382878a97bf0d9d2441a6a2e02b6
 SHA512:
-  metadata.gz: e2e68e6ebb4da63511fe2a8712eeee07368b3ab6f427faa0be00799784ba73aa67eb49787d6c09f67a6da9dd6dda08e0c57296e3b1f621505e5db40576aaab1a
-  data.tar.gz: 0752765d093c875d5d96eb7b32451dc38a2f15519920f1bf85ebb1c6c926e4161e7e9488f681ee0d2067ca22b0192efab994e3ae268a55521b8789b7bc077b93
+  metadata.gz: b350bf93e1e2fe881486e7693a832aedfaff2e75e3ae271fe08f3f70ee6f3ebbfce7fd871eb44a4627f832d92b8855846c7b6045165b31607358a35923467c11
+  data.tar.gz: 0fc695db5edb67785a0ce5533bfe5d23a64dd596a6c87d4aededc76f44bfb6e858cc4fb1af59dab5b6bd4e635e8b3fc4b67eaa4d4d8a0fa43ced32229757a843

data/lib/capistrano/ops/backup/s3.rb

@@ -11,13 +11,13 @@ module Backup
       self.region = region
       self.access_key_id = access_key_id
       self.secret_access_key = secret_access_key
-      config = {
+      configuration = {
         region: region,
         access_key_id: access_key_id,
         secret_access_key: secret_access_key
       }
-      config[:endpoint] = endpoint unless endpoint.nil?
-      self.s3_resource = Aws::S3::Resource.new(config)
+      configuration[:endpoint] = endpoint unless endpoint.nil?
+      self.s3_resource = Aws::S3::Resource.new(configuration)
     end
 
     def upload(backup_file, key)

data/lib/capistrano/ops/capistrano/v3/tasks/backup/backup_helper.rb

@@ -12,7 +12,7 @@ module BackupHelper
 
   def download_backup(backup_file, type)
     puts "Downloading #{type} backup"
-    download! "#{shared_path}/backups/#{backup_file}"
+    download! "#{shared_path}/backups/#{backup_file}" , backup_file
     puts "Download finished\nDeleting temporary backup..."
     cleanup_backup(backup_file, "Download finished\nDeleting temporary backup...")
   end

data/lib/capistrano/ops/capistrano/v3/tasks/backup.rake

@@ -19,7 +19,7 @@ namespace :backup do
     on roles(rake_roles) do
       warn "deprecated: use 'backup:database:pull' instead, in future versions this task will be removed"
       backup_file = backup_file_name('database')
-      download! "#{shared_path}/backups/#{backup_file}"
+      download! "#{shared_path}/backups/#{backup_file}", backup_file
     end
   end
 end

data/lib/capistrano/ops/tasks/pg/dump.rake

@@ -5,9 +5,9 @@ namespace :pg do
   include PostgresHelper
 
   task :dump do
-    backup_path = config[:backup_path]
-    backups_enabled = config[:backups_enabled]
-    external_backup = config[:external_backup]
+    backup_path = configuration[:backup_path]
+    backups_enabled = configuration[:backups_enabled]
+    external_backup = configuration[:external_backup]
 
     unless backups_enabled
       puts 'dump: Backups are disabled'
@@ -15,7 +15,7 @@ namespace :pg do
     end
 
     notification = Notification::Api.new
-    commandlist = dump_cmd(config)
+    commandlist = dump_cmd(configuration)
 
     system "mkdir -p #{backup_path}" unless Dir.exist?(backup_path)
 

data/lib/capistrano/ops/tasks/pg/postgres_helper.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module PostgresHelper
-  def config
-    @config ||=
+  def configuration
+    @configuration ||=
       {
         database: Rails.configuration.database_configuration[Rails.env]['database'],
         username: Rails.configuration.database_configuration[Rails.env]['username'],
@@ -19,10 +19,10 @@ module PostgresHelper
     ENV['DEFAULT_URL'] || "#{Rails.env} Backup"
   end
 
-  def content(result, config = {})
-    @database = config[:database]
-    @backup_path = config[:backup_path]
-    @filename = config[:filename]
+  def content(result, settings = {})
+    @database = settings[:database]
+    @backup_path = settings[:backup_path]
+    @filename = settings[:filename]
 
     messages = []
     if result
@@ -34,13 +34,13 @@ module PostgresHelper
     messages.join("\n")
   end
 
-  def dump_cmd(config = {})
-    @hostname = config[:hostname]
-    @database = config[:database]
-    @username = config[:username]
-    @password = config[:password]
-    @portnumber = config[:portnumber]
-    @backup_path = config[:backup_path]
+  def dump_cmd(settings = {})
+    @hostname = settings[:hostname]
+    @database = settings[:database]
+    @username = settings[:username]
+    @password = settings[:password]
+    @portnumber = settings[:portnumber]
+    @backup_path = settings[:backup_path]
 
     @date = Time.now.to_i
     options = []

data/lib/capistrano/ops/tasks/storage/backup.rake

@@ -17,11 +17,11 @@ namespace :storage do
     date = Time.now.to_i
     @filename = "storage_#{date}.tar.gz"
     FileUtils.mkdir_p(@backup_path) unless Dir.exist?(@backup_path)
-    result = system "tar -zcf #{@backup_path}/#{@filename} -C #{@storage_path} ."
-    FileUtils.rm_rf("#{@backup_path}/#{filename}") unless result
-    puts result ? "Backup created: #{@backup_path}/#{@filename} (#{size_str(File.size("#{@backup_path}/#{@filename}"))})" : 'Backup failed removing dump file'
+    response = system "tar -zcf #{@backup_path}/#{@filename} -C #{@storage_path} ."
+    FileUtils.rm_rf("#{@backup_path}/#{filename}") unless response
+    puts response ? "Backup created: #{@backup_path}/#{@filename} (#{size_str(File.size("#{@backup_path}/#{@filename}"))})" : 'Backup failed removing dump file'
 
-    if ENV['BACKUP_PROVIDER'].present? && external_backup && result
+    if ENV['BACKUP_PROVIDER'].present? && external_backup && response
       puts "Uploading #{@filename} to #{ENV['BACKUP_PROVIDER']}..."
       provider = Backup::Api.new
       begin
@@ -31,14 +31,14 @@ namespace :storage do
         puts "#{@filename} upload failed: #{e.message}"
       end
     end
-    notification.send_backup_notification(result, title, message(result), { date: date, backup_path: @backup_path, database: 'storage' })
+    notification.send_backup_notification(response, title, message(response), { date: date, backup_path: @backup_path, database: 'storage' })
   end
 
   def title
     ENV['DEFAULT_URL'] || "#{Rails.env} Backup"
   end
 
-  def message(result)
+  def message(result=false)
     messages = []
     if result
       messages << "Backup of storage folder successfully finished at #{Time.now}"

data/lib/capistrano/ops/version.rb

@@ -2,6 +2,6 @@
 
 module Capistrano
   module Ops
-    VERSION = '0.2.5'
+    VERSION = '0.2.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ops
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Florian Crusius
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3