ruborg 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca72109e555872d29ba3b56a07b6ed10ea5b41fec351631232265c42216fd376
-  data.tar.gz: 2049a2ba62a07171f2fc62237243043be6dacf83200f0ffa4f10b6a05285d5b1
+  metadata.gz: b3dfe277e22cf29ef1132f479b8e8a969e87c69b383529b7f05eb7238ac5ea07
+  data.tar.gz: fcf98cabcd5f4636fc513e69e3b446747c9ca2f054f6480f4da60416ec865f0d
 SHA512:
-  metadata.gz: ce9e39076fbb118801cf910ca241e930d2139e0f15c8adaf139a62e36bf8dad5a7495d81618db5f82d45d7c1e6c0784c143258afbc0c4ad524945d13b91ca345
-  data.tar.gz: 94534dfd27da62827c5976bcbbe291d9c6906a7e3355905a970b6f9ea65bb3b7612ae50373445a249f2b57ad9283028ca06ab5db87d85f05e6ff76e3b6d34121
+  metadata.gz: 159296240a1cec2e7791edb3689bf032569d8c1f4fda0ac5c1522e92076fec8c719dba3117326c9fcb9e074ffa295ed71a75b500657625d1ce71fab391b441c2
+  data.tar.gz: f6385fa1ff56520719b1f8b3985931b4083b3139889b34ed4d1dcb5d449eec8ba98e96f030988cf03cdcb5744f47255ef3b7a605e7bb040d6b1f2c0446ab3b81

data/CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.0] - 2025-10-05
+
+### Added
+- Auto-initialization feature: Set `auto_init: true` in config to automatically initialize repositories on first use
+- Multi-repository configuration support with per-repository sources
+- `--repository` / `-r` option to target specific repository in multi-repo configs
+- `--all` option to backup all repositories at once
+- Repository-specific Passbolt integration (overrides global settings)
+- Per-source exclude patterns in multi-repo configs
+- BackupConfig wrapper class for multi-repo compatibility
+- Automatic format detection (single vs multi-repo)
+- Support for multiple backup sources per repository
+- Global settings with per-repository overrides
+- `log_file` configuration option to set log path in config file
+- Log file priority: CLI option > config file > default
+
+### Changed
+- Config class now detects and handles both single-repo and multi-repo formats
+- Backup command automatically routes to single or multi-repo implementation
+- Archive naming includes repository name for multi-repo configs
+- CLI now reads log_file from config if --log option not provided
+
 ## [0.2.0] - 2025-10-05
 
 ### Added

data/README.md

@@ -15,6 +15,8 @@ A friendly Ruby frontend for [Borg Backup](https://www.borgbackup.org/). Ruborg
 - 🗂️ **Selective Restore** - Restore individual files or directories from archives
 - 🧹 **Auto-cleanup** - Optionally remove source files after successful backup
 - 📊 **Logging** - Comprehensive logging with daily rotation
+- 🗄️ **Multi-Repository** - Manage multiple backup repositories with different sources
+- 🔄 **Auto-initialization** - Automatically initialize repositories on first use
 - ✅ **Well-tested** - Comprehensive test suite with RSpec
 
 ## Prerequisites
@@ -63,7 +65,9 @@ gem install ruborg
 
 ## Configuration
 
-Create a `ruborg.yml` configuration file:
+Ruborg supports two configuration formats: **single repository** (legacy) and **multi-repository** (recommended for complex setups).
+
+### Single Repository Configuration
 
 ```yaml
 # Repository path
@@ -73,15 +77,11 @@ repository: /path/to/borg/repository
 backup_paths:
   - /home/user/documents
   - /home/user/projects
-  - /etc
 
 # Exclude patterns
 exclude_patterns:
   - "*.tmp"
   - "*.log"
-  - "*/.cache/*"
-  - "*/node_modules/*"
-  - "*/.git/*"
 
 # Compression algorithm (lz4, zstd, zlib, lzma, none)
 compression: lz4
@@ -92,9 +92,62 @@ encryption: repokey
 # Passbolt integration (optional)
 passbolt:
   resource_id: "your-passbolt-resource-uuid"
+
+# Auto-initialize repository (optional, default: false)
+auto_init: true
+
+# Log file path (optional, default: ~/.ruborg/logs/ruborg.log)
+log_file: /var/log/ruborg.log
+```
+
+### Multi-Repository Configuration
+
+For managing multiple repositories with different sources:
+
+```yaml
+# Global settings (applied to all repositories unless overridden)
+compression: lz4
+encryption: repokey
+auto_init: true
+passbolt:
+  resource_id: "global-passbolt-id"
+
+# Multiple repositories
+repositories:
+  - name: documents
+    path: /mnt/backup/documents
+    sources:
+      - name: home-docs
+        paths:
+          - /home/user/documents
+        exclude:
+          - "*.tmp"
+      - name: work-docs
+        paths:
+          - /home/user/work
+        exclude:
+          - "*.log"
+
+  - name: databases
+    path: /mnt/backup/databases
+    # Repository-specific passbolt (overrides global)
+    passbolt:
+      resource_id: "db-specific-passbolt-id"
+    sources:
+      - name: mysql
+        paths:
+          - /var/lib/mysql/dumps
+      - name: postgres
+        paths:
+          - /var/lib/postgresql/dumps
 ```
 
-See `ruborg.yml.example` for a complete configuration template.
+**Multi-repo benefits:**
+- Organize backups by type (documents, databases, media)
+- Different encryption keys per repository
+- Multiple sources per repository
+- Per-source exclude patterns
+- Repository-specific settings override global ones
 
 ## Usage
 
@@ -110,6 +163,7 @@ ruborg init /path/to/repository --passbolt-id "resource-uuid"
 
 ### Create a Backup
 
+**Single repository:**
 ```bash
 # Using default configuration (ruborg.yml)
 ruborg backup
@@ -124,6 +178,18 @@ ruborg backup --name "my-backup-2025-10-04"
 ruborg backup --remove-source
 ```
 
+**Multi-repository:**
+```bash
+# Backup specific repository
+ruborg backup --repository documents
+
+# Backup all repositories
+ruborg backup --all
+
+# Backup specific repository with custom name
+ruborg backup --repository databases --name "db-backup-2025-10-05"
+```
+
 ### List Archives
 
 ```bash
@@ -151,13 +217,23 @@ ruborg info
 
 ## Logging
 
-Ruborg automatically logs all operations to `~/.ruborg/logs/ruborg.log` with daily rotation. You can specify a custom log file:
+Ruborg automatically logs all operations with daily rotation. Log file location priority:
+
+1. **CLI option** (highest priority): `--log /path/to/custom.log`
+2. **Config file**: `log_file: /path/to/log.log`
+3. **Default**: `~/.ruborg/logs/ruborg.log`
+
+**Examples:**
 
 ```bash
-ruborg backup --log /path/to/custom.log
+# Use CLI option (overrides config)
+ruborg backup --log /var/log/ruborg.log
+
+# Or set in config file
+log_file: /var/log/ruborg.log
 ```
 
-Logs include:
+**Logs include:**
 - Operation start/completion timestamps
 - Paths being backed up
 - Archive names created
@@ -191,20 +267,41 @@ passbolt:
 
 Ruborg will automatically retrieve the passphrase when performing backup operations.
 
+## Auto-initialization
+
+Set `auto_init: true` in your configuration file to automatically initialize the repository on first use:
+
+```yaml
+repository: /path/to/borg/repository
+auto_init: true
+passbolt:
+  resource_id: "your-passbolt-resource-uuid"
+backup_paths:
+  - /path/to/backup
+```
+
+When enabled, ruborg will automatically run `borg init` if the repository doesn't exist when you run `backup`, `list`, or `info` commands. The passphrase will be retrieved from Passbolt if configured.
+
 ## Command Reference
 
 | Command | Description | Options |
 |---------|-------------|---------|
 | `init REPOSITORY` | Initialize a new Borg repository | `--passphrase`, `--passbolt-id`, `--log` |
-| `backup` | Create a backup using config file | `--config`, `--name`, `--remove-source`, `--log` |
-| `list` | List all archives in repository | `--config`, `--log` |
-| `restore ARCHIVE` | Restore files from archive | `--config`, `--destination`, `--path`, `--log` |
-| `info` | Show repository information | `--config`, `--log` |
+| `backup` | Create a backup using config file | `--config`, `--name`, `--remove-source`, `--repository`, `--all`, `--log` |
+| `list` | List all archives in repository | `--config`, `--repository`, `--log` |
+| `restore ARCHIVE` | Restore files from archive | `--config`, `--destination`, `--path`, `--repository`, `--log` |
+| `info` | Show repository information | `--config`, `--repository`, `--log` |
 
 ### Global Options
 
 - `--config`: Path to configuration file (default: `ruborg.yml`)
-- `--log`: Path to log file (default: `~/.ruborg/logs/ruborg.log`)
+- `--log`: Path to log file (overrides config, default: `~/.ruborg/logs/ruborg.log`)
+- `--repository` / `-r`: Repository name (required for multi-repo configs)
+
+### Multi-Repository Options
+
+- `--all`: Backup all repositories (multi-repo config only)
+- `--repository NAME`: Target specific repository by name
 
 ## Development
 

data/lib/ruborg/cli.rb

@@ -7,10 +7,21 @@ module Ruborg
   class CLI < Thor
     class_option :config, type: :string, default: "ruborg.yml", desc: "Path to configuration file"
     class_option :log, type: :string, desc: "Path to log file"
+    class_option :repository, type: :string, aliases: "-r", desc: "Repository name (for multi-repo configs)"
 
     def initialize(*args)
       super
-      @logger = RuborgLogger.new(log_file: options[:log])
+      # Priority: CLI option > config file > default
+      log_path = options[:log]
+      unless log_path
+        # Try to load config to get log_file setting
+        config_path = options[:config] || "ruborg.yml"
+        if File.exist?(config_path)
+          config_data = YAML.load_file(config_path) rescue {}
+          log_path = config_data["log_file"]
+        end
+      end
+      @logger = RuborgLogger.new(log_file: log_path)
     end
 
     desc "init REPOSITORY", "Initialize a new Borg repository"
@@ -31,26 +42,16 @@ module Ruborg
     desc "backup", "Create a backup using configuration file"
     option :name, type: :string, desc: "Archive name"
     option :remove_source, type: :boolean, default: false, desc: "Remove source files after successful backup"
+    option :all, type: :boolean, default: false, desc: "Backup all repositories (multi-repo config only)"
     def backup
       @logger.info("Starting backup operation with config: #{options[:config]}")
       config = Config.new(options[:config])
-      @logger.info("Backing up paths: #{config.backup_paths.join(', ')}")
-      passphrase = fetch_passphrase_from_config(config)
-
-      repo = Repository.new(config.repository, passphrase: passphrase)
-      backup = Backup.new(repo, config: config)
-
-      archive_name = options[:name] || Time.now.strftime("%Y-%m-%d_%H-%M-%S")
-      @logger.info("Creating archive: #{archive_name}")
-      backup.create(name: options[:name], remove_source: options[:remove_source])
-      @logger.info("Backup created successfully: #{archive_name}")
 
-      if options[:remove_source]
-        @logger.info("Removed source files: #{config.backup_paths.join(', ')}")
+      if config.multi_repo?
+        backup_multi_repo(config)
+      else
+        backup_single_repo(config)
       end
-
-      puts "Backup created successfully"
-      puts "Source files removed" if options[:remove_source]
     rescue Error => e
       @logger.error("Backup failed: #{e.message}")
       error_exit(e)
@@ -63,6 +64,14 @@ module Ruborg
       passphrase = fetch_passphrase_from_config(config)
 
       repo = Repository.new(config.repository, passphrase: passphrase)
+
+      # Auto-initialize repository if configured
+      if config.auto_init? && !repo.exists?
+        @logger.info("Auto-initializing repository at #{config.repository}")
+        repo.create
+        puts "Repository auto-initialized at #{config.repository}"
+      end
+
       repo.list
       @logger.info("Successfully listed archives")
     rescue Error => e
@@ -102,6 +111,14 @@ module Ruborg
       passphrase = fetch_passphrase_from_config(config)
 
       repo = Repository.new(config.repository, passphrase: passphrase)
+
+      # Auto-initialize repository if configured
+      if config.auto_init? && !repo.exists?
+        @logger.info("Auto-initializing repository at #{config.repository}")
+        repo.create
+        puts "Repository auto-initialized at #{config.repository}"
+      end
+
       repo.info
       @logger.info("Successfully retrieved repository information")
     rescue Error => e
@@ -129,5 +146,128 @@ module Ruborg
       puts "Error: #{error.message}"
       exit 1
     end
+
+    # Single repository backup (legacy)
+    def backup_single_repo(config)
+      @logger.info("Backing up paths: #{config.backup_paths.join(', ')}")
+      passphrase = fetch_passphrase_from_config(config)
+
+      repo = Repository.new(config.repository, passphrase: passphrase)
+
+      # Auto-initialize repository if configured
+      if config.auto_init? && !repo.exists?
+        @logger.info("Auto-initializing repository at #{config.repository}")
+        repo.create
+        puts "Repository auto-initialized at #{config.repository}"
+      end
+
+      backup = Backup.new(repo, config: config)
+
+      archive_name = options[:name] || Time.now.strftime("%Y-%m-%d_%H-%M-%S")
+      @logger.info("Creating archive: #{archive_name}")
+      backup.create(name: options[:name], remove_source: options[:remove_source])
+      @logger.info("Backup created successfully: #{archive_name}")
+
+      if options[:remove_source]
+        @logger.info("Removed source files: #{config.backup_paths.join(', ')}")
+      end
+
+      puts "Backup created successfully"
+      puts "Source files removed" if options[:remove_source]
+    end
+
+    # Multi-repository backup
+    def backup_multi_repo(config)
+      global_settings = config.global_settings
+      repos_to_backup = if options[:all]
+                          config.repositories
+                        elsif options[:repository]
+                          repo_config = config.get_repository(options[:repository])
+                          raise ConfigError, "Repository '#{options[:repository]}' not found" unless repo_config
+                          [repo_config]
+                        else
+                          raise ConfigError, "Please specify --repository or --all for multi-repo config"
+                        end
+
+      repos_to_backup.each do |repo_config|
+        backup_repository(repo_config, global_settings)
+      end
+    end
+
+    def backup_repository(repo_config, global_settings)
+      repo_name = repo_config["name"]
+      puts "\n--- Backing up repository: #{repo_name} ---"
+      @logger.info("Backing up repository: #{repo_name}")
+
+      # Merge global settings with repo-specific settings (repo-specific takes precedence)
+      merged_config = global_settings.merge(repo_config)
+
+      passphrase = fetch_passphrase_for_repo(merged_config)
+      repo = Repository.new(repo_config["path"], passphrase: passphrase)
+
+      # Auto-initialize if configured
+      auto_init = merged_config["auto_init"] || false
+      if auto_init && !repo.exists?
+        @logger.info("Auto-initializing repository at #{repo_config['path']}")
+        repo.create
+        puts "Repository auto-initialized at #{repo_config['path']}"
+      end
+
+      # Create backup config wrapper
+      backup_config = BackupConfig.new(repo_config, merged_config)
+      backup = Backup.new(repo, config: backup_config)
+
+      archive_name = options[:name] || "#{repo_name}-#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}"
+      @logger.info("Creating archive: #{archive_name}")
+
+      sources = repo_config["sources"] || []
+      @logger.info("Backing up #{sources.size} source(s)")
+
+      backup.create(name: archive_name, remove_source: options[:remove_source])
+      @logger.info("Backup created successfully: #{archive_name}")
+
+      puts "✓ Backup created: #{archive_name}"
+      puts "  Sources removed" if options[:remove_source]
+    end
+
+    def fetch_passphrase_for_repo(repo_config)
+      passbolt_config = repo_config["passbolt"]
+      return nil if passbolt_config.nil? || passbolt_config.empty?
+
+      Passbolt.new(resource_id: passbolt_config["resource_id"]).get_password
+    end
+
+    # Wrapper class to adapt multi-repo config to existing Backup class
+    class BackupConfig
+      def initialize(repo_config, merged_settings)
+        @repo_config = repo_config
+        @merged_settings = merged_settings
+      end
+
+      def backup_paths
+        sources = @repo_config["sources"] || []
+        sources.flat_map do |source|
+          source["paths"] || []
+        end
+      end
+
+      def exclude_patterns
+        patterns = []
+        sources = @repo_config["sources"] || []
+        sources.each do |source|
+          patterns += (source["exclude"] || [])
+        end
+        patterns += (@merged_settings["exclude_patterns"] || [])
+        patterns.uniq
+      end
+
+      def compression
+        @merged_settings["compression"] || "lz4"
+      end
+
+      def encryption_mode
+        @merged_settings["encryption"] || "repokey"
+      end
+    end
   end
 end

data/lib/ruborg/config.rb

@@ -11,6 +11,7 @@ module Ruborg
     def initialize(config_path)
       @config_path = config_path
       load_config
+      detect_format
     end
 
     def load_config
@@ -21,6 +22,7 @@ module Ruborg
       raise ConfigError, "Invalid YAML syntax: #{e.message}"
     end
 
+    # Legacy single-repo accessors (for backward compatibility)
     def repository
       @data["repository"]
     end
@@ -44,5 +46,43 @@ module Ruborg
     def passbolt_integration
       @data["passbolt"] || {}
     end
+
+    def auto_init?
+      @data["auto_init"] || false
+    end
+
+    def log_file
+      @data["log_file"]
+    end
+
+    # New multi-repo support
+    def multi_repo?
+      @multi_repo
+    end
+
+    def repositories
+      return [] unless multi_repo?
+      @data["repositories"] || []
+    end
+
+    def get_repository(name)
+      return nil unless multi_repo?
+      repositories.find { |r| r["name"] == name }
+    end
+
+    def repository_names
+      return [] unless multi_repo?
+      repositories.map { |r| r["name"] }
+    end
+
+    def global_settings
+      @data.slice("passbolt", "compression", "encryption", "auto_init")
+    end
+
+    private
+
+    def detect_format
+      @multi_repo = @data.key?("repositories")
+    end
   end
 end

data/lib/ruborg/version.rb

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

metadata

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