backy_rb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7bb1c2b1110d5fe15106b8bb78e8e07201e2318156aa6f67a4349eb92720a06
-  data.tar.gz: 5a8ae6f47b04ac3480cecedf77987166d5d630cc511496a734cddf5f7659e871
+  metadata.gz: 592cedc95670f4512c65fffebd96358d351153b2821ad2f237be4c32460060ca
+  data.tar.gz: 7055c420d1d2e382abde9f7049de3241648387acaaf124e5d2b8be92de32c9b1
 SHA512:
-  metadata.gz: 956ae711507992a7c75a3340d108b2df9e8da541ce9e90d346b1c0249bd22a414a6bf41f5e78f901f8b81ec68fd626a6f4cafbc8833d02a6eaea5f55563a0796
-  data.tar.gz: ca0b9c66ff07d33bd204df31e400690e53ca3a7108d8267eed734e9f5bc3d280046d1033856fbf13f89c297c38821d212ae573f4ea1d30b49eda95eb135bb624
+  metadata.gz: 9d7416f6c12e79d74202e98dca6f66cebb73d5b08cd7615c1966100aa88f288c4d0724361ec0661783124c281618ddba2bb4d65fd51dbab08ad5ddef4906c7a7
+  data.tar.gz: b2e58e94802831d2915c05e77d94dd87f46a789cc841e679083227d6dd0f6be3d9f20c98b374b5efc7a6f6fddfa525255b76e86b7a632388f84727f0e4ae4a53

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to `Backy` will be documented in this file.
 
 ## [Unreleased]
+
+## [0.2.2] - 2025-01-25
+### Fixed
+- Add Ruby 3.4 compatibility fix for ActiveSupport < 7.1
+
 ## [0.2.1] - 2024-06-24
 ### Fixed
 - Fix bug where `push` is not working because of missing filename

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    backy_rb (0.2.1)
+    backy_rb (0.2.2)
       activerecord (>= 4.0)
       activesupport (>= 4.0)
       aws-sdk-s3 (>= 1.117)
+      concurrent-ruby (~> 1.3)
       pg (~> 1.5)
       thor (~> 1.2)
 
@@ -95,7 +96,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     brakeman (5.4.1)
     builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.5)
     crass (1.0.6)
     date (3.3.3)
     diff-lcs (1.5.0)
@@ -120,6 +121,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.9)
     minitest (5.18.0)
     net-imap (0.3.6)
       date
@@ -131,9 +133,8 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.2-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.2-x86_64-linux)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.2.1.1)
@@ -231,6 +232,7 @@ GEM
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES

data/backy_rb.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Backy is a powerful and user-friendly database backup gem designed specifically for Ruby on Rails applications. It streamlines the backup process, ensuring your data is safe, secure, and easily retrievable. With its versatile features and easy integration, Backy is the go-to solution for Rails developers looking to protect their valuable information."
   spec.description = "Backy is a comprehensive database backup solution for Ruby on Rails applications, created to help developers manage and safeguard their data with ease. This robust gem offers a wide range of features"
   spec.homepage = "https://rubynor.com"
-  spec.required_ruby_version = ">= 2.2.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/rubynor/backy"
@@ -43,9 +43,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", ">= 4.0"
   spec.add_dependency "activesupport", ">= 4.0"
+  
+  # Note: For Ruby 3.4+ compatibility with ActiveSupport < 7.1, 
+  # we include a compatibility fix in lib/backy_rb.rb
   spec.add_dependency "aws-sdk-s3", ">= 1.117"
   spec.add_dependency "pg", "~> 1.5"
   spec.add_dependency "thor", "~> 1.2"
+  spec.add_dependency "concurrent-ruby", "~> 1.3"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/backy/pg_dump.rb

@@ -15,13 +15,15 @@ module Backy
       log_start
 
       dump_file = nil
+      @replication_resumed = false
 
       begin
         handle_replication { dump_file = backup }
       rescue => e
         Logger.error("An error occurred during backup: #{e.message}")
       ensure
-        log_replication_resume if replica? && pause_replication?
+        # Only resume if not already resumed (single core path resumes early)
+        log_replication_resume if replica? && pause_replication? && !@replication_resumed
       end
 
       dump_file
@@ -63,6 +65,7 @@ module Backy
     def log_replication_resume
       if resume_replication
         Logger.log("Replication resumed.")
+        @replication_resumed = true
       else
         Logger.error("Failed to resume replication. Manual intervention required.")
       end
@@ -70,13 +73,46 @@ module Backy
 
     def plain_text_backup
       timestamp = current_timestamp
-      dump_file = "#{DUMP_DIR}/#{database}_#{whoami}@#{hostname}_#{timestamp}.sql.gz"
-
-      cmd = "(#{pg_password_env}pg_dump #{pg_credentials} #{database} #{DUMP_CMD_OPTS} | gzip -9 > #{dump_file}) 2>&1 >> #{log_file}"
-
-      Logger.log("Saving to #{dump_file} ... ")
-
-      execute_command(cmd, "error. See #{log_file}")
+      temp_dump_file = "#{DUMP_DIR}/#{database}_#{whoami}@#{hostname}_#{timestamp}.sql"
+      dump_file = "#{temp_dump_file}.gz"
+
+      # First, dump the database without compression
+      dump_cmd = "(#{pg_password_env}pg_dump #{pg_credentials} #{database} #{DUMP_CMD_OPTS} > #{temp_dump_file}) 2>&1 >> #{log_file}"
+      
+      Logger.log("Dumping database to #{temp_dump_file} ... ")
+      
+      if system(dump_cmd)
+        Logger.success("Database dump completed")
+        
+        # Resume replication immediately after dump completes
+        if replica? && pause_replication?
+          log_replication_resume
+        end
+        
+        # Now compress the dump file
+        Logger.log("Compressing dump file ... ")
+        
+        # Check if pigz is available for single-threaded but faster compression
+        if system("which pigz > /dev/null 2>&1")
+          compression_cmd = "pigz -1 < #{temp_dump_file} > #{dump_file}"
+          Logger.log("Using pigz for faster compression")
+        else
+          compression_cmd = "gzip -1 < #{temp_dump_file} > #{dump_file}"
+        end
+        
+        if system(compression_cmd)
+          Logger.success("Compression completed")
+          # Remove the uncompressed file
+          FileUtils.rm_f(temp_dump_file)
+        else
+          Logger.error("Compression failed. See #{log_file}")
+          FileUtils.rm_f(temp_dump_file)
+          return nil
+        end
+      else
+        Logger.error("Database dump failed. See #{log_file}")
+        return nil
+      end
 
       dump_file
     end

data/lib/backy/pg_restore.rb

@@ -45,7 +45,7 @@ module Backy
       FileUtils.mkdir_p(dump_dir)
 
       decompress_cmd = "pigz -p #{Etc.nprocessors} -dc #{file_name} | tar -C #{dump_dir} --strip-components 3 -xf -"
-      restore_cmd = "pg_restore -j #{Etc.nprocessors} -Fd -O -d #{database} #{dump_dir}"
+      restore_cmd = "pg_restore -j #{Etc.nprocessors} -Fd -O #{pg_credentials} -d #{database} #{dump_dir}"
 
       # Terminate connections and drop/create database
       terminate_and_recreate_db = "(#{pg_password_env}psql -c \"#{terminate_connection_sql};\" #{pg_credentials} #{database}; #{pg_password_env}dropdb #{pg_credentials} #{database}; #{pg_password_env}createdb #{pg_credentials} #{database}) 2>&1 >> #{log_file}"

data/lib/backy/s3_save.rb

@@ -3,6 +3,8 @@ module Backy
     include S3
 
     DEFAULT_EXPIRE_AFTER = 1.month
+    PART_SIZE = 50 * 1024 * 1024
+    MAX_THREADS = 5
 
     def initialize(file_name:, key: nil, expire_after: nil)
       @file_name = file_name
@@ -19,8 +21,12 @@ module Backy
         return
       end
 
-      File.open(file_name, "rb") do |body|
-        s3.put_object(key: key, body: body, bucket: bucket, expires: expires)
+      file_size = File.size(file_name)
+
+      if file_size < 5 * 1024 * 1024 * 1024
+        upload_simple
+      else
+        upload_multipart
       end
 
       puts "done"
@@ -29,5 +35,68 @@ module Backy
     private
 
     attr_reader :file_name, :key, :expires
+
+    def upload_simple
+      puts "Uploading #{file_name} to S3 ... "
+      File.open(file_name, "rb") do |body|
+        s3.put_object(key: key, body: body, bucket: bucket, expires: expires)
+      end
+    end
+
+    def upload_multipart
+      puts "Uploading #{file_name} to S3 (multipart) ... "
+      upload_id = s3.create_multipart_upload(bucket: bucket, key: key, expires: expires).upload_id
+      parts = []
+      mutex = Mutex.new
+
+      file_size = File.size(file_name)
+      total_parts = (file_size.to_f / PART_SIZE).ceil
+
+      part_numbers = (1..total_parts).to_a
+
+      part_numbers.each_slice(MAX_THREADS) do |batch|
+        threads = batch.map do |part_number|
+          Thread.new do
+            start_pos = (part_number - 1) * PART_SIZE
+            end_pos = [start_pos + PART_SIZE, file_size].min
+
+            part_data = nil
+            File.open(file_name, "rb") do |file|
+              file.seek(start_pos)
+              part_data = file.read(end_pos - start_pos)
+            end
+
+            resp = s3.upload_part(
+              bucket: bucket,
+              key: key,
+              upload_id: upload_id,
+              part_number: part_number,
+              body: part_data
+            )
+
+            mutex.synchronize do
+              parts << {etag: resp.etag, part_number: part_number}
+            end
+          end
+        end
+
+        threads.each(&:join)
+      end
+
+      sorted_parts = parts.sort_by { |p| p[:part_number] }
+
+      s3.complete_multipart_upload(
+        bucket: bucket,
+        key: key,
+        upload_id: upload_id,
+        multipart_upload: {
+          parts: sorted_parts
+        }
+      )
+    rescue => e
+      puts "\nError during multipart upload: #{e.message}"
+      s3.abort_multipart_upload(bucket: bucket, key: key, upload_id: upload_id)
+      raise e
+    end
   end
 end

data/lib/backy/version.rb

@@ -1,3 +1,3 @@
 module Backy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/backy_rb.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Ruby 3.4+ compatibility fix for ActiveSupport < 7.1
+require 'logger' if RUBY_VERSION >= '3.4.0'
+
 require "active_support"
 require "active_support/core_ext/integer/time"
 require "active_support/core_ext/object/blank"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backy_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alexey Kharchenko
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2025-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -236,6 +236,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Backy is a comprehensive database backup solution for Ruby on Rails applications,
   created to help developers manage and safeguard their data with ease. This robust
   gem offers a wide range of features
@@ -294,14 +308,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Backy is a powerful and user-friendly database backup gem designed specifically