dotsync 0.1.27 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2cef06dff635c8202f87424d1532d0db5cfdf7e26e1c0c98daee44acdd12e4
-  data.tar.gz: 38484cab4e99854a8b54259e222ace225834000c9d9a6df8005dff8b1baa228c
+  metadata.gz: 492eda1f730e490322f6ff7fe85fd3fb91a1bd337f191f13d9574d63a5a9a326
+  data.tar.gz: f797e4c6a06258d312c3264be88cda022cb02f8053ed31159de54ce585ef9e3a
 SHA512:
-  metadata.gz: 22d5fe759b17a723377363c22f05f77cedf57fd6ac41b4c8d379c2f2b2bf4fb42022a0c92707083356a096385fe51b1175c9865fb1f78fde58ba41b94be9fa17
-  data.tar.gz: 3fb40ad4ac4835cf0c3a45e8bb3d872197dc60bb79d04b8a6ff09d5626d6b92f63865b035d5eb7cc923f12319b4651e08ffe36e808296d002f88712e5bc54730
+  metadata.gz: 0d9bd4948c5d7de46e30443ca19ae4fabfc8d0caf3410b2a5e8bb519c8dc27384e032c06db32bd2a9bad041f6642707e8223f4affad58aa540cde4e277663b77
+  data.tar.gz: f20438f023966222c67f1a5397dfa8110d0d1cf4985fe67a82f0f8cbe615a9b25bdb88db176db33f1a0bf5109dccb1c5cce4889d74ab259dbd8bdd6e1716c2cf

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.2.0] - 2025-02-06
+
+**New Features:**
+- Add `--diff-content` CLI option to display git-like unified diff output for modified files
+  - Shows actual content changes without needing external tools like `nvim -d`
+  - Color-coded output: blue for additions, red for deletions, cyan for hunk headers
+  - Automatically skips binary files
+  - Works with both `push` and `pull` commands
+
+**Performance Optimizations:**
+- Add parallel processing for mapping operations
+  - New `Dotsync::Parallel` utility module with thread-pool based execution
+  - Diff computation runs in parallel across multiple mappings
+  - File transfers execute concurrently for independent mappings
+  - Thread-safe error collection and reporting
+- Add directory pruning optimization
+  - New `should_prune_directory?` method for early-exit during traversal
+  - Skips entire directory subtrees that are ignored or outside inclusion lists
+  - Reduces filesystem operations for large excluded directories
+
 ## [0.1.26] - 2025-01-11
 
 **Breaking Changes:**

data/Gemfile.lock

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

data/lib/dotsync/actions/concerns/mappings_transfer.rb

@@ -87,28 +87,33 @@ module Dotsync
     end
 
     def transfer_mappings
-      valid_mappings.each do |mapping|
+      errors = []
+      mutex = Mutex.new
+
+      Dotsync::Parallel.each(valid_mappings) do |mapping|
         Dotsync::FileTransfer.new(mapping).transfer
       rescue Dotsync::PermissionError => e
-        logger.error("Permission denied: #{e.message}")
-        logger.info("Try: chmod +w <path> or check file permissions")
+        mutex.synchronize { errors << ["Permission denied: #{e.message}", "Try: chmod +w <path> or check file permissions"] }
       rescue Dotsync::DiskFullError => e
-        logger.error("Disk full: #{e.message}")
-        logger.info("Free up disk space and try again")
+        mutex.synchronize { errors << ["Disk full: #{e.message}", "Free up disk space and try again"] }
       rescue Dotsync::SymlinkError => e
-        logger.error("Symlink error: #{e.message}")
-        logger.info("Check that symlink target exists and is accessible")
+        mutex.synchronize { errors << ["Symlink error: #{e.message}", "Check that symlink target exists and is accessible"] }
       rescue Dotsync::TypeConflictError => e
-        logger.error("Type conflict: #{e.message}")
-        logger.info("Cannot overwrite directory with file or vice versa")
+        mutex.synchronize { errors << ["Type conflict: #{e.message}", "Cannot overwrite directory with file or vice versa"] }
       rescue Dotsync::FileTransferError => e
-        logger.error("File transfer failed: #{e.message}")
+        mutex.synchronize { errors << ["File transfer failed: #{e.message}", nil] }
+      end
+
+      # Report all errors after parallel execution
+      errors.each do |error_msg, info_msg|
+        logger.error(error_msg)
+        logger.info(info_msg) if info_msg
       end
     end
 
     private
       def differs
-        @differs ||= valid_mappings.map do |mapping|
+        @differs ||= Dotsync::Parallel.map(valid_mappings) do |mapping|
           Dotsync::DirectoryDiffer.new(mapping).diff
         end
       end

data/lib/dotsync/loaders/pull_loader.rb

@@ -12,6 +12,7 @@ require_relative "../utils/file_transfer"
 require_relative "../utils/directory_differ"
 require_relative "../utils/config_cache"
 require_relative "../utils/content_diff"
+require_relative "../utils/parallel"
 
 # Models
 require_relative "../models/mapping"

data/lib/dotsync/loaders/push_loader.rb

@@ -12,6 +12,7 @@ require_relative "../utils/file_transfer"
 require_relative "../utils/directory_differ"
 require_relative "../utils/config_cache"
 require_relative "../utils/content_diff"
+require_relative "../utils/parallel"
 
 # Models
 require_relative "../models/mapping"

data/lib/dotsync/models/mapping.rb

@@ -140,6 +140,16 @@ module Dotsync
       ignore?(path) || !include?(path)
     end
 
+    # Returns true if a directory can be entirely skipped during destination walks.
+    # A directory should be pruned if:
+    # 1. It's ignored, OR
+    # 2. It has inclusions AND the path is neither included nor a parent of any inclusion
+    def should_prune_directory?(path)
+      return true if ignore?(path)
+      return false unless has_inclusions?
+      !bidirectional_include?(path)
+    end
+
     private
       def has_ignores?
         @original_ignores.any?

data/lib/dotsync/utils/directory_differ.rb

@@ -61,6 +61,12 @@ module Dotsync
 
             src_path = File.join(mapping_src, rel_path)
 
+            # Prune entire directory trees that are outside the inclusion list or ignored
+            if File.directory?(dest_path) && @mapping.should_prune_directory?(src_path)
+              Find.prune
+              next
+            end
+
             next if @mapping.skip?(src_path)
 
             if !File.exist?(src_path)

data/lib/dotsync/utils/parallel.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Dotsync
+  # Simple thread-based parallel execution for independent operations.
+  # Uses a configurable thread pool to process items concurrently.
+  module Parallel
+    # Default number of threads (matches typical CPU core count)
+    DEFAULT_THREADS = 4
+
+    # Executes a block for each item in the collection using parallel threads.
+    # Returns results in the same order as the input collection.
+    #
+    # @param items [Array] Collection of items to process
+    # @param threads [Integer] Number of parallel threads (default: 4)
+    # @yield [item] Block to execute for each item
+    # @return [Array] Results in same order as input
+    #
+    # @example
+    #   results = Dotsync::Parallel.map(urls, threads: 8) do |url|
+    #     fetch(url)
+    #   end
+    def self.map(items, threads: DEFAULT_THREADS, &block)
+      return [] if items.empty?
+      return items.map(&block) if items.size == 1
+
+      # Limit threads to item count
+      thread_count = [threads, items.size].min
+
+      # Create indexed work items
+      work_queue = Queue.new
+      items.each_with_index { |item, idx| work_queue << [idx, item] }
+
+      # Results array (pre-sized for thread safety with index assignment)
+      results = Array.new(items.size)
+      mutex = Mutex.new
+      errors = []
+
+      # Spawn worker threads
+      workers = thread_count.times.map do
+        Thread.new do
+          loop do
+            idx, item = work_queue.pop(true) rescue break
+            begin
+              results[idx] = yield(item)
+            rescue => e
+              mutex.synchronize { errors << e }
+            end
+          end
+        end
+      end
+
+      # Wait for completion
+      workers.each(&:join)
+
+      # Re-raise first error if any occurred
+      raise errors.first unless errors.empty?
+
+      results
+    end
+
+    # Executes a block for each item in parallel, ignoring return values.
+    # Useful for side-effect operations like file transfers.
+    #
+    # @param items [Array] Collection of items to process
+    # @param threads [Integer] Number of parallel threads (default: 4)
+    # @yield [item] Block to execute for each item
+    def self.each(items, threads: DEFAULT_THREADS, &block)
+      map(items, threads: threads, &block)
+      nil
+    end
+  end
+end

data/lib/dotsync/version.rb

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

data/lib/dotsync.rb

@@ -31,6 +31,7 @@ require_relative "dotsync/utils/file_transfer"
 require_relative "dotsync/utils/directory_differ"
 require_relative "dotsync/utils/version_checker"
 require_relative "dotsync/utils/config_cache"
+require_relative "dotsync/utils/parallel"
 
 # Models
 require_relative "dotsync/models/mapping"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotsync
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.2.0
 platform: ruby
 authors:
 - David Sáenz
@@ -338,6 +338,7 @@ files:
 - lib/dotsync/utils/directory_differ.rb
 - lib/dotsync/utils/file_transfer.rb
 - lib/dotsync/utils/logger.rb
+- lib/dotsync/utils/parallel.rb
 - lib/dotsync/utils/path_utils.rb
 - lib/dotsync/utils/version_checker.rb
 - lib/dotsync/version.rb