dotsync 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653f18b457e91c025888eb6fca1d14de2718aa0ee7253c30d80e699c6fdc720a
-  data.tar.gz: 9c180933f5b35c186fbfaf754a38a9217fcdd459fae3c75d67787d43516f3871
+  metadata.gz: a868366d1612681fb6a8342ded8b94887e8c822fff94dbcfaecc6991efe3804b
+  data.tar.gz: efb0a01d0a6210915c019e2b133ef18c1e12fb8a0348c2151c506722089ee33e
 SHA512:
-  metadata.gz: 0aedae57228a61723b3f4f929e64387dce6fbc227d2f9d68271512eafa7ff15c7ac780fc0f2be80b60868266f309d52403b0ea24d7222770f5ce16edce102df9
-  data.tar.gz: 19cb8d65ba7216aa1e2577eb77876a363267e1f7a73f5b5c7dd9ce26c4490988613d30be2199e1580971ac10c45515f86d145bd6565b98edd6d0035dacd352c5
+  metadata.gz: e9f71907042f83845b11367f430581e7f91d002a0fb9ad3a7b5506bb63ac85486ad30f668597daa9a73a1f8f79b71e794e137493fd48eb84aa9d74b9e9af81c2
+  data.tar.gz: 31dbc7a701a809efd03d085b7544dfaec9ba550e5089fcabb87208a4f3e18f910d709821cf91f854769b9d7b8b1e4efeb40c0d6af40606a184301627306cd4b1

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

@@ -45,6 +45,12 @@ jobs:
         env:
           GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
 
+      - name: Configure Git
+        if: matrix.ruby == '3.2' && github.ref_name == 'master'
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+
       - name: Generate release tag
         if: matrix.ruby == '3.2' && github.ref_name == 'master'
         run: |

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.17
+
+- Fixes skipped files
+- FileTransfer: fixes options
+- GithubActions: fixes generate release tag
+- Avoid backup without no difference
+
 # 0.1.16
 
 - DirectoryDiffer: fixes path on removal difference

data/Gemfile.lock

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

data/exe/dotsync

@@ -32,6 +32,10 @@ opt_parser = OptionParser.new do |opts|
       -h, --help            Show this help message
   BANNER
 
+  opts.on("-a", "--apply", "Apply changes") do
+    options[:apply] = true
+  end
+
   opts.on("-q", "--quiet", "Hide all non-essential output (only errors or final status)") do
     options[:quiet] = true
   end

data/lib/dotsync/actions/pull_action.rb

@@ -19,9 +19,11 @@ module Dotsync
 
       return unless options[:apply]
 
-      if create_backup
-        show_backup
-        purge_old_backups
+      if has_differences?
+        if create_backup
+          show_backup
+          purge_old_backups
+        end
       end
 
       transfer_mappings

data/lib/dotsync/models/mapping.rb

@@ -130,6 +130,10 @@ module Dotsync
       ignores.any? { |ignore| path.start_with?(ignore) }
     end
 
+    def skip?(path)
+      ignore?(path) || !include?(path)
+    end
+
     private
       def has_ignores?
         @original_ignores.any?
@@ -145,8 +149,8 @@ module Dotsync
         sanitized_ignores = raw_ignores.flat_map do |path|
           [File.join(sanitized_src, path), File.join(sanitized_dest, path)]
         end
-        sanitized_only = raw_only.map do |path|
-          File.join(sanitized_src, path)
+        sanitized_only = raw_only.flat_map do |path|
+          [File.join(sanitized_src, path), File.join(sanitized_dest, path)]
         end
         [sanitized_src, sanitized_dest, sanitized_ignores, sanitized_only]
       end

data/lib/dotsync/utils/directory_differ.rb

@@ -59,6 +59,8 @@ module Dotsync
 
             src_path = File.join(mapping_src, rel_path)
 
+            next if @mapping.skip?(src_path)
+
             if !File.exist?(src_path)
               removals << rel_path
             end

data/lib/dotsync/utils/file_transfer.rb

@@ -22,7 +22,7 @@ module Dotsync
       if File.file?(@src)
         transfer_file(@src, @dest)
       else
-        cleanup_folder(@dest, @ignores) if @force
+        cleanup_folder(@dest) if @force
         transfer_folder(@src, @dest)
       end
     end
@@ -46,6 +46,9 @@ module Dotsync
           next if [".", ".."].include?(File.basename(path))
 
           full_path = File.expand_path(path)
+          # puts full_path
+          # require 'debug'; binding.b if full_path.include?("file6.txt")
+          # require 'debug'; binding.b if full_path.include?("sub2folder2")
           next unless mapping.bidirectional_include?(full_path)
           next if mapping.ignore?(full_path)
 
@@ -58,8 +61,7 @@ module Dotsync
         end
       end
 
-      def cleanup_folder(target_dir, exclusions = [])
-        exclusions = exclusions.map { |ex| File.expand_path(ex) }
+      def cleanup_folder(target_dir)
         target_dir = File.expand_path(target_dir)
 
         # The `Find.find` method in Ruby performs a depth-first traversal of the
@@ -72,7 +74,7 @@ module Dotsync
         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) }
+          if @mapping.ignore?(abs_path)
             Find.prune if File.directory?(path)
             next
           end

data/lib/dotsync/version.rb

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

metadata

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