ruborg 0.7.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1659a54e64ed15742467c6e95ea96fd311f0332e2fafdee7e560cec5c2385c
-  data.tar.gz: ec49de1e1231ad2bd189e08aedb70d22ec10f4f322f1b4690c9c3ec41be590bb
+  metadata.gz: 8b7697818fdf4537e02f840cb2f30c71cc3cbd6bbfc8cb8b72fe4bba7908deac
+  data.tar.gz: 2c509aec3d6586f7f3ea85aa84a621516e8ea73cd191ff325f8c33f056eb5a15
 SHA512:
-  metadata.gz: '0593d8521ab13110b3fefe00b9a1bc3cd6a8c28ffa70e93dda6e3bfa6b763f0562abd564af25a14c5619b2fe7dabb7ef76ffbe1341c6dcdb4dcac7efbb7be847'
-  data.tar.gz: 9486465c9803962569b5f376556efafa8147d72a294e9a6e3137d29e67c9664b212bed69addc0bab0ad434ddc5f42416e3aa7426087bbf4dd7c9a4ce2c71192f
+  metadata.gz: 711e51216fcc8e7522d32567f4a1759dccadb2d9691599b6408eb2f46187586dca3e837b45f7a7044a15117747b3a39ff5b083254ada2fd64f8e88f1c01e9f22
+  data.tar.gz: d7d2a732e8fbf38b33a2a5b39d35a820b98f22d3515656663c4e64fc8b589ca7ad5f49441e00f0b117118b04fe13c6ca036c28bcc6109b387a67275b5b8e7d1d

data/CHANGELOG.md

@@ -7,6 +7,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.4] - 2025-10-09
+
+### Fixed
+- **Passbolt Error Reporting**: Enhanced error handling for Passbolt CLI failures
+  - Now captures and logs stderr from Passbolt CLI commands
+  - Error messages include actual Passbolt CLI output for easier debugging
+  - Improved error logging with detailed failure context
+
+### Changed
+- **Passbolt Environment Variables**: Passbolt env vars now explicitly passed to subprocess
+  - Preserves `PASSBOLT_SERVER_ADDRESS`, `PASSBOLT_USER_PRIVATE_KEY_FILE`, `PASSBOLT_USER_PASSWORD`
+  - Also preserves `PASSBOLT_GPG_HOME` and `PASSBOLT_CONFIG`
+  - Ensures Passbolt CLI has access to required configuration when run by Ruborg
+
+## [0.7.3] - 2025-10-09
+
+### Changed
+- **Smart Remove-Source for Skipped Files**: Skipped files (unchanged, already backed up) are now deleted when `--remove-source` is used
+  - Previously: Only newly backed-up files were deleted, skipped files remained
+  - Now: Both backed-up AND skipped files are deleted (they're all safely backed up)
+  - Rationale: If a file is skipped because it's already in an archive (verified by hash), it's safe to delete
+  - Makes `--remove-source` behavior consistent: "delete everything that's safely backed up"
+
+### Technical Details
+- Per-file mode verifies files are safely backed up before skipping (path + size + SHA256 hash match)
+- Skipped files are deleted immediately after verification (lib/ruborg/backup.rb:102)
+- Test updated to verify skipped files are deleted (spec/ruborg/per_file_backup_spec.rb:518)
+
+## [0.7.2] - 2025-10-09
+
+### Fixed
+- **Per-File Remove Source Behavior**: Files are now deleted immediately after each successful backup in per-file mode
+  - Previously deleted entire source paths at the end (dangerous - could delete unchanged files)
+  - Now deletes only successfully backed-up files, one at a time
+  - Skipped files (unchanged) are never deleted
+  - Matches the per-file philosophy: individual file handling throughout the backup process
+
+### Added
+- **Test Coverage**: Added 2 new RSpec tests verifying per-file remove-source behavior
+  - Tests immediate file deletion after backup
+  - Tests that skipped files are not deleted
+
 ## [0.7.1] - 2025-10-08
 
 ### Added

data/README.md

@@ -25,7 +25,7 @@ A friendly Ruby frontend for [Borg Backup](https://www.borgbackup.org/). Ruborg
 - 📈 **Summary View** - Quick overview of all repositories and their configurations
 - 🔧 **Custom Borg Path** - Support for custom Borg executable paths per repository
 - 🏠 **Hostname Validation** - NEW! Restrict backups to specific hosts (global or per-repository)
-- ✅ **Well-tested** - Comprehensive test suite with RSpec (286+ examples)
+- ✅ **Well-tested** - Comprehensive test suite with RSpec (288+ examples)
 - 🔒 **Security-focused** - Path validation, safe YAML loading, command injection protection
 
 ## Prerequisites

data/lib/ruborg/backup.rb

@@ -91,12 +91,16 @@ module Ruborg
               stored_hash = stored_info[:hash]
 
               if current_hash == stored_hash
-                # Content truly unchanged
+                # Content truly unchanged - file is already safely backed up
                 puts " - Archive already exists (file unchanged)"
                 @logger&.info(
                   "[#{@repo_name}] Skipped #{file_path} - archive #{archive_name} already exists (file unchanged)"
                 )
                 skipped_count += 1
+
+                # If remove_source is enabled, delete the file (it's already safely backed up)
+                remove_single_file(file_path) if remove_source
+
                 next
               else
                 # Size same but content changed (rare: edited + truncated/padded to same size)
@@ -131,6 +135,9 @@ module Ruborg
         # Log successful action with details
         @logger&.info("[#{@repo_name}] Archived #{file_path} in archive #{archive_name}")
         backed_up_count += 1
+
+        # Remove source file immediately after successful backup in per-file mode
+        remove_single_file(file_path) if remove_source
       end
       # rubocop:enable Metrics/BlockLength
 
@@ -139,9 +146,6 @@ module Ruborg
       else
         puts "✓ Per-file backup completed: #{backed_up_count} file(s) backed up"
       end
-
-      # NOTE: remove_source handled per file after successful backup
-      remove_source_files if remove_source
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockNesting
 
@@ -333,6 +337,34 @@ module Ruborg
       result
     end
 
+    def remove_single_file(file_path)
+      require "fileutils"
+
+      # Resolve symlinks and validate path
+      begin
+        real_path = File.realpath(file_path)
+      rescue Errno::ENOENT
+        # File doesn't exist (already deleted?), skip
+        @logger&.warn("Source file does not exist, skipping: #{file_path}")
+        return
+      end
+
+      # Security check: ensure file still exists
+      unless File.exist?(real_path)
+        @logger&.warn("Source file no longer exists, skipping: #{real_path}")
+        return
+      end
+
+      # Additional safety: don't delete system files
+      if real_path == "/" || real_path.start_with?("/bin", "/sbin", "/usr", "/etc", "/sys", "/proc")
+        @logger&.error("Refusing to delete system path: #{real_path}")
+        raise BorgError, "Refusing to delete system path: #{real_path}"
+      end
+
+      @logger&.info("Removing file: #{real_path}")
+      FileUtils.rm(real_path)
+    end
+
     def remove_source_files
       require "fileutils"
 

data/lib/ruborg/passbolt.rb

@@ -17,11 +17,12 @@ module Ruborg
       @logger&.info("Retrieving password from Passbolt (resource_id: #{@resource_id})")
 
       cmd = ["passbolt", "get", "resource", "--id", @resource_id, "--json"]
-      output, status = execute_command(cmd)
+      output, status, error_msg = execute_command(cmd)
 
       unless status
         @logger&.error("Failed to retrieve password from Passbolt for resource #{@resource_id}")
-        raise PassboltError, "Failed to retrieve password from Passbolt"
+        error_detail = error_msg ? ": #{error_msg}" : ""
+        raise PassboltError, "Failed to retrieve password from Passbolt#{error_detail}"
       end
 
       @logger&.info("Successfully retrieved password from Passbolt")
@@ -38,8 +39,29 @@ module Ruborg
 
     def execute_command(cmd)
       require "open3"
-      stdout, _, status = Open3.capture3(*cmd)
-      [stdout, status.success?]
+
+      # Preserve Passbolt environment variables
+      env = {}
+      %w[
+        PASSBOLT_SERVER_ADDRESS
+        PASSBOLT_USER_PRIVATE_KEY_FILE
+        PASSBOLT_USER_PASSWORD
+        PASSBOLT_GPG_HOME
+        PASSBOLT_CONFIG
+      ].each do |var|
+        env[var] = ENV[var] if ENV[var]
+      end
+
+      stdout, stderr, status = Open3.capture3(env, *cmd)
+
+      # Log stderr if command failed
+      error_msg = nil
+      if !status.success? && !stderr.strip.empty?
+        error_msg = stderr.strip
+        @logger&.error("Passbolt CLI error: #{error_msg}")
+      end
+
+      [stdout, status.success?, error_msg]
     end
 
     def parse_password(json_output)

data/lib/ruborg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruborg
-  VERSION = "0.7.1"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruborg
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.4
 platform: ruby
 authors:
 - Michail Pantelelis