dotsync 0.1.25 → 0.1.27

data/lib/dotsync/utils/directory_differ.rb

@@ -31,6 +31,7 @@ module Dotsync
       def diff_mapping_directories
         additions = []
         modifications = []
+        modification_pairs = []
         removals = []
 
         Find.find(mapping_src) do |src_path|
@@ -48,6 +49,7 @@ module Dotsync
           elsif File.file?(src_path) && File.file?(dest_path)
             if files_differ?(src_path, dest_path)
               modifications << rel_path
+              modification_pairs << { rel_path: rel_path, src: src_path, dest: dest_path }
             end
           end
         end
@@ -67,21 +69,29 @@ module Dotsync
           end
         end
 
+        filtered_modifications = filter_ignores(modifications)
+        modification_pairs = modification_pairs.select { |pair| filtered_modifications.include?(pair[:rel_path]) }
+
         additions = relative_to_absolute(filter_ignores(additions), mapping_original_dest)
-        modifications = relative_to_absolute(filter_ignores(modifications), mapping_original_dest)
+        modifications = relative_to_absolute(filtered_modifications, mapping_original_dest)
         removals = relative_to_absolute(filter_ignores(removals), mapping_original_dest)
 
-        Dotsync::Diff.new(additions: additions, modifications: modifications, removals: removals)
+        Dotsync::Diff.new(additions: additions, modifications: modifications, removals: removals, modification_pairs: modification_pairs)
       end
 
       def diff_mapping_files
-        Dotsync::Diff.new.tap do |diff|
-          if @mapping.file_present_in_src_only?
-            diff.additions << @mapping.original_dest
-          elsif @mapping.file_changed?
-            diff.modifications << @mapping.original_dest
-          end
+        additions = []
+        modifications = []
+        modification_pairs = []
+
+        if @mapping.file_present_in_src_only?
+          additions << @mapping.original_dest
+        elsif @mapping.file_changed?
+          modifications << @mapping.original_dest
+          modification_pairs << { rel_path: File.basename(@mapping.original_dest), src: @mapping.src, dest: @mapping.dest }
         end
+
+        Dotsync::Diff.new(additions: additions, modifications: modifications, modification_pairs: modification_pairs)
       end
 
       def filter_ignores(all_paths)

data/lib/dotsync/version.rb

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

data/lib/dotsync.rb

@@ -22,6 +22,7 @@ require_relative "dotsync/version"
 
 # Config Concerns (loaded early as they're used by other modules)
 require_relative "dotsync/config/concerns/xdg_base_directory"
+require_relative "dotsync/config/concerns/sync_mappings"
 
 # Utils
 require_relative "dotsync/utils/path_utils"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dotsync
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.27
 platform: ruby
 authors:
 - David Sáenz
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb
@@ -285,9 +284,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".github/workflows/gem-push.yml"
-- ".github/workflows/gem-push.yml.bak"
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
+- ".pre-commit-config.yaml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -317,6 +317,7 @@ files:
 - lib/dotsync/actions/watch_action.rb
 - lib/dotsync/colors.rb
 - lib/dotsync/config/base_config.rb
+- lib/dotsync/config/concerns/sync_mappings.rb
 - lib/dotsync/config/concerns/xdg_base_directory.rb
 - lib/dotsync/config/pull_action_config.rb
 - lib/dotsync/config/push_action_config.rb
@@ -333,6 +334,7 @@ files:
 - lib/dotsync/runner.rb
 - lib/dotsync/tasks/actions.rake
 - lib/dotsync/utils/config_cache.rb
+- lib/dotsync/utils/content_diff.rb
 - lib/dotsync/utils/directory_differ.rb
 - lib/dotsync/utils/file_transfer.rb
 - lib/dotsync/utils/logger.rb
@@ -346,7 +348,6 @@ metadata:
   homepage_uri: https://github.com/dsaenztagarro/dotsync
   source_code_uri: https://github.com/dsaenztagarro/dotsync
   changelog_uri: https://github.com/dsaenztagarro/dotsync/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -361,8 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Manage dotfiles like a boss
 test_files: []

data/.github/workflows/gem-push.yml.bak

@@ -1,45 +0,0 @@
-jobs:
-  build:
-    name: Build + Publish
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Publish to GPR
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-      env:
-        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
-        OWNER: ${{ github.repository_owner }}
-
-  publish:
-    needs: test
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && matrix.ruby == '3.2'
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.2
-          bundler-cache: true
-
-      - name: Check if gem version has changed
-        id: gem_version_check
-        run: |
-          gem build *.gemspec
-          gem_name=$(ls *.gem | head -n 1)
-          gem info $gem_name --remote || echo "new_version" > version_changed
-        env:
-          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"