dotsync 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a3bda4bc44a07335f8373e9411b3bf480b3531875e7decf97bd7b8bf013737f
-  data.tar.gz: f16173b0468886005524702cf3b808a46c90d6c06d1bef30228b6d3d7cbf08cb
+  metadata.gz: c1bdf9f9ccaf7c8fb89e69d1e2f8cd95b72bc7b089d2e582fb358a84ebefb6d2
+  data.tar.gz: e05942884ce70c0921c8bfa18f7a9e8be1d8f92ff06912b1f9d09098088ff8fc
 SHA512:
-  metadata.gz: f558392c0c9f8cf336fa7088c99df08e9d390f5e29eb2b2a62286aeae09fd13fde752499dff070bf0cd683195a2514d2b911d6adebcb82247e9430575501e3ae
-  data.tar.gz: edb809cda8a1d9c5c2aec1bd9f0588015df1bb2d4ffad14d7fe1761ae8ff30494c8e57f96ca46cbc7a1e2221b395948fad2d42454e6bcea621f05aa9238aaf15
+  metadata.gz: f33b7f4c6293a0a50c263560f433f7712f6b7d67f997222db3070c7c72b35837b7ed7d92c1b7fcc3b05574d047db6d4daa8a97bd20438e1237ed9f1ffbd8fba8
+  data.tar.gz: 15e81bab5c0eaba1ab206c7a8c720f1baaacceb1e8ee5429e7ec1df20515329466c1a43949a637a8485219d92578d2e6acefc3768a529aef9136b90ab6d6b34a

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

@@ -34,7 +34,7 @@ jobs:
           bundle exec rubocop
 
       - name: Publish to RubyGems
-        if: matrix.ruby == '3.2'
+        if: matrix.ruby == '3.2' && github.ref_name == 'master'
         run: |
           mkdir -p $HOME/.gem
           touch $HOME/.gem/credentials

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.15
+
+- Readme: update screenshots in docs
+- Consistent order of icons on Legend and Mappings
+- DirectoryDiffer: implements only option
+- Show Flags icons closer
+
 # 0.1.14
 
 - Render environment variables and mappings with a table

data/Gemfile.lock

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

data/README.md

@@ -114,6 +114,14 @@ dest = "$DOTFILES_DIR/config/alacritty"
 Each mapping entry supports the following options:
 
 - **`force`**: A boolean (true/false) value. When set to `true`, it forces deletion of the destination folder before transferring files from the source. This is particularly useful when you need to ensure that the destination is clean before a transfer.
+- **`only`**: An array of files or folders. This option ensures that only the specified files or folders from the `src` directory are transferred to the `dest` directory. Example:
+  ```toml
+  [[push.mappings]]
+  src = "$XDG_CONFIG_HOME"
+  dest = "$DOTFILES_DIR/config"
+  only = ["config.yml", "themes"]
+
+  ```
 - **`ignore`**: An array of patterns or file names to exclude during the transfer. This allows you to specify files or folders that should not be copied from the source to the destination.
 
 These options apply when the source is a directory and are relevant for both `push` and `pull` operations.

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

@@ -6,7 +6,7 @@ module Dotsync
 
     LEGEND = [
       [Dotsync::Icons.force, "The source will overwrite the destination"],
-      [Dotsync::Icons.only, " Only paths configured to considered in the source"],
+      [Dotsync::Icons.only, "Paths designated explicitly as source only"],
       [Dotsync::Icons.ignore, "Paths configured to be ignored in the destination"],
       [Dotsync::Icons.invalid, "Invalid paths detected in the source or destination"]
     ]

data/lib/dotsync/models/mapping.rb

@@ -13,7 +13,7 @@ module Dotsync
       @original_only = Array(attributes["only"])
       @force = attributes["force"] || false
 
-      @sanitized_src, @sanitized_dest, @sanitized_ignore, @sanitized_only = process_paths(
+      @sanitized_src, @sanitized_dest, @sanitized_ignores, @sanitized_only = process_paths(
         @original_src,
         @original_dest,
         @original_ignores,
@@ -30,7 +30,7 @@ module Dotsync
     end
 
     def ignores
-      @sanitized_ignore
+      @sanitized_ignores
     end
 
     def inclusions
@@ -77,11 +77,11 @@ module Dotsync
 
     def icons
       msg = []
-      msg << Icons.invalid unless valid?
-      msg << Icons.only if only?
-      msg << Icons.ignore if ignores?
       msg << Icons.force if force?
-      msg.join(" ")
+      msg << Icons.only if has_inclusions?
+      msg << Icons.ignore if has_ignores?
+      msg << Icons.invalid unless valid?
+      msg.join
     end
 
     def to_s
@@ -114,25 +114,41 @@ module Dotsync
       )
     end
 
+    def include?(path)
+      return true unless has_inclusions?
+      return true if path == src
+      inclusions.any? { |inclusion| path_is_parent_or_same?(inclusion, path) }
+    end
+
+    def bidirectional_include?(path)
+      return true unless has_inclusions?
+      return true if path == src
+      inclusions.any? { |inclusion| path_is_parent_or_same?(inclusion, path) || path_is_parent_or_same?(path, inclusion) }
+    end
+
+    def ignore?(path)
+      ignores.any? { |ignore| path.start_with?(ignore) }
+    end
+
     private
-      def ignores?
+      def has_ignores?
         @original_ignores.any?
       end
 
-      def only?
+      def has_inclusions?
         @original_only.any?
       end
 
       def process_paths(raw_src, raw_dest, raw_ignores, raw_only)
         sanitized_src = sanitize_path(raw_src)
         sanitized_dest = sanitize_path(raw_dest)
-        sanitized_ignore = raw_ignores.flat_map do |path|
+        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)
         end
-        [sanitized_src, sanitized_dest, sanitized_ignore, sanitized_only]
+        [sanitized_src, sanitized_dest, sanitized_ignores, sanitized_only]
       end
   end
 end

data/lib/dotsync/utils/directory_differ.rb

@@ -36,6 +36,11 @@ module Dotsync
         Find.find(mapping_src) do |src_path|
           rel_path = src_path.sub(/^#{Regexp.escape(mapping_src)}\/?/, "")
 
+          unless @mapping.include?(src_path)
+            Find.prune
+            next
+          end
+
           dest_path = File.join(mapping_dest, rel_path)
 
           if !File.exist?(dest_path)

data/lib/dotsync/utils/file_transfer.rb

@@ -2,8 +2,6 @@
 
 module Dotsync
   class FileTransfer
-    attr_reader :ignores
-
     # Initializes a new FileTransfer instance
     #
     # @param mapping [Dotsync::Mapping] the mapping object containing source, destination, force, and ignore details
@@ -12,6 +10,7 @@ module Dotsync
     # @option mapping [Boolean] :force? optional flag to force actions
     # @option mapping [Array<String>] :ignores optional list of files/directories to ignore
     def initialize(mapping)
+      @mapping = mapping
       @src = mapping.src
       @dest = mapping.dest
       @force = mapping.force?
@@ -29,6 +28,8 @@ module Dotsync
     end
 
     private
+      attr_reader :mapping, :ignores
+
       def transfer_file(file_src, file_dest)
         FileUtils.mkdir_p(File.dirname(file_dest))
         FileUtils.cp(file_src, file_dest)
@@ -36,12 +37,17 @@ module Dotsync
 
       def transfer_folder(folder_src, folder_dest)
         FileUtils.mkdir_p(folder_dest)
+
+        # `Dir.glob("#{folder_src}/*")` retrieves only the immediate contents
+        # (files and directories) within the specified directory (`folder_src`),
+        # without descending into subdirectories.
+
         Dir.glob("#{folder_src}/*", File::FNM_DOTMATCH).each do |path|
           next if [".", ".."].include?(File.basename(path))
 
           full_path = File.expand_path(path)
-          next unless inclusion?(full_path)
-          next if ignore?(full_path)
+          next unless mapping.bidirectional_include?(full_path)
+          next if mapping.ignore?(full_path)
 
           target = File.join(folder_dest, File.basename(path))
           if File.file?(full_path)
@@ -77,14 +83,5 @@ module Dotsync
           end
         end
       end
-
-      def inclusion?(path)
-        return true unless @inclusions.any?
-        @inclusions.any? { |inclusion| path.start_with?(inclusion) || inclusion.start_with?(path) }
-      end
-
-      def ignore?(path)
-        @ignores.any? { |ignore| path.start_with?(ignore) }
-      end
   end
 end

data/lib/dotsync/utils/path_utils.rb

@@ -24,6 +24,12 @@ module Dotsync
       paths.map { |path| File.join(base_path, path) }
     end
 
+    def path_is_parent_or_same?(parent, child)
+      parent = Pathname.new(parent).expand_path
+      child  = Pathname.new(child).expand_path
+      child.ascend.any? { |ancestor| ancestor == parent }
+    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.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotsync
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - David Sáenz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 2025-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml-rb