dotsync 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ee97490d95db52087796f0da0615d71e3dacf7ac7a89834864abac834006b36
-  data.tar.gz: c0f9ad979444a1ba28fdf7397fa7660e140dd483f8c5e7062d14cfc86852471a
+  metadata.gz: 793ae0a7e00707a97255d631304eddae60e6ce6224d8c4d85c9550f54cbd59bd
+  data.tar.gz: 34fdbefc7f9b27a2f7fedd8dcbac9748ae59c99fb7cb15a970ebc67605e5ebe1
 SHA512:
-  metadata.gz: c66534cc5d286e4fe7e85a4bff3edecd323db8ad30e653d4bee9d73dfde7277c46305f3c740626223ee302f171ae5f3bddca390805a4af366057a1a17da10a31
-  data.tar.gz: 4fc6b7b11d3e8086292d85d53cdb54de1d0ddcb11d77761c6e834f915d0db1fdd2cb7a95b56753ddbf426eb8170e697df15c86a4c4a51eb01b945ccc5191b6b8
+  metadata.gz: 50471dd7fca75246adb01dd946b17dc217b590cc0df359253f608f4868ae190c08aeb5ce5c9302dafa2533f368c69f35b1f9b3f70143ed36066745729904030b
+  data.tar.gz: 2061b3db4dfb07aaec4750efba675091797ce8ebcb9979ce37ffca5e1b838f20d2ebec181925c45d5a0a6c52d4681d05f989953f4022540c0a6705dc8fc6dd76

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+# 0.1.25
+
+**Features:**
+- Add support for file-specific paths in 'only' configuration option
+  - Enable specifying individual files within directories: `only = ["bundle/config", "ghc/ghci.conf"]`
+  - Parent directories are automatically created as needed
+  - Sibling files in the same directory remain unaffected
+  - Works with deeply nested paths: `only = ["nvim/lua/plugins/init.lua"]`
+  - Fix DirectoryDiffer to use bidirectional_include? for proper file traversal
+
+**Documentation:**
+- Completely rewrite 'force', 'only', and 'ignore' options section in README
+- Add 4 detailed examples showing different use cases
+- Add warnings and notes about combining options
+- Document important behaviors and edge cases
+
+**Testing:**
+- Add comprehensive test coverage for file-specific paths in 'only' option
+- Add tests for FileTransfer with nested file paths
+- Add tests for DirectoryDiffer with file-specific only paths
+- Add tests with force mode enabled
+- All 396 tests pass with 96.61% line coverage
+
 # 0.1.24
 
 **Performance Optimizations:**

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dotsync (0.1.24)
+    dotsync (0.1.25)
       fileutils (~> 1.7.3)
       find (~> 0.2.0)
       listen (~> 3.9.0)

data/README.md

@@ -264,16 +264,107 @@ dest = "$DOTFILES_DIR/config/alacritty"
 
 Each mapping entry supports the following options:
 
-- **`force`**: A boolean (true/false) value. When set to `true`, it forces deletion of the destination folder before transferring files from the source. This is particularly useful when you need to ensure that the destination is clean before a transfer.
-- **`only`**: An array of files or folders. This option ensures that only the specified files or folders from the `src` directory are transferred to the `dest` directory. Example:
-  ```toml
-  [[push.mappings]]
-  src = "$XDG_CONFIG_HOME"
-  dest = "$DOTFILES_DIR/config"
-  only = ["config.yml", "themes"]
+##### `force` Option
 
-  ```
-- **`ignore`**: An array of patterns or file names to exclude during the transfer. This allows you to specify files or folders that should not be copied from the source to the destination.
+A boolean (true/false) value. When set to `true`, it forces deletion of files in the destination directory that don't exist in the source. This is particularly useful when you need to ensure the destination stays synchronized with the source.
+
+**Example:**
+```toml
+[[pull.mappings]]
+src = "$XDG_CONFIG_HOME_MIRROR/nvim"
+dest = "$XDG_CONFIG_HOME/nvim"
+force = true
+ignore = ["lazy-lock.json"]
+```
+
+> [!WARNING]
+> When using `force = true` with the `only` option, only files matching the `only` filter will be managed. Other files in the destination remain untouched.
+
+##### `only` Option
+
+An array of relative paths (files or directories) to selectively transfer from the source. This option provides precise control over which files get synchronized.
+
+**How it works:**
+- Paths are relative to the `src` directory
+- You can specify entire directories or individual files
+- Parent directories are automatically created as needed
+- Other files in the source are ignored
+- With `force = true`, only files matching the `only` filter are cleaned up in the destination
+
+**Example 1: Selecting specific directories**
+```toml
+[[push.mappings]]
+src = "$XDG_CONFIG_HOME"
+dest = "$DOTFILES_DIR/config"
+only = ["nvim", "alacritty", "zsh"]
+```
+This transfers only the `nvim/`, `alacritty/`, and `zsh/` directories.
+
+**Example 2: Selecting specific files**
+```toml
+[[push.mappings]]
+src = "$XDG_CONFIG_HOME/alacritty"
+dest = "$DOTFILES_DIR/config/alacritty"
+only = ["alacritty.toml", "rose-pine.toml"]
+```
+This transfers only two specific TOML files from the alacritty config directory.
+
+**Example 3: Selecting files inside nested directories**
+```toml
+[[push.mappings]]
+src = "$HOME/.config"
+dest = "$DOTFILES_DIR/config"
+only = ["bundle/config", "ghc/ghci.conf", "cabal/config"]
+```
+This transfers only specific configuration files from different subdirectories:
+- `bundle/config` file from the `bundle/` directory
+- `ghc/ghci.conf` file from the `ghc/` directory  
+- `cabal/config` file from the `cabal/` directory
+
+The parent directories (`bundle/`, `ghc/`, `cabal/`) are created automatically in the destination, but other files in those directories are not transferred.
+
+**Example 4: Deeply nested paths**
+```toml
+[[push.mappings]]
+src = "$XDG_CONFIG_HOME"
+dest = "$DOTFILES_DIR/config"
+only = ["nvim/lua/plugins/init.lua", "nvim/lua/config/settings.lua"]
+```
+This transfers only specific Lua files from deeply nested paths within the nvim configuration.
+
+**Important behaviors:**
+- **File-specific paths**: When specifying individual files (e.g., `"bundle/config"`), only that file is managed. Sibling files in the same directory are not affected, even with `force = true`.
+- **Directory paths**: When specifying directories (e.g., `"nvim"`), all contents of that directory are managed, including subdirectories.
+- **Combining with `force`**: With `force = true` and directory paths, files in the destination directory that don't exist in the source are removed. With file-specific paths, only that specific file is managed.
+
+##### `ignore` Option
+
+An array of relative paths or patterns to exclude during transfer. This allows you to skip certain files or folders.
+
+**Example:**
+```toml
+[[pull.mappings]]
+src = "$XDG_CONFIG_HOME_MIRROR/nvim"
+dest = "$XDG_CONFIG_HOME/nvim"
+ignore = ["lazy-lock.json", "plugin/packer_compiled.lua"]
+```
+
+**Combining options:**
+```toml
+[[push.mappings]]
+src = "$XDG_CONFIG_HOME/nvim"
+dest = "$DOTFILES_DIR/config/nvim"
+only = ["lua", "init.lua"]
+ignore = ["lua/plugin/packer_compiled.lua"]
+force = true
+```
+This configuration:
+1. Transfers only the `lua/` directory and `init.lua` file (`only`)
+2. Excludes `lua/plugin/packer_compiled.lua` even though it's in the `lua/` directory (`ignore`)
+3. Removes files in the destination that don't exist in the source (`force`)
+
+> [!NOTE]
+> When `ignore` and `only` both match a path, `ignore` takes precedence.
 
 These options apply when the source is a directory and are relevant for both `push` and `pull` operations.
 

data/exe/dotsync

@@ -6,6 +6,10 @@ require_relative "../lib/dotsync/version"
 
 options = { apply: false, config_path: nil }
 
+# Initialize logger early for consistent error handling
+require_relative "../lib/dotsync/core"
+logger = Dotsync::Logger.new
+
 opt_parser = OptionParser.new do |opts|
   opts.banner = <<~BANNER
     dotsync #{Dotsync::VERSION}
@@ -30,6 +34,7 @@ opt_parser = OptionParser.new do |opts|
       dotsync diff                       # Show what would change
       dotsync watch                      # Monitor and sync continuously
       dotsync -c ~/custom.toml push      # Use custom config file
+      dotsync push --trace               # Show full error backtraces
 
     Options:
       -a, --apply           Apply changes (push or pull)
@@ -46,6 +51,7 @@ opt_parser = OptionParser.new do |opts|
       --only-config         Show only the config section
       --only-mappings       Show only the mappings section
       -v, --verbose         Force showing all available information
+      --trace               Show full error backtraces (for debugging)
       --version             Show version number
       -h, --help            Show this help message
   BANNER
@@ -106,6 +112,10 @@ opt_parser = OptionParser.new do |opts|
     options[:verbose] = true
   end
 
+  opts.on("--trace", "Show full error backtraces (for debugging)") do
+    options[:trace] = true
+  end
+
   opts.on("--version", "Show version number") do
     puts "dotsync #{Dotsync::VERSION}"
     exit
@@ -117,12 +127,29 @@ opt_parser = OptionParser.new do |opts|
   end
 end
 
-opt_parser.parse!
+begin
+  opt_parser.parse!
+rescue OptionParser::InvalidOption, OptionParser::InvalidArgument => e
+  # Extract just the problematic option from the error message
+  option_match = e.message.match(/invalid (?:option|argument): (.+)/)
+  problem = option_match ? option_match[1] : e.message
+
+  logger.error("Invalid option: #{problem}")
+  logger.info("See 'dotsync --help' for available options")
+
+  if options[:trace]
+    logger.log("\nFull backtrace:", color: 240)
+    e.backtrace.each { |line| logger.log("  #{line}", color: 240) }
+  end
+
+  exit 1
+end
 
 command = ARGV.shift
 
 # Load only the dependencies needed for the specific command
-case command
+begin
+  case command
 when "push"
   require_relative "../lib/dotsync/loaders/push_loader"
   Dotsync::Runner.new(config_path: options[:config_path]).run(:push, options)
@@ -153,9 +180,22 @@ when "diff"
   Dotsync::Runner.new(config_path: options[:config_path]).run(:push, diff_options)
 else
   if command
-    puts "dotsync: no such command '#{command}'"
+    logger.error("Unknown command: '#{command}'")
+    logger.info("See 'dotsync --help' for available commands")
   else
     puts opt_parser.banner
   end
   exit 1
+  end
+rescue => e
+  logger.error("Unexpected error: #{e.message}")
+
+  if options[:trace]
+    logger.log("\nFull backtrace:", color: 240)
+    e.backtrace.each { |line| logger.log("  #{line}", color: 240) }
+  else
+    logger.info("Run with --trace to see full error details")
+  end
+
+  exit 1
 end

data/lib/dotsync/utils/directory_differ.rb

@@ -36,7 +36,7 @@ module Dotsync
         Find.find(mapping_src) do |src_path|
           rel_path = src_path.sub(/^#{Regexp.escape(mapping_src)}\/?/, "")
 
-          unless @mapping.include?(src_path)
+          unless @mapping.bidirectional_include?(src_path)
             Find.prune
             next
           end

data/lib/dotsync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dotsync
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotsync
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - David Sáenz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-15 00:00:00.000000000 Z
+date: 2025-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb