dotsync 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28cc44acb0d37fc42964d0d269f39207a511ffd46b5ac56576ac0ac3c9987d3
-  data.tar.gz: 858ba580f260d48a150807fffb1a57932933b24c92759ba335930479183aa568
+  metadata.gz: 2f547b92c47c8fc439eb6e46ab2fb858d6ad7ec8d424c67c76611b990fae88c9
+  data.tar.gz: 910ff1e02a260708a8b5dee75a665db652b47936bc565c5b435ca26c31d58c4b
 SHA512:
-  metadata.gz: 1057cde0ff17f551fa476660f4be420e5e8057a4fab9daf1b5880b6e11d7a7c99a354d18a7e28e72ac51359e6c889877dc663634891b3da64da58955b548220d
-  data.tar.gz: 84058bd7fbdf36e078efc3b38f0804f545c6e1d0d25d1725ee65f85e20b77302df7281d3021441808c544535b54df697bb48218fa01e92136d6c277b8f904c4c
+  metadata.gz: b60dfcd57e1c676ed7a9f2a003610066c37d57689bbb90f864ecae9d5277ad95e9df76794f932858ba486b63f5a9d9ca8990ad4b27ecef73622145647e877526
+  data.tar.gz: 242485598ab533582382f2452ce63bf4772a8f4c3f5178b27a1e74712b31ebffe816550046b1519d02a39cdd360a14d5afa1a776342ec8090e3b4653990e9535

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.12
+
+- FileTransfer: apply ignores both to src and dest
+- DirectoryDiffer: fix diff on simple files
+- PullAction: fix deletion older backup
+- Readme: new screenshots
+
 # 0.1.11
 
 - Readme: fixes badge icon
@@ -12,7 +19,7 @@
 - Exe: improved banner with options
 - Options: added "--apply"
 - Options: added "--environment-variables"
-- Differ: show full path using original mapping paths
+- DirectoryDiffer: show full path using original mapping paths
 - Readme: add gem version badge
 - Readme: add requirements section
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dotsync (0.1.11)
+    dotsync (0.1.12)
       fileutils (~> 1.7.3)
       find (~> 0.2.0)
       listen (~> 3.9.0)
@@ -14,7 +14,12 @@ GEM
   specs:
     ast (2.4.3)
     citrus (3.0.2)
+    date (3.5.0)
+    debug (1.11.0)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     diff-lcs (1.6.2)
+    erb (5.1.3)
     ffi (1.17.2)
     ffi (1.17.2-aarch64-linux-gnu)
     ffi (1.17.2-aarch64-linux-musl)
@@ -28,6 +33,11 @@ GEM
     ffi (1.17.2-x86_64-linux-musl)
     fileutils (1.7.3)
     find (0.2.0)
+    io-console (0.8.1)
+    irb (1.15.3)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     json (2.15.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
@@ -40,7 +50,13 @@ GEM
     parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
     prism (1.6.0)
+    psych (5.2.6)
+      date
+      stringio
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.0)
@@ -49,7 +65,13 @@ GEM
       ffi (~> 1.0)
     rbs (3.9.5)
       logger
+    rdoc (6.15.1)
+      erb
+      psych (>= 4.0.0)
+      tsort
     regexp_parser (2.11.3)
+    reline (0.6.2)
+      io-console (~> 0.5)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -95,10 +117,12 @@ GEM
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 5)
     ruby-progressbar (1.13.0)
+    stringio (3.1.7)
     timecop (0.9.10)
     toml-rb (4.0.0)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
+    tsort (0.2.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.1.0)
@@ -117,6 +141,7 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
+  debug (~> 1.11)
   dotsync!
   rake (~> 13.3.0)
   rspec (~> 3.13.1)

data/README.md

@@ -38,7 +38,7 @@ Dotsync provides the following commands to manage your dotfiles:
   dotsync push
   ```
 
-  ![dotsync push](docs/images/dotsync_push_apply.png)
+  ![dotsync push](docs/images/dotsync_push.png)
 
 - **Pull**: Synchronize dotfiles from the repository to your local machine.
   ```shell
@@ -47,6 +47,8 @@ Dotsync provides the following commands to manage your dotfiles:
 
   During the `pull` operation, `Dotsync::PullAction` creates a backup of the existing files on the destination. These backups are stored in a directory under the XDG path, with each backup organized by a timestamp. To prevent excessive storage usage, only the 10 most recent backups are retained. Older backups are automatically purged, ensuring efficient storage management.
 
+  ![dotsync pull](docs/images/dotsync_pull.png)
+
 - **Watch**: Continuously monitor and sync changes between your local machine and the repository.
   ```shell
   dotsync watch
@@ -65,6 +67,13 @@ The configuration file uses a `mappings` structure to define the source and dest
 [[pull.mappings]]
 src = "$XDG_CONFIG_HOME_MIRROR"
 dest = "$XDG_CONFIG_HOME"
+ignore = ["nvim"]
+
+[[pull.mappings]]
+src  = "$XDG_CONFIG_HOME_MIRROR/nvim"
+dest = "$XDG_CONFIG_HOME/nvim"
+force = true  # it forces the deletion of destination folder
+ignore = ["lazy-lock.json"]  # use relative paths to "dest" to ignore files and folders
 
 [[pull.mappings]]
 src = "$HOME_MIRROR/.zshenv"
@@ -78,8 +87,6 @@ src = "$HOME_MIRROR/.zshenv"
 [[push.mappings]]
 src = "$XDG_CONFIG_HOME/alacritty"
 dest = "$DOTFILES_DIR/config/alacritty"
-force = true # it forces the deletion of destination folder
-ignore = ["themes/rose-pine.toml"] # use relative paths to "dest" to ignore files and folders
 
 
 [[watch.mappings]]

data/dotsync.gemspec

@@ -33,6 +33,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "logger", "~> 1.7.0" # No longer part of default gems from Ruby 3.5
   spec.add_dependency "ostruct", "~> 0.6.3" # No longer part of default gems from Ruby 3.5
   spec.add_dependency "find", "~> 0.2.0"
+
+  # Debug with:
+  # require 'debug'; binding.break
+  spec.add_development_dependency "debug", "~> 1.11"
   spec.add_development_dependency "rake", "~> 13.3.0"
   spec.add_development_dependency "rspec", "~> 3.13.1"
   spec.add_development_dependency "rubocop", "~> 1.81.1"

data/lib/dotsync/actions/watch_action.rb

@@ -47,7 +47,7 @@ module Dotsync
 
       def handle_file_changes(mapping, modified, added, removed)
         (modified + added).each do |path|
-          new_mapping = mapping.applied_to(path)
+          new_mapping = mapping.apply_to(path)
           logger.info("Copied file: #{new_mapping}", icon: :copy)
           Dotsync::FileTransfer.new(new_mapping).transfer
         end

data/lib/dotsync/models/mapping.rb

@@ -40,12 +40,23 @@ module Dotsync
     end
 
     def files?
-      return true if File.file?(src) && File.file?(dest)
+      files_present? || file_present_in_src_only?
+    end
+
+    def files_present?
+      File.file?(src) && File.file?(dest)
+    end
+
+    def file_present_in_src_only?
       File.file?(src) && !File.exist?(dest) && File.directory?(File.dirname(dest))
     end
 
     def valid?
-      directories? || files?
+      directories? || files? || file_present_in_src_only?
+    end
+
+    def file_changed?
+      files_present? && (File.size(src) != File.size(dest))
     end
 
     def backup_possible?
@@ -68,7 +79,7 @@ module Dotsync
       msg.join(" ")
     end
 
-    def applied_to(path)
+    def apply_to(path)
       relative_path = if Pathname.new(path).absolute?
         path.delete_prefix(File.join(src, "/"))
       else
@@ -91,7 +102,9 @@ module Dotsync
       def process_paths(src, dest, ignores)
         sanitized_src = sanitize_path(src)
         sanitized_dest = sanitize_path(dest)
-        sanitized_ignore = ignores.map { |path| File.join(sanitized_src, path) }
+        sanitized_ignore = ignores.flat_map do |path|
+          [File.join(sanitized_src, path), File.join(sanitized_dest, path)]
+        end
         [sanitized_src, sanitized_dest, sanitized_ignore]
       end
   end

data/lib/dotsync/utils/directory_differ.rb

@@ -2,6 +2,8 @@
 
 module Dotsync
   class DirectoryDiffer
+    include Dotsync::PathUtils
+
     extend Forwardable
 
     # attr_reader :src, :dest
@@ -58,32 +60,27 @@ module Dotsync
           end
         end
 
-        if ignores.any?
-          additions = filter_paths(additions, ignores)
-          modifications = filter_paths(modifications, ignores)
-          removals = filter_paths(removals, ignores)
-        end
-
-        additions.map! { |rel_path| File.join(mapping_original_dest, rel_path) }
-        modifications.map! { |rel_path| File.join(mapping_original_dest, rel_path) }
-        removals.map! { |rel_path| File.join(mapping_original_src, rel_path) }
+        additions = relative_to_absolute(filter_ignores(additions), mapping_original_dest)
+        modifications = relative_to_absolute(filter_ignores(modifications), mapping_original_dest)
+        removals = relative_to_absolute(filter_ignores(removals), mapping_original_src)
 
         Dotsync::Diff.new(additions: additions, modifications: modifications, removals: removals)
       end
 
       def diff_mapping_files
         Dotsync::Diff.new.tap do |diff|
-          if !File.exist?(@mapping.dest)
+          if @mapping.file_present_in_src_only?
             diff.additions << @mapping.original_dest
-          else
+          elsif @mapping.file_changed?
             diff.modifications << @mapping.original_dest
           end
         end
       end
 
-      def filter_paths(all_paths, ignore_paths)
+      def filter_ignores(all_paths)
+        return all_paths unless ignores.any?
         all_paths.reject do |path|
-          ignore_paths.any? do |ignore|
+          ignores.any? do |ignore|
             path == ignore || path.start_with?("#{ignore}/")
           end
         end

data/lib/dotsync/utils/file_transfer.rb

@@ -22,7 +22,7 @@ module Dotsync
       if File.file?(@src)
         transfer_file(@src, @dest)
       else
-        FileUtils.rm_rf(Dir.glob(File.join(@dest, "*"))) if @force
+        cleanup_folder(@dest, @ignores) if @force
         transfer_folder(@src, @dest)
       end
     end
@@ -50,6 +50,32 @@ module Dotsync
         end
       end
 
+      def cleanup_folder(target_dir, exclusions = [])
+        exclusions = exclusions.map { |ex| File.expand_path(ex) }
+        target_dir = File.expand_path(target_dir)
+
+        # The `Find.find` method in Ruby performs a depth-first traversal of the
+        # file hierarchy. This means it will explore all files and subdirectories
+        # within a directory before returning to process the parent directory.
+        # Because of this order, `FileUtils.rmdir` can be executed safely at the
+        # end of the traversal, as all files and subdirectories within a directory
+        # would have already been processed and removed.
+
+        Find.find(target_dir) do |path|
+          next if path == target_dir
+          abs_path = File.expand_path(path)
+          if exclusions.any? { |ex| abs_path.start_with?(ex) }
+            Find.prune if File.directory?(path)
+            next
+          end
+          if File.file?(path)
+            FileUtils.rm(path)
+          elsif File.directory?(path) && Dir.empty?(path)
+            FileUtils.rmdir(path)
+          end
+        end
+      end
+
       def ignore?(path)
         @ignores.any? { |ignore| path.start_with?(ignore) }
       end

data/lib/dotsync/utils/path_utils.rb

@@ -16,6 +16,14 @@ module Dotsync
       path.gsub(/\$(\w+)/) { "\e[38;5;#{ENV_VARS_COLOR}m$#{$1}\e[0m" }
     end
 
+    # Converts an array of relative paths to absolute paths based on a specified base path
+    # @param [Array<String>] paths The array of relative paths
+    # @param [String] base_path The base absolute path to resolve relative paths
+    # @return [Array<String>] The array of absolute paths
+    def relative_to_absolute(paths, base_path)
+      paths.map { |path| File.join(base_path, path) }
+    end
+
     # Translates /tmp paths to /private/tmp paths on macOS
     # Retains other paths as-is
     # @param [String] path The input path to translate

data/lib/dotsync/version.rb

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

data/lib/dotsync.rb

@@ -10,10 +10,10 @@ require "ostruct"
 require "find"
 
 # Utils
+require_relative "dotsync/utils/path_utils"
 require_relative "dotsync/utils/logger"
 require_relative "dotsync/utils/file_transfer"
 require_relative "dotsync/utils/directory_differ"
-require_relative "dotsync/utils/path_utils"
 
 # Models
 require_relative "dotsync/models/mapping"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotsync
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - David Sáenz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-01 00:00:00.000000000 Z
+date: 2025-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +258,8 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- docs/images/dotsync_pull.png
+- docs/images/dotsync_push.png
 - docs/images/dotsync_push_apply.png
 - dotsync.gemspec
 - exe/console