dotsync 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296888a8438bcbc159e621b7e1423429c6a937e7d67ec8970c4b0779d85b840f
-  data.tar.gz: 2d6fa4363f2a107cd074002ef8d40bb553cf5aa5bb11f52048ec3eb58cf90a09
+  metadata.gz: b3c840b83736169eaabf3296862872f088fc9ae49dc15545adf49bf75439620e
+  data.tar.gz: c8cf364077464a687df689c9bc6f43aa75fa45c61df531fcdc498a043ab2b02d
 SHA512:
-  metadata.gz: 389498f088842bebc6a45426d1451b9ac5cd00724526fcf92633d7dbf48ad32adc35986067ade21d086963d557a993b58d5a35c6332b5ef6e81ec36065f81600
-  data.tar.gz: 740404a8803dcc05f053c0f1b7ba57f1187b7b920a8f34af3217162c554e8d263740bad31921bf8249e9b25820a6905651c200da63e8e072573f031d775516cf
+  metadata.gz: 105b36727336e5169a23de08a2a8f2165a568682a8ea4f590f93d93525990181cf3994239151d9a1e72d75e33416c217777a604373a37fbd0d7ff3e1aca94d93
+  data.tar.gz: 97a767742387ebd6af332e8e1a1d4e19b887c019fe5fb4863d449ea9e9ba6c9ddcf8459bee0a018362761d7f2c4d699bd7b69240af45ebc144c9ded697d46115

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+# 0.1.20
+
+**Robustness & Error Handling:**
+- Add specific error classes for better error handling (`PermissionError`, `DiskFullError`, `SymlinkError`, `TypeConflictError`)
+- Add symlink support with proper preservation of link targets (regular, broken, and relative symlinks)
+- Add type conflict detection to prevent overwriting directories with files or vice versa
+- Enhance FileTransfer error handling for permission issues and disk space errors
+
+**Testing & Quality:**
+- Add 16 new test cases covering edge cases and error scenarios
+- Add comprehensive symlink handling tests (regular, broken, relative)
+- Add path traversal security validation tests
+- Add Unicode filename compatibility tests (Russian, Japanese, Chinese, emoji)
+- Add empty directory transfer tests
+- Add Mapping#apply_to tests for path handling and force flag preservation
+- Improve content comparison tests to verify actual file changes
+- Improve path validation tests with more edge cases
+- Total test count increased from 136 to 152 examples
+
+**Developer Experience:**
+- All tests passing (152 examples, 0 failures)
+- RuboCop compliant with no offenses
+
 # 0.1.19
 
 **Documentation & Testing:**

data/Gemfile.lock

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

data/lib/dotsync/errors.rb

@@ -3,4 +3,9 @@
 module Dotsync
   class Error < StandardError; end
   class ConfigError < StandardError; end
+  class FileTransferError < Error; end
+  class PermissionError < FileTransferError; end
+  class DiskFullError < FileTransferError; end
+  class SymlinkError < FileTransferError; end
+  class TypeConflictError < FileTransferError; end
 end

data/lib/dotsync/models/mapping.rb

@@ -58,11 +58,17 @@ module Dotsync
     end
 
     def valid?
+      return false unless paths_are_distinct?
+      return false unless paths_not_nested?
       directories? || files? || file_present_in_src_only?
     end
 
     def file_changed?
-      files_present? && (File.size(src) != File.size(dest))
+      return false unless files_present?
+      # Check size first for quick comparison
+      return true if File.size(src) != File.size(dest)
+      # If sizes match, compare content
+      FileUtils.compare_file(src, dest) == false
     end
 
     def backup_possible?
@@ -154,5 +160,16 @@ module Dotsync
         end
         [sanitized_src, sanitized_dest, sanitized_ignores, sanitized_only]
       end
+
+      def paths_are_distinct?
+        src != dest
+      end
+
+      def paths_not_nested?
+        # Check if dest is inside src or vice versa
+        return false if dest.start_with?("#{src}/")
+        return false if src.start_with?("#{dest}/")
+        true
+      end
   end
 end

data/lib/dotsync/utils/directory_differ.rb

@@ -46,7 +46,7 @@ module Dotsync
           if !File.exist?(dest_path)
             additions << rel_path
           elsif File.file?(src_path) && File.file?(dest_path)
-            if File.size(src_path) != File.size(dest_path)
+            if files_differ?(src_path, dest_path)
               modifications << rel_path
             end
           end
@@ -92,5 +92,13 @@ module Dotsync
           end
         end
       end
+
+      def files_differ?(src_path, dest_path)
+        # First check size for quick comparison
+        return true if File.size(src_path) != File.size(dest_path)
+
+        # If sizes match, compare content
+        FileUtils.compare_file(src_path, dest_path) == false
+      end
   end
 end

data/lib/dotsync/utils/file_transfer.rb

@@ -20,7 +20,28 @@ module Dotsync
 
     def transfer
       if File.file?(@src)
-        transfer_file(@src, @dest)
+        # Check if we're trying to overwrite a directory with a file
+        if File.exist?(@dest) && File.directory?(@dest) && !File.symlink?(@dest)
+          # If @dest is a directory and NOT just a parent directory for the file,
+          # this is a conflict. The check is: if @dest path exactly matches where
+          # we want the file to be (not a parent dir), then it's a conflict.
+          # We determine this by checking if File.basename(@src) already appears
+          # to be accounted for in @dest path.
+          dest_basename = File.basename(@dest)
+          src_basename = File.basename(@src)
+
+          if dest_basename == src_basename
+            raise Dotsync::TypeConflictError, "Cannot overwrite directory '#{@dest}' with file '#{@src}'"
+          end
+        end
+
+        # If dest is a directory, compute the target file path
+        target_dest = if File.directory?(@dest)
+          File.join(@dest, File.basename(@src))
+        else
+          @dest
+        end
+        transfer_file(@src, target_dest)
       else
         cleanup_folder(@dest) if @force
         transfer_folder(@src, @dest)
@@ -31,8 +52,29 @@ module Dotsync
       attr_reader :mapping, :ignores
 
       def transfer_file(file_src, file_dest)
+        # Check for type conflicts before transfer
+        if File.exist?(file_dest) && File.directory?(file_dest)
+          raise Dotsync::TypeConflictError, "Cannot overwrite directory '#{file_dest}' with file '#{file_src}'"
+        end
+
         FileUtils.mkdir_p(File.dirname(file_dest))
-        FileUtils.cp(file_src, file_dest)
+
+        # Use atomic write: copy to temp file, then rename
+        # This prevents corruption if copy is interrupted
+        temp_file = "#{file_dest}.tmp.#{Process.pid}"
+        begin
+          FileUtils.cp(file_src, temp_file)
+          FileUtils.mv(temp_file, file_dest, force: true)
+        rescue Errno::EACCES, Errno::EPERM => e
+          FileUtils.rm_f(temp_file) if File.exist?(temp_file)
+          raise Dotsync::PermissionError, "Permission denied: #{e.message}"
+        rescue Errno::ENOSPC => e
+          FileUtils.rm_f(temp_file) if File.exist?(temp_file)
+          raise Dotsync::DiskFullError, "Disk full: #{e.message}"
+        rescue StandardError => e
+          FileUtils.rm_f(temp_file) if File.exist?(temp_file)
+          raise Dotsync::FileTransferError, "Transfer failed: #{e.message}"
+        end
       end
 
       def transfer_folder(folder_src, folder_dest)
@@ -53,14 +95,42 @@ module Dotsync
           next if mapping.ignore?(full_path)
 
           target = File.join(folder_dest, File.basename(path))
-          if File.file?(full_path)
-            FileUtils.cp(full_path, target)
-          else
+          if File.symlink?(full_path)
+            transfer_symlink(full_path, target)
+          elsif File.file?(full_path)
+            transfer_file(full_path, target)
+          elsif File.directory?(full_path)
             transfer_folder(full_path, target)
           end
         end
       end
 
+      def transfer_symlink(symlink_src, symlink_dest)
+        # Check if we're trying to overwrite a regular file or directory with a symlink
+        if File.exist?(symlink_dest) && !File.symlink?(symlink_dest)
+          if File.directory?(symlink_dest)
+            raise Dotsync::TypeConflictError, "Cannot overwrite directory '#{symlink_dest}' with symlink '#{symlink_src}'"
+          end
+        end
+
+        FileUtils.mkdir_p(File.dirname(symlink_dest))
+
+        # Get the target the symlink points to
+        link_target = File.readlink(symlink_src)
+
+        begin
+          # Remove existing symlink if present
+          FileUtils.rm(symlink_dest) if File.exist?(symlink_dest) || File.symlink?(symlink_dest)
+
+          # Create the new symlink
+          File.symlink(link_target, symlink_dest)
+        rescue Errno::EACCES, Errno::EPERM => e
+          raise Dotsync::PermissionError, "Permission denied creating symlink: #{e.message}"
+        rescue StandardError => e
+          raise Dotsync::SymlinkError, "Failed to create symlink: #{e.message}"
+        end
+      end
+
       def cleanup_folder(target_dir)
         target_dir = File.expand_path(target_dir)
 

data/lib/dotsync/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotsync
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - David Sáenz